Minecraft 1.19.3 Support

.github/workflows/maven.yml

@@ -154,7 +154,7 @@ jobs:
         run: cd BuildTools && java -jar BuildTools.jar --rev 1.18.2 --remapped
 
   # Build 1.19.2 NMS
-  wild_1_19:
+  wild_1_19_2:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 17 # 1.19.2 can only be built with Java 17
@@ -163,7 +163,7 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
       - name: Cache 1.19.2 Maven package
-        id: cacheWild
+        id: cacheWild_r1
         uses: actions/cache@v2
         with:
           path: |
@@ -195,78 +195,130 @@ 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.2 --remapped
 
+  # Build 1.19.3 NMS
+  wild_1_19_3:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 17 # 1.19.3 can only be built with Java 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Cache 1.19.3 Maven package
+        id: cacheWild_r2
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot-parent/
+            ~/.m2/repository/org/spigotmc/minecraft-server/
+          key: ${{ runner.os }}-spigot-1.19.3-all
+          restore-keys: ${{ runner.os }}-spigot-1.19.3-all
+      - name: Cache Maven packages
+        id: cacheMain
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2_1.19.3
+          restore-keys: ${{ runner.os }}-m2_1.19.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.19.3 Spigot
+        id: wild
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/spigot-1.19.3-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+      - name: Check 1.19.3 Spigot (Mojang)
+        id: wildMojang
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/spigot-1.19.3-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+      - name: Check 1.19.3 Spigot (Obf)
+        id: wildObf
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/spigot-1.19.3-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+      - name: Build 1.19.3
+        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.3 --remapped
+
   # Build Movecraft
   build:
     runs-on: ubuntu-latest
-    needs: [pillage_1_14, nether_1_16, goats_1_17, caves_1_18, wild_1_19]
+    needs: [pillage_1_14, nether_1_16, goats_1_17, caves_1_18, wild_1_19_2, wild_1_19_3]
 
     steps:
-    - name: Checkout Movecraft
-      uses: actions/checkout@v1
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Cache Maven packages
-      id: cacheMain
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2
-        restore-keys: ${{ runner.os }}-m2
-    - name: Cache 1.14.4 Maven package
-      id: cachePillage
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-1.14.4
-        restore-keys: ${{ runner.os }}-1.14.4
-    - name: Cache 1.16.5 Maven package
-      id: cacheNether
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-1.16.5
-        restore-keys: ${{ runner.os }}-1.16.5
-    - name: Cache 1.17.1 Maven package
-      id: cacheGoats
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/
-          ~/.m2/repository/org/spigotmc/spigot-parent/
-          ~/.m2/repository/org/spigotmc/minecraft-server/
-        key: ${{ runner.os }}-spigot-1.17.1-all
-        restore-keys: ${{ runner.os }}-spigot-1.17.1-all
-    - name: Cache 1.18.2 Maven package
-      id: cacheCaves
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository/org/spigotmc/spigot/1.18.2-R0.1-SNAPSHOT/
-          ~/.m2/repository/org/spigotmc/spigot-parent/
-          ~/.m2/repository/org/spigotmc/minecraft-server/
-        key: ${{ runner.os }}-spigot-1.18.2-all
-        restore-keys: ${{ runner.os }}-spigot-1.18.2-all
-    - name: Cache 1.19.2 Maven package
-      id: cacheWild
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository/org/spigotmc/spigot/1.19.2-R0.1-SNAPSHOT/
-          ~/.m2/repository/org/spigotmc/spigot-parent/
-          ~/.m2/repository/org/spigotmc/minecraft-server/
-        key: ${{ runner.os }}-spigot-1.19.2-all
-        restore-keys: ${{ runner.os }}-spigot-1.19.2-all
+      - name: Checkout Movecraft
+        uses: actions/checkout@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Cache Maven packages
+        id: cacheMain
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2
+          restore-keys: ${{ runner.os }}-m2
+      - name: Cache 1.14.4 Maven package
+        id: cachePillage
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
+          key: ${{ runner.os }}-1.14.4
+          restore-keys: ${{ runner.os }}-1.14.4
+      - name: Cache 1.16.5 Maven package
+        id: cacheNether
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
+          key: ${{ runner.os }}-1.16.5
+          restore-keys: ${{ runner.os }}-1.16.5
+      - name: Cache 1.17.1 Maven package
+        id: cacheGoats
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot/1.17.1-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot-parent/
+            ~/.m2/repository/org/spigotmc/minecraft-server/
+          key: ${{ runner.os }}-spigot-1.17.1-all
+          restore-keys: ${{ runner.os }}-spigot-1.17.1-all
+      - name: Cache 1.18.2 Maven package
+        id: cacheCaves
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot/1.18.2-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot-parent/
+            ~/.m2/repository/org/spigotmc/minecraft-server/
+          key: ${{ runner.os }}-spigot-1.18.2-all
+          restore-keys: ${{ runner.os }}-spigot-1.18.2-all
+      - name: Cache 1.19.2 Maven package
+        id: cacheWild_r1
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot/1.19.2-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot-parent/
+            ~/.m2/repository/org/spigotmc/minecraft-server/
+          key: ${{ runner.os }}-spigot-1.19.2-all
+          restore-keys: ${{ runner.os }}-spigot-1.19.2-all
+      - name: Cache 1.19.3 Maven package
+        id: cacheWild_r2
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot-parent/
+            ~/.m2/repository/org/spigotmc/minecraft-server/
+          key: ${{ runner.os }}-spigot-1.19.3-all
+          restore-keys: ${{ runner.os }}-spigot-1.19.3-all
 
