Merge remote-tracking branch 'upstream/master' into dev

# Conflicts:
#	.github/workflows/dev-ci.yml
#	README.md
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AutoBreeder.java

Author: neokoni

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: https://afdian.net/a/nora1ncity
+custom: https://afdian.com/a/nora1ncity

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -72,7 +72,13 @@ body:
     attributes:
       label: Minecraft 版本
       options:
-        - 1.21.x
+        - 1.21.9~1.21.10
+        - 1.21.7~1.21.8
+        - 1.21.6
+        - 1.21.5
+        - 1.21.4
+        - 1.21.2~1.21.3
+        - 1.21~1.21.1
         - 1.20.x
         - 1.19.x
         - 1.18.x

.github/workflows/build-ci.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: ${{ vars.JAVA_CI_VERSION }}
+          java-version: ${{ vars.JAVA_CI_VERSION || 21 }}
           java-package: jdk
           architecture: x64
           cache: maven
@@ -33,7 +33,7 @@ jobs:
         name: Upload Beta artifact
         with:
           name: Slimefun Beta Build
-          path: staging
+          path: target/Slimefun-*.jar
       - name: Automatic Releases
         uses: marvinpinto/action-automatic-releases@v1.2.1
         if: github.ref_name == 'master'
@@ -43,4 +43,4 @@ jobs:
           prerelease: true
           title: "Slimefun 自动构建版本"
           files: |
-            target/slimefun-*.jar
+            target/Slimefun-*.jar

.github/workflows/dev-ci.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: ${{ vars.JAVA_CI_VERSION || 21 }}
           java-package: jdk
           architecture: x64
           cache: maven
@@ -33,17 +33,17 @@ jobs:
           echo "::add-mask::$MAVEN_PASSWORD"
           mvn -s .mvn/settings.xml -B deploy -Dversioning.disable --errors
         env:
-          MAVEN_ACCOUNT: '${{ secrets.MAVEN_ACCOUNT }}'
+          MAVEN_ACCOUNT: '${{ vars.MAVEN_ACCOUNT }}'
           MAVEN_PASSWORD: '${{ secrets.MAVEN_PASSWORD }}'
       - name: Build Slimefun
         run: mvn -B clean package --errors
-      - name: select SlimeFun.jar
+      - name: Get build artifact filename
         run: |
-          cd target
-          rm -rf original*
-          echo "FILE=$(ls | grep jar)" >> $GITHUB_ENV
+          cd target && FILENAME=$(find . -maxdepth 1 -mindepth 1 -name "Slimefun-*" | cut -d'/' -f 2)
+          echo "SLIMEFUN_ARTIFACT_NAME=$FILENAME" >> "$GITHUB_ENV"
+          cd ..
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.FILE }}
-          path: target/${{ env.FILE }}
+          name: ${{ env.SLIMEFUN_ARTIFACT_NAME }}
+          path: target/${{ env.SLIMEFUN_ARTIFACT_NAME }}

.github/workflows/e2e-testing.yml

@@ -27,6 +27,8 @@ jobs:
             javaVersion: '21'
           - mcVersion: '1.21.4'
             javaVersion: '21'
+          - mcVersion: '1.21.8'
+            javaVersion: '21'
           - mcVersion: 'latest'
             javaVersion: '21'
 

.github/workflows/pr-checker.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: ${{ vars.JAVA_CI_VERSION }}
+          java-version: ${{ vars.JAVA_CI_VERSION || 21 }}
           java-package: jdk
           architecture: x64
           cache: 'maven'

.github/workflows/spotless.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: ${{ vars.JAVA_CI_VERSION || 21 }}
           java-package: jdk
           architecture: x64
           cache: maven