From 97a9e5f6e84853b90b96e3725b42b3a70ffb7887 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sun, 11 Aug 2024 10:39:45 +0200 Subject: [PATCH] feat: Compile v1_21_R1 nms module with Spigot 1.21.1 for compatibility --- .github/actions/setup_project_workspace/action.yml | 2 +- .../java/com/craftaro/core/compatibility/ServerVersion.java | 1 + NMS/NMS-v1_21_R1/pom.xml | 2 +- .../craftaro/core/nms/v1_21_R1/anvil/AnvilInventoryCustom.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup_project_workspace/action.yml b/.github/actions/setup_project_workspace/action.yml index 5df0e19d..3b153d97 100644 --- 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 index e77fe9f7..87a726f2 100644 --- 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 index 2b26ee8e..baefe0f3 100644 --- a/NMS/NMS-v1_21_R1/pom.xml +++ b/NMS/NMS-v1_21_R1/pom.xml @@ -16,7 +16,7 @@ 21 21 - 1.21-R0.1-SNAPSHOT + 1.21.1-R0.1-SNAPSHOT diff --git a/NMS/NMS-v1_21_R1/src/main/java/com/craftaro/core/nms/v1_21_R1/anvil/AnvilInventoryCustom.java b/NMS/NMS-v1_21_R1/src/main/java/com/craftaro/core/nms/v1_21_R1/anvil/AnvilInventoryCustom.java index 15d1cb18..c538035e 100644 --- a/NMS/NMS-v1_21_R1/src/main/java/com/craftaro/core/nms/v1_21_R1/anvil/AnvilInventoryCustom.java +++ b/NMS/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; }