Add 1.21.3 support

stefvanschie · Oct 31, 2024 · 60b19dc · 60b19dc
1 parent 1408227
commit 60b19dc
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 49 deletions.
diff --git a/IF/pom.xml b/IF/pom.xml
@@ -181,7 +181,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.stefvanschie.inventoryframework</groupId>
-            <artifactId>1_21_2</artifactId>
+            <artifactId>1_21_2-3</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java b/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java
@@ -178,19 +178,19 @@ public enum Version {
     V1_21_1,
 
     /**
-     * Version 1.21.2
+     * Version 1.21.2 - 1.21.3
      *
      * @since 0.10.18
      */
-    V1_21_2;
+    V1_21_2_3;
 
     /**
      * A collection of versions on which modern smithing tables are available.
      */
     private static final Collection<Version> MODERN_SMITHING_TABLE_VERSIONS = EnumSet.of(
             V1_19_4,
             V1_20_0, V1_20_1, V1_20_2, V1_20_3_4, V1_20_5, V1_20_6,
-            V1_21_0, V1_21_1, V1_21_2
+            V1_21_0, V1_21_1, V1_21_2_3
     );
 
     /**
@@ -211,7 +211,7 @@ public enum Version {
      */
     @NotNull
     private static final Collection<@NotNull Version> INTERFACE_INVENTORY_VIEW = EnumSet.of(
-            V1_21_0, V1_21_1, V1_21_2
+            V1_21_0, V1_21_1, V1_21_2_3
     );
 
     /**
@@ -315,7 +315,8 @@ public static Version getVersion() {
             case "1.21.1":
                 return V1_21_1;
             case "1.21.2":
-                return V1_21_2;
+            case "1.21.3":
+                return V1_21_2_3;
             default:
                 throw new UnsupportedVersionException("The server version provided is not supported");
         }

diff --git a/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/VersionMatcher.java b/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/VersionMatcher.java
@@ -321,8 +321,8 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.AnvilInventoryImpl.class);
         ANVIL_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.AnvilInventoryImpl.class);
-        ANVIL_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.AnvilInventoryImpl.class);
+        ANVIL_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.AnvilInventoryImpl.class);
 
         BEACON_INVENTORIES = new EnumMap<>(Version.class);
         BEACON_INVENTORIES.put(Version.V1_14,
@@ -371,8 +371,8 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.BeaconInventoryImpl.class);
         BEACON_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.BeaconInventoryImpl.class);
-        BEACON_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.BeaconInventoryImpl.class);
+        BEACON_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.BeaconInventoryImpl.class);
 
         CARTOGRAPHY_TABLE_INVENTORIES = new EnumMap<>(Version.class);
         CARTOGRAPHY_TABLE_INVENTORIES.put(Version.V1_14,
@@ -421,8 +421,8 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.CartographyTableInventoryImpl.class);
         CARTOGRAPHY_TABLE_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.CartographyTableInventoryImpl.class);
-        CARTOGRAPHY_TABLE_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.CartographyTableInventoryImpl.class);
+        CARTOGRAPHY_TABLE_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.CartographyTableInventoryImpl.class);
 
         ENCHANTING_TABLE_INVENTORIES = new EnumMap<>(Version.class);
         ENCHANTING_TABLE_INVENTORIES.put(Version.V1_14,
@@ -471,8 +471,8 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.EnchantingTableInventoryImpl.class);
         ENCHANTING_TABLE_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.EnchantingTableInventoryImpl.class);
-        ENCHANTING_TABLE_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.EnchantingTableInventoryImpl.class);
+        ENCHANTING_TABLE_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.EnchantingTableInventoryImpl.class);
 
         GRINDSTONE_INVENTORIES = new EnumMap<>(Version.class);
         GRINDSTONE_INVENTORIES.put(Version.V1_14,
@@ -521,8 +521,8 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.GrindstoneInventoryImpl.class);
         GRINDSTONE_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.GrindstoneInventoryImpl.class);
-        GRINDSTONE_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.GrindstoneInventoryImpl.class);
+        GRINDSTONE_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.GrindstoneInventoryImpl.class);
 
         MERCHANT_INVENTORIES = new EnumMap<>(Version.class);
         MERCHANT_INVENTORIES.put(Version.V1_14,
@@ -571,8 +571,8 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.MerchantInventoryImpl.class);
         MERCHANT_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.MerchantInventoryImpl.class);
-        MERCHANT_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.MerchantInventoryImpl.class);
+        MERCHANT_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.MerchantInventoryImpl.class);
 
         SMITHING_TABLE_INVENTORIES = new EnumMap<>(Version.class);
         SMITHING_TABLE_INVENTORIES.put(Version.V1_19_4,
@@ -593,8 +593,8 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.SmithingTableInventoryImpl.class);
         SMITHING_TABLE_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.SmithingTableInventoryImpl.class);
-        SMITHING_TABLE_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.SmithingTableInventoryImpl.class);
+        SMITHING_TABLE_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.SmithingTableInventoryImpl.class);
 
         LEGACY_SMITHING_TABLE_INVENTORIES = new EnumMap<>(Version.class);
         LEGACY_SMITHING_TABLE_INVENTORIES.put(Version.V1_16_1,
@@ -671,7 +671,7 @@ public static StonecutterInventory newStonecutterInventory(@NotNull Version vers
             com.github.stefvanschie.inventoryframework.nms.v1_21_0.StonecutterInventoryImpl.class);
         STONECUTTER_INVENTORIES.put(Version.V1_21_1,
             com.github.stefvanschie.inventoryframework.nms.v1_21_1.StonecutterInventoryImpl.class);
-        STONECUTTER_INVENTORIES.put(Version.V1_21_2,
-            com.github.stefvanschie.inventoryframework.nms.v1_21_2.StonecutterInventoryImpl.class);
+        STONECUTTER_INVENTORIES.put(Version.V1_21_2_3,
+            com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.StonecutterInventoryImpl.class);
     }
 }
diff --git a/nms/1_21_2/pom.xml → nms/1_21_2-3/pom.xml b/nms/1_21_2/pom.xml → nms/1_21_2-3/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>1_21_2</artifactId>
+    <artifactId>1_21_2-3</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.21.2-R0.1-SNAPSHOT</version>
+            <version>1.21.3-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>
@@ -46,9 +46,9 @@
                         </goals>
                         <id>remap-obf</id>
                         <configuration>
-                            <srgIn>org.spigotmc:minecraft-server:1.21.2-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <srgIn>org.spigotmc:minecraft-server:1.21.3-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
                             <reverse>true</reverse>
-                            <remappedDependencies>org.spigotmc:spigot:1.21.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedDependencies>org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
                             <remappedClassifierName>remapped-obf</remappedClassifierName>
                         </configuration>
@@ -61,8 +61,8 @@
                         <id>remap-spigot</id>
                         <configuration>
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-                            <srgIn>org.spigotmc:minecraft-server:1.21.2-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-                            <remappedDependencies>org.spigotmc:spigot:1.21.2-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                            <srgIn>org.spigotmc:minecraft-server:1.21.3-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...ework/nms/v1_21_2/AnvilInventoryImpl.java → ...ork/nms/v1_21_2_3/AnvilInventoryImpl.java b/...ework/nms/v1_21_2/AnvilInventoryImpl.java → ...ork/nms/v1_21_2_3/AnvilInventoryImpl.java
@@ -1,9 +1,9 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.AnvilInventory;
 import com.github.stefvanschie.inventoryframework.adventuresupport.TextHolder;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.CustomInventoryUtil;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.TextHolderUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.CustomInventoryUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.TextHolderUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;

diff --git a/...work/nms/v1_21_2/BeaconInventoryImpl.java → ...rk/nms/v1_21_2_3/BeaconInventoryImpl.java b/...work/nms/v1_21_2/BeaconInventoryImpl.java → ...rk/nms/v1_21_2_3/BeaconInventoryImpl.java
@@ -1,4 +1,4 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.BeaconInventory;
 import net.minecraft.core.NonNullList;

diff --git a/...1_21_2/CartographyTableInventoryImpl.java → ...21_2_3/CartographyTableInventoryImpl.java b/...1_21_2/CartographyTableInventoryImpl.java → ...21_2_3/CartographyTableInventoryImpl.java
@@ -1,9 +1,9 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.CartographyTableInventory;
 import com.github.stefvanschie.inventoryframework.adventuresupport.TextHolder;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.CustomInventoryUtil;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.TextHolderUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.CustomInventoryUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.TextHolderUtil;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket;

diff --git a/...v1_21_2/EnchantingTableInventoryImpl.java → ..._21_2_3/EnchantingTableInventoryImpl.java b/...v1_21_2/EnchantingTableInventoryImpl.java → ..._21_2_3/EnchantingTableInventoryImpl.java
@@ -1,8 +1,8 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.EnchantingTableInventory;
 import com.github.stefvanschie.inventoryframework.adventuresupport.TextHolder;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.TextHolderUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.TextHolderUtil;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket;

diff --git a/.../nms/v1_21_2/GrindstoneInventoryImpl.java → ...ms/v1_21_2_3/GrindstoneInventoryImpl.java b/.../nms/v1_21_2/GrindstoneInventoryImpl.java → ...ms/v1_21_2_3/GrindstoneInventoryImpl.java
@@ -1,9 +1,9 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.GrindstoneInventory;
 import com.github.stefvanschie.inventoryframework.adventuresupport.TextHolder;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.CustomInventoryUtil;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.TextHolderUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.CustomInventoryUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.TextHolderUtil;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket;

diff --git a/...rk/nms/v1_21_2/MerchantInventoryImpl.java → .../nms/v1_21_2_3/MerchantInventoryImpl.java b/...rk/nms/v1_21_2/MerchantInventoryImpl.java → .../nms/v1_21_2_3/MerchantInventoryImpl.java
@@ -1,4 +1,4 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.MerchantInventory;
 import net.minecraft.core.component.DataComponentPredicate;

diff --git a/...s/v1_21_2/SmithingTableInventoryImpl.java → ...v1_21_2_3/SmithingTableInventoryImpl.java b/...s/v1_21_2/SmithingTableInventoryImpl.java → ...v1_21_2_3/SmithingTableInventoryImpl.java
@@ -1,9 +1,9 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.SmithingTableInventory;
 import com.github.stefvanschie.inventoryframework.adventuresupport.TextHolder;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.CustomInventoryUtil;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.TextHolderUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.CustomInventoryUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.TextHolderUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;

diff --git a/...nms/v1_21_2/StonecutterInventoryImpl.java → ...s/v1_21_2_3/StonecutterInventoryImpl.java b/...nms/v1_21_2/StonecutterInventoryImpl.java → ...s/v1_21_2_3/StonecutterInventoryImpl.java
@@ -1,8 +1,8 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3;
 
 import com.github.stefvanschie.inventoryframework.abstraction.StonecutterInventory;
 import com.github.stefvanschie.inventoryframework.adventuresupport.TextHolder;
-import com.github.stefvanschie.inventoryframework.nms.v1_21_2.util.TextHolderUtil;
+import com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util.TextHolderUtil;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket;

diff --git a/...nms/v1_21_2/util/CustomInventoryUtil.java → ...s/v1_21_2_3/util/CustomInventoryUtil.java b/...nms/v1_21_2/util/CustomInventoryUtil.java → ...s/v1_21_2_3/util/CustomInventoryUtil.java
@@ -1,4 +1,4 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2.util;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util;
 
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.item.ItemStack;

diff --git a/...work/nms/v1_21_2/util/TextHolderUtil.java → ...rk/nms/v1_21_2_3/util/TextHolderUtil.java b/...work/nms/v1_21_2/util/TextHolderUtil.java → ...rk/nms/v1_21_2_3/util/TextHolderUtil.java
@@ -1,4 +1,4 @@
-package com.github.stefvanschie.inventoryframework.nms.v1_21_2.util;
+package com.github.stefvanschie.inventoryframework.nms.v1_21_2_3.util;
 
 import com.github.stefvanschie.inventoryframework.adventuresupport.ComponentHolder;
 import com.github.stefvanschie.inventoryframework.adventuresupport.StringHolder;

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <modules>
         <module>IF</module>
         <module>nms/abstraction</module>
-        <module>nms/1_21_2</module>
+        <module>nms/1_21_2-3</module>
         <module>nms/1_21_1</module>
         <module>nms/1_21_0</module>
         <module>nms/1_20_6</module>