From ed9eca583d51b43e8c0803f5c2a9339be703c80e Mon Sep 17 00:00:00 2001 From: SirYwell Date: Mon, 24 Mar 2025 14:32:13 +0100 Subject: [PATCH] Remove outdated version checks --- .../com/fastasyncworldedit/bukkit/FaweBukkit.java | 15 ++------------- .../java/com/fastasyncworldedit/core/IFawe.java | 1 + .../queue/implementation/packet/ChunkPacket.java | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java index 5e60a704ce..3cf486d0fc 100644 --- a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java +++ b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java @@ -12,7 +12,6 @@ import com.fastasyncworldedit.bukkit.regions.WorldGuardFeature; import com.fastasyncworldedit.bukkit.util.BukkitTaskManager; import com.fastasyncworldedit.bukkit.util.ItemUtil; -import com.fastasyncworldedit.bukkit.util.MinecraftVersion; import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer; import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl; import com.fastasyncworldedit.core.Fawe; @@ -58,7 +57,6 @@ public class FaweBukkit implements IFawe, Listener { private static final Logger LOGGER = LogManagerCompat.getLogger(); private final Plugin plugin; - private final boolean chunksStretched; private final FAWEPlatformAdapterImpl platformAdapter; private ItemUtil itemUtil; private Preloader preloader; @@ -82,10 +80,6 @@ public FaweBukkit(Plugin plugin) { Bukkit.getServer().shutdown(); } - MinecraftVersion version = MinecraftVersion.getCurrent(); - - chunksStretched = version.isEqualOrHigherThan(MinecraftVersion.NETHER); - platformAdapter = new NMSAdapter(); //PlotSquared support is limited to Spigot/Paper as of 02/20/2020 @@ -105,8 +99,8 @@ public FaweBukkit(Plugin plugin) { }); // Warn if small-edits are enabled with extended world heights - if (version.isEqualOrHigherThan(MinecraftVersion.CAVES_18) && Settings.settings().HISTORY.SMALL_EDITS) { - LOGGER.warn("Small-edits enabled (maximum y range of 0 -> 256) with 1.18 world heights. Are you sure?"); + if (Settings.settings().HISTORY.SMALL_EDITS) { + LOGGER.warn("Small-edits enabled (maximum y range of 0 -> 256) with 1.18+ world heights. Are you sure?"); } } @@ -302,11 +296,6 @@ public Preloader getPreloader(boolean initialise) { return null; } - @Override - public boolean isChunksStretched() { - return chunksStretched; - } - @Override public FAWEPlatformAdapterImpl getPlatformAdapter() { return platformAdapter; diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java index 5c8a80c02f..3c7a442d86 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java @@ -43,6 +43,7 @@ default String getDebugInfo() { */ Preloader getPreloader(boolean initialise); + @Deprecated(forRemoval = true, since = "TODO") default boolean isChunksStretched() { return true; } diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/packet/ChunkPacket.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/packet/ChunkPacket.java index 7f8195bbc3..0fb1552a9e 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/packet/ChunkPacket.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/packet/ChunkPacket.java @@ -65,7 +65,7 @@ public byte[] getSectionBytes() { if (sectionBytes == null) { IBlocks tmpChunk = getChunk(); byte[] buf = FaweCache.INSTANCE.BYTE_BUFFER_8192.get(); - sectionBytes = tmpChunk.toByteArray(buf, tmpChunk.getBitMask(), this.full, Fawe.platform().isChunksStretched()); + sectionBytes = tmpChunk.toByteArray(buf, tmpChunk.getBitMask(), this.full, true); } tmp = sectionBytes; }