Update to 1.20.6

APDevTeam · May 3, 2024 · 4d87289 · 4d87289
1 parent 44fe151
commit 4d87289
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 42 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -125,21 +125,21 @@ jobs:
         if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
         run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped
 
-  # Build 1.20.5 NMS
+  # Build 1.20.6 NMS
   v1_20_R4:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up JDK 21 # 1.20.5 can only be built with Java 21
+      - name: Set up JDK 21 # 1.20.6 can only be built with Java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '21'
-      - name: Cache 1.20.5 Maven package
+      - name: Cache 1.20.6 Maven package
         id: cacheWild_r2
         uses: actions/cache@v3
         with:
           path: |
-            ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/
             ~/.m2/repository/org/spigotmc/spigot-parent/
             ~/.m2/repository/org/spigotmc/minecraft-server/
           key: ${{ runner.os }}-v1_20_R4
@@ -154,18 +154,18 @@ jobs:
 
       - name: Setup BuildTools
         run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-      - name: Check 1.20.5 Spigot
+      - name: Check 1.20.6 Spigot
         id: wild
-        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/spigot-1.20.5-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Check 1.20.5 Spigot (Mojang)
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
+      - name: Check 1.20.6 Spigot (Mojang)
         id: wildMojang
-        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/spigot-1.20.5-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Check 1.20.5 Spigot (Obf)
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
+      - name: Check 1.20.6 Spigot (Obf)
         id: wildObf
-        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/spigot-1.20.5-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Build 1.20.5
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
+      - name: Build 1.20.6
         if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.5 --remapped
+        run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.6 --remapped
 
   # Build Movecraft
   build:
@@ -210,11 +210,11 @@ jobs:
             ~/.m2/repository/org/spigotmc/minecraft-server/
           key: ${{ runner.os }}-v1_19_R3
           restore-keys: ${{ runner.os }}-v1_19_R3
-      - name: Cache 1.20.5 Maven package
+      - name: Cache 1.20.6 Maven package
         uses: actions/cache@v3
         with:
           path: |
-            ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/
             ~/.m2/repository/org/spigotmc/spigot-parent/
             ~/.m2/repository/org/spigotmc/minecraft-server/
           key: ${{ runner.os }}-v1_20_R4

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -123,21 +123,21 @@ jobs:
         if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
         run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped
 
-  # Build 1.20.5 NMS
+  # Build 1.20.6 NMS
   v1_20_R4:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up JDK 21 # 1.20.5 can only be built with Java 21
+      - name: Set up JDK 21 # 1.20.6 can only be built with Java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '21'
-      - name: Cache 1.20.5 Maven package
+      - name: Cache 1.20.6 Maven package
         id: cacheWild_r2
         uses: actions/cache@v3
         with:
           path: |
-            ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/
             ~/.m2/repository/org/spigotmc/spigot-parent/
             ~/.m2/repository/org/spigotmc/minecraft-server/
           key: ${{ runner.os }}-v1_20_R4
@@ -152,18 +152,18 @@ jobs:
 
       - name: Setup BuildTools
         run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-      - name: Check 1.20.5 Spigot
+      - name: Check 1.20.6 Spigot
         id: wild
-        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/spigot-1.20.5-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Check 1.20.5 Spigot (Mojang)
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
+      - name: Check 1.20.6 Spigot (Mojang)
         id: wildMojang
-        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/spigot-1.20.5-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Check 1.20.5 Spigot (Obf)
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT-remapped-mojang.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
+      - name: Check 1.20.6 Spigot (Obf)
         id: wildObf
-        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/spigot-1.20.5-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Build 1.20.5
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT-remapped-obf.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
+      - name: Build 1.20.6
         if: steps.wild.outputs.sucess != 'true' || steps.wildMojang.outputs.sucess != 'true' || steps.wildObf.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.5 --remapped
+        run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.6 --remapped
 
   # Build Movecraft
   build:
@@ -208,11 +208,11 @@ jobs:
           ~/.m2/repository/org/spigotmc/minecraft-server/
         key: ${{ runner.os }}-v1_19_R3
         restore-keys: ${{ runner.os }}-v1_19_R3
-    - name: Cache 1.20.5 Maven package
+    - name: Cache 1.20.6 Maven package
       uses: actions/cache@v3
       with:
         path: |
-          ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/
+          ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/
           ~/.m2/repository/org/spigotmc/spigot-parent/
           ~/.m2/repository/org/spigotmc/minecraft-server/
         key: ${{ runner.os }}-v1_20_R4

