Upstream v 0.9.9

.editorconfig

@@ -2,4 +2,14 @@ root = true
 
 # Indentation override for all java files
 [**.java]
+indent_style = space
 indent_size = 4
+insert_final_newline = true
+ij_continuation_indent_size = 8
+
+# Indentation override for all
+[pom.xml]
+indent_style = space
+indent_size = 4
+insert_final_newline = false
+ij_continuation_indent_size = 8

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/deployment/deploy.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+PARENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -pl :IF-parent -q -DforceStdout)
+BASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -pl :IF -q -DforceStdout)
+
+if [[ $PARENT_VERSION != "$BASE_VERSION" ]]; then
+  echo "IF-parent and IF versions mismatch"
+  exit 1
+fi
+
+if [[ $PARENT_VERSION != *-SNAPSHOT ]]; then
+  exit 0
+fi
+
+if ! mvn clean install -B; then
+  echo "Unable to build IF"
+  exit 1
+fi
+
+if ! mvn deploy -N -pl :IF-parent -P deploy -s ./.github/deployment/settings.xml -B -Dgpg.passphrase="$1" -Ddeploy.username="$2" -Ddeploy.password="$3"; then
+  echo "Unable to deploy IF-parent"
+  exit 1
+fi
+
+if ! mvn deploy -pl :IF -P deploy -s ./.github/deployment/settings.xml -B -Dgpg.passphrase="$1" -Ddeploy.username="$2" -Ddeploy.password="$3"; then
+  echo "Unable to deploy IF"
+fi

.github/deployment/settings.xml

@@ -0,0 +1,9 @@
+<settings>
+    <servers>
+        <server>
+            <id>central</id>
+            <username>${deploy.username}</username>
+            <password>${deploy.password}</password>
+        </server>
+    </servers>
+</settings>

.github/workflows/auto-deploy.yml

