From 5ca10b44b95744bf8bca074138971c92cfa11ef9 Mon Sep 17 00:00:00 2001
From: r3back <andresponce1334@gmail.com>
Date: Sun, 17 Nov 2024 17:47:23 -0300
Subject: [PATCH] Added fix for 1.21 factory

---
 .github/workflows/gradle.yml                               | 4 ++--
 .../com/qualityplus/assistant/base/factory/NMSFactory.java | 7 +++++++
 test-suite/docker-compose.yml                              | 2 +-
 test-suite/mc-config/mc.env                                | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 917dc61..c5645b6 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Build with Gradle
       uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
diff --git a/plugin/src/main/java/com/qualityplus/assistant/base/factory/NMSFactory.java b/plugin/src/main/java/com/qualityplus/assistant/base/factory/NMSFactory.java
index f11d116..9a3ce8a 100644
--- a/plugin/src/main/java/com/qualityplus/assistant/base/factory/NMSFactory.java
+++ b/plugin/src/main/java/com/qualityplus/assistant/base/factory/NMSFactory.java
@@ -102,6 +102,13 @@ public TabHandler configureTab() {
      * @return {@link MinecraftVersion}
      */
     private MinecraftVersion getMcVersion() {
+        final String version = Bukkit.getServer().getVersion();
+
+        if (version.startsWith("1.21")) {
+            final String nmsVersion = "v1_21_R1";
+            return MinecraftVersion.byName(nmsVersion);
+        }
+
         final String nmsVersion = Bukkit.getServer().getClass()
                 .getPackage()
                 .getName()
diff --git a/test-suite/docker-compose.yml b/test-suite/docker-compose.yml
index a78fea4..ccc4608 100644
--- a/test-suite/docker-compose.yml
+++ b/test-suite/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   test-server:
-    image: itzg/minecraft-server:java17
+    image: itzg/minecraft-server:java21
     environment:
       CFG_SERVER_NAME: "test-server"
     ports:
diff --git a/test-suite/mc-config/mc.env b/test-suite/mc-config/mc.env
index dc4312a..9342a64 100644
--- a/test-suite/mc-config/mc.env
+++ b/test-suite/mc-config/mc.env
@@ -1,5 +1,5 @@
 TYPE=PAPER
-VERSION=1.19.4
+VERSION=1.21.1
 EULA=TRUE
 ONLINE_MODE=TRUE
 COPY_CONFIG_DEST=/data