Post-backport fixes

nekosmp · Apr 15, 2023 · 2005de0 · 2005de0
1 parent 33f92ce
commit 2005de0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/appeng/core/worlddata/AESavedData.java b/src/main/java/appeng/core/worlddata/AESavedData.java
@@ -7,9 +7,9 @@
 
 import org.slf4j.Logger;
 
+import net.minecraft.SharedConstants;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.NbtUtils;
 import net.minecraft.world.level.saveddata.SavedData;
 
 /**
@@ -28,7 +28,7 @@ public void save(File file) {
 
         CompoundTag compoundTag = new CompoundTag();
         compoundTag.put("data", this.save(new CompoundTag()));
-        NbtUtils.addCurrentDataVersion(compoundTag);
+        compoundTag.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
         try {
             // Write to temp file first.
             NbtIo.writeCompressed(compoundTag, tempFile);

diff --git a/src/main/java/appeng/server/testplots/AutoCraftingTestPlots.java b/src/main/java/appeng/server/testplots/AutoCraftingTestPlots.java
@@ -15,8 +15,6 @@
 import net.minecraft.world.level.material.Fluids;
 
 import appeng.api.config.Actionable;
-import appeng.api.config.Settings;
-import appeng.api.config.YesNo;
 import appeng.api.crafting.PatternDetailsHelper;
 import appeng.api.stacks.AEFluidKey;
 import appeng.api.stacks.AEItemKey;
@@ -287,9 +285,7 @@ public static void patternProviderFacesRoundRobin(PlotBuilder plot) {
             provider.getLogic().getPatternInv().addItems(pattern);
         });
         for (var pos : inscriberPos) {
-            plot.blockEntity(pos, AEBlocks.INSCRIBER, inscriber -> {
-                inscriber.getConfigManager().putSetting(Settings.AUTO_EXPORT, YesNo.YES);
-            });
+            plot.block(pos, AEBlocks.INSCRIBER);
         }
         plot.cable("0 0 -4");
         {
@@ -310,7 +306,7 @@ public static void patternProviderFacesRoundRobin(PlotBuilder plot) {
                         for (var pos : inscriberPos) {
                             var inscriber = (InscriberBlockEntity) helper.getBlockEntity(pos);
                             helper.check(inscriber.getInternalInventory().getStackInSlot(2).getCount() == 5,
-                                    "Furnace should have 5 = 10/2 items", pos);
+                                    "Furnace should have 5 = 10/2 items");
                         }
                     })
                     .thenSucceed();