Add support for 1.20.2 and 1.20.3 and fix workflows (#173)

* Add support for 1.20.2 and 1.20.3 * Fix workflow errors * Fix workflow errors * Fix workflow errors * Fix workflow errors
rowan-vr · Dec 7, 2023 · 4e76a93 · 4e76a93
1 parent 44896ae
commit 4e76a93
Show file tree

Hide file tree

Showing 16 changed files with 1,593 additions and 255 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: Maven Build
 
 on:
   push:
@@ -213,43 +213,43 @@ jobs:
  creative_1_19_4:
      runs-on: ubuntu-latest
      steps:
-         - name: Set up JDK 17
-           uses: actions/setup-java@v2
-           with:
-               distribution: 'temurin'
-               java-version: '17'
-         - name: Cache 1.19.4 Maven package
-           id: cacheChat
-           uses: actions/cache@v2
-           with:
-               path: |
-                   ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/
-                   ~/.m2/repository/org/spigotmc/spigot-parent/
-                   ~/.m2/repository/org/spigotmc/minecraft-server/
-               key: ${{ runner.os }}-spigot-1.19.4-all
-               restore-keys: ${{ runner.os }}-spigot-1.19.4-all
-         - name: Cache Maven packages
-           id: cacheMain
-           uses: actions/cache@v2
-           with:
-               path: ~/.m2
-               key: ${{ runner.os }}-m2_1.19.4
-               restore-keys: ${{ runner.os }}-m2_1.19.4
+       - name: Set up JDK 17
+         uses: actions/setup-java@v2
+         with:
+             distribution: 'temurin'
+             java-version: '17'
+       - name: Cache 1.19.4 Maven package
+         id: cacheChat
+         uses: actions/cache@v2
+         with:
+             path: |
+                 ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/
+                 ~/.m2/repository/org/spigotmc/spigot-parent/
+                 ~/.m2/repository/org/spigotmc/minecraft-server/
+             key: ${{ runner.os }}-spigot-1.19.4-all
+             restore-keys: ${{ runner.os }}-spigot-1.19.4-all
+       - name: Cache Maven packages
+         id: cacheMain
+         uses: actions/cache@v2
+         with:
+             path: ~/.m2
+             key: ${{ runner.os }}-m2_1.19.4
+             restore-keys: ${{ runner.os }}-m2_1.19.4
 
-         - 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.19.4 Spigot
-           id: creative
-           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-         - name: Check 1.19.4 Spigot (Mojang)
-           id: creativeMojang
-           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-         - name: Check 1.19.4 Spigot (Obf)
-           id: creativeObf
-           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-         - name: Build 1.19
-           if: steps.chat.outputs.sucess != 'true' || steps.chatMojang.outputs.sucess != 'true' || steps.chatObf.outputs.sucess != 'true'
-           run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped
+       - 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.19.4 Spigot
+         id: creative
+         run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+       - name: Check 1.19.4 Spigot (Mojang)
+         id: creativeMojang
+         run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+       - name: Check 1.19.4 Spigot (Obf)
+         id: creativeObf
+         run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/spigot-1.19.4-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+       - name: Build 1.19
+         if: steps.creative.outputs.sucess != 'true' || steps.creativeMojang.outputs.sucess != 'true' || steps.creativeObf.outputs.sucess != 'true'
+         run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped
  trails_1_20:
      runs-on: ubuntu-latest
      steps:
@@ -258,41 +258,121 @@ jobs:
            with:
                distribution: 'temurin'
                java-version: '17'
-         - name: Cache 1.20 Maven package
-           id: cacheChat
+         - name: Cache 1.20.1 Maven package
+           id: cacheTrails
            uses: actions/cache@v2
            with:
                path: |
-                   ~/.m2/repository/org/spigotmc/spigot/1.20-R0.1-SNAPSHOT/
+                   ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/
                    ~/.m2/repository/org/spigotmc/spigot-parent/
                    ~/.m2/repository/org/spigotmc/minecraft-server/
-               key: ${{ runner.os }}-spigot-1.20-all
-               restore-keys: ${{ runner.os }}-spigot-1.20-all
+               key: ${{ runner.os }}-spigot-1.20.1-all
+               restore-keys: ${{ runner.os }}-spigot-1.20.1-all
          - name: Cache Maven packages
            id: cacheMain
            uses: actions/cache@v2
            with:
                path: ~/.m2
-               key: ${{ runner.os }}-m2_1.20
-               restore-keys: ${{ runner.os }}-m2_1.20
+               key: ${{ runner.os }}-m2_1.20.1
+               restore-keys: ${{ runner.os }}-m2_1.20.1
 
          - 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 Spigot
+         - name: Check 1.20.1 Spigot
            id: trails
-           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20-R0.1-SNAPSHOT/spigot-1.20-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-         - name: Check 1.20 Spigot (Mojang)
+           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+         - name: Check 1.20.1 Spigot (Mojang)
            id: trailsMojang
-           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20-R0.1-SNAPSHOT/spigot-1.20-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-         - name: Check 1.20 Spigot (Obf)
+           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+         - name: Check 1.20.1 Spigot (Obf)
            id: trailsObf
-           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20-R0.1-SNAPSHOT/spigot-1.20-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-         - name: Build 1.20
-           if: steps.chat.outputs.sucess != 'true' || steps.chatMojang.outputs.sucess != 'true' || steps.chatObf.outputs.sucess != 'true'
-           run: cd BuildTools && java -jar BuildTools.jar --rev 1.20 --remapped
+           run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/spigot-1.20.1-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+         - name: Build 1.20.1
+           if: steps.trails.outputs.sucess != 'true' || steps.trailsMojang.outputs.sucess != 'true' || steps.trailsObf.outputs.sucess != 'true'
+           run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.1 --remapped
+ trails_1_20_2:
+   runs-on: ubuntu-latest
+   steps:
+     - name: Set up JDK 17
+       uses: actions/setup-java@v2
+       with:
+         distribution: 'temurin'
+         java-version: '17'
+     - name: Cache 1.20.2 Maven package
+       id: cacheTrails2
+       uses: actions/cache@v2
+       with:
+         path: |
+           ~/.m2/repository/org/spigotmc/spigot/1.20.2-R0.1-SNAPSHOT/
+           ~/.m2/repository/org/spigotmc/spigot-parent/
+           ~/.m2/repository/org/spigotmc/minecraft-server/
+         key: ${{ runner.os }}-spigot-1.20.2-all
+         restore-keys: ${{ runner.os }}-spigot-1.20.2-all
+     - name: Cache Maven packages
+       id: cacheMain
+       uses: actions/cache@v2
+       with:
+         path: ~/.m2
+         key: ${{ runner.os }}-m2_1.20.2
+         restore-keys: ${{ runner.os }}-m2_1.20.2
+
+     - 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.2 Spigot
+       id: trails2
+       run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.2-R0.1-SNAPSHOT/spigot-1.20.2-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+     - name: Check 1.20.2 Spigot (Mojang)
+       id: trails2Mojang
+       run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.2-R0.1-SNAPSHOT/spigot-1.20.2-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+     - name: Check 1.20.2 Spigot (Obf)
+       id: trails2Obf
+       run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.2-R0.1-SNAPSHOT/spigot-1.20.2-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+     - name: Build 1.20.2
+       if: steps.trails2.outputs.sucess != 'true' || steps.trails2Mojang.outputs.sucess != 'true' || steps.trails2Obf.outputs.sucess != 'true'
+       run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.2 --remapped
+ trails_1_20_3:
+   runs-on: ubuntu-latest
+   steps:
+     - name: Set up JDK 17
+       uses: actions/setup-java@v2
+       with:
+         distribution: 'temurin'
+         java-version: '17'
+     - name: Cache 1.20.3 Maven package
+       id: cacheTrails3
+       uses: actions/cache@v2
+       with:
+         path: |
+           ~/.m2/repository/org/spigotmc/spigot/1.20.3-R0.1-SNAPSHOT/
+           ~/.m2/repository/org/spigotmc/spigot-parent/
+           ~/.m2/repository/org/spigotmc/minecraft-server/
+         key: ${{ runner.os }}-spigot-1.20.3-all
+         restore-keys: ${{ runner.os }}-spigot-1.20.3-all
+     - name: Cache Maven packages
+       id: cacheMain
+       uses: actions/cache@v2
+       with:
+         path: ~/.m2
+         key: ${{ runner.os }}-m2_1.20.3
+         restore-keys: ${{ runner.os }}-m2_1.20.3
+
+     - 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.3 Spigot
+       id: trails3
+       run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.3-R0.1-SNAPSHOT/spigot-1.20.3-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+     - name: Check 1.20.3 Spigot (Mojang)
+       id: trails3Mojang
+       run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.3-R0.1-SNAPSHOT/spigot-1.20.3-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+     - name: Check 1.20.3 Spigot (Obf)
+       id: trails3Obf
+       run: test -f ~/.m2/repository/org/spigotmc/spigot/1.20.3-R0.1-SNAPSHOT/spigot-1.20.3-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+     - name: Build 1.20.3
+       if: steps.trails3.outputs.sucess != 'true' || steps.trails3Mojang.outputs.sucess != 'true' || steps.trails3Obf.outputs.sucess != 'true'
+       run: cd BuildTools && java -jar BuildTools.jar --rev 1.20.3 --remapped
  build:
     runs-on: ubuntu-latest
-    needs: [goats_1_17_1,caves_1_18_1,cliffs_1_18_2,wild_1_19,chat_1_19_3,creative_1_19_4, trails_1_20]
+    needs: [goats_1_17_1,caves_1_18_1,cliffs_1_18_2,wild_1_19,chat_1_19_3,creative_1_19_4, trails_1_20,trails_1_20_2,trails_1_20_3]
     permissions:
       contents: read
       packages: write
@@ -373,24 +453,44 @@ jobs:
               ~/.m2/repository/org/spigotmc/minecraft-server/
           key: ${{ runner.os }}-spigot-1.19.4-all
           restore-keys: ${{ runner.os }}-spigot-1.19.4-all
-    - name: Cache 1.20 Maven package
+    - name: Cache 1.20.1 Maven package
       id: cacheTrails
       uses: actions/cache@v2
       with:
           path: |
-              ~/.m2/repository/org/spigotmc/spigot/1.20-R0.1-SNAPSHOT/
+              ~/.m2/repository/org/spigotmc/spigot/1.20.1-R0.1-SNAPSHOT/
               ~/.m2/repository/org/spigotmc/spigot-parent/
               ~/.m2/repository/org/spigotmc/minecraft-server/
-          key: ${{ runner.os }}-spigot-1.20-all
-          restore-keys: ${{ runner.os }}-spigot-1.20-all
+          key: ${{ runner.os }}-spigot-1.20.1-all
+          restore-keys: ${{ runner.os }}-spigot-1.20.1-all
+    - name: Cache 1.20.2 Maven package
+      id: cacheTrails2
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.m2/repository/org/spigotmc/spigot/1.20.2-R0.1-SNAPSHOT/
+          ~/.m2/repository/org/spigotmc/spigot-parent/
+          ~/.m2/repository/org/spigotmc/minecraft-server/
+        key: ${{ runner.os }}-spigot-1.20.2-all
+        restore-keys: ${{ runner.os }}-spigot-1.20.2-all
+    - name: Cache 1.20.3 Maven package
+      id: cacheTrails3
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.m2/repository/org/spigotmc/spigot/1.20.3-R0.1-SNAPSHOT/
+          ~/.m2/repository/org/spigotmc/spigot-parent/
+          ~/.m2/repository/org/spigotmc/minecraft-server/
+        key: ${{ runner.os }}-spigot-1.20.3-all
+        restore-keys: ${{ runner.os }}-spigot-1.20.3-all
     - uses: s4u/[email protected]
       with:
-          servers: |
-            [{
-                "id": "tippie-repo",
-                "username": "${{ secrets.TIPPIE_REPO_USERNAME }}",
-                "password": "${{ secrets.TIPPIE_REPO_PASSWORD }}"
-            }]
+        servers: |
+          [{
+              "id": "tippie-repo",
+              "username": "${{ secrets.TIPPIE_REPO_USERNAME }}",
+              "password": "${{ secrets.TIPPIE_REPO_PASSWORD }}"
+          }]
     - name: Build with Maven
       run: mvn -B package --file pom.xml
     - name: Upload Artifacts

diff --git a/core/pom.xml b/core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>me.tippie</groupId>
         <artifactId>customadvancements-parent</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <properties>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>customadvancements-parent</artifactId>
         <groupId>me.tippie</groupId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <build>
@@ -81,6 +81,16 @@
             <artifactId>customadvancements-spigot_1_20_R1</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>me.tippie</groupId>
+            <artifactId>customadvancements-spigot_1_20_R2</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>me.tippie</groupId>
+            <artifactId>customadvancements-spigot_1_20_R3</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.tippie</groupId>
     <artifactId>customadvancements-parent</artifactId>
-    <version>1.2.9</version>
+    <version>1.2.10</version>
     <packaging>pom</packaging>
 
     <name>CustomAdvancements</name>
@@ -33,6 +33,8 @@
         <module>spigot_1_19_R2</module>
         <module>spigot_1_19_R3</module>
         <module>spigot_1_20_R1</module>
+        <module>spigot_1_20_R2</module>
+        <module>spigot_1_20_R3</module>
         <module>dist</module>
     </modules>
 </project>
diff --git a/spigot_1_17_R1/pom.xml b/spigot_1_17_R1/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>me.tippie</groupId>
         <artifactId>customadvancements-parent</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <properties>

diff --git a/spigot_1_18_R1/pom.xml b/spigot_1_18_R1/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>me.tippie</groupId>
         <artifactId>customadvancements-parent</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <properties>

diff --git a/spigot_1_18_R2/pom.xml b/spigot_1_18_R2/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>me.tippie</groupId>
         <artifactId>customadvancements-parent</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <properties>

diff --git a/spigot_1_19_R1/pom.xml b/spigot_1_19_R1/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>me.tippie</groupId>
         <artifactId>customadvancements-parent</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <properties>

diff --git a/spigot_1_19_R2/pom.xml b/spigot_1_19_R2/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>me.tippie</groupId>
         <artifactId>customadvancements-parent</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <properties>

diff --git a/spigot_1_19_R3/pom.xml b/spigot_1_19_R3/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>me.tippie</groupId>
         <artifactId>customadvancements-parent</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10</version>
     </parent>
 
     <properties>