Add DeviceBlockEntity common tag helpers

src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlockEntity.kt

@@ -147,27 +147,33 @@ abstract class DeviceBlockEntity(type: BlockEntityType<*>): BlockEntity(type),
 		}
 	}
 
-	override fun toTag(tag: CompoundTag): CompoundTag {
+	protected open fun toCommonTag(tag: CompoundTag) {
 		tag.putInt("IPAddress", ipAddress.address)
 		tag.putLong("MACAddress", macAddress.address)
+	}
+
+	protected open fun fromCommonTag(tag: CompoundTag) {
+		ipAddress = IPAddress(tag.getInt("IPAddress"))
+		macAddress = MACAddress(tag.getLong("MACAddress"))
+	}
+
+	override fun toTag(tag: CompoundTag): CompoundTag {
+		toCommonTag(tag)
 		return super.toTag(tag)
 	}
 
 	override fun fromTag(state: BlockState, tag: CompoundTag) {
 		super.fromTag(state, tag)
-		ipAddress = IPAddress(tag.getInt("IPAddress"))
+		fromCommonTag(tag)
-		macAddress = MACAddress(tag.getLong("MACAddress"))
 	}
 
 	override fun toClientTag(tag: CompoundTag): CompoundTag {
-		tag.putInt("IPAddress", ipAddress.address)
+		toCommonTag(tag)
-		tag.putLong("MACAddress", macAddress.address)
 		return tag
 	}
 
 	override fun fromClientTag(tag: CompoundTag) {
-		ipAddress = IPAddress(tag.getInt("IPAddress"))
+		fromCommonTag(tag)
-		macAddress = MACAddress(tag.getLong("MACAddress"))
 	}
 
 	fun onBreak() {

src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlockEntity.kt

@@ -99,23 +99,13 @@ class ExtractorBlockEntity: DeviceBlockEntity(PhyBlockEntities.EXTRACTOR),
 		return false
 	}
 
-	override fun toTag(tag: CompoundTag): CompoundTag {
+	override fun toCommonTag(tag: CompoundTag) {
+		super.toCommonTag(tag)
 		tag.putString("ActivationMode", controller.activationMode.name)
-		return super.toTag(tag)
 	}
 
-	override fun fromTag(state: BlockState, tag: CompoundTag) {
+	override fun fromCommonTag(tag: CompoundTag) {
-		super.fromTag(state, tag)
+		super.fromCommonTag(tag)
-		controller.activationMode = ActivationMode.valueOf(tag.getString("ActivationMode"))
-	}
-
-	override fun toClientTag(tag: CompoundTag): CompoundTag {
-		tag.putString("ActivationMode", controller.activationMode.name)
-		return super.toClientTag(tag)
-	}
-
-	override fun fromClientTag(tag: CompoundTag) {
-		super.fromClientTag(tag)
 		controller.activationMode = ActivationMode.valueOf(tag.getString("ActivationMode"))
 	}
 

src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterBlockEntity.kt

@@ -125,34 +125,19 @@ class InserterBlockEntity: DeviceBlockEntity(PhyBlockEntities.INSERTER),
 		currentRequest = null
 	}
 
-	override fun toTag(tag: CompoundTag): CompoundTag {
+	override fun toCommonTag(tag: CompoundTag) {
+		super.toCommonTag(tag)
 		tag.putString("ActivationMode", controller.activationMode.name)
 		tag.put("StackToExtract", stackToExtract.toTag(CompoundTag()))
 		tag.putInt("AmountToExtract", amountToExtract)
-		return super.toTag(tag)
 	}
 
-	override fun fromTag(state: BlockState, tag: CompoundTag) {
+	override fun fromCommonTag(tag: CompoundTag) {
-		super.fromTag(state, tag)
+		super.fromCommonTag(tag)
 		controller.activationMode = ActivationMode.valueOf(tag.getString("ActivationMode"))
 		stackToExtract = ItemStack.fromTag(tag.getCompound("StackToExtract"))
 		amountToExtract = tag.getInt("AmountToExtract")
 	}
-
-	override fun toClientTag(tag: CompoundTag): CompoundTag {
-		tag.putString("ActivationMode", controller.activationMode.name)
-		tag.put("StackToExtract", stackToExtract.toTag(CompoundTag()))
-		tag.putInt("AmountToExtract", amountToExtract)
-		return super.toClientTag(tag)
-	}
-
-	override fun fromClientTag(tag: CompoundTag) {
-		super.fromClientTag(tag)
-		controller.activationMode = ActivationMode.valueOf(tag.getString("ActivationMode"))
-		stackToExtract = ItemStack.fromTag(tag.getCompound("StackToExtract"))
-		amountToExtract = tag.getInt("AmountToExtract")
-	}
-
 	class PendingExtractRequest(
 		val stack: ItemStack,
 		val timestamp: Long,

src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt

@@ -46,27 +46,14 @@ class RedstoneControllerBlockEntity: DeviceBlockEntity(PhyBlockEntities.REDSTONE
 		}
 	}
 
-	override fun toTag(tag: CompoundTag): CompoundTag {
+	override fun toCommonTag(tag: CompoundTag) {
+		super.toCommonTag(tag)
 		tag.putIntArray("ManagedDevices", managedDevices.mapNotNull { it?.address })
 		tag.putString("RedstoneMode", redstoneMode.name)
-		return super.toTag(tag)
 	}
 
-	override fun fromTag(state: BlockState, tag: CompoundTag) {
+	override fun fromCommonTag(tag: CompoundTag) {
-		super.fromTag(state, tag)
+		super.fromCommonTag(tag)
-		val addresses = tag.getIntArray("ManagedDevices")
-		managedDevices = (0..4).map { if (it >= addresses.size) null else IPAddress(addresses[it]) }.toTypedArray()
-		redstoneMode = RedstoneMode.valueOf(tag.getString("RedstoneMode"))
-	}
-
-	override fun toClientTag(tag: CompoundTag): CompoundTag {
-		tag.putIntArray("ManagedDevices", managedDevices.mapNotNull { it?.address })
-		tag.putString("RedstoneMode", redstoneMode.name)
-		return super.toClientTag(tag)
-	}
-
-	override fun fromClientTag(tag: CompoundTag) {
-		super.fromClientTag(tag)
 		val addresses = tag.getIntArray("ManagedDevices")
 		managedDevices = (0..4).map { if (it >= addresses.size) null else IPAddress(addresses[it]) }.toTypedArray()
 		redstoneMode = RedstoneMode.valueOf(tag.getString("RedstoneMode"))

src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlockEntity.kt

@@ -239,25 +239,15 @@ class TerminalBlockEntity: DeviceBlockEntity(PhyBlockEntities.TERMINAL),
 		}
 	}
 
-	override fun toTag(tag: CompoundTag): CompoundTag {
+	override fun toCommonTag(tag: CompoundTag) {
+		super.toCommonTag(tag)
 		tag.put("InternalBuffer", internalBuffer.toTag())
-		return super.toTag(tag)
 	}
 
-	override fun fromTag(state: BlockState, tag: CompoundTag) {
+	override fun fromCommonTag(tag: CompoundTag) {
-		super.fromTag(state, tag)
+		super.fromCommonTag(tag)
 		internalBuffer.fromTag(tag.getCompound("InternalBuffer"))
 	}
-
-	override fun toClientTag(tag: CompoundTag): CompoundTag {
-		tag.put("InternalBuffer", internalBuffer.toTag())
-		return tag
-	}
-
-	override fun fromClientTag(tag: CompoundTag) {
-		internalBuffer.fromTag(tag.getCompound("InternalBuffer"))
-	}
-
 	interface NetItemObserver {
 		fun netItemsChanged()
 	}