merge

.github/renovate.json

@@ -1,5 +1,5 @@
 {
   "extends": [
-    "config:base"
+    "config:recommended"
   ]
 }

.github/workflows/auto-squash.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Auto squash
-      uses: pascalgn/automerge-action@v0.16.2
+      uses: pascalgn/automerge-action@v0.16.4
       env:
         GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         UPDATE_RETRIES: 0
@@ -42,7 +42,7 @@ jobs:
 
     steps:
     - name: Auto squash
-      uses: pascalgn/automerge-action@v0.16.2
+      uses: pascalgn/automerge-action@v0.16.4
       env:
         GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         UPDATE_RETRIES: 0

.github/workflows/discord-webhook.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.2.2
 
     - name: Set up Java JDK 21
-      uses: actions/setup-java@v4.0.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: 'adopt'
         java-version: '21'

.github/workflows/e2e-testing.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: temurin
           java-version: ${{ matrix.javaVersion }}

.github/workflows/javadocs.yml

@@ -19,7 +19,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up JDK 21
-      uses: actions/setup-java@v4.0.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: 'adopt'
         java-version: '21'

.github/workflows/maven-compiler.yml

@@ -28,7 +28,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up JDK 21
-      uses: actions/setup-java@v4.0.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: 'adopt'
         java-version: '21'

.github/workflows/publish-build.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - stable
+      - experimental
 
 jobs:
   publish:
@@ -16,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'adopt'
           java-version: '21'
@@ -26,11 +27,32 @@ jobs:
       - name: Build with Maven
         run: mvn clean package
 
-      - name: Upload to Blob Builds
-        uses: WalshyDev/blob-builds/gh-action@f3da5ce7b7e2b70eb963e0c0014677b3d78c10fa
+      - name: Upload Dev build
+        uses: WalshyDev/blob-builds/gh-action@ea9ecd9266c902c6627f884e657560d0fa6b61dd
+        if: github.ref == 'refs/heads/master'
         with:
           project: Slimefun4
-          releaseChannel: ${{ github.ref == 'refs/heads/master' && 'Dev' || 'RC' }}
+          releaseChannel: Dev
+          apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
+          file: './target/Slimefun v4.9-UNOFFICIAL.jar'
+          releaseNotes: ${{ github.event.head_commit.message }}
+
+      - name: Upload RC build
+        uses: WalshyDev/blob-builds/gh-action@ea9ecd9266c902c6627f884e657560d0fa6b61dd
+        if: github.ref == 'refs/heads/stable'
+        with:
+          project: Slimefun4
+          releaseChannel: 'RC'
+          apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
+          file: './target/Slimefun v4.9-UNOFFICIAL.jar'
+          releaseNotes: ${{ github.event.head_commit.message }}
+
+      - name: Upload Experimental build
+        uses: WalshyDev/blob-builds/gh-action@ea9ecd9266c902c6627f884e657560d0fa6b61dd
+        if: github.ref == 'refs/heads/experimental'
+        with:
+          project: Slimefun4
+          releaseChannel: 'Experimental'
           apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
           file: './target/Slimefun v4.9-UNOFFICIAL.jar'
           releaseNotes: ${{ github.event.head_commit.message }}

.github/workflows/pull-request.yml

@@ -22,7 +22,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up JDK 21
-      uses: actions/setup-java@v4.0.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: 'adopt'
         java-version: '21'

.github/workflows/sonarcloud.yml

@@ -19,12 +19,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'adopt'
           java-version: '21'

Makefile

@@ -0,0 +1,12 @@
+default: help
+
+.PHONY: help
+help:
+	@echo "  * gen-biomes version=<version> - Generate biomes for the given version"
+
+.PHONY: gen-biomes
+gen-biomes:
+	@echo "Generating biomes for $(version)"
+	@curl "https://raw.githubusercontent.com/MockBukkit/MockBukkit/refs/heads/v$(version)/src/main/resources/keyed/worldgen/biome.json" -s \
+		| jq '[ .values[].key]' \
+		> "src/test/resources/biomes/$(version).x.json"

pom.xml

@@ -14,7 +14,7 @@
     <packaging>jar</packaging>
 
     <!-- Project Info -->
