Merge branch 'master' into feat/wiki

Slimefun · Oct 16, 2024 · 357ea18 · 357ea18
2 parents 313811c + 0a7fea8
commit 357ea18
Show file tree

Hide file tree

Showing 90 changed files with 1,261 additions and 511 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -20,6 +20,8 @@ body:
     options:
     - label: I am using the official english version of Slimefun and did not modify the jar.
       required: true
+    - label: I downloaded the official version from the new build site [Blob Builds](https://blob.build/).
+      required: true
     - label: I am using an up to date "DEV" (not "RC") version of Slimefun.
       required: true
     - label: I am aware that issues related to Slimefun addons need to be reported on their bug trackers and not here.

diff --git a/.github/workflows/discord-webhook.yml b/.github/workflows/discord-webhook.yml
@@ -23,11 +23,11 @@ jobs:
     - name: Checkout repository
       uses: actions/[email protected]
 
-    - name: Set up Java JDK 17
+    - name: Set up Java JDK 21
       uses: actions/[email protected]
       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
@@ -0,0 +1,37 @@
+name: Javadocs
+
+on:
+  push:
+    paths:
+    - 'src/**'
+    - 'pom.xml'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Maven build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 21
+      uses: actions/[email protected]
+      with:
+        distribution: 'adopt'
+        java-version: '21'
+        java-package: jdk
+        architecture: x64
+
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+
+    - name: Build Javadocs
+      run: mvn javadoc:javadoc
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/[email protected]
       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/[email protected]
         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/[email protected]
       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/[email protected]
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
           java-package: jdk
           architecture: x64
 

diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 /.idea/
 /.vscode/
 /data-storage/
+/javadocs/
 
 dependency-reduced-pom.xml
 

diff --git a/jitpack.yml b/jitpack.yml
@@ -1,6 +1,7 @@
 before_install:
-  - sdk install java 17.0.1-open
-  - sdk use java 17.0.1-open
+  - sdk install java 21.0.2-open
+  - sdk use java 21.0.2-open
+  - sdk install maven
 
 jdk:
-  - openjdk17
+  - openjdk21
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,11 +238,11 @@
                 <!-- 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>
-                    <destDir>docs</destDir>
+                    <destDir>javadocs</destDir>
 
                     <doctitle>Slimefun4 - Javadocs</doctitle>
                     <windowtitle>Slimefun4 - Javadocs</windowtitle>
@@ -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>e99d02a8ff</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>