Fix block entity serialization

gdavid04 · Mar 13, 2024 · 7b469f4 · 7b469f4
1 parent 5a04a56
commit 7b469f4
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 39 deletions.
diff --git a/src/main/java/gdavid/phi/block/tile/CADHolderTile.java b/src/main/java/gdavid/phi/block/tile/CADHolderTile.java
@@ -140,20 +140,21 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		nbt.put(tagItem, item.save(new CompoundTag()));
-		return nbt;
 	}
 
 	@Override
 	public ClientboundBlockEntityDataPacket getUpdatePacket() {
-		return ClientboundBlockEntityDataPacket.create(this, IForgeBlockEntity::serializeNBT);
+		return ClientboundBlockEntityDataPacket.create(this);
 	}
 
 	@Override
 	public CompoundTag getUpdateTag() {
-		return serializeNBT();
+		var nbt = new CompoundTag();
+		saveAdditional(nbt);
+		return nbt;
 	}
 
 	@Override

diff --git a/src/main/java/gdavid/phi/block/tile/CableTile.java b/src/main/java/gdavid/phi/block/tile/CableTile.java
@@ -82,11 +82,10 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		if (connected != null) nbt.putLong(tagConnection, connected.asLong());
 		else nbt.remove(tagConnection);
-		return nbt;
 	}
 
 }
diff --git a/src/main/java/gdavid/phi/block/tile/DistillChamberControllerTile.java b/src/main/java/gdavid/phi/block/tile/DistillChamberControllerTile.java
@@ -163,8 +163,8 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		ListTag list = new ListTag();
 		for (Pair<ItemStack, Integer> pair : fuel) {
 			CompoundTag item = new CompoundTag();
@@ -174,7 +174,6 @@ public CompoundTag serializeNBT() {
 		}
 		nbt.put(tagFuel, list);
 		nbt.putInt(tagPsi, psi);
-		return nbt;
 	}
 
 }
diff --git a/src/main/java/gdavid/phi/block/tile/InfusionLaserTile.java b/src/main/java/gdavid/phi/block/tile/InfusionLaserTile.java
@@ -100,10 +100,9 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		nbt.putInt(tagPsi, psi);
-		return nbt;
 	}
 
 }
diff --git a/src/main/java/gdavid/phi/block/tile/MPUTile.java b/src/main/java/gdavid/phi/block/tile/MPUTile.java
@@ -231,8 +231,8 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		CompoundTag spellNbt = new CompoundTag();
 		if (spell != null) spell.writeToNBT(spellNbt);
 		nbt.put(tagSpell, spellNbt);
@@ -243,17 +243,18 @@ public CompoundTag serializeNBT() {
 		nbt.putInt(tagComparatorSignal, comparatorSignal);
 		nbt.putInt(tagSuccessCount, successCount);
 		nbt.putInt(tagRedstoneMode, redstoneMode.ordinal());
-		return nbt;
 	}
 
 	@Override
 	public ClientboundBlockEntityDataPacket getUpdatePacket() {
-		return ClientboundBlockEntityDataPacket.create(this, IForgeBlockEntity::serializeNBT);
+		return ClientboundBlockEntityDataPacket.create(this);
 	}
 
 	@Override
 	public CompoundTag getUpdateTag() {
-		return serializeNBT();
+		var nbt = new CompoundTag();
+		saveAdditional(nbt);
+		return nbt;
 	}
 
 	@Override

diff --git a/src/main/java/gdavid/phi/block/tile/PsimetalCrusherTile.java b/src/main/java/gdavid/phi/block/tile/PsimetalCrusherTile.java
@@ -86,7 +86,7 @@ private ItemEntity getItemUnder() {
 
 	@Override
 	public ClientboundBlockEntityDataPacket getUpdatePacket() {
-		return ClientboundBlockEntityDataPacket.create(this, IForgeBlockEntity::serializeNBT);
+		return ClientboundBlockEntityDataPacket.create(this);
 	}
 
 	@Override

diff --git a/src/main/java/gdavid/phi/block/tile/SpellDisplayTile.java b/src/main/java/gdavid/phi/block/tile/SpellDisplayTile.java
@@ -60,22 +60,23 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		CompoundTag spellNbt = new CompoundTag();
 		if (spell != null) spell.writeToNBT(spellNbt);
 		nbt.put(tagSpell, spellNbt);
-		return nbt;
 	}
 
 	@Override
 	public ClientboundBlockEntityDataPacket getUpdatePacket() {
-		return ClientboundBlockEntityDataPacket.create(this, IForgeBlockEntity::serializeNBT);
+		return ClientboundBlockEntityDataPacket.create(this);
 	}
 
 	@Override
 	public CompoundTag getUpdateTag() {
-		return serializeNBT();
+		var nbt = new CompoundTag();
+		saveAdditional(nbt);
+		return nbt;
 	}
 
 	@Override

diff --git a/src/main/java/gdavid/phi/block/tile/SpellStorageTile.java b/src/main/java/gdavid/phi/block/tile/SpellStorageTile.java
@@ -81,15 +81,14 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		for (int i = 0; i < slots; i++) {
 			CompoundTag spellNbt = new CompoundTag();
 			if (spells[i] != null) spells[i].writeToNBT(spellNbt);
 			nbt.put(tagSpell + i, spellNbt);
 		}
 		nbt.putInt(tagSelectedSlot, selectedSlot);
-		return nbt;
 	}
 
 }
diff --git a/src/main/java/gdavid/phi/block/tile/TextDisplayTile.java b/src/main/java/gdavid/phi/block/tile/TextDisplayTile.java
@@ -91,24 +91,25 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		var list = new ListTag();
 		for (String line : text) {
 			list.add(StringTag.valueOf(line));
 		}
 		nbt.put(tagText, list);
-		return nbt;
 	}
 
 	@Override
 	public ClientboundBlockEntityDataPacket getUpdatePacket() {
-		return ClientboundBlockEntityDataPacket.create(this, IForgeBlockEntity::serializeNBT);
+		return ClientboundBlockEntityDataPacket.create(this);
 	}
 
 	@Override
 	public CompoundTag getUpdateTag() {
-		return serializeNBT();
+		var nbt = new CompoundTag();
+		saveAdditional(nbt);
+		return nbt;
 	}
 
 	@Override

diff --git a/src/main/java/gdavid/phi/block/tile/TextSUTile.java b/src/main/java/gdavid/phi/block/tile/TextSUTile.java
@@ -40,10 +40,9 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		nbt.putString(tagText, text);
-		return nbt;
 	}
 
 	@Override

diff --git a/src/main/java/gdavid/phi/block/tile/VSUTile.java b/src/main/java/gdavid/phi/block/tile/VSUTile.java
@@ -39,14 +39,13 @@ public void load(CompoundTag nbt) {
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
-		var nbt = super.serializeNBT();
+	public void saveAdditional(CompoundTag nbt) {
+		super.saveAdditional(nbt);
 		ListTag list = new ListTag();
 		list.add(DoubleTag.valueOf(vector.x));
 		list.add(DoubleTag.valueOf(vector.y));
 		list.add(DoubleTag.valueOf(vector.z));
 		nbt.put(tagVector, list);
-		return nbt;
 	}
 
 	@Override