DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Rename computed field factories to be prefixed with computed

Browse Source 
to avoid shooting in foot
This commit is contained in:
DBotThePony 2023-03-18 14:25:21 +07:00
parent 982554d2f0
commit f68d3e749d
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/StringInputWithFeedback.kt
View File

@ -6,7 +6,7 @@ import kotlin.reflect.KMutableProperty0
class StringInputWithFeedback(menu: MatteryMenu) : AbstractPlayerInputWithFeedback<String>() {
override val input = menu.stringInput { consumer?.invoke(it.replace('\u0000', ' ')) }
override val value by menu.mSynchronizer.string { supplier?.invoke() ?: "" }
override val value by menu.mSynchronizer.computedString { supplier?.invoke() ?: "" }
constructor(menu: MatteryMenu, state: KMutableProperty0<String>) : this(menu) {
with(state)

90
src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt
View File

@ -87,59 +87,59 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
hasChanges = false
}
fun byte(getter: () -> Byte) = ComputedField(getter, ByteValueCodec)
fun computedByte(getter: () -> Byte) = ComputedField(getter, ByteValueCodec)
fun computedBool(getter: BooleanSupplier) = ComputedBooleanField(getter)
fun short(getter: () -> Short) = ComputedField(getter, ShortValueCodec)
fun long(getter: LongSupplier) = ComputedLongField(getter)
fun fixedLong(getter: LongSupplier) = ComputedFixedLongField(getter)
fun float(getter: FloatSupplier) = ComputedFloatField(getter)
fun double(getter: DoubleSupplier) = ComputedDoubleField(getter)
fun uuid(getter: () -> UUID) = ComputedField(getter, UUIDValueCodec)
fun int(getter: IntSupplier) = ComputedIntField(getter)
fun fixedInt(getter: IntSupplier) = ComputedFixedIntField(getter)
fun fraction(getter: () -> Decimal) = ComputedField(getter, DecimalValueCodec)
fun bigDecimal(getter: () -> BigDecimal) = ComputedField(getter, BigDecimalValueCodec)
fun item(getter: () -> ItemStack) = ComputedField(getter, ItemStackValueCodec)
fun string(getter: () -> String) = ComputedField(getter, BinaryStringCodec)
fun computedShort(getter: () -> Short) = ComputedField(getter, ShortValueCodec)
fun computedLong(getter: LongSupplier) = ComputedLongField(getter)
fun computedFixedLong(getter: LongSupplier) = ComputedFixedLongField(getter)
fun computedFloat(getter: FloatSupplier) = ComputedFloatField(getter)
fun computedDouble(getter: DoubleSupplier) = ComputedDoubleField(getter)
fun computedUuid(getter: () -> UUID) = ComputedField(getter, UUIDValueCodec)
fun computedInt(getter: IntSupplier) = ComputedIntField(getter)
fun computedFixedInt(getter: IntSupplier) = ComputedFixedIntField(getter)
fun computedDecimal(getter: () -> Decimal) = ComputedField(getter, DecimalValueCodec)
fun computedBigDecimal(getter: () -> BigDecimal) = ComputedField(getter, BigDecimalValueCodec)
fun computedItem(getter: () -> ItemStack) = ComputedField(getter, ItemStackValueCodec)
fun computedString(getter: () -> String) = ComputedField(getter, BinaryStringCodec)
fun byte(getter: KProperty0<Byte>) = ComputedField(getter, ByteValueCodec)
fun computedByte(getter: KProperty0<Byte>) = ComputedField(getter, ByteValueCodec)
fun computedBool(getter: KProperty0<Boolean>) = ComputedBooleanField(getter::get)
fun short(getter: KProperty0<Short>) = ComputedField(getter, ShortValueCodec)
fun long(getter: KProperty0<Long>) = ComputedLongField(getter::get)
fun fixedLong(getter: KProperty0<Long>) = ComputedFixedLongField(getter::get)
fun float(getter: KProperty0<Float>) = ComputedFloatField(getter::get)
fun double(getter: KProperty0<Double>) = ComputedDoubleField(getter::get)
fun uuid(getter: KProperty0<UUID>) = ComputedField(getter, UUIDValueCodec)
fun int(getter: KProperty0<Int>) = ComputedIntField(getter::get)
fun fixedInt(getter: KProperty0<Int>) = ComputedFixedIntField(getter::get)
fun fraction(getter: KProperty0<Decimal>) = ComputedField(getter, DecimalValueCodec)
fun bigDecimal(getter: KProperty0<BigDecimal>) = ComputedField(getter, BigDecimalValueCodec)
fun item(getter: KProperty0<ItemStack>) = ComputedField(getter, ItemStackValueCodec)
fun string(getter: KProperty0<String>) = ComputedField(getter, BinaryStringCodec)
fun computedShort(getter: KProperty0<Short>) = ComputedField(getter, ShortValueCodec)
fun computedLong(getter: KProperty0<Long>) = ComputedLongField(getter::get)
fun computedFixedLong(getter: KProperty0<Long>) = ComputedFixedLongField(getter::get)
fun computedFloat(getter: KProperty0<Float>) = ComputedFloatField(getter::get)
fun computedDouble(getter: KProperty0<Double>) = ComputedDoubleField(getter::get)
fun computedUuid(getter: KProperty0<UUID>) = ComputedField(getter, UUIDValueCodec)
fun computedInt(getter: KProperty0<Int>) = ComputedIntField(getter::get)
fun computedFixedInt(getter: KProperty0<Int>) = ComputedFixedIntField(getter::get)
fun computedDecimal(getter: KProperty0<Decimal>) = ComputedField(getter, DecimalValueCodec)
fun computedBigDecimal(getter: KProperty0<BigDecimal>) = ComputedField(getter, BigDecimalValueCodec)
fun computedItem(getter: KProperty0<ItemStack>) = ComputedField(getter, ItemStackValueCodec)
fun computedString(getter: KProperty0<String>) = ComputedField(getter, BinaryStringCodec)
fun byte(getter: Supplier<Byte>) = ComputedField(getter::get, ByteValueCodec)
fun computedByte(getter: Supplier<Byte>) = ComputedField(getter::get, ByteValueCodec)
fun computedBool(getter: Supplier<Boolean>) = ComputedBooleanField(getter::get)
fun short(getter: Supplier<Short>) = ComputedField(getter::get, ShortValueCodec)
fun long(getter: Supplier<Long>) = ComputedLongField(getter::get)
fun fixedLong(getter: Supplier<Long>) = ComputedFixedLongField(getter::get)
fun float(getter: Supplier<Float>) = ComputedFloatField(getter::get)
fun double(getter: Supplier<Double>) = ComputedDoubleField(getter::get)
fun uuid(getter: Supplier<UUID>) = ComputedField(getter::get, UUIDValueCodec)
fun int(getter: Supplier<Int>) = ComputedIntField(getter::get)
fun fixedInt(getter: Supplier<Int>) = ComputedFixedIntField(getter::get)
fun fraction(getter: Supplier<Decimal>) = ComputedField(getter::get, DecimalValueCodec)
fun bigDecimal(getter: Supplier<BigDecimal>) = ComputedField(getter::get, BigDecimalValueCodec)
fun item(getter: Supplier<ItemStack>) = ComputedField(getter::get, ItemStackValueCodec)
fun string(getter: Supplier<String>) = ComputedField(getter::get, BinaryStringCodec)
fun computedShort(getter: Supplier<Short>) = ComputedField(getter::get, ShortValueCodec)
fun computedLong(getter: Supplier<Long>) = ComputedLongField(getter::get)
fun computedFixedLong(getter: Supplier<Long>) = ComputedFixedLongField(getter::get)
fun computedFloat(getter: Supplier<Float>) = ComputedFloatField(getter::get)
fun computedDouble(getter: Supplier<Double>) = ComputedDoubleField(getter::get)
fun computedUuid(getter: Supplier<UUID>) = ComputedField(getter::get, UUIDValueCodec)
fun computedInt(getter: Supplier<Int>) = ComputedIntField(getter::get)
fun computedFixedInt(getter: Supplier<Int>) = ComputedFixedIntField(getter::get)
fun computedDecimal(getter: Supplier<Decimal>) = ComputedField(getter::get, DecimalValueCodec)
fun computedBigDecimal(getter: Supplier<BigDecimal>) = ComputedField(getter::get, BigDecimalValueCodec)
fun computedItem(getter: Supplier<ItemStack>) = ComputedField(getter::get, ItemStackValueCodec)
fun computedString(getter: Supplier<String>) = ComputedField(getter::get, BinaryStringCodec)
fun <T : Enum<T>> enum(type: Class<T>, getter: () -> T) = ComputedField(getter, EnumValueCodec(type))
inline fun <reified T : Enum<T>> enum(noinline getter: () -> T) = ComputedField(getter, EnumValueCodec(T::class.java))
fun <T : Enum<T>> computedEnum(type: Class<T>, getter: () -> T) = ComputedField(getter, EnumValueCodec(type))
inline fun <reified T : Enum<T>> computedEnum(noinline getter: () -> T) = ComputedField(getter, EnumValueCodec(T::class.java))
fun <T : Enum<T>> enum(type: Class<T>, getter: KProperty0<T>) = ComputedField(getter, EnumValueCodec(type))
inline fun <reified T : Enum<T>> enum(getter: KProperty0<T>) = ComputedField(getter, EnumValueCodec(T::class.java))
fun <T : Enum<T>> computedEnum(type: Class<T>, getter: KProperty0<T>) = ComputedField(getter, EnumValueCodec(type))
inline fun <reified T : Enum<T>> computedEnum(getter: KProperty0<T>) = ComputedField(getter, EnumValueCodec(T::class.java))
fun <T : Enum<T>> enum(type: Class<T>, getter: Supplier<T>) = ComputedField(getter::get, EnumValueCodec(type))
inline fun <reified T : Enum<T>> enum(getter: Supplier<T>) = ComputedField(getter::get, EnumValueCodec(T::class.java))
fun <T : Enum<T>> computedEnum(type: Class<T>, getter: Supplier<T>) = ComputedField(getter::get, EnumValueCodec(type))
inline fun <reified T : Enum<T>> computedEnum(getter: Supplier<T>) = ComputedField(getter::get, EnumValueCodec(T::class.java))
@JvmOverloads
fun byte(