From 784b04dcd5d770da665f5da7bfa0161178f40c45 Mon Sep 17 00:00:00 2001
From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com>
Date: Tue, 22 Sep 2026 18:18:07 +0000
Subject: [PATCH 1/2] build: unify Java 21 and Minecraft 1.21.10

---
 .github/dependencies.sha256        |  1 -
 .github/scripts/prepare-release.sh |  1 -
 .github/workflows/build.yml        |  2 +-
 .github/workflows/release.yml      |  2 +-
 pom.xml                            | 24 ++++++++++++++++++------
 src/main/resources/plugin.yml      |  2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.github/dependencies.sha256 b/.github/dependencies.sha256
index ff1f17d..a4b42e0 100644
--- a/.github/dependencies.sha256
+++ b/.github/dependencies.sha256
@@ -1,3 +1,2 @@
-b7156eab567772f9fdac0bf696b209111790c3f69149ab9a742e3dd030ec4b10  libs/spigot-api.jar
 ee2e7ab9b5386f2d103081c4d108e61b1035df2ca692b53d6e2409fb1f5caccf  libs/ProtocolLib.jar
 0116d714822b6f0cfebfe833a5df2e4754797b637d0fe709afb762c56da463a3  libs/ItemsAdder_3.5.0-r2.jar
diff --git a/.github/scripts/prepare-release.sh b/.github/scripts/prepare-release.sh
index a599b96..e0942aa 100644
--- a/.github/scripts/prepare-release.sh
+++ b/.github/scripts/prepare-release.sh
@@ -3,7 +3,6 @@ set -euo pipefail
 : "${GH_TOKEN:?Set DEPS_TOKEN with Contents read access to TF-Minecraft/ServerAssets}"
 ref=8a44414cd5b74b7d1c7a258ccf5a86a5f6e0294b
 mkdir -p libs
-curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/b7156eab5677/spigot-api.jar?ref=$ref" > "libs/spigot-api.jar"
 curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/runtime/plugins/ProtocolLib.jar?ref=$ref" > "libs/ProtocolLib.jar"
 curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/0116d714822b/ItemsAdder_3.5.0-r2.jar?ref=$ref" > "libs/ItemsAdder_3.5.0-r2.jar"
 sha256sum --check .github/dependencies.sha256
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3093b48..bc8044f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v6
         with:
           distribution: temurin
-          java-version: '25'
+          java-version: '21'
       - name: Install shared plugin dependencies
         uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@7afa185bee605908a99ac55288ed27a3babbad62
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93d42ec..6fbc68d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write
     uses: ./.github/workflows/maven-release.yml
     with:
-      java-version: '25'
+      java-version: '21'
       # Exact path, not a glob. {version} is replaced with the tag without v.
       artifact-path: target/games-{version}.jar
     secrets:
diff --git a/pom.xml b/pom.xml
index 7e79746..caaa5a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,18 +13,25 @@
         <rpcharacters.version>1.1.7</rpcharacters.version>
         <denareconomy.version>0.1.9</denareconomy.version>
         <tlibs.version>1.1.0</tlibs.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>spigot-snapshots</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
-            <groupId>local</groupId>
+            <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21.8</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/spigot-api.jar</systemPath>
+            <version>1.21.10-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+
         </dependency>
         <dependency>
             <groupId>me.plugins</groupId>
@@ -111,6 +118,11 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 52c954b..1b6eeea 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: net.tfminecraft.games.Games
-api-version: '1.21'
+api-version: '1.21.10'
 name: Games
 version: ${project.version}
 author: Drefvelin

From 0ed3ee836a3397651c79d3797745d6ecd6d610a1 Mon Sep 17 00:00:00 2001
From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com>
Date: Tue, 22 Sep 2026 18:44:46 +0000
Subject: [PATCH 2/2] build: pin Java 21 dependency releases

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index caaa5a5..c0bc717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
         <simplefactions.version>2.8.7</simplefactions.version>
         <rpcharacters.version>1.1.7</rpcharacters.version>
         <denareconomy.version>0.1.9</denareconomy.version>
-        <tlibs.version>1.1.0</tlibs.version>
+        <tlibs.version>1.1.1</tlibs.version>
         <maven.compiler.release>21</maven.compiler.release>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>