diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java index 741950216..805aafba4 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBatteryBank.java @@ -255,9 +255,9 @@ public class BlockEntityBatteryBank extends BlockEntityMattery { } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("battery_bank", battery_container.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java index a73cf9435..0360901b0 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityBlackHole.java @@ -336,9 +336,9 @@ public class BlockEntityBlackHole extends BlockEntity { // disk io @Override - public CompoundTag save(CompoundTag tag) { - writeBlackHoleData(tag); - return super.save(tag); + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); + writeBlackHoleData(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.java index 609304bd8..47a5b33d9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.java @@ -71,9 +71,9 @@ public class BlockEntityCargoCrate extends BlockEntityMattery { } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("slots", container.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveRack.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveRack.java index 7b46e7ba3..4014967b9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveRack.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveRack.java @@ -62,9 +62,9 @@ public class BlockEntityDriveRack extends BlockEntityMatteryPowered { } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("drives", drives.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveViewer.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveViewer.java index 2c788482e..8d6c5a412 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveViewer.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityDriveViewer.java @@ -120,9 +120,9 @@ public class BlockEntityDriveViewer extends BlockEntityMatteryPowered { } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("drive_slot", drive_slot.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityEnergyCounter.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityEnergyCounter.java index c2091fc95..1f6278f37 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityEnergyCounter.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityEnergyCounter.java @@ -100,16 +100,15 @@ public class BlockEntityEnergyCounter extends BlockEntityMattery { } @Override - public CompoundTag save(CompoundTag nbt) { - nbt.putString("passed", passed.toString()); + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); + nbt.put("passed", passed.serializeNBT()); var list = new ListTag(); nbt.put("history", list); nbt.putInt("history_tick", history_tick); for (var num : history) list.add(StringTag.valueOf(num.toString())); - - return super.save(nbt); } private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java index 2ee7ee8b4..ec9f81981 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java @@ -186,11 +186,11 @@ public class BlockEntityMatterBottler extends BlockEntityMatteryPowered implemen } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("work_slots", work_slots.serializeNBT()); nbt.putBoolean("work_flow", work_flow); nbt.put("matter_capability", matter.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java index cb3ecab7e..ddf8e7127 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java @@ -180,9 +180,9 @@ public class BlockEntityMatterCapacitorBank extends BlockEntityMattery implement } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("matter_container", matter_container.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java index 3e3a6442b..baa2c4af4 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java @@ -76,11 +76,10 @@ public class BlockEntityMatterDecomposer extends BlockEntityMatteryWorker implem } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("work_slots", item_container.serializeNBT()); nbt.put("matter_capability", matter.serializeNBT()); - - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java index b59f94ff3..627b25798 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java @@ -203,7 +203,8 @@ public class BlockEntityMatterPanel extends BlockEntityMattery implements IMatte } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); ListTag list = new ListTag(); for (MatterTask task : tasks.values()) { @@ -211,8 +212,6 @@ public class BlockEntityMatterPanel extends BlockEntityMattery implements IMatte } nbt.put("tasks", list); - - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java index 76c65c207..66350cc85 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java @@ -207,11 +207,11 @@ public class BlockEntityMatterReplicator extends BlockEntityMatteryWorker implem } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("regular_slots", regular_slots.serializeNBT()); nbt.put("reserved_slots", reserved_slots.serializeNBT()); nbt.put("matter_capability", matter.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java index 2422ed118..8316a8cb2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java @@ -127,9 +127,9 @@ public class BlockEntityMatterScanner extends BlockEntityMatteryWorker implement } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("work_slots", input_slot.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java index 6e4f00fd1..6a261498c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMattery.java @@ -152,14 +152,14 @@ public abstract class BlockEntityMattery extends BlockEntity implements MenuProv } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); + if (display_name != null) nbt.putString("Name", Component.Serializer.toJson(display_name)); nbt.putByte("redstone", (byte) redstone_setting.ordinal()); nbt.putByte("redstone_signal", (byte) redstone_signal); - - return super.save(nbt); } public void load(CompoundTag nbt) { diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPowered.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPowered.java index 8da4d90ac..cb2dde8ad 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPowered.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatteryPowered.java @@ -111,13 +111,13 @@ abstract public class BlockEntityMatteryPowered extends BlockEntityMattery { } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); + if (energy != null) nbt.put("energy_cap", energy.serializeNBT()); nbt.put("battery_container", battery_container.serializeNBT()); - - return super.save(nbt); } public void load(CompoundTag nbt) { diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java index df2310741..7ca4d463c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java @@ -86,9 +86,9 @@ public class BlockEntityPatternStorage extends BlockEntityMattery implements IMa private MatterGrid grid; @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.put("patterns", patterns.serializeNBT()); - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/worker/BlockEntityMatteryWorker.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/worker/BlockEntityMatteryWorker.java index 5faf5f76f..e15d66c3f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/worker/BlockEntityMatteryWorker.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/worker/BlockEntityMatteryWorker.java @@ -48,14 +48,13 @@ abstract public class BlockEntityMatteryWorker extends BlockEntityMatteryPowered } @Override - public CompoundTag save(CompoundTag nbt) { + public void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); nbt.putDouble("work_ticks", work_ticks); if (current_job != null) { nbt.put("current_job", current_job.serializeNBT()); } - - return super.save(nbt); } @Override diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerCapability.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerCapability.java index e66c71cc7..3d994615c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerCapability.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerCapability.java @@ -152,14 +152,14 @@ public class MatterHandlerCapability implements IMatterHandler, INBTSerializable @Override public CompoundTag serializeNBT() { CompoundTag tag = new CompoundTag(); - tag.putString("stored", stored.toString()); - tag.putString("max_storage", max_storage.toString()); + tag.put("stored", stored.serializeNBT()); + tag.put("max_storage", max_storage.serializeNBT()); if (max_receive != null) - tag.putString("max_receive", max_receive.toString()); + tag.put("max_receive", max_receive.serializeNBT()); if (max_extract != null) - tag.putString("max_extract", max_extract.toString()); + tag.put("max_extract", max_extract.serializeNBT()); return tag; }