-    - name: Build with Maven
-      run: mvn -T 1C -B package --file pom.xml
+      - name: Build with Maven
+        run: mvn -T 1C -B package --file pom.xml
 
-    - name: Stage jar
-      run: mkdir staging && cp target/Movecraft.jar staging && mv staging/Movecraft.jar staging/Movecraft_$GITHUB_SHA.jar
-    - name: Upload jar
-      uses: actions/upload-artifact@v2
-      with:
-        name: Movecraft_Dev-Build
-        path: staging/Movecraft_*.jar
+      - name: Stage jar
+        run: mkdir staging && cp target/Movecraft.jar staging && mv staging/Movecraft.jar staging/Movecraft_$GITHUB_SHA.jar
+      - name: Upload jar
+        uses: actions/upload-artifact@v2
+        with:
+          name: Movecraft_Dev-Build
+          path: staging/Movecraft_*.jar

.github/workflows/publish.yml

@@ -157,7 +157,7 @@ jobs:
         run: cd BuildTools && java -jar BuildTools.jar --rev 1.18.2 --remapped
 
   # Build 1.19.2 NMS
-  wild_1_19:
+  wild_1_19_2:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 17 # 1.19.2 can only be built with Java 17
@@ -166,7 +166,7 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
       - name: Cache 1.19.2 Maven package
-        id: cacheWild
+        id: cacheWild_r1
         uses: actions/cache@v2
         with:
           path: |
@@ -198,10 +198,52 @@ 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.2 --remapped
 
+  # Build 1.19.3 NMS
+  wild_1_19_3:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 17 # 1.19.3 can only be built with Java 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Cache 1.19.3 Maven package
+        id: cacheWild_r2
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/
+            ~/.m2/repository/org/spigotmc/spigot-parent/
+            ~/.m2/repository/org/spigotmc/minecraft-server/
+          key: ${{ runner.os }}-spigot-1.19.3-all
+          restore-keys: ${{ runner.os }}-spigot-1.19.3-all
+      - name: Cache Maven packages
+        id: cacheMain
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2_1.19.3
+          restore-keys: ${{ runner.os }}-m2_1.19.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.19.3 Spigot
+        id: wild
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/spigot-1.19.3-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+      - name: Check 1.19.3 Spigot (Mojang)
+        id: wildMojang
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/spigot-1.19.3-R0.1-SNAPSHOT-remapped-mojang.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+      - name: Check 1.19.3 Spigot (Obf)
+        id: wildObf
+        run: test -f ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/spigot-1.19.3-R0.1-SNAPSHOT-remapped-obf.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+      - name: Build 1.19.3
+        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.3 --remapped
+
   # Build Movecraft
   publish:
     runs-on: ubuntu-latest
-    needs: [pillage_1_14, nether_1_16, goats_1_17, caves_1_18, wild_1_19]
+    needs: [pillage_1_14, nether_1_16, goats_1_17, caves_1_18, wild_1_19_2, wild_1_19_3]
     permissions:
       contents: read
       packages: write
@@ -256,7 +298,7 @@ jobs:
         key: ${{ runner.os }}-spigot-1.18.2-all
         restore-keys: ${{ runner.os }}-spigot-1.18.2-all
     - name: Cache 1.19.2 Maven package
-      id: cacheWild
+      id: cacheWild_r1
       uses: actions/cache@v2
       with:
         path: |
@@ -265,6 +307,16 @@ jobs:
           ~/.m2/repository/org/spigotmc/minecraft-server/
         key: ${{ runner.os }}-spigot-1.19.2-all
         restore-keys: ${{ runner.os }}-spigot-1.19.2-all
+    - name: Cache 1.19.3 Maven package
+      id: cacheWild_r2
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.m2/repository/org/spigotmc/spigot/1.19.3-R0.1-SNAPSHOT/
+          ~/.m2/repository/org/spigotmc/spigot-parent/
+          ~/.m2/repository/org/spigotmc/minecraft-server/
+        key: ${{ runner.os }}-spigot-1.19.3-all
+        restore-keys: ${{ runner.os }}-spigot-1.19.3-all
 
     - name: Build with Maven
       run: mvn -T 1C -B package --file pom.xml

modules/Movecraft/pom.xml

@@ -68,6 +68,12 @@
             <version>${revision}</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>net.countercraft</groupId>
+            <artifactId>movecraft-v1_19_r2</artifactId>
+            <version>${revision}</version>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>net.countercraft</groupId>
             <artifactId>movecraft-api</artifactId>
@@ -83,18 +89,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.32</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations-java5</artifactId>
-            <version>22.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
-            <version>8.5.8</version>
-            <scope>compile</scope>
+            <version>1.33</version>
         </dependency>
     </dependencies>
 
@@ -188,6 +183,10 @@
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>net.countercraft.movecraft.libs.net.kyori</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.roaringbitmap</pattern>
+                                    <shadedPattern>net.countercraft.movecraft.libs.org.roaringbitmap</shadedPattern>
+                                </relocation>
                             </relocations>
                             <minimizeJar>true</minimizeJar>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
@@ -222,6 +221,12 @@
                                         <include>**</include>
                                     </includes>
                                 </filter>
+                                <filter>
+                                    <artifact>net.countercraft:movecraft-v1_19_r2</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
                                 <filter>
                                     <artifact>net.countercraft:datapack</artifact>
                                     <includes>