Remove 1.16.5 (#635)

APDevTeam · May 12, 2024 · 7569351 · 7569351
1 parent 65833e2
commit 7569351
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 664 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,7 +27,7 @@ If applicable, add screenshots (or videos) to help explain your problem.
  - Movecraft: [e.g. 8.0.0 alpha 6]
  - Addons: [e.g. Movecraft-Combat v1.0.0, Movecraft-Repair v1.0.0, etc]
  - Java [e.g. Adoptium JDK 13]
- - Minecraft [e.g. 1.16.5]
+ - Minecraft [e.g. 1.20.6]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -8,39 +8,6 @@ on:
     - cron: '22 13 * * 6'
 
 jobs:
-  # Build 1.16.5 NMS
-  v1_16_R3:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up JDK 16 # 1.16.5 can be built with Java 8 to Java 16
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '16'
-      - name: Cache 1.16.5 Maven package
-        id: cacheNether
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-v1_16_R3
-          restore-keys: ${{ runner.os }}-v1_16_R3
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-v1_16_R3
-          restore-keys: ${{ runner.os }}-m2-v1_16_R3
-
-      - 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.16.5
-        id: nether
-        run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/craftbukkit-1.16.5-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Build 1.16.5
-        if: steps.nether.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit
-
   # Build 1.18.2 NMS
   v1_18_R2:
     runs-on: ubuntu-latest
@@ -170,7 +137,7 @@ jobs:
   # Build Movecraft
   build:
     runs-on: ubuntu-latest
-    needs: [v1_16_R3, v1_18_R2, v1_19_R3, v1_20_R4]
+    needs: [v1_18_R2, v1_19_R3, v1_20_R4]
 
     steps:
       - name: Checkout Movecraft
@@ -186,12 +153,6 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2
           restore-keys: ${{ runner.os }}-m2
-      - name: Cache 1.16.5 Maven package
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-v1_16_R3
-          restore-keys: ${{ runner.os }}-v1_16_R3
       - name: Cache 1.18.2 Maven package
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,39 +6,6 @@ on:
     types: [created, prereleased]
 
 jobs:
-  # Build 1.16.5 NMS
-  v1_16_R3:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up JDK 16 # 1.16.5 can be built with Java 8 to Java 16
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '16'
-      - name: Cache 1.16.5 Maven package
-        id: cacheNether
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-v1_16_R3
-          restore-keys: ${{ runner.os }}-v1_16_R3
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-v1_16_R3
-          restore-keys: ${{ runner.os }}-m2-v1_16_R3
-
-      - 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.16.5
-        id: nether
-        run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/craftbukkit-1.16.5-R0.1-SNAPSHOT.jar && echo "sucess=true" >> $GITHUB_OUTPUT || echo "sucess=false" >> $GITHUB_OUTPUT
-      - name: Build 1.16.5
-        if: steps.nether.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit
-
   # Build 1.18.2 NMS
   v1_18_R2:
     runs-on: ubuntu-latest
@@ -168,7 +135,7 @@ jobs:
   # Build Movecraft
   build:
     runs-on: ubuntu-latest
-    needs: [v1_16_R3, v1_18_R2, v1_19_R3, v1_20_R4]
+    needs: [v1_18_R2, v1_19_R3, v1_20_R4]
 
     steps:
     - name: Checkout Movecraft
@@ -184,12 +151,6 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-m2
         restore-keys: ${{ runner.os }}-m2
-    - name: Cache 1.16.5 Maven package
-      uses: actions/cache@v3
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-v1_16_R3
-        restore-keys: ${{ runner.os }}-v1_16_R3
     - name: Cache 1.18.2 Maven package
       uses: actions/cache@v3
       with:

diff --git a/README.md b/README.md
@@ -24,10 +24,9 @@ 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.6 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.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.6 --remapped

diff --git a/modules/Movecraft/pom.xml b/modules/Movecraft/pom.xml
@@ -30,12 +30,6 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>net.countercraft</groupId>
-            <artifactId>movecraft-v1_16_r3</artifactId>
-            <version>${revision}</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>net.countercraft</groupId>
             <artifactId>movecraft-v1_18_r2</artifactId>
@@ -171,12 +165,6 @@
                             <minimizeJar>true</minimizeJar>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <filters>
-                                <filter>
-                                    <artifact>net.countercraft:movecraft-v1_16_r3</artifact>
-                                    <includes>
-                                        <include>**</include>
-                                    </includes>
-                                </filter>
                                 <filter>
                                     <artifact>net.countercraft:movecraft-v1_18_r2</artifact>
                                     <includes>

diff --git a/modules/api/pom.xml b/modules/api/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>

diff --git a/modules/api/src/main/java/net/countercraft/movecraft/support/AsyncChunk.java b/modules/api/src/main/java/net/countercraft/movecraft/support/AsyncChunk.java
@@ -19,7 +19,7 @@ public abstract class AsyncChunk<T extends Chunk> {
         String version = packageName.substring(packageName.lastIndexOf('.') + 1);
         Constructor<?> temp = null;
         try {
-            Class.forName("net.countercraft.movecraft.support.v1_16_R3.IAsyncChunk");
+            Class.forName("net.countercraft.movecraft.support.v1_18_R2.IAsyncChunk");
             final Class<?> clazz = Class.forName("net.countercraft.movecraft.support." + version + ".IAsyncChunk");
             if (AsyncChunk.class.isAssignableFrom(clazz)) {
                 temp = clazz.getConstructor(Chunk.class);

diff --git a/modules/v1_16_R3/pom.xml b/modules/v1_16_R3/pom.xml