From 0ea0def776af87b55eea9d2b561bb773834a431c Mon Sep 17 00:00:00 2001
From: stefvanschie <stefvanschiedev@gmail.com>
Date: Thu, 31 Oct 2024 20:53:04 +0100
Subject: [PATCH] Fix CI/CD & dependabot

---
 .github/dependabot.yml            |  4 ++++
 .github/workflows/auto-deploy.yml |  3 ++-
 .github/workflows/maven.yml       |  3 ++-
 README.md                         | 21 ++++++++++++++++++++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fb2210cf..2472e19a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -104,6 +104,10 @@ updates:
     directory: "/nms/1_21_1"
     schedule:
       interval: "daily"
+  - package-ecosystem: "maven"
+    directory: "/nms/1_21_2-3"
+    schedule:
+      interval: "daily"
   - package-ecosystem: "maven"
     directory: "/nms/abstraction"
     schedule:
diff --git a/.github/workflows/auto-deploy.yml b/.github/workflows/auto-deploy.yml
index 9c671e5b..5db9d040 100644
--- a/.github/workflows/auto-deploy.yml
+++ b/.github/workflows/auto-deploy.yml
@@ -76,7 +76,7 @@ jobs:
         mvn paper-nms:init -pl nms/1_20_1
         mvn paper-nms:init -pl nms/1_20_2
         mvn paper-nms:init -pl nms/1_20_3-4
-    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21.1'
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21'
       if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
       run: |
         mkdir -p build
@@ -142,6 +142,7 @@ jobs:
         cd ..
         
         java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.21.3 --remapped --disable-java-check
         
         cd ../
     - name: Setup GPG keys
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1608ec05..9113fa10 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -82,7 +82,7 @@ jobs:
         mvn paper-nms:init -pl nms/1_20_1
         mvn paper-nms:init -pl nms/1_20_2
         mvn paper-nms:init -pl nms/1_20_3-4
-    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21.1'
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21'
       if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
       run: |
         mkdir -p build
@@ -148,6 +148,7 @@ jobs:
         cd ..
         
         java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.21.3 --remapped --disable-java-check
         
         cd ../
     - name: Build with Maven
diff --git a/README.md b/README.md
index 4d04840d..7fc917bc 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ mvn paper-nms:init -pl nms/1_20_3-4
 ```
 
 ### Installing Spigot via BuildTools
-For versions 1.20.5-1.21.1, we use BuildTools. To install these versions, we run the following commands.
+For versions 1.20.5-1.21.3, we use BuildTools. To install these versions, we run the following commands.
 ```
 wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O BuildTools.jar
         
@@ -187,6 +187,25 @@ cd ..
 
 java -jar BuildTools.jar --remapped --disable-java-check --dont-update
 java -jar BuildTools.jar --rev 1.21.1 --remapped --disable-java-check
+
+cd Bukkit
+git checkout 8ec77750aa334e886ed2a0cee3320c62985b28e3
+cd ..
+
+cd CraftBukkit
+git checkout d50f50585eab860db7889b3e736a62faf430f7a4
+cd ..
+
+cd Spigot
+git checkout a084d85da8604d468f81091f56dc81166d912931
+cd ..
+
+cd BuildData
+git checkout 0ea6fcc9bc8ad9e7c729f5031123bcc69ce2b033
+cd ..
+
+java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+java -jar BuildTools.jar --rev 1.21.3 --remapped --disable-java-check
 ```
 
 Your environment is now set up correctly. To create a build, run the following inside the root folder of the project.