From a8fccb45fdf9b1648572da57410241e557959b3a Mon Sep 17 00:00:00 2001
From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com>
Date: Tue, 22 Sep 2026 18:18:31 +0000
Subject: [PATCH 1/2] build: target 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                            | 22 ++++++++++++++++------
 src/main/resources/plugin.yml      |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/dependencies.sha256 b/.github/dependencies.sha256
index 27380b6..eeadb99 100644
--- a/.github/dependencies.sha256
+++ b/.github/dependencies.sha256
@@ -1,3 +1,2 @@
 4241c14a7727c34feea6507ec801318a3d4a90f070e4525681079fb94ee4c593  libs/gson-2.10.1.jar
 2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439  libs/json-simple-1.1.jar
-97e0c708c1e319189ce1cda049244551a105860d51e908d2bcbc183fd1f89816  libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar
diff --git a/.github/scripts/prepare-release.sh b/.github/scripts/prepare-release.sh
index b4bc0e8..b602fa2 100644
--- a/.github/scripts/prepare-release.sh
+++ b/.github/scripts/prepare-release.sh
@@ -5,5 +5,4 @@ ref=2fe025eb9879bab7dfe48e32395d8a8c1dff75f7
 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/4241c14a7727/gson-2.10.1.jar?ref=$ref" > "libs/gson-2.10.1.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/2d9484f4c649/json-simple-1.1.jar?ref=$ref" > "libs/json-simple-1.1.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/97e0c708c1e3/spigot-api-1.20.2-R0.1-SNAPSHOT.jar?ref=$ref" > "libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar"
 sha256sum --check .github/dependencies.sha256
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2de30e..68802e1 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 pinned TLibs in Maven
         uses: TF-Minecraft/TLibs/.github/actions/setup@905a196217471252b96be5ecf8eeb16c9e85e41d
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3a5b7f0..13579a9 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/pointshop-{version}.jar
     secrets:
diff --git a/pom.xml b/pom.xml
index e7218c1..b722dcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,16 @@
 
     <properties>
         <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>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>spigot-snapshots</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -46,11 +52,10 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>local</groupId>
+            <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar</systemPath>
+            <version>1.21.10-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -68,6 +73,11 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.1</version>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 5aba7b5..54ff990 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: net.tfminecraft.PointShop.PointShop
-api-version: 1.20
+api-version: '1.21.10'
 name: PointShop
 version: ${project.version}
 author: Drefvelin

From 651a4df38373294be5164d81159a74cdf2c3adb6 Mon Sep 17 00:00:00 2001
From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com>
Date: Tue, 22 Sep 2026 18:41:25 +0000
Subject: [PATCH 2/2] fix: pin Java 21 TLibs release

---
 .github/workflows/build.yml         | 2 +-
 .github/workflows/maven-release.yml | 2 +-
 pom.xml                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68802e1..cda70b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
           distribution: temurin
           java-version: '21'
       - name: Install pinned TLibs in Maven
-        uses: TF-Minecraft/TLibs/.github/actions/setup@905a196217471252b96be5ecf8eeb16c9e85e41d
+        uses: TF-Minecraft/TLibs/.github/actions/setup@94043ef24d509592df8a42d4d4bdfb5bc0d6a499
         with:
           token: ${{ secrets.DEPS_TOKEN }}
 
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index b72587b..d0a18f2 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -51,7 +51,7 @@ jobs:
           [[ "${TAG^^}" != *SNAPSHOT* ]] || exit 1
 
       - name: Install pinned TLibs in Maven
-        uses: TF-Minecraft/TLibs/.github/actions/setup@905a196217471252b96be5ecf8eeb16c9e85e41d
+        uses: TF-Minecraft/TLibs/.github/actions/setup@94043ef24d509592df8a42d4d4bdfb5bc0d6a499
         with:
           token: ${{ secrets.DEPS_TOKEN }}
 
diff --git a/pom.xml b/pom.xml
index b722dcc..fe994e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <version>1.1.0</version>
 
     <properties>
-        <tlibs.version>1.1.0</tlibs.version>
+        <tlibs.version>1.1.1</tlibs.version>
         <maven.compiler.release>21</maven.compiler.release>
     </properties>