Fix issue of redstone blocks spawning under ships

.classpath

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.codebeatsettings

@@ -0,0 +1,5 @@
+{
+  "JAVA": {
+    "ABC": [9000, 9001, 9002, 9003]
+  }
+}

.github/FUNDING.yml

@@ -1,7 +1,8 @@
 # These are supported funding model platforms
 
+
+patreon: eirikh1996plugins
 github: [cccm5]# Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

.github/workflows/maven.yml

@@ -1,225 +1,129 @@
 name: Java CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
-  # Build 1.14.4 NMS
-  pillage_1_14_4:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-      - name: Cache 1.14.4 Maven package
-        id: cachePillage
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-1.14.4
-          restore-keys: ${{ runner.os }}-1.14.4
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2_1.14.4
-          restore-keys: ${{ runner.os }}-m2_1.14.4
-
-      - name: Setup BuildTools
-        run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-      - name: Check 1.14.4
-        id: pillage
-        run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/craftbukkit-1.14.4-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-      - name: Build 1.14.4
-        if: steps.pillage.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit
-
-  # Build 1.15.2 NMS
-  bees_1_15_2:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-      - name: Cache 1.15.2 Maven package
-        id: cacheBees
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.15.2-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-1.15.2
-          restore-keys: ${{ runner.os }}-1.15.2
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2_1.15.2
-          restore-keys: ${{ runner.os }}-m2_1.15.2
-
-      - name: Setup BuildTools
-        run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-      - name: Check 1.15.2
-        id: bees
-        run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.15.2-R0.1-SNAPSHOT/craftbukkit-1.15.2-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-      - name: Build 1.15.2
-        if: steps.bees.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.15.2 --compile craftbukkit
-
-  # Build 1.16.1 NMS
-  nether_1_16_1:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-      - name: Cache 1.16.1 Maven package
-        id: cacheNether
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.1-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-1.16.1
-          restore-keys: ${{ runner.os }}-1.16.1
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2_1.16.1
-          restore-keys: ${{ runner.os }}-m2_1.16.1
-
-      - name: Setup BuildTools
-        run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-      - name: Check 1.16.1
-        id: nether
-        run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.1-R0.1-SNAPSHOT/craftbukkit-1.16.1-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-      - name: Build 1.16.1
-        if: steps.nether.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.1 --compile craftbukkit
-
-  # Build 1.16.3 NMS
-  nether_1_16_3:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-      - name: Cache 1.16.3 Maven package
-        id: cacheNether
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.3-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-1.16.3
-          restore-keys: ${{ runner.os }}-1.16.3
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2_1.16.3
-          restore-keys: ${{ runner.os }}-m2_1.16.3
-
-      - name: Setup BuildTools
-        run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-      - name: Check 1.16.3
-        id: nether2
-        run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.3-R0.1-SNAPSHOT/craftbukkit-1.16.3-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-      - name: Build 1.16.3
-        if: steps.nether2.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.3 --compile craftbukkit
-
-  # Build 1.16.5 NMS
-  nether_1_16_5:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-      - name: Cache 1.16.5 Maven package
-        id: cacheNether
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
-          key: ${{ runner.os }}-1.16.5
-          restore-keys: ${{ runner.os }}-1.16.5
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2_1.16.5
-          restore-keys: ${{ runner.os }}-m2_1.16.5
-
-      - name: Setup BuildTools
-        run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-      - name: Check 1.16.5
-        id: nether3
-        run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/craftbukkit-1.16.5-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
-      - name: Build 1.16.5
-        if: steps.nether3.outputs.sucess != 'true'
-        run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit
-
-  # Build Movecraft
   build:
     runs-on: ubuntu-latest
-    needs: [pillage_1_14_4, bees_1_15_2, nether_1_16_1, nether_1_16_3, nether_1_16_5]
 
     steps:
     - name: Checkout Movecraft
       uses: actions/checkout@v1
-    - name: Set up JDK 11
+    - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        java-version: 1.8
     - name: Cache Maven packages
-      id: cacheMain
+      id: cache
       uses: actions/cache@v2
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2
         restore-keys: ${{ runner.os }}-m2
