From 1061102073694733a010ee1065da4e3f48908a64 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 5 Dec 2023 17:30:32 +0100 Subject: [PATCH] [Change] Adapted to new Nbt-API --- .../bclib/api/v2/levelgen/structures/StructureNBT.java | 3 ++- src/main/java/org/betterx/bclib/util/StructureHelper.java | 3 ++- .../org/betterx/worlds/together/world/WorldConfig.java | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java index 454be563..504bac33 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java @@ -8,6 +8,7 @@ import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.Vec3i; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtAccounter; import net.minecraft.nbt.NbtIo; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; @@ -204,7 +205,7 @@ public class StructureNBT { } private static StructureTemplate readStructureFromStream(InputStream stream) throws IOException { - CompoundTag nbttagcompound = NbtIo.readCompressed(stream); + CompoundTag nbttagcompound = NbtIo.readCompressed(stream, NbtAccounter.unlimitedHeap()); StructureTemplate template = new StructureTemplate(); diff --git a/src/main/java/org/betterx/bclib/util/StructureHelper.java b/src/main/java/org/betterx/bclib/util/StructureHelper.java index 6bb001ad..7b90b304 100644 --- a/src/main/java/org/betterx/bclib/util/StructureHelper.java +++ b/src/main/java/org/betterx/bclib/util/StructureHelper.java @@ -4,6 +4,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtAccounter; import net.minecraft.nbt.NbtIo; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; @@ -65,7 +66,7 @@ public class StructureHelper { } private static StructureTemplate readStructureFromStream(InputStream stream) throws IOException { - CompoundTag nbttagcompound = NbtIo.readCompressed(stream); + CompoundTag nbttagcompound = NbtIo.readCompressed(stream, NbtAccounter.unlimitedHeap()); StructureTemplate template = new StructureTemplate(); template.load(BuiltInRegistries.BLOCK.asLookup(), nbttagcompound); diff --git a/src/main/java/org/betterx/worlds/together/world/WorldConfig.java b/src/main/java/org/betterx/worlds/together/world/WorldConfig.java index de239a08..c672c803 100644 --- a/src/main/java/org/betterx/worlds/together/world/WorldConfig.java +++ b/src/main/java/org/betterx/worlds/together/world/WorldConfig.java @@ -6,6 +6,7 @@ import org.betterx.worlds.together.world.event.WorldBootstrap; import net.minecraft.Util; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtAccounter; import net.minecraft.nbt.NbtIo; import net.fabricmc.loader.api.FabricLoader; @@ -50,7 +51,7 @@ public class WorldConfig { CompoundTag root = new CompoundTag(); if (file.exists()) { try { - root = NbtIo.readCompressed(file); + root = NbtIo.readCompressed(file.toPath(), NbtAccounter.unlimitedHeap()); } catch (IOException e) { WorldsTogether.LOGGER.error("World data loading failed", e); } @@ -140,11 +141,11 @@ public class WorldConfig { final File tempFile = new File(dataDir, modID + "_temp.nbt"); - NbtIo.writeCompressed(tag, tempFile); + NbtIo.writeCompressed(tag, tempFile.toPath()); final File oldFile = new File(dataDir, modID + "_old.nbt"); final File dataFile = new File(dataDir, modID + ".nbt"); - Util.safeReplaceFile(dataFile, tempFile, oldFile); + Util.safeReplaceFile(dataFile.toPath(), tempFile.toPath(), oldFile.toPath()); } catch (IOException e) { WorldsTogether.LOGGER.error("World data saving failed", e); }