Remove references to the now-broken BlockEntity#save(CompoundTag) m…

…ethod (MinecraftForge#8235)
sobrinth · Jan 19, 2022 · 75408c1 · 75408c1
1 parent 00fafb0
commit 75408c1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/patches/minecraft/net/minecraft/world/level/block/entity/BlockEntity.java.patch b/patches/minecraft/net/minecraft/world/level/block/entity/BlockEntity.java.patch
@@ -24,17 +24,12 @@
     }
 
     public static BlockPos m_187472_(CompoundTag p_187473_) {
-@@ -48,6 +_,13 @@
+@@ -48,6 +_,8 @@
     }
 
     public void m_142466_(CompoundTag p_155245_) {
 +      if (p_155245_.m_128441_("ForgeData")) this.customTileData = p_155245_.m_128469_("ForgeData");
 +      if (getCapabilities() != null && p_155245_.m_128441_("ForgeCaps")) deserializeCaps(p_155245_.m_128469_("ForgeCaps"));
-+   }
-+
-+   public CompoundTag save(CompoundTag tag) {
-+      m_187478_(tag);
-+      return tag;
     }
 
     protected void m_183515_(CompoundTag p_187471_) {

diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBlockEntity.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBlockEntity.java
@@ -54,9 +54,7 @@ default void deserializeNBT(CompoundTag nbt)
     @Override
     default CompoundTag serializeNBT()
     {
-        CompoundTag ret = new CompoundTag();
-        self().save(ret);
-        return ret;
+        return self().saveWithFullMetadata();
     }
 
     /**

diff --git a/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java b/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java
@@ -84,7 +84,7 @@ public static BlockSnapshot create(ResourceKey<Level> dim, LevelAccessor world,
     @Nullable
     private static CompoundTag getBlockEntityTag(@Nullable BlockEntity te)
     {
-        return te == null ? null : te.save(new CompoundTag());
+        return te == null ? null : te.saveWithFullMetadata();
     }
 
     public BlockState getCurrentBlock()

diff --git a/src/main/java/net/minecraftforge/fluids/capability/TileFluidHandler.java b/src/main/java/net/minecraftforge/fluids/capability/TileFluidHandler.java
@@ -52,11 +52,10 @@ public void load(CompoundTag tag)
     }
 
     @Override
-    public CompoundTag save(CompoundTag tag)
+    protected void saveAdditional(CompoundTag tag)
     {
-        super.save(tag);
+        super.saveAdditional(tag);
         tank.writeToNBT(tag);
-        return tag;
     }
 
     @Override

diff --git a/src/test/java/net/minecraftforge/debug/block/FullPotsAccessorDemo.java b/src/test/java/net/minecraftforge/debug/block/FullPotsAccessorDemo.java
@@ -205,7 +205,7 @@ public void setPlant(Block plant)
         @Override
         public CompoundTag getUpdateTag()
         {
-            return save(new CompoundTag());
+            return saveWithFullMetadata();
         }
 
         @Override
@@ -238,11 +238,11 @@ public void load(CompoundTag tag)
         }
 
         @Override
-        public CompoundTag save(CompoundTag tag)
+        protected void saveAdditional(CompoundTag tag)
         {
             //noinspection ConstantConditions
             tag.putString("plant", plant.getRegistryName().toString());
-            return super.save(tag);
+            super.saveAdditional(tag);
         }
     }