-    - name: Cache 1.14.4 Maven package
-      id: cachePillage
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-1.14.4
-        restore-keys: ${{ runner.os }}-1.14.4
-    - name: Cache 1.15.2 Maven package
-      id: cacheBees
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.15.2-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-1.15.2
-        restore-keys: ${{ runner.os }}-1.15.2
-    - name: Cache 1.16.1 Maven package
-      id: cacheNether1
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.1-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-1.16.1
-        restore-keys: ${{ runner.os }}-1.16.1
-    - name: Cache 1.16.3 Maven package
-      id: cacheNether2
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.3-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-1.16.3
-        restore-keys: ${{ runner.os }}-1.16.3
-    - name: Cache 1.16.5 Maven package
-      id: cacheNether3
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/
-        key: ${{ runner.os }}-1.16.5
-        restore-keys: ${{ runner.os }}-1.16.5
+
+# Run Spigot BuildTools for NMS if required
+    - name: Setup BuildTools
+      run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+
+# EXAMPLE - Copy/paste as required to add version support to CI
+#    - name: Test [version]
+#      id: [version name]
+#      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/[NMS version]/craftbukkit-[NMS version].jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+#    - name: [version]
+#      if: steps.frostburn.outputs.sucess != 'true'
+#      run: cd BuildTools && java -jar BuildTools.jar --rev [version] <if newer than 1.14:  --compile craftbukkit>
+#    - run: test -d ~/.m2/repository/org/bukkit/craftbukkit/ && ls ~/.m2/repository/org/bukkit/craftbukkit/
+
+    - name: Check 1.8.8
+      id: bountiful
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.8.8-R0.1-SNAPSHOT/craftbukkit-1.8.8-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.8.8
+      if: steps.bountiful.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.8.8
+    - name: Check 1.9.4
+      id: combat
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.9.4-R0.1-SNAPSHOT/craftbukkit-1.9.4-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.9.4
+      if: steps.combat.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.9.4
+    - name: Check 1.10.2
+      id: frostburn
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.10.2-R0.1-SNAPSHOT/craftbukkit-1.10.2-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.10.2
+      if: steps.frostburn.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.10.2
+    - name: Check 1.11.2
+      id: exploration
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.11.2-R0.1-SNAPSHOT/craftbukkit-1.11.2-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.11.2
+      if: steps.exploration.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.11.2
+    - name: Check 1.12.2
+      id: color
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.12.2-R0.1-SNAPSHOT/craftbukkit-1.12.2-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.12.2
+      if: steps.color.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.12.2
+    - name: Check 1.13.2
+      id: aquatic
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.13.2-R0.1-SNAPSHOT/craftbukkit-1.13.2-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.13.2
+      if: steps.aquatic.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.13.2
+    - name: Check 1.14.4
+      id: pillage
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/craftbukkit-1.14.4-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.14.4
+      if: steps.pillage.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit
+    - name: Check 1.15.2
+      id: bees
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.15.2-R0.1-SNAPSHOT/craftbukkit-1.15.2-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.15.2
+      if: steps.bees.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.15.2 --compile craftbukkit
+    - name: Check 1.16.1
+      id: nether
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.1-R0.1-SNAPSHOT/craftbukkit-1.16.1-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.16.1
+      if: steps.nether.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.1 --compile craftbukkit
+    - name: Check 1.16.3
+      id: nether2
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.3-R0.1-SNAPSHOT/craftbukkit-1.16.3-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.16.3
+      if: steps.nether2.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.3 --compile craftbukkit
+    - name: Check 1.16.5
+      id: nether3
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.16.5-R0.1-SNAPSHOT/craftbukkit-1.16.5-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.16.5
+      if: steps.nether3.outputs.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.16.5 --compile craftbukkit
+    - name: Check 1.17
+      id: caves&cliffs
+      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/1.17-R0.1-SNAPSHOT/craftbukkit-1.17-R0.1-SNAPSHOT.jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+    - name: Build 1.17
+      if: steps.caves&cliffs.output.sucess != 'true'
+      run: cd BuildTools && java -jar BuildTools.jar --rev 1.17 --remapped
+
+# EXAMPLE - Copy/paste as required to add version support to CI
+#    - name: Test [version]
+#      id: [version name]
+#      run: test -f ~/.m2/repository/org/bukkit/craftbukkit/[NMS version]/craftbukkit-[NMS version].jar && echo "::set-output name=sucess::true" || echo "::set-output name=sucess::false"
+#    - name: [version]
+#      if: steps.frostburn.outputs.sucess != 'true'
+#      run: cd BuildTools && java -jar BuildTools.jar --rev [version] <if newer than 1.14:  --compile craftbukkit>
+#    - run: test -d ~/.m2/repository/org/bukkit/craftbukkit/ && ls ~/.m2/repository/org/bukkit/craftbukkit/
 
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package -T 1C --file pom.xml
 
     - name: Stage jar
       run: mkdir staging && cp target/Movecraft.jar staging && mv staging/Movecraft.jar staging/Movecraft_$GITHUB_SHA.jar