Multiple Bugfixes and Features (#363)

* Fixing not visible tool-points

* Fixing Loadout for Offhand

Offhand can now be placed without errors

* Adding new 1.16 materials

Adding new 1.16 materials and prevent outdating through new materials.

* MatchTeamColor Condidtion showing matching item to color

* Fixes PlayerHasItemCondition

* Fixing AsyncInventoryEvent Calls

* Adding GameTickTrigger

* Fixing Region Select NoSuchElementError

* Adding keep inventory option

* Update to 1.19
- Change RegionDisplay to Barrier and imporved performance issues, when many and big regions were displayed

* Update minigamesdistribution to 1.19

* Update Mavenworkflow to Java 17

* Adding potionFriendlyFire configuration

* T::28 Correcting GUI information
Action "Take Item" had another name in the gui -> "Give Item"

* T::32,39,42 Translation strings missing
Several translation string were missed or were not correctly used.

* Added every possible vanilla potion effekt.

* Fixes T::45, T::46, T::49, T::53

- TakeFlagTrigger wasn't triggered
- Only Oak-Signs worked as Flags
- Broadcasts wasn't working
- CTF-Broadcasts are now a seperate option
- Flag Home-Returns were announced, even though broadcasts were disabled

* T::44 Support for signs

* T::9 Autocomplete Commands: set node/region

* T::22 Wrong message when there's no lobby

* T::18 Flag falling in lava does not respawn

* Replaced deprecated MinigameUtils.formStr call

* Fixed reset of Blocks in Minigames. (#3)

* Fixed reset of Blocks in Minigames.

* Rebuilt how the regeneration region works (#4)

RegenRegions can now be splittet into several smaller regions. This allows to be more flexible: Big Regions with eg. 4 million blocks are crashing the server. If only small fitting regions are set, there is no need for 4 million blocks to regen.
Also a block limit is implemented to ensure that a crash is not going to happen. This limit can be changed within the minigames config file and is default set to 300k.

* Rebuilt FloorDegeneration to use the new Regeneration Regions (#7)

* Code cleanup (#5)

* Merging Memory and Region Actions from Turidus (#8)

Co-authored-by: joshi1999 <[email protected]>

* Fix MemorySwapBlock for unordered created regions

* Updating actions to use a cache for faster building (#10)

* fix regen regions and lists not getting saved

* fix regen regions not regenerating properly

* added feedback how many blocks are in a regenregion total

fix update of regions resulting in wrong feedback

* added a new trigger to fire whenever a player moves inside a region (for better kill boxes)

remove unused code

* fix binding to first item in inventory instead of in hands

* fix minigame objective error (rolling back the lines, still have to get a future-proof modern version working)

* fix false calculation, if one coord was 0

* Fixing PullRequest Template

---------

Co-authored-by: Schpammer <[email protected]>
Co-authored-by: FireInstall <[email protected]>
Co-authored-by: FireInstall <[email protected]>

Author: 3 people

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,12 +5,13 @@ _Describe the problem or feature in addition to a link to the issues._
 _How does this change address the problem?_
 
 #### Open Questions and Pre-Merge TODOs
-- [ ] Use github checklists. When solved, check the box and explain the answer.
+- [ ] Use GitHub checklists. When solved, check the box and explain the answer.
 
 ## Learning
 _Describe the research stage_
 
 _Links to blog posts, patterns, libraries or addons used to solve this problem_
 
 #### Blog Posts
-- [How to Pull Request](https://github.com/flexyford/pull-request) Github Repo with Learning focused Pull Request Template.
+- [How to Pull Request](https://github.com/flexyford/pull-request) GitHub Repo with Learning focused Pull Request
+  Template.

.github/workflows/maven.yml

@@ -8,10 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        distribution: 'temurin'
+        java-version: 17
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -B package --file pom.xml

Minigames/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.mineauz</groupId>
         <artifactId>MinigamesProject</artifactId>
-        <version>1.16-SNAPSHOT</version>
+        <version>1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>Minigames</artifactId>
@@ -75,9 +75,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>be.seeseemelk</groupId>
-            <artifactId>MockBukkit</artifactId>
-            <version>0.2.1-SNAPSHOT</version>
+            <groupId>com.github.seeseemelk</groupId>
+            <artifactId>MockBukkit-v1.19</artifactId>
+            <version>2.29.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.47</version>
+            <version>8.0.28</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,6 +109,12 @@
             <artifactId>paste-gg-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.5</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -141,7 +147,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.4.0</version>
                 <configuration>
                     <filters>
                         <filter>
@@ -221,6 +227,14 @@
                 <artifactId>versions-maven-plugin</artifactId>
                 <version>2.8.1</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>

Minigames/src/main/java/au/com/mineauz/minigames/ComparableVersion.java

@@ -22,13 +22,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Stack;
+import java.util.*;
 
 /**
  * Generic implementation of version comparison.
@@ -181,8 +175,7 @@ private interface Item {
     /**
      * Represents a numeric item in the version item list.
      */
-    private static class IntegerItem
-            implements Item {
+    private static class IntegerItem implements Item {
         public static final IntegerItem ZERO = new IntegerItem();
         private static final BigInteger BIG_INTEGER_ZERO = new BigInteger("0");
         private final BigInteger value;
@@ -205,22 +198,16 @@ public boolean isNull() {
 
         public int compareTo(Item item) {
             if (item == null) {
-                return BIG_INTEGER_ZERO.equals(value) ? 0 : 1; // 1.0 == 1, 1.1 > 1
+                //todo whatever this was supposed to do, it always returned 0.
+                return 0; // 1.0 == 1, 1.1 > 1
             }
 
-            switch (item.getType()) {
-                case INTEGER_ITEM:
-                    return value.compareTo(((IntegerItem) item).value);
-
-                case STRING_ITEM:
-                    return 1; // 1.1 > 1-sp
-
-                case LIST_ITEM:
-                    return 1; // 1.1 > 1-1
-
-                default:
-                    throw new RuntimeException("invalid item: " + item.getClass());
-            }
+            return switch (item.getType()) {
+                case INTEGER_ITEM -> value.compareTo(((IntegerItem) item).value);
+                case STRING_ITEM -> 1; // 1.1 > 1-sp
+                case LIST_ITEM -> 1; // 1.1 > 1-1
+                default -> throw new RuntimeException("invalid item: " + item.getClass());
+            };
         }
 
         public String toString() {
@@ -237,36 +224,30 @@ private static class StringItem
 
         @SuppressWarnings("checkstyle:constantname")
         private static final List<String> _QUALIFIERS = Arrays.asList(QUALIFIERS);
-
-        private static final Properties ALIASES = new Properties();
         /**
          * A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
          * the version older than one without a qualifier, or more recent.
          */
         private static final String RELEASE_VERSION_INDEX = String.valueOf(_QUALIFIERS.indexOf(""));
+        private static final Properties ALIASES = new Properties();
 
         static {
             ALIASES.put("ga", "");
             ALIASES.put("final", "");
             ALIASES.put("cr", "rc");
         }
 
-        private String value;
+        private final String value;
 
         public StringItem(String value, boolean followedByDigit) {
             if (followedByDigit && value.length() == 1) {
                 // a1 = alpha-1, b1 = beta-1, m1 = milestone-1
                 switch (value.charAt(0)) {
-                    case 'a':
-                        value = "alpha";
-                        break;
-                    case 'b':
-                        value = "beta";
-                        break;
-                    case 'm':
-                        value = "milestone";
-                        break;
-                    default:
+                    case 'a' -> value = "alpha";
+                    case 'b' -> value = "beta";
+                    case 'm' -> value = "milestone";
+                    default -> {
+                    }
                 }
             }
             this.value = ALIASES.getProperty(value, value);
@@ -304,19 +285,13 @@ public int compareTo(Item item) {
                 // 1-rc < 1, 1-ga > 1
                 return comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX);
             }
-            switch (item.getType()) {
-                case INTEGER_ITEM:
-                    return -1; // 1.any < 1.1 ?
-
-                case STRING_ITEM:
-                    return comparableQualifier(value).compareTo(comparableQualifier(((StringItem) item).value));
-
-                case LIST_ITEM:
-                    return -1; // 1.any < 1-1
-
-                default:
-                    throw new RuntimeException("invalid item: " + item.getClass());
-            }
+            return switch (item.getType()) {
+                case INTEGER_ITEM -> -1; // 1.any < 1.1 ?
+                case STRING_ITEM ->
+                        comparableQualifier(value).compareTo(comparableQualifier(((StringItem) item).value));
+                case LIST_ITEM -> -1; // 1.any < 1-1
+                default -> throw new RuntimeException("invalid item: " + item.getClass());
+            };
         }
 
         public String toString() {
@@ -361,13 +336,13 @@ public int compareTo(Item item) {
                 return first.compareTo(null);
             }
             switch (item.getType()) {
-                case INTEGER_ITEM:
+                case INTEGER_ITEM -> {
                     return -1; // 1-1 < 1.0.x
-
-                case STRING_ITEM:
+                }
+                case STRING_ITEM -> {
                     return 1; // 1-1 > 1-sp
-
-                case LIST_ITEM:
+                }
+                case LIST_ITEM -> {
                     Iterator<Item> left = iterator();
                     Iterator<Item> right = ((ListItem) item).iterator();
 
@@ -376,17 +351,16 @@ public int compareTo(Item item) {
                         Item r = right.hasNext() ? right.next() : null;
 
                         // if this is shorter, then invert the compare and mul with -1
-                        int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r);
+                        int result = l == null ? (r == null ? 0 : -1 * r.compareTo(null)) : l.compareTo(r);
 
                         if (result != 0) {
                             return result;
                         }
                     }
 
                     return 0;
-
-                default:
-                    throw new RuntimeException("invalid item: " + item.getClass());
+                }
+                default -> throw new RuntimeException("invalid item: " + item.getClass());
             }
         }