Merge branch 'master' into release

# Conflicts:
#	pom.xml

Author: StarWishsama

.adr-dir

@@ -0,0 +1 @@
+docs/adr

.git-hooks/commit-msg

@@ -1,49 +1,19 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 echo "[pre-commit check]"
 
-if ! [ -x "$(command -v mvn)" ]; then
-  echo -e 'Maven are not installed!'
-  echo
-  echo 'Please visit following site to download latest maven:'
-  echo
-  echo "  https://maven.apache.org/download.cgi"
-  echo
-  echo 'If you are sure that you have installed maven,'
-  echo 'Please check whether your environment variables is being set properly.'
-  exit 1
-fi
-
-spotless() {
-  if [ ! -e "mvn" ]; then
-    return 0
-  fi
-
-  CHANGED_FILES="$(git --no-pager diff --name-status --no-color --cached | awk '$1 != "D" && $NF ~ /\.xml?$/ { print $NF }')"
+STAGED_FILES=$(git --no-pager diff --name-only --staged --line-prefix=$(git rev-parse --show-toplevel)/ | paste -sd ',')
 
-  if [ -z "$CHANGED_FILES" ]; then
-    echo "No staged files."
-    return 0
+if [ ! -z "$STAGED_FILES" ]
+then
+  echo -n "Checking code format with spotless: "
+  mvn spotless:check -DspotlessFiles=$STAGED_FILES > /tmp/spotless.out 2>&1
+  RETURN_VALUE=$?
+  if [ $RETURN_VALUE -gt 0 ]
+  then
+    echo "Please run 'mvn spotless:check' for more details or 'mvn spotless:apply' to automatically fix the violations."
   fi
+  exit $RETURN_VALUE
+fi
 
-  echo '[pre-commit] Executing Maven spotlessCheck before commit'
-
-  git stash --quiet --keep-index
-
-  mvn -B spotless:check
-
-  RESULT=$?
-
-  git stash pop -q
-
-  if [ "$RESULT" -ne "0" ]; then
-    echo -e "spotlessCheck failed..."
-    echo -e 'You can try "./mvn spotless:apply" to apply auto-fixes.'
-  fi
-
-  return $RESULT
-}
-
-if ! spotless; then
-  exit 1
-fi
+exit 0

.git-hooks/pre-commit

@@ -7,6 +7,7 @@ version: 2
 updates:
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
+    target-branch: 'dev'
     schedule:
       interval: "daily"
     commit-message:

.github/dependabot.yml

@@ -0,0 +1,77 @@
+name: End to End Testing
+
+on:
+  workflow_call:
+    inputs:
+      artifact-name:
+        description: 'Slimefun artifact name'
+        required: true
+        type: string
+
+jobs:
+  e2e-testing:
+    name: End to End Testing
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    strategy:
+      matrix:
+        include:
+          - mcVersion: '1.16.5'
+            javaVersion: '16'
+          - mcVersion: '1.17.1'
+            javaVersion: '17'
+          - mcVersion: '1.18.2'
+            javaVersion: '18'
+          - mcVersion: '1.19.4'
+            javaVersion: '19'
+          - mcVersion: 'latest'
+            javaVersion: '20'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4.0.0
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.javaVersion }}
+          java-package: jdk
+          architecture: x64
+
+      - name: Setup server
+        run: |
+          echo 'eula=true' > eula.txt
+          mkdir plugins
+
+      - name: Download ${{ matrix.mcVersion }} Paper
+        run: |
+          VERSION="${{ matrix.mcVersion }}"
+          if [ "$VERSION" == "latest" ]; then
+            VERSION=$(curl https://api.papermc.io/v2/projects/paper/ -s | jq -r '.versions[-1]')
+          fi
+
+          BUILD_JAR=$(curl -s "https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds" \
+            | jq '.builds[-1] | "\(.build) \(.downloads.application.name)"' -r)
+          BUILD=$(echo "$BUILD_JAR" | awk '{print $1}')
+          JAR_FILE=$(echo "$BUILD_JAR" | awk '{print $2}')
+
+          echo "Downloading... https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds/$BUILD/downloads/$JAR_FILE"
+          curl -o paper.jar \
+            "https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds/$BUILD/downloads/$JAR_FILE"
+
+      - name: Download Slimefun
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ inputs.artifact-name }}
+          path: plugins/
+
+      - name: Download e2e-tester
+        run: |
+          curl -o e2e-tester.jar https://builds.guizhanss.com/api/download/ybw0014/Slimefun-e2e-tester/main/latest
+          mv e2e-tester.jar plugins/e2e-tester.jar
+
+      - name: Run server
+        run: |
+          java -jar paper.jar --nogui

.github/workflows/e2e-testing.yml

@@ -10,19 +10,63 @@ on:
       - 'src/**'
       - 'pom.xml'
 
+permissions:
+  contents: read
+  packages: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: read
+    outputs:
+      short-commit-hash: ${{ steps.env-setup.outputs.SHORT_COMMIT_HASH }}
+
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 17
           java-package: jdk
           architecture: x64
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
       - name: Codestyle Check