@@ -0,0 +1,135 @@
+name: Automatically deploy the project
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    name: 'Deploy'
+    steps:
+    - name: Cache Paper(clip) jars
+      id: cache-paperclip-jars
+      uses: actions/cache@v4
+      with:
+        path: |
+          .paper-nms
+          build
+          paperclip
+          ~/.m2/repository/io/papermc/paper
+          ~/.m2/repository/ca/bkaw/paper-nms
+          ~/.m2/repository/org/spigotmc
+        key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-paperclip
+    - name: Download Paperclip jars
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      run: |
+        mkdir -p paperclip
+        wget https://api.papermc.io/v2/projects/paper/versions/1.16.1/builds/138/downloads/paper-1.16.1-138.jar -O paperclip/paper-1.16.1.jar
+        wget https://api.papermc.io/v2/projects/paper/versions/1.16.3/builds/253/downloads/paper-1.16.3-253.jar -O paperclip/paper-1.16.3.jar
+        wget https://api.papermc.io/v2/projects/paper/versions/1.16.4/builds/416/downloads/paper-1.16.4-416.jar -O paperclip/paper-1.16.4.jar
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Generate 1.15 - 1.16 Paper jars
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      working-directory: paperclip
+      run: |
+        java -jar paper-1.16.1.jar
+        java -jar paper-1.16.3.jar
+        java -jar paper-1.16.4.jar
+    - name: Install 1.15 - 1.16 Paper jars
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      working-directory: paperclip
+      run: |
+        mvn install:install-file -Dfile=cache/patched_1.16.1.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.1-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
+        mvn install:install-file -Dfile=cache/patched_1.16.3.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.3-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
+        mvn install:install-file -Dfile=cache/patched_1.16.4.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.4-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
+    - name: Set up JDK 21
+      uses: actions/setup-java@v1
+      with:
+        java-version: 21
+    - uses: actions/checkout@v2
+      name: Checkout code
+    - name: Run paper-nms init
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      run: |
+        mvn paper-nms:init -pl nms/1_17_0
+        mvn paper-nms:init -pl nms/1_17_1
+        mvn paper-nms:init -pl nms/1_18_0
+        mvn paper-nms:init -pl nms/1_18_1
+        mvn paper-nms:init -pl nms/1_18_2
+        mvn paper-nms:init -pl nms/1_19_0
+        mvn paper-nms:init -pl nms/1_19_1
+        mvn paper-nms:init -pl nms/1_19_2
+        mvn paper-nms:init -pl nms/1_19_3
+        mvn paper-nms:init -pl nms/1_19_4
+        mvn paper-nms:init -pl nms/1_20_0
+        mvn paper-nms:init -pl nms/1_20_1
+        mvn paper-nms:init -pl nms/1_20_2
+        mvn paper-nms:init -pl nms/1_20_3-4
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21'
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      run: |
+        mkdir -p build
+        cd build/
+        wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O BuildTools.jar
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/bukkit.git Bukkit
+        cd Bukkit
+        git checkout 304e83eb384c338546aa96eea51388e0e8407e26
+        cd ..
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git CraftBukkit
+        cd CraftBukkit
+        git checkout 91b1fc3f1cf89e2591367dca1fa7362fe376f289
+        cd ..
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/spigot.git Spigot
+        cd Spigot
+        git checkout b698b49caf14f97a717afd67e13fd7ac59f51089
+        cd ..
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/builddata.git BuildData
+        cd BuildData
+        git checkout a7f7c2118b877fde4cf0f32f1f730ffcdee8e9ee
+        cd ..
+
+        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.20.6 --remapped --disable-java-check
+
+        cd Bukkit
+        git checkout 2ec53f498e32b3af989cb24672fc54dfab087154
+        cd ..
+
+        cd CraftBukkit
+        git checkout 8ee6fd1b8db9896590aa321d0199453de1fc35db
+        cd ..
+
+        cd Spigot
+        git checkout fb8fb722a327a2f9f097f2ded700ac5de8157408
+        cd ..
+
+        cd BuildData
+        git checkout ae1e7b1e31cd3a3892bb05a6ccdcecc48c73c455
+        cd ..
+
+        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.21.1 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.3 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.4 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.5 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.8 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.9 --remapped --disable-java-check
+
+        cd ../
+    - name: Setup GPG keys
+      run: cat <(echo -e "${{ secrets.GPG_KEY }}") | gpg --batch --import
+    - name: Automatically deploy the project
+      env:
+        gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
+        deploy_username: ${{ secrets.DEPLOY_USERNAME }}
+        deploy_password: ${{ secrets.DEPLOY_PASSWORD }}
+      run: bash ./.github/deployment/deploy.sh "$gpg_passphrase" "$deploy_username" "$deploy_password"

.github/workflows/maven.yml

@@ -16,17 +16,120 @@ jobs:
     runs-on: ubuntu-latest
     name: 'Build'
     steps:
