Merge pull request #2568 from BentoBoxWorld/MC_1_21_4

Update to MC 1 21 4. Remove code for older versions.
BentoBoxWorld · Dec 5, 2024 · 336ed7e · 336ed7e
2 parents c8dc618 + 6b3d7a6
commit 336ed7e
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 253 deletions.
diff --git a/pom.xml b/pom.xml
@@ -234,6 +234,12 @@
             <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+             <groupId>org.spigotmc......</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.21.4-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency>
         <dependency>
              <groupId>org.spigotmc.....</groupId>
              <artifactId>spigot</artifactId>

diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/PasteHandlerImpl.java
diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_0_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/PasteHandlerImpl.java
diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_1_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/PasteHandlerImpl.java
diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_20_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
diff --git a/..._20_4_R0_1_SNAPSHOT/PasteHandlerImpl.java → ..._21_4_R0_1_SNAPSHOT/PasteHandlerImpl.java b/..._20_4_R0_1_SNAPSHOT/PasteHandlerImpl.java → ..._21_4_R0_1_SNAPSHOT/PasteHandlerImpl.java
@@ -1,12 +1,12 @@
-package world.bentobox.bentobox.nms.v1_20_4_R0_1_SNAPSHOT;
+package world.bentobox.bentobox.nms.v1_21_4_R0_1_SNAPSHOT;
 
 import java.util.concurrent.CompletableFuture;
 
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R3.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData;
 
 import net.minecraft.core.BlockPosition;
 import net.minecraft.world.level.block.state.IBlockData;

diff --git a/...4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java → ...4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/...4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java → ...4_R0_1_SNAPSHOT/WorldRegeneratorImpl.java
@@ -1,8 +1,8 @@
-package world.bentobox.bentobox.nms.v1_20_4_R0_1_SNAPSHOT;
+package world.bentobox.bentobox.nms.v1_21_4_R0_1_SNAPSHOT;
 
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R3.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData;
 
 import net.minecraft.core.BlockPosition;
 import net.minecraft.world.level.World;

diff --git a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
@@ -197,64 +197,74 @@ public enum ServerVersion {
         /**
          * @since 1.21.0
          */
-        V1_19(Compatibility.COMPATIBLE),
+        V1_19(Compatibility.INCOMPATIBLE),
         /**
          * @since 1.21.0
          */
-        V1_19_1(Compatibility.COMPATIBLE),
+        V1_19_1(Compatibility.INCOMPATIBLE),
         /**
          * @since 1.21.0
          */
-        V1_19_2(Compatibility.COMPATIBLE),
+        V1_19_2(Compatibility.INCOMPATIBLE),
         /**
          * @since 1.22.0
          */
-        V1_19_3(Compatibility.COMPATIBLE),
+        V1_19_3(Compatibility.INCOMPATIBLE),
         /**
          * @since 1.22.1
          */
-        V1_19_4(Compatibility.COMPATIBLE),
+        V1_19_4(Compatibility.INCOMPATIBLE),
         /**
          * @since 1.24.0
          */
         V1_20(Compatibility.INCOMPATIBLE),
         /**
          * @since 1.24.0
          */
-        V1_20_1(Compatibility.COMPATIBLE),
+        V1_20_1(Compatibility.INCOMPATIBLE),
         /**
          * @since 2.0.0
          */
-        V1_20_2(Compatibility.COMPATIBLE),
+        V1_20_2(Compatibility.INCOMPATIBLE),
         /**
          * @since 2.0.0
          */
-        V1_20_3(Compatibility.COMPATIBLE),
+        V1_20_3(Compatibility.INCOMPATIBLE),
         /**
          * @since 2.0.0
          */
-        V1_20_4(Compatibility.COMPATIBLE),
+        V1_20_4(Compatibility.INCOMPATIBLE),
         /**
          * @since 2.4.0
          */
-        V1_20_5(Compatibility.COMPATIBLE),
+        V1_20_5(Compatibility.INCOMPATIBLE),
         /**
          * @since 2.4.0
          */
-        V1_20_6(Compatibility.COMPATIBLE),
+        V1_20_6(Compatibility.INCOMPATIBLE),
         /**
          * @since 2.4.0
          */
-        V1_21(Compatibility.COMPATIBLE),
+        V1_21(Compatibility.INCOMPATIBLE),
         /**
          * @since 2.5.0
          */
-        V1_21_1(Compatibility.COMPATIBLE),
+        V1_21_1(Compatibility.INCOMPATIBLE),
 
         /**
          * @since 2.7.0
          */
-        V1_21_2(Compatibility.INCOMPATIBLE), V1_21_3(Compatibility.COMPATIBLE);
+        V1_21_2(Compatibility.INCOMPATIBLE),
+
+        /**
+         * @since 3.0.0
+         */
+        V1_21_3(Compatibility.COMPATIBLE),
+
+        /**
+         * @since 3.0.1
+         */
+        V1_21_4(Compatibility.COMPATIBLE),;
 
         private final Compatibility compatibility;