fix: Fix crash when saving blocks with empty processing content

TwelveIterationMods · Aug 12, 2024 · e62ea59 · e62ea59
1 parent 8550afe
commit e62ea59
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...src/main/java/net/blay09/mods/excompressum/block/entity/AbstractAutoSieveBlockEntity.java b/...src/main/java/net/blay09/mods/excompressum/block/entity/AbstractAutoSieveBlockEntity.java
@@ -351,7 +351,7 @@ public void loadAdditional(CompoundTag tag, HolderLookup.Provider provider) {
 
     @Override
     public void saveAdditional(CompoundTag tag, HolderLookup.Provider provider) {
-        tag.put("CurrentStack", currentStack.save(provider));
+        tag.put("CurrentStack", currentStack.saveOptional(provider));
         tag.putFloat("Progress", progress);
         if (skinProfile != null) {
             final var customSkinTag = ResolvableProfile.CODEC.encodeStart(NbtOps.INSTANCE, this.skinProfile).getOrThrow();
@@ -375,7 +375,7 @@ public void writeUpdateTag(CompoundTag tag) {
         final var provider = level.registryAccess();
         saveAdditional(tag, provider);
         ItemStack meshStack = meshSlots.getItem(0);
-        tag.put("MeshStack", meshStack.save(provider));
+        tag.put("MeshStack", meshStack.saveOptional(provider));
     }
 
     public float getEnergyPercentage() {

diff --git a/common/src/main/java/net/blay09/mods/excompressum/block/entity/AutoHammerBlockEntity.java b/common/src/main/java/net/blay09/mods/excompressum/block/entity/AutoHammerBlockEntity.java
@@ -374,14 +374,14 @@ public void loadAdditional(CompoundTag tag, HolderLookup.Provider provider) {
     public void saveAdditional(CompoundTag tag, HolderLookup.Provider provider) {
         tag.put("EnergyStorage", energyStorage.serialize());
 
-        tag.put("CurrentStack", currentStack.save(provider));
+        tag.put("CurrentStack", currentStack.saveOptional(provider));
         tag.putFloat("Progress", progress);
         tag.put("ItemHandler", backingContainer.serialize(provider));
 
         tag.putBoolean("IsDisabledByRedstone", isDisabledByRedstone);
 
         if (!finishedStack.isEmpty()) {
-            tag.put("FinishedStack", finishedStack.save(provider));
+            tag.put("FinishedStack", finishedStack.saveOptional(provider));
         }
 
         final var overflowList = new ListTag();
@@ -396,9 +396,9 @@ public void writeUpdateTag(CompoundTag tag) {
         final var provider = level.registryAccess();
         saveAdditional(tag, provider);
         ItemStack firstHammer = hammerSlots.getItem(0);
-        tag.put("FirstHammer", firstHammer.save(provider));
+        tag.put("FirstHammer", firstHammer.saveOptional(provider));
         ItemStack secondHammer = hammerSlots.getItem(1);
-        tag.put("SecondHammer", secondHammer.save(provider));
+        tag.put("SecondHammer", secondHammer.saveOptional(provider));
     }
 
     public boolean isProcessing() {

diff --git a/common/src/main/java/net/blay09/mods/excompressum/block/entity/HeavySieveBlockEntity.java b/common/src/main/java/net/blay09/mods/excompressum/block/entity/HeavySieveBlockEntity.java
@@ -169,8 +169,8 @@ public void loadAdditional(CompoundTag tagCompound, HolderLookup.Provider provid
 
     @Override
     public void saveAdditional(CompoundTag tagCompound, HolderLookup.Provider provider) {
-        tagCompound.put("Content", currentStack.save(provider));
-        tagCompound.put("Mesh", meshStack.save(provider));
+        tagCompound.put("Content", currentStack.saveOptional(provider));
+        tagCompound.put("Mesh", meshStack.saveOptional(provider));
         tagCompound.putFloat("Progress", progress);
         tagCompound.putInt("ParticleTicks", particleTicks);
         tagCompound.putInt("ParticleCount", particleCount);