-    - run: |
-        wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O BuildTools.jar
-        java -jar BuildTools.jar --rev 1.14.4
-        java -jar BuildTools.jar --rev 1.15.2
-        java -jar BuildTools.jar --rev 1.16.1
-        java -jar BuildTools.jar --rev 1.16.3
-        java -jar BuildTools.jar --rev 1.16.4
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Cache Paper(clip) jars
+      id: cache-paperclip-jars
+      uses: actions/cache@v4
+      with:
+        path: |
+          .paper-nms
+          build
+          paperclip
+          ~/.m2/repository/io/papermc/paper
+          ~/.m2/repository/ca/bkaw/paper-nms
+          ~/.m2/repository/org/spigotmc
+        key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-paperclip
+    - name: Download Paperclip jars
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      run: |
+        mkdir -p paperclip
+        wget https://api.papermc.io/v2/projects/paper/versions/1.16.1/builds/138/downloads/paper-1.16.1-138.jar -O paperclip/paper-1.16.1.jar
+        wget https://api.papermc.io/v2/projects/paper/versions/1.16.3/builds/253/downloads/paper-1.16.3-253.jar -O paperclip/paper-1.16.3.jar
+        wget https://api.papermc.io/v2/projects/paper/versions/1.16.4/builds/416/downloads/paper-1.16.4-416.jar -O paperclip/paper-1.16.4.jar
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
+    - name: Generate 1.14=5 - 1.16 Paper jars
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      working-directory: paperclip
+      run: |
+        java -jar paper-1.16.1.jar
+        java -jar paper-1.16.3.jar
+        java -jar paper-1.16.4.jar
+    - name: Install 1.15 - 1.16 Paper jars
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      working-directory: paperclip
+      run: |
+        mvn install:install-file -Dfile=cache/patched_1.16.1.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.1-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
+        mvn install:install-file -Dfile=cache/patched_1.16.3.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.3-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
+        mvn install:install-file -Dfile=cache/patched_1.16.4.jar -DgroupId="io.papermc" -DartifactId="paper" -Dversion="1.16.4-R0.1-SNAPSHOT" -Dpackaging="jar" -DgeneratePom="true"
+    - name: Set up JDK 21
+      uses: actions/setup-java@v1
+      with:
+        java-version: 21
+    - uses: actions/checkout@v2
+      name: Checkout code
+    - name: Run paper-nms init
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      run: |
+        mvn paper-nms:init -pl nms/1_17_0
+        mvn paper-nms:init -pl nms/1_17_1
+        mvn paper-nms:init -pl nms/1_18_0
+        mvn paper-nms:init -pl nms/1_18_1
+        mvn paper-nms:init -pl nms/1_18_2
+        mvn paper-nms:init -pl nms/1_19_0
+        mvn paper-nms:init -pl nms/1_19_1
+        mvn paper-nms:init -pl nms/1_19_2
+        mvn paper-nms:init -pl nms/1_19_3
+        mvn paper-nms:init -pl nms/1_19_4
+        mvn paper-nms:init -pl nms/1_20_0
+        mvn paper-nms:init -pl nms/1_20_1
+        mvn paper-nms:init -pl nms/1_20_2
+        mvn paper-nms:init -pl nms/1_20_3-4
+    - name: 'Run BuildTools 1.20.5-1.20.6, 1.21'
+      if: steps.cache-paperclip-jars.outputs.cache-hit != 'true'
+      run: |
+        mkdir -p build
+        cd build/
+        wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O BuildTools.jar
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/bukkit.git Bukkit
+        cd Bukkit
+        git checkout 304e83eb384c338546aa96eea51388e0e8407e26
+        cd ..
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git CraftBukkit
+        cd CraftBukkit
+        git checkout 91b1fc3f1cf89e2591367dca1fa7362fe376f289
+        cd ..
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/spigot.git Spigot
+        cd Spigot
+        git checkout b698b49caf14f97a717afd67e13fd7ac59f51089
+        cd ..
+
+        git clone https://hub.spigotmc.org/stash/scm/spigot/builddata.git BuildData
+        cd BuildData
+        git checkout a7f7c2118b877fde4cf0f32f1f730ffcdee8e9ee
+        cd ..
+
+        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.20.6 --remapped --disable-java-check
+
+        cd Bukkit
+        git checkout 2ec53f498e32b3af989cb24672fc54dfab087154
+        cd ..
+
+        cd CraftBukkit
+        git checkout 8ee6fd1b8db9896590aa321d0199453de1fc35db
+        cd ..
+
+        cd Spigot
+        git checkout fb8fb722a327a2f9f097f2ded700ac5de8157408
+        cd ..
+
+        cd BuildData
+        git checkout ae1e7b1e31cd3a3892bb05a6ccdcecc48c73c455
+        cd ..
+
+        java -jar BuildTools.jar --remapped --disable-java-check --dont-update
+        java -jar BuildTools.jar --rev 1.21.1 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.3 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.4 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.5 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.8 --remapped --disable-java-check
+        java -jar BuildTools.jar --rev 1.21.9 --remapped --disable-java-check
+
+        cd ../
     - name: Build with Maven
       run: mvn -B package --file pom.xml

.gitignore

@@ -5,4 +5,6 @@ target
 IF-Test
 *.iml
 *.txt
-dependency-reduced-pom.xml
+dependency-reduced-pom.xml
+*.log
+.paper-nms