-    <description>Slimefun is a Spigot/Paper plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server.</description>
+    <description>Slimefun is a Paper plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server.</description>
     <url>https://github.com/Slimefun/Slimefun4</url>
 
     <properties>
@@ -29,8 +29,8 @@
         <maven.compiler.testTarget>21</maven.compiler.testTarget>
 
         <!-- Spigot properties -->
-        <spigot.version>1.20.6</spigot.version>
-        <spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
+        <paper.version>1.21.1</paper.version>
+        <paper.javadocs>https://hub.spigotmc.org/javadocs/spigot/</paper.javadocs>
 
         <!-- Default settings for sonarcloud.io -->
         <sonar.projectKey>Slimefun_Slimefun4</sonar.projectKey>
@@ -149,7 +149,7 @@
                 <!-- Plugin for Unit Tests -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.5.2</version>
 
                 <configuration>
                     <junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
@@ -161,14 +161,14 @@
                 <!-- Sonarcloud Scanner -->
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.10.0.2594</version>
+                <version>5.0.0.4389</version>
             </plugin>
 
             <plugin>
                 <!-- Code Coverage Reports -->
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version>
+                <version>0.8.12</version>
 
                 <executions>
                     <execution>
@@ -194,7 +194,7 @@
                 <!-- Dependency shading -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.0</version>
 
                 <configuration>
                     <!-- Relocate these to avoid clashes and conflicts -->
@@ -238,7 +238,7 @@
                 <!-- Javadocs -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.11.2</version>
 
                 <configuration>
                     <reportOutputDirectory>${project.basedir}</reportOutputDirectory>
@@ -251,7 +251,7 @@
 
                     <links>
                         <!-- We can reference the Spigot API in our Javadocs -->
-                        <link>${spigot.javadocs}</link>
+                        <link>${paper.javadocs}</link>
                     </links>
 
                     <!-- We can group packages together in our Javadocs -->
@@ -337,7 +337,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.3</version>
+                <version>5.11.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -354,10 +354,17 @@
         </dependency>
 
         <!-- Shaded packages -->
+
+        <dependency>
+            <groupId>com.github.Slimefun.dough</groupId>
+            <artifactId>dough-api</artifactId>
+            <version>cb22e71335</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
-            <groupId>com.github.baked-libs.dough</groupId>
+            <groupId>com.github.Slimefun.dough</groupId>
             <artifactId>dough-api</artifactId>
-            <version>f8ff25187d</version>
+            <version>cb22e71335</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -367,6 +374,14 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- Paper -->
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>${paper.version}-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Testing dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -376,20 +391,20 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.10.0</version>
+            <version>5.15.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.16</version>
             <scope>test</scope>
         </dependency>
         <!-- This needs to be before Spigot because MockBukkit will fail otherwise. -->
         <dependency>
-            <groupId>com.github.MockBukkit</groupId>
-            <artifactId>MockBukkit</artifactId>
-            <version>c7cc678834</version>
+            <groupId>com.github.seeseemelk</groupId>
+            <artifactId>MockBukkit-v1.21</artifactId>
+            <version>3.133.2</version>
             <scope>test</scope>
 
             <exclusions>
@@ -401,19 +416,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- 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.6-R0.1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
 
         <!-- Third party plugin integrations / soft dependencies -->
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-core</artifactId>
-            <version>7.2.19</version>
+            <version>7.3.9</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -427,7 +435,7 @@
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.2.19</version>
+            <version>7.3.9</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -441,7 +449,7 @@
         <dependency>
             <groupId>com.gmail.nossr50.mcMMO</groupId>
             <artifactId>mcMMO</artifactId>
-            <version>2.1.230</version>
+            <version>2.2.029</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -455,7 +463,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.5</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -515,12 +523,6 @@
             <version>2.6</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>${spigot.version}-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>authlib</artifactId>

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java

@@ -55,6 +55,12 @@ public enum MinecraftVersion {
      */
     MINECRAFT_1_20_5(20, 5, "1.20.5+"),
 
+     /**
+     * This constant represents Minecraft (Java Edition) Version 1.21
+     * ("Tricky Trials")
+     */
+    MINECRAFT_1_21(21, 0, "1.21.x"),
+
     /**
      * This constant represents an exceptional state in which we were unable
      * to identify the Minecraft Version we are using