diff --git a/README.md b/README.md
@@ -24,13 +24,13 @@ Please check the [Wiki](https://github.com/APDevTeam/Movecraft/wiki) and [FAQ](h
 [Discord](http://bit.ly/JoinAP-Dev)
 
 ## Development Environment
-Movecraft uses multiple versions of the Spigot server software for legacy support.  As such, you need to run [BuildTools](https://www.spigotmc.org/wiki/buildtools/) for several versions before building the plugin.  It doesn't matter where you do this, but inside the Movecraft directory is probably a bad place.  We recommend building Spigot 1.16.5 with Java 13, 1.18.2 and 1.19.4 with Java 17, and 1.20.5 with Java 21.
+Movecraft uses multiple versions of the Spigot server software for legacy support.  As such, you need to run [BuildTools](https://www.spigotmc.org/wiki/buildtools/) for several versions before building the plugin.  It doesn't matter where you do this, but inside the Movecraft directory is probably a bad place.  We recommend building Spigot 1.16.5 with Java 13, 1.18.2 and 1.19.4 with Java 17, and 1.20.6 with Java 21.
 
 ```
 java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit
 java -jar BuildTools.jar --rev 1.18.2 --remapped
 java -jar BuildTools.jar --rev 1.19.4 --remapped
-java -jar BuildTools.jar --rev 1.20.5 --remapped
+java -jar BuildTools.jar --rev 1.20.6 --remapped
 ```
 
 Once you have compiled CraftBukkit, it should continue to exist in your local maven repository, and thus you should need to compile each version at most one time. Once complete, run the following to build Movecraft through `maven`.

diff --git a/modules/v1_20_R4/pom.xml b/modules/v1_20_R4/pom.xml
@@ -17,10 +17,10 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.20.5-R0.1-SNAPSHOT</version>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
-            <!-- Mappings: https://piston-data.mojang.com/v1/objects/14be97974a77b09eb8bca88ed9268445f0fde3e7/server.txt -->
+            <!-- Mappings: https://piston-data.mojang.com/v1/objects/9e96100f573a46ef44caab3e716d5eb974594bb7/server.txt -->
         </dependency>
         <dependency>
             <groupId>net.countercraft</groupId>
@@ -68,9 +68,9 @@
                         </goals>
                         <id>remap-obf</id>
                         <configuration>
-                            <srgIn>org.spigotmc:minecraft-server:1.20.5-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <srgIn>org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
                             <reverse>true</reverse>
-                            <remappedDependencies>org.spigotmc:spigot:1.20.5-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedDependencies>org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
                             <remappedClassifierName>remapped-obf</remappedClassifierName>
                         </configuration>
@@ -83,8 +83,8 @@
                         <id>remap-spigot</id>
                         <configuration>
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-                            <srgIn>org.spigotmc:minecraft-server:1.20.5-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-                            <remappedDependencies>org.spigotmc:spigot:1.20.5-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                            <srgIn>org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/IWorldHandler.java b/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/IWorldHandler.java
@@ -54,7 +54,7 @@ public class IWorldHandler extends WorldHandler {
 
     public IWorldHandler() {
         String mappings = ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion();
-        if (!mappings.equals("ad1a88fd7eaf2277f2507bf34d7b994c"))
+        if (!mappings.equals("ee13f98a43b9c5abffdcc0bb24154460"))
             throw new IllegalStateException("Movecraft is not compatible with this version of Minecraft 1.20: " + mappings);
     }
 

diff --git a/...s/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/ISmoothTeleport.java b/...s/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/ISmoothTeleport.java
@@ -17,7 +17,7 @@
 /**
  * Code derived from code taken with permission from MicleBrick
  * https://www.spigotmc.org/threads/teleport-player-smoothly.317416/
- * Used for 1.20.5
+ * Used for 1.20.6
  */
 public class ISmoothTeleport extends SmoothTeleport {
     private final Field teleportPosField;

diff --git a/setup.sh b/setup.sh
@@ -47,11 +47,11 @@ else
     java -jar BuildTools.jar --rev 1.19.4 --remapped
 fi
 
-# Build 1.20.5
-if [ -f ~/.m2/repository/org/spigotmc/spigot/1.20.5-R0.1-SNAPSHOT/spigot-1.20.5-R0.1-SNAPSHOT.jar ]; then
-    echo "1.20.5 already exists, skipping build"
+# Build 1.20.6
+if [ -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT.jar ]; then
+    echo "1.20.6 already exists, skipping build"
 else
-    java -jar BuildTools.jar --rev 1.20.5 --remapped
+    java -jar BuildTools.jar --rev 1.20.6 --remapped
 fi
 
 # Restore git information