Update to 1.20.5 (#4186)

**This build should be considered experimental for now** * Update to 1.20.5 * Keep old isMinecraftVersion func * Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com> * Update mockbukkit * Update Junit and maven plugin versions, update mockbukkit to latest for 1.20.6 * Refactor AbstractLocateRegexCheck to detect and return null if the locale file only contains the null delimiter * Refactor to use a permission check in the TestGuideCommand * Fix TestBiomeMapCompatibility failing due to JsonUtils neeeding Slimefun to be loaded, add biome json for 1.20.5+ * Refactor versioned classes to use the Registry api * Mark the paper-api dependency in the provided scope * Check if getBasePotionType can be used before using it * Revert "Refactor versioned classes to use the Registry api" This reverts commit b529c34. * Refactor VersionedEntityType and VersionedEnchantment to use the registry api * Mark the paper-api dependency in the test scope, update comment * Refactor MinecraftVersion to include a range of minor patches which a MinecraftVersion targets * Make tests pass and update to dough pr * Update CI * Update dough and move fireworkutils to registry * Update dough to HEAD * chore: various changes to 1.20.5 branch (#4240) * fix: fix isBefore, also added unit tests * chore: comments * chore: simplify * chore: use == for enum comparison * chore: retrigger ci * chore(ci): e2e on more versions * Update src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com> * Update src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java Co-authored-by: ybw0014 <i@guizhanss.com> --------- Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com> Co-authored-by: Andrew Wong <42793301+md5sha256@users.noreply.github.com> Co-authored-by: ybw0014 <i@guizhanss.com> Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
Slimefun · Sep 13, 2024 · 4e46546 · 4e46546
1 parent 17d01d7
commit 4e46546
Show file tree

Hide file tree

Showing 60 changed files with 952 additions and 333 deletions.
diff --git a/.github/workflows/discord-webhook.yml b/.github/workflows/discord-webhook.yml
@@ -23,11 +23,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4.1.1
 
-    - name: Set up Java JDK 17
+    - name: Set up Java JDK 21
       uses: actions/setup-java@v4.0.0
       with:
         distribution: 'adopt'
-        java-version: '17'
+        java-version: '21'
         java-package: jdk
         architecture: x64
 

diff --git a/.github/workflows/e2e-testing.yml b/.github/workflows/e2e-testing.yml
@@ -25,8 +25,12 @@ jobs:
             javaVersion: '18'
           - mcVersion: '1.19.4'
             javaVersion: '19'
-          - mcVersion: 'latest'
+          - mcVersion: '1.20.4'
             javaVersion: '20'
+          - mcVersion: '1.20.6'
+            javaVersion: '21'
+          #- mcVersion: 'latest'
+          #  javaVersion: '21'
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
@@ -18,11 +18,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4.0.0
       with:
         distribution: 'adopt'
-        java-version: '17'
+        java-version: '21'
         java-package: jdk
         architecture: x64
 

diff --git a/.github/workflows/maven-compiler.yml b/.github/workflows/maven-compiler.yml
@@ -27,11 +27,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4.0.0
       with:
         distribution: 'adopt'
-        java-version: '17'
+        java-version: '21'
         java-package: jdk
         architecture: x64
 

diff --git a/.github/workflows/publish-build.yml b/.github/workflows/publish-build.yml
@@ -15,11 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3.13.0
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
           java-package: jdk
           architecture: x64
 

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -21,11 +21,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4.0.0
       with:
         distribution: 'adopt'
-        java-version: '17'
+        java-version: '21'
         java-package: jdk
         architecture: x64
 

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -23,11 +23,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4.0.0
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
           java-package: jdk
           architecture: x64
 

diff --git a/pom.xml b/pom.xml
@@ -24,9 +24,12 @@
         <!-- Target Java 16 -->
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
+        <!-- Run tests using java 21 -->
+        <maven.compiler.testSource>21</maven.compiler.testSource>
+        <maven.compiler.testTarget>21</maven.compiler.testTarget>
 
         <!-- Spigot properties -->
-        <spigot.version>1.20.4</spigot.version>
+        <spigot.version>1.20.6</spigot.version>
         <spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
 
         <!-- Default settings for sonarcloud.io -->
@@ -115,7 +118,7 @@
                 <!-- Compiler plugin -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
 
                 <configuration>
                     <excludes>
@@ -130,7 +133,7 @@
                 <!-- Attach sources -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
 
                 <executions>
                     <execution>
@@ -146,7 +149,7 @@
                 <!-- Plugin for Unit Tests -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.1</version>
 
                 <configuration>
                     <junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
@@ -235,7 +238,7 @@
                 <!-- Javadocs -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.3</version>
+                <version>3.7.0</version>
 
                 <configuration>
                     <reportOutputDirectory>${project.basedir}</reportOutputDirectory>
@@ -329,9 +332,19 @@
         </resources>
     </build>
 
-    <dependencies>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>5.10.3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
+    <dependencies>
         <!-- Development dependencies -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -344,7 +357,7 @@
         <dependency>
             <groupId>com.github.baked-libs.dough</groupId>
             <artifactId>dough-api</artifactId>
-            <version>baf2d79f62</version>
+            <version>f8ff25187d</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -358,7 +371,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -375,9 +387,9 @@
         </dependency>
         <!-- This needs to be before Spigot because MockBukkit will fail otherwise. -->
         <dependency>
-            <groupId>com.github.seeseemelk</groupId>
-            <artifactId>MockBukkit-v1.20</artifactId>
-            <version>3.65.0</version>
+            <groupId>com.github.MockBukkit</groupId>
+            <artifactId>MockBukkit</artifactId>
+            <version>c7cc678834</version>
             <scope>test</scope>
 
             <exclusions>
@@ -387,19 +399,13 @@
                     <groupId>org.jetbrains</groupId>
                     <artifactId>annotations</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>io.papermc.paper</groupId>
-                    <artifactId>paper-api</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <!-- Override MockBukkit's Paper to a pinned slightly older version -->
-        <!-- This is because MockBukkit currently fails after this PR: -->
-        <!-- https://github.com/PaperMC/Paper/pull/9629 -->
+        <!-- Override Spigot with Paper tests as a CommandMap ctor which MockBukkit uses only exists on Paper but not in Spigot -->
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.4-R0.1-20240205.114523-90</version>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>