feat: Compile v1_21_R1 nms module with Spigot 1.21.1 for compatibility

craftaro · Aug 11, 2024 · 97a9e5f · 97a9e5f
1 parent 91a92bc
commit 97a9e5f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.github/actions/setup_project_workspace/action.yml b/.github/actions/setup_project_workspace/action.yml
@@ -56,7 +56,7 @@ runs:
 
     - uses: SpraxDev/Action-SpigotMC@v5
       with:
-        versions: 1.20.6, 1.21
+        versions: 1.20.6, 1.21.1
         remapped: true
         sftpCacheHost: ${{ inputs.spigot_buildtools_sftp_host }}
         sftpCachePort: ${{ inputs.spigot_buildtools_sftp_port }}

diff --git a/Compatibility/src/main/java/com/craftaro/core/compatibility/ServerVersion.java b/Compatibility/src/main/java/com/craftaro/core/compatibility/ServerVersion.java
@@ -78,6 +78,7 @@ public enum ServerVersion {
         VERSION_TO_REVISION.put("1.20.5", "v1_20_R4");
         VERSION_TO_REVISION.put("1.20.6", "v1_20_R4");
         VERSION_TO_REVISION.put("1.21", "v1_21_R1");
+        VERSION_TO_REVISION.put("1.21.1", "v1_21_R1");
 
         if (Bukkit.getServer() != null) {
             String srvPackage = Bukkit.getServer().getClass().getPackage().getName();

diff --git a/NMS/NMS-v1_21_R1/pom.xml b/NMS/NMS-v1_21_R1/pom.xml
@@ -16,7 +16,7 @@
         <java.version>21</java.version>
         <java.release>21</java.release>
 
-        <nms.ver>1.21-R0.1-SNAPSHOT</nms.ver>
+        <nms.ver>1.21.1-R0.1-SNAPSHOT</nms.ver>
     </properties>
 
     <build>

diff --git a/...NMS-v1_21_R1/src/main/java/com/craftaro/core/nms/v1_21_R1/anvil/AnvilInventoryCustom.java b/...NMS-v1_21_R1/src/main/java/com/craftaro/core/nms/v1_21_R1/anvil/AnvilInventoryCustom.java
@@ -10,7 +10,7 @@ public class AnvilInventoryCustom extends CraftInventoryAnvil {
     final InventoryHolder holder;
 
     public AnvilInventoryCustom(InventoryHolder holder, Location location, Container inventory, Container resultInventory, AnvilMenu container) {
-        super(location, inventory, resultInventory, container);
+        super(location, inventory, resultInventory);
 
         this.holder = holder;
     }