diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AndroidPowerSource.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AndroidPowerSource.kt index 609c108c3..6e6fc2f2d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AndroidPowerSource.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AndroidPowerSource.kt @@ -21,8 +21,8 @@ class AndroidPowerSource( initialCharge: ImpreciseFraction, maxCharge: ImpreciseFraction ) : IMatteryEnergyStorage, INBTSerializable { - private var battery by synchronizer.fraction(initialCharge) - private var maxBattery by synchronizer.fraction(maxCharge) + private var battery by synchronizer.fraction(initialCharge, name = "android battery") + private var maxBattery by synchronizer.fraction(maxCharge, name = "android max battery") var item by synchronizer.item(setter = setter@{ value, access, setByRemote -> access.write(value) @@ -30,7 +30,7 @@ class AndroidPowerSource( if (ply is ServerPlayer) { AndroidBatteryTrigger.trigger(ply, value) } - }) + }, name = "android battery item") override fun serializeNBT(): CompoundTag { return CompoundTag().also { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index ebb6ebd8b..00faed840 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -85,7 +85,7 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial publicSynchronizer.defaultEndpoint.markUnused() } - var hasExoSuit by publicSynchronizer.bool() + var hasExoSuit by publicSynchronizer.bool(name = "hasExoSuit") private val exoSuitSlotCountModifiersMap: MutableMap by synchronizer.Map( keyCodec = UUIDValueCodec, @@ -93,7 +93,8 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial backingMap = HashMap(), callback = { this.exoSuitSlotCountModifiers.recompute() - } + }, + name = "exoSuitSlotCountModifiersMap" ) val exoSuitSlotCountModifiers = UUIDIntModifiersMap(observer = observer@{ @@ -115,7 +116,7 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial _exoSuitMenu = null exoSuitContainer = PlayerMatteryContainer(value) } - }) + }, name = "exoSuitSlotCount") var exoSuitContainer: MatteryContainer = PlayerMatteryContainer(0) private set(value) { @@ -144,7 +145,7 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial access.write(value) _exoSuitMenu = null } - }) + }, name = "isExoSuitCraftingUpgraded") private var _exoSuitMenu: ExoSuitInventoryMenu? = null set(value) { @@ -185,8 +186,8 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial var ticksIExist = 0 private set - var willBecomeAndroid by publicSynchronizer.bool() - var isAndroid by publicSynchronizer.bool() + var willBecomeAndroid by publicSynchronizer.bool(name = "willBecomeAndroid") + var isAndroid by publicSynchronizer.bool(name = "isAndroid") val androidEnergy = AndroidPowerSource(ply, synchronizer, ServerConfig.ANDROID_MAX_ENERGY, ServerConfig.ANDROID_MAX_ENERGY)