diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/StringInputWithFeedback.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/StringInputWithFeedback.kt index fb4f7760d..9d918dd2d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/StringInputWithFeedback.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/StringInputWithFeedback.kt @@ -6,7 +6,7 @@ import kotlin.reflect.KMutableProperty0 class StringInputWithFeedback(menu: MatteryMenu) : AbstractPlayerInputWithFeedback() { 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) : this(menu) { with(state) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt index 6f9bac7c5..a4b68d91f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/synchronizer/FieldSynchronizer.kt @@ -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) = ComputedField(getter, ByteValueCodec) + fun computedByte(getter: KProperty0) = ComputedField(getter, ByteValueCodec) fun computedBool(getter: KProperty0) = ComputedBooleanField(getter::get) - fun short(getter: KProperty0) = ComputedField(getter, ShortValueCodec) - fun long(getter: KProperty0) = ComputedLongField(getter::get) - fun fixedLong(getter: KProperty0) = ComputedFixedLongField(getter::get) - fun float(getter: KProperty0) = ComputedFloatField(getter::get) - fun double(getter: KProperty0) = ComputedDoubleField(getter::get) - fun uuid(getter: KProperty0) = ComputedField(getter, UUIDValueCodec) - fun int(getter: KProperty0) = ComputedIntField(getter::get) - fun fixedInt(getter: KProperty0) = ComputedFixedIntField(getter::get) - fun fraction(getter: KProperty0) = ComputedField(getter, DecimalValueCodec) - fun bigDecimal(getter: KProperty0) = ComputedField(getter, BigDecimalValueCodec) - fun item(getter: KProperty0) = ComputedField(getter, ItemStackValueCodec) - fun string(getter: KProperty0) = ComputedField(getter, BinaryStringCodec) + fun computedShort(getter: KProperty0) = ComputedField(getter, ShortValueCodec) + fun computedLong(getter: KProperty0) = ComputedLongField(getter::get) + fun computedFixedLong(getter: KProperty0) = ComputedFixedLongField(getter::get) + fun computedFloat(getter: KProperty0) = ComputedFloatField(getter::get) + fun computedDouble(getter: KProperty0) = ComputedDoubleField(getter::get) + fun computedUuid(getter: KProperty0) = ComputedField(getter, UUIDValueCodec) + fun computedInt(getter: KProperty0) = ComputedIntField(getter::get) + fun computedFixedInt(getter: KProperty0) = ComputedFixedIntField(getter::get) + fun computedDecimal(getter: KProperty0) = ComputedField(getter, DecimalValueCodec) + fun computedBigDecimal(getter: KProperty0) = ComputedField(getter, BigDecimalValueCodec) + fun computedItem(getter: KProperty0) = ComputedField(getter, ItemStackValueCodec) + fun computedString(getter: KProperty0) = ComputedField(getter, BinaryStringCodec) - fun byte(getter: Supplier) = ComputedField(getter::get, ByteValueCodec) + fun computedByte(getter: Supplier) = ComputedField(getter::get, ByteValueCodec) fun computedBool(getter: Supplier) = ComputedBooleanField(getter::get) - fun short(getter: Supplier) = ComputedField(getter::get, ShortValueCodec) - fun long(getter: Supplier) = ComputedLongField(getter::get) - fun fixedLong(getter: Supplier) = ComputedFixedLongField(getter::get) - fun float(getter: Supplier) = ComputedFloatField(getter::get) - fun double(getter: Supplier) = ComputedDoubleField(getter::get) - fun uuid(getter: Supplier) = ComputedField(getter::get, UUIDValueCodec) - fun int(getter: Supplier) = ComputedIntField(getter::get) - fun fixedInt(getter: Supplier) = ComputedFixedIntField(getter::get) - fun fraction(getter: Supplier) = ComputedField(getter::get, DecimalValueCodec) - fun bigDecimal(getter: Supplier) = ComputedField(getter::get, BigDecimalValueCodec) - fun item(getter: Supplier) = ComputedField(getter::get, ItemStackValueCodec) - fun string(getter: Supplier) = ComputedField(getter::get, BinaryStringCodec) + fun computedShort(getter: Supplier) = ComputedField(getter::get, ShortValueCodec) + fun computedLong(getter: Supplier) = ComputedLongField(getter::get) + fun computedFixedLong(getter: Supplier) = ComputedFixedLongField(getter::get) + fun computedFloat(getter: Supplier) = ComputedFloatField(getter::get) + fun computedDouble(getter: Supplier) = ComputedDoubleField(getter::get) + fun computedUuid(getter: Supplier) = ComputedField(getter::get, UUIDValueCodec) + fun computedInt(getter: Supplier) = ComputedIntField(getter::get) + fun computedFixedInt(getter: Supplier) = ComputedFixedIntField(getter::get) + fun computedDecimal(getter: Supplier) = ComputedField(getter::get, DecimalValueCodec) + fun computedBigDecimal(getter: Supplier) = ComputedField(getter::get, BigDecimalValueCodec) + fun computedItem(getter: Supplier) = ComputedField(getter::get, ItemStackValueCodec) + fun computedString(getter: Supplier) = ComputedField(getter::get, BinaryStringCodec) - fun > enum(type: Class, getter: () -> T) = ComputedField(getter, EnumValueCodec(type)) - inline fun > enum(noinline getter: () -> T) = ComputedField(getter, EnumValueCodec(T::class.java)) + fun > computedEnum(type: Class, getter: () -> T) = ComputedField(getter, EnumValueCodec(type)) + inline fun > computedEnum(noinline getter: () -> T) = ComputedField(getter, EnumValueCodec(T::class.java)) - fun > enum(type: Class, getter: KProperty0) = ComputedField(getter, EnumValueCodec(type)) - inline fun > enum(getter: KProperty0) = ComputedField(getter, EnumValueCodec(T::class.java)) + fun > computedEnum(type: Class, getter: KProperty0) = ComputedField(getter, EnumValueCodec(type)) + inline fun > computedEnum(getter: KProperty0) = ComputedField(getter, EnumValueCodec(T::class.java)) - fun > enum(type: Class, getter: Supplier) = ComputedField(getter::get, EnumValueCodec(type)) - inline fun > enum(getter: Supplier) = ComputedField(getter::get, EnumValueCodec(T::class.java)) + fun > computedEnum(type: Class, getter: Supplier) = ComputedField(getter::get, EnumValueCodec(type)) + inline fun > computedEnum(getter: Supplier) = ComputedField(getter::get, EnumValueCodec(T::class.java)) @JvmOverloads fun byte(