-        run: mvn -B spotless:check compile --errors
+        run: mvn -B spotless:check compile --errors
+
+      - name: Build with Maven
+        run: mvn package
+
+      # Setup for the preview build
+      - name: Environment Setup
+        id: env-setup
+        run: |
+          SHORT_COMMIT_HASH=$(git rev-parse --short=8 ${{ github.sha }})
+          JAR_VERSION="Preview Build #${{ github.event.number }}-$SHORT_COMMIT_HASH"
+          echo "SHORT_COMMIT_HASH=$SHORT_COMMIT_HASH" >> "$GITHUB_ENV"
+          echo "SHORT_COMMIT_HASH=$SHORT_COMMIT_HASH" >> "$GITHUB_OUTPUT"
+          echo "JAR_VERSION=$JAR_VERSION" >> "$GITHUB_ENV"
+          sed -i "s/<version>5.0-SNAPSHOT<\/version>/<version>$JAR_VERSION<\/version>/g" pom.xml
+
+      - name: Build with Maven
+        run: mvn clean package
+
+      - name: Upload the artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: slimefun-${{ github.event.number }}-${{ env.SHORT_COMMIT_HASH }}
+          path: 'target/Slimefun-${{ env.JAR_VERSION }}.jar'
+
+  call-workflows:
+    needs: [ build ]
+    uses: ./.github/workflows/e2e-testing.yml
+    with:
+      artifact-name: slimefun-${{ github.event.number }}-${{ needs.build.outputs.short-commit-hash }}

.github/workflows/pr-checker.yml

@@ -5,6 +5,7 @@
 /target/
 /.idea/
 /.vscode/
+/data-storage/
 
 .classpath
 .factorypath

.gitignore

@@ -0,0 +1 @@
+-Dfile.encoding=UTF8

.mvn/jvm.config

@@ -8,13 +8,9 @@
        <ref type="branch">
            <pattern>dev</pattern>
            <version>
-               ${build.timestamp.year.2digit}${build.timestamp.month}${build.timestamp.day}-${commit.short}-Insider
+               ${commit.short}-Insider
            </version>
        </ref>
-       <ref type="branch">
-           <pattern>release</pattern>
-           <version>${build.timestamp.year.2digit}.${build.timestamp.month}.${build.timestamp.day}-release</version>
-       </ref>
        <ref type="branch">
            <pattern>test/(.+)</pattern>
            <version>${ref}-${commit.short}</version>

.mvn/maven-git-versioning-extension.xml

@@ -1,6 +1,7 @@
 # Table of contents
-- [Release Candidate 36 (TBD)](#release-candidate-36-tbd)
-- [Release Candidate 35 (7 Jul 2023)](#release-candidate-35-7-jul-2023)
+- [Release Candidate 37 (TBD)](#release-candidate-37-tbd)
+- [Release Candidate 36 (20 Dec 2023)](#release-candidate-36-20-dec-2023)
+- [Release Candidate 35 (07 Jul 2023)](#release-candidate-35-07-jul-2023)
 - [Release Candidate 34 (20 Jun 2023)](#release-candidate-34-20-jun-2023)
 - [Release Candidate 33 (07 Jan 2023)](#release-candidate-33-07-jan-2023)
 - [Release Candidate 32 (26 Jun 2022)](#release-candidate-32-26-jun-2022)
@@ -36,15 +37,55 @@
 - [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019)
 - [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)
 
-## Release Candidate 36 (TBD)
+## Release Candidate 37 (TBD)
+
+## Release Candidate 36 (20 Dec 2023)
 
 #### Additions
+* Added e2e testing to PRs to better ensure compatibility
+* Added compatibility to 1.20+
+* Added rainbow armor
+* Added grace periods to radiation
+* Added cherry log to android woodcutter
+* Added blackstone recipes to Grindstone and Ore Crusher (#3912)
+* Added Enchanted Golden Apple recipe (suggestion #2147 from punished_Garett) (#3591)
+* Added new flags for timings (#3246)
+* Added yaw to GPS Waypoints
+* (API) Add MultiBlockCraftEvent (#3928)
+* (API) Add TalismanActivateEvent (#4045)
 
 #### Changes
+* Changed the radiation system
+* Removed backwards compatibility
+* (API) Improve performance for clearAllBlockInfoAtChunk
+* Change Energized GPS Transmitter values to follow the pattern of previous tiers (#3915)
+* Allowed the sword of beheading to drop piglin heads
+* Improvements to BlockStorage handling (#3911)
+* Moved builds to https://blob.build
 
 #### Fixes
-
-## Release Candidate 35 (7 Jul 2023)
+* Fix #3444
+* Fix #3507
+* Fix possible enchantment duplication
+* Fix Different Time of Pan Recipes
+* Fix some of the reported blocks not working (#3848)
+* Fix Soulbound Runes not working (#3932)
+* Fix #3836
+* Fix unable to craft soulbound backpack with woven backpack with id (#3939)
+* Fix getting radiated when not supposed to
+* Fix geo miner voiding resources
+* Fix sensitive blocks attached to sf blocks not dropping (1.19+)
+* Fix breaking sf block with not unlocked item duping contents (#3976)
+* Fix the case of SlimefunItem#itemhandlers
+* Fix taking damage on head collision while wearing elytra cap (#3760)
+* Fix heads showing as steve (#4027)
+* Fix grappling hook not working due to bat dying (#3926)
+* Fix freezer material
+* Fix auto update
+* Fix rate limiting issues (#4042)
+* Fix orebfuscator plugin with blocks when gold panning (#3921)
+
+## Release Candidate 35 (07 Jul 2023)
 
 #### Additions
 * Added `sounds.yml` file to configure sound effects for Slimefun