Add 1.21.1 support

stefvanschie · Aug 17, 2024 · f2e54bc · f2e54bc
1 parent ff2f992
commit f2e54bc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 43 deletions.
diff --git 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'
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21.1'
       if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
       run: |
         mkdir -p build
@@ -105,24 +105,7 @@ jobs:
 
         java -jar BuildTools.jar --remapped --disable-java-check --dont-update
         java -jar BuildTools.jar --rev 1.20.6 --remapped --disable-java-check
-        
-        cd Bukkit
-        git checkout 2ec53f498e32b3af989cb24672fc54dfab087154
-        cd ..
-
-        cd CraftBukkit
-        git checkout 8ee6fd1b8db9896590aa321d0199453de1fc35db
-        cd ..
-
-        cd Spigot
-        git checkout fb8fb722a327a2f9f097f2ded700ac5de8157408
-        cd ..
-
-        cd BuildData
-        git checkout ae1e7b1e31cd3a3892bb05a6ccdcecc48c73c455
-        cd ..
-        
-        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.21.1 --remapped --disable-java-check
         cd ../
     - name: Setup GPG keys
       run: cat <(echo -e "${{ secrets.GPG_KEY }}") | gpg --batch --import

diff --git 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'
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21.1'
       if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
       run: |
         mkdir -p build
@@ -111,24 +111,7 @@ jobs:
         
         java -jar BuildTools.jar --remapped --disable-java-check --dont-update
         java -jar BuildTools.jar --rev 1.20.6 --remapped --disable-java-check
-        
-        cd Bukkit
-        git checkout 2ec53f498e32b3af989cb24672fc54dfab087154
-        cd ..
-
-        cd CraftBukkit
-        git checkout 8ee6fd1b8db9896590aa321d0199453de1fc35db
-        cd ..
-
-        cd Spigot
-        git checkout fb8fb722a327a2f9f097f2ded700ac5de8157408
-        cd ..
-
-        cd BuildData
-        git checkout ae1e7b1e31cd3a3892bb05a6ccdcecc48c73c455
-        cd ..
-        
-        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.21.1 --remapped --disable-java-check
         cd ../
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java b/IF/src/main/java/com/github/stefvanschie/inventoryframework/util/version/Version.java
@@ -289,6 +289,7 @@ public static Version getVersion() {
             case "1.20.6":
                 return V1_20_6;
             case "1.21":
+            case "1.21.1":
                 return V1_21;
             default:
                 throw new UnsupportedVersionException("The server version provided is not supported");

diff --git a/nms/1_21/pom.xml b/nms/1_21/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21.1-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>
@@ -46,9 +46,9 @@
                         </goals>
                         <id>remap-obf</id>
                         <configuration>
-                            <srgIn>org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <srgIn>org.spigotmc:minecraft-server:1.21.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
                             <reverse>true</reverse>
-                            <remappedDependencies>org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedDependencies>org.spigotmc:spigot:1.21.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
                             <remappedClassifierName>remapped-obf</remappedClassifierName>
                         </configuration>
@@ -61,8 +61,8 @@
                         <id>remap-spigot</id>
                         <configuration>
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-                            <srgIn>org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-                            <remappedDependencies>org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                            <srgIn>org.spigotmc:minecraft-server:1.21.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.21.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                         </configuration>
                     </execution>
                 </executions>