Watch booster file changes as it is now loaded from a rsynced file instead of a shared file

.gitignore

@@ -48,3 +48,4 @@ out/
 *~
 
 !gradle/wrapper/gradle-wrapper.jar
+*bat

Jenkinsfile

@@ -3,7 +3,13 @@ pipeline {
     stages {
         stage('Gradle') {
             steps {
-                sh './gradlew build'
+                withCredentials([usernamePassword(credentialsId: 'alttd-snapshot-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+                sh '''
+                  set +x
+                  chmod +x gradlew
+                  ./gradlew build -PalttdSnapshotUsername=$USERNAME -PalttdSnapshotPassword=$PASSWORD
+                '''
+                }
             }
         }
         stage('Archive') {

api/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly("com.alttd:Galaxy-API:1.21-R0.1-SNAPSHOT")
+    compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
     compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate
     compileOnly("net.luckperms:api:5.3") // Luckperms
 

api/src/main/java/com/alttd/boosterapi/config/BoosterFileStorage.java

@@ -4,11 +4,10 @@ import com.alttd.boosterapi.data.Booster;
 import com.alttd.boosterapi.data.BoosterType;
 import com.alttd.boosterapi.util.Logger;
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.*;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.LinkedList;
@@ -20,6 +19,9 @@ public class BoosterFileStorage {
 
     private File CONFIG_FILE;
     private final Logger logger;
+    private WatchService watchService;
+    private Thread watchThread;
+
     public BoosterFileStorage(Logger logger) {
         this.logger = logger;
         logger.info("Preparing booster file storage...");
@@ -29,103 +31,198 @@ public class BoosterFileStorage {
     private void init() {
         File CONFIG_PATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "Boosters");
         if (!CONFIG_PATH.exists()) {
-            if (!CONFIG_PATH.mkdir())
+            if (!CONFIG_PATH.mkdir()) {
                 logger.severe("Unable to create json storage directory");
+            }
         }
         CONFIG_FILE = new File(CONFIG_PATH, "storage.json");
         if (!CONFIG_FILE.exists()) {
             try {
-                if (!CONFIG_FILE.createNewFile())
+                if (!CONFIG_FILE.createNewFile()) {
-                    logger.severe("Unable to create json storeage file");
+                    logger.severe("Unable to create json storage file");
+                }
             } catch (IOException e) {
-                e.printStackTrace();
+                throw new RuntimeException(e);
             }
         }
-
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.enable(SerializationFeature.INDENT_OUTPUT);
     }
 
-    public synchronized List<Booster> reload() {
+    /**
+     * Attempts to reload the whole storage file.
+     *
+     * Optional.empty() means the file was invalid/incomplete and callers should
+     * keep their current in-memory state rather than replacing it.
+     */
+    public synchronized Optional<List<Booster>> reload() {
         logger.debug("Reloading boosters...");
         return loadBoosters();
     }
 
-    private List<Booster> loadBoosters()  {
+    /**
-        List<Booster> boosters = new LinkedList<>();
+     * Watches storage.json and asks the owner of the cache to reload whenever
+     * the file changes or is replaced.
+     */
+    public synchronized void startWatching(Runnable onReload) {
+        if (watchThread != null && watchThread.isAlive())
+            return;
 
         try {
-            JsonParser parser = new JsonFactory().createParser(CONFIG_FILE);
+            Path directory = CONFIG_FILE.toPath().getParent();
-            if (parser == null) {
+            watchService = FileSystems.getDefault().newWatchService();
-                logger.warning("Unable to load in boosters from storage file.");
+            directory.register(
-                return boosters;
+                    watchService,
+                    StandardWatchEventKinds.ENTRY_MODIFY,
+                    StandardWatchEventKinds.ENTRY_CREATE
+            );
+
+            watchThread = new Thread(() -> watchLoop(onReload), "booster-storage-watcher");
+            watchThread.setDaemon(true);
+            watchThread.start();
+        } catch (IOException e) {
+            throw new RuntimeException("Unable to watch booster storage file", e);
+        }
+    }
+
+    private void watchLoop(Runnable onReload) {
+        Path fileName = CONFIG_FILE.toPath().getFileName();
+
+        while (!Thread.currentThread().isInterrupted()) {
+            try {
+                WatchKey key = watchService.take();
+                boolean changed = false;
+
+                for (WatchEvent<?> event : key.pollEvents()) {
+                    if (event.kind() == StandardWatchEventKinds.OVERFLOW)
+                        continue;
+
+                    Path changedFile = (Path) event.context();
+                    if (fileName.equals(changedFile))
+                        changed = true;
+                }
+
+                if (!key.reset())
+                    break;
+
+                if (changed) {
+                    try {
+                        onReload.run();
+                    } catch (RuntimeException e) {
+                        logger.severe("Unable to reload boosters after storage file changed: " + e.getMessage());
+                    }
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            } catch (ClosedWatchServiceException e) {
+                break;
             }
-            parser.nextToken();
+        }
-            while (parser.currentToken() != null && parser.currentToken().isStructStart()) {
+    }
+
+    private Optional<List<Booster>> loadBoosters() {
+        List<Booster> boosters = new LinkedList<>();
+
+        try (JsonParser parser = new JsonFactory().createParser(CONFIG_FILE)) {
+            JsonToken token = parser.nextToken();
+
+            // An empty file represents an empty booster list.
+            if (token == null)
+                return Optional.of(boosters);
+
+            while (token != null) {
+                if (token != JsonToken.START_OBJECT)
+                    return invalid("Expected booster object start but found " + token);
+
                 Optional<Booster> optionalBooster = loadBooster(parser);
-                if (optionalBooster.isEmpty())
+                if (optionalBooster.isEmpty()) {
-                    continue;
+                    return Optional.empty();
+                }
+
                 Booster booster = optionalBooster.get();
                 logger.debug("Loading booster:" + booster.getBoosterType());
                 boosters.add(booster);
-                if (parser.nextToken() != null && !parser.currentToken().isStructEnd()) {
+
-                    logger.warning("Last loaded booster had more data than expected, skipping it...");
+                token = parser.nextToken();
-                    while (!parser.nextToken().isStructEnd())
+                if (token != JsonToken.END_OBJECT) {
-                        ;
+                    return invalid("Expected booster object end but found " + token);
                 }
-                parser.nextToken();
+
+                token = parser.nextToken();
             }
-            parser.close();
+
-        } catch (IOException e) {
+            return Optional.of(boosters);
-            throw new RuntimeException(e);
+        } catch (IOException | IllegalArgumentException e) {
+            logger.warning("Unable to load boosters from storage file: " + e.getMessage());
+            return Optional.empty();
         }
-        return boosters;
     }
 
     public Optional<Booster> loadBooster(JsonParser parser) throws IOException {
-        JsonToken jsonToken = parser.getCurrentToken();
+        JsonToken jsonToken = parser.nextToken();
-        if (!jsonToken.isStructStart())
+        if (jsonToken != JsonToken.FIELD_NAME || !"boosterUUID".equals(parser.getCurrentName())) {
-            return error("Didn't find struct start");
-
-        jsonToken = parser.nextToken();
-        if (jsonToken != JsonToken.FIELD_NAME || !"boosterUUID".equals(parser.getCurrentName()))
             return error("Didn't find boosterUUID at expected location");
-        parser.nextValue();
+        }
+        if (parser.nextToken() != JsonToken.VALUE_STRING) {
+            return error("boosterUUID was not a string");
+        }
         UUID boosterUUID = UUID.fromString(parser.getValueAsString());
 
         jsonToken = parser.nextToken();
-        if (jsonToken != JsonToken.FIELD_NAME || !"activatorName".equals(parser.getCurrentName()))
+        if (jsonToken != JsonToken.FIELD_NAME || !"activatorName".equals(parser.getCurrentName())) {
             return error("Didn't find activatorName at expected location");
-        parser.nextValue();
+        }
+        if (parser.nextToken() != JsonToken.VALUE_STRING) {
+            return error("activatorName was not a string");
+        }
         String activatorName = parser.getValueAsString();
 
         jsonToken = parser.nextToken();
-        if (jsonToken != JsonToken.FIELD_NAME || !"boosterType".equals(parser.getCurrentName()))
+        if (jsonToken != JsonToken.FIELD_NAME || !"boosterType".equals(parser.getCurrentName())) {
             return error("Didn't find boosterType at expected location");
-        parser.nextValue();
+        }
+        if (parser.nextToken() != JsonToken.VALUE_STRING) {
+            return error("boosterType was not a string");
+        }
         BoosterType boosterType = BoosterType.getByName(parser.getValueAsString());
+        if (boosterType == null) {
+            return error("Unknown boosterType");
+        }
 
         jsonToken = parser.nextToken();
-        if (jsonToken != JsonToken.FIELD_NAME || !"startingTime".equals(parser.getCurrentName()))
+        if (jsonToken != JsonToken.FIELD_NAME || !"startingTime".equals(parser.getCurrentName())) {
             return error("Didn't find startingTime at expected location");
-        parser.nextValue();
+        }
-        Instant startingTime = Instant.ofEpochMilli(parser.getValueAsLong());
+        if (parser.nextToken() != JsonToken.VALUE_NUMBER_INT) {
+            return error("startingTime was not an integer");
+        }
+        Instant startingTime = Instant.ofEpochMilli(parser.getLongValue());
 
         jsonToken = parser.nextToken();
-        if (jsonToken != JsonToken.FIELD_NAME || !"duration".equals(parser.getCurrentName()))
+        if (jsonToken != JsonToken.FIELD_NAME || !"duration".equals(parser.getCurrentName())) {
             return error("Didn't find duration at expected location");
-        parser.nextValue();
+        }
-        Duration duration = Duration.ofMillis(parser.getValueAsLong());
+        if (parser.nextToken() != JsonToken.VALUE_NUMBER_INT) {
+            return error("duration was not an integer");
+        }
+        Duration duration = Duration.ofMillis(parser.getLongValue());
 
         jsonToken = parser.nextToken();
-        if (jsonToken != JsonToken.FIELD_NAME || !"multiplier".equals(parser.getCurrentName()))
+        if (jsonToken != JsonToken.FIELD_NAME || !"multiplier".equals(parser.getCurrentName())) {
             return error("Didn't find multiplier at expected location");
-        parser.nextValue();
+        }
-        double multiplier = parser.getValueAsDouble();
+        JsonToken multiplierToken = parser.nextToken();
+        if (multiplierToken != JsonToken.VALUE_NUMBER_INT && multiplierToken != JsonToken.VALUE_NUMBER_FLOAT) {
+            return error("multiplier was not a number");
+        }
+        double multiplier = parser.getDoubleValue();
 
         return Optional.of(new Booster(boosterUUID, activatorName, boosterType, startingTime, duration, multiplier));
     }
 
+    private <T> Optional<T> invalid(String error) {
+        logger.severe(error);
+        return Optional.empty();
+    }
+
     private Optional<Booster> error(String error) {
         logger.severe(error);
         return Optional.empty();
@@ -143,7 +240,6 @@ public class BoosterFileStorage {
         }
     }
 
-
     private void saveBooster(Booster booster, JsonGenerator generator) throws IOException {
         generator.writeStartObject();
 

api/src/main/java/com/alttd/boosterapi/data/BoosterCache.java

@@ -17,16 +17,23 @@ public class BoosterCache {
     public BoosterCache(BoosterFileStorage boosterFileStorage) {
         this.boosterFileStorage = boosterFileStorage;
         reloadBoosters();
+        boosterFileStorage.startWatching(this::reloadBoosters);
     }
 
     public synchronized void reloadBoosters() {
-        boosters.clear();
+        Optional<List<Booster>> reloadedBoosters = boosterFileStorage.reload();
-        List<Booster> allBoosters = boosterFileStorage.reload();
+        if (reloadedBoosters.isEmpty())
-        for (Booster booster : allBoosters) {
+            return;
-            LinkedList<Booster> list = boosters.getOrDefault(booster.getBoosterType(), new LinkedList<>());
+
+        HashMap<BoosterType, LinkedList<Booster>> newBoosters = new HashMap<>();
+        for (Booster booster : reloadedBoosters.get()) {
+            LinkedList<Booster> list = newBoosters.getOrDefault(booster.getBoosterType(), new LinkedList<>());
             list.add(booster);
-            boosters.put(booster.getBoosterType(), list);
+            newBoosters.put(booster.getBoosterType(), list);
         }
+
+        boosters.clear();
+        boosters.putAll(newBoosters);
         updateOrder();
     }
 
@@ -43,21 +50,23 @@ public class BoosterCache {
         LinkedList<Booster> list = boosters.get(boosterType);
         Booster oldActive = null;
         if (list.size() > 1) {
-            oldActive = list.get(0);
+            oldActive = list.getFirst();
         }
         list.sort(Booster::compareTo);
-        if (oldActive != null && !list.get(0).getBoosterUUID().equals(oldActive.getBoosterUUID())) {
+        if (oldActive != null && !list.getFirst().getBoosterUUID().equals(oldActive.getBoosterUUID())) {
             oldActive.updateDuration();
         }
     }
 
     public synchronized Optional<Booster> getActiveBooster(BoosterType boosterType) {
-        if (!boosters.containsKey(boosterType))
+        if (!boosters.containsKey(boosterType)) {
             return Optional.empty();
+        }
         LinkedList<Booster> list = boosters.get(boosterType);
-        if (list.isEmpty())
+        if (list.isEmpty()) {
             return Optional.empty();
-        return Optional.of(list.get(0));
+        }
+        return Optional.of(list.getFirst());
     }
 
     public synchronized List<Booster> getAllActiveBoosters() {

api/src/main/java/com/alttd/boosterapi/data/BoosterType.java

@@ -29,6 +29,7 @@ public enum BoosterType {
     CROSSBOWS("crossbows", MCMMO),
     MACES("maces", MCMMO),
     TRIDENTS("tridents", MCMMO),
+    SPEARS("spears", MCMMO),
 
     /**
      * MYPET - Boosts MyPet exp gains

build.gradle.kts

@@ -1,12 +1,12 @@
 plugins {
     `java-library`
     `maven-publish`
-    id("io.github.goooler.shadow") version "8.1.8"
+    id("com.gradleup.shadow") version "9.6.1"
 }
 
 allprojects {
     group = "com.alttd.boosters"
-    version = "1.0.0-BETA-SNAPSHOT"
+    version = System.getenv("BUILD_NUMBER") ?: "1.0.0-BETA-SNAPSHOT"
     description = "Easily manage all boosters on the Altitude Minecraft Server Network."
 
     apply<JavaLibraryPlugin>()
@@ -14,7 +14,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(21))
+            languageVersion.set(JavaLanguageVersion.of(25))
         }
     }
 }
@@ -54,7 +54,6 @@ dependencies {
     implementation(project(":boosters-api"))
     implementation(project(":plugin"))
     implementation(project(":velocity"))
-//    implementation("net.kyori", "adventure-text-minimessage", "4.2.0-SNAPSHOT")
 }
 
 tasks {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,81 +15,114 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
+# This is normally unused
-APP_BASE_NAME=`basename "$0"`
+# shellcheck disable=SC2034
-
+APP_BASE_NAME=${0##*/}
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC2039,SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC2039,SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,32 +59,33 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

plugin/build.gradle.kts

@@ -1,18 +1,17 @@
 plugins {
     `maven-publish`
-    id("io.github.goooler.shadow")
+    id("com.gradleup.shadow")
     id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
 }
 
 dependencies {
     // API
     implementation(project(":boosters-api"))
-    // Galaxy
+    compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
-    compileOnly("com.alttd:Galaxy-API:1.21-R0.1-SNAPSHOT")
     // MyPet
-    compileOnly("de.keyle:mypet:3.12-SNAPSHOT")
+    compileOnly("de.keyle:mypet-api:4.0.1-SNAPSHOT")
     // mcMMO
-    compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.2.004") {
+    compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.3.000") {
         exclude("com.sk89q.worldguard")
     }
 
@@ -37,8 +36,9 @@ tasks {
 bukkit {
     name = rootProject.name
     main = "$group.BoostersPlugin"
-    apiVersion = "1.18"
+    version = "${rootProject.version}"
-    authors = listOf("destro174")
+    apiVersion = "26.2"
+    authors = listOf("destro174", "akastijn")
     softDepend = listOf("MyPet", "mcMMO")
     commands {
         register("listboosters") {

plugin/src/main/java/com/alttd/boosters/commands/BoosterCommand.java

@@ -28,11 +28,11 @@ public class BoosterCommand implements CommandExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         if (!commandSender.hasPermission("boosters.list")) {
-            commandSender.sendMiniMessage("<red>You don't have permission for this command", null);
+            commandSender.sendRichMessage("<red>You don't have permission for this command");
             return true;
         }
 
-        commandSender.sendMiniMessage(Config.BOOSTER_MESSAGES.LIST_BOOSTER_MESSAGE, TagResolver.resolver(
+        commandSender.sendRichMessage(Config.BOOSTER_MESSAGES.LIST_BOOSTER_MESSAGE, TagResolver.resolver(
                 Placeholder.component("active_boosters", Component.join(JoinConfiguration.newlines(),
                         BoosterParser.parseBoosters(logger, boosterCache.getAllActiveBoosters(),
                                 Config.BOOSTER_MESSAGES.ACTIVE_BOOSTER_PART, true))),

plugin/src/main/java/com/alttd/boosters/listeners/MyPetListener.java

@@ -3,7 +3,7 @@ package com.alttd.boosters.listeners;
 import com.alttd.boosterapi.data.Booster;
 import com.alttd.boosterapi.data.BoosterCache;
 import com.alttd.boosterapi.data.BoosterType;
-import de.Keyle.MyPet.api.event.MyPetExpEvent;
+import de.Keyle.MyPet.api.event.PetExpEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
@@ -18,15 +18,16 @@ public class MyPetListener implements Listener {
     }
 
     @EventHandler
-    public void onMyPetExpEvent(MyPetExpEvent event) {
+    public void onMyPetExpEvent(PetExpEvent event) {
         double exp = event.getPet().getExp();
         if (exp == 0) {
             return;
         }
 
         Optional<Booster> myPetBooster = boosterCache.getActiveBooster(BoosterType.MYPET);
-        if (myPetBooster.isEmpty())
+        if (myPetBooster.isEmpty()) {
             return;
+        }
 
         Booster booster = myPetBooster.get();
         event.setExp(booster.useMultiplier(event.getExp()));

plugin/src/main/java/com/alttd/boosters/listeners/PhantomSpawnListener.java

@@ -2,6 +2,7 @@ package com.alttd.boosters.listeners;
 
 import com.alttd.boosterapi.data.BoosterCache;
 import com.alttd.boosterapi.data.BoosterType;
+import com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -16,7 +17,7 @@ public class PhantomSpawnListener implements Listener {
     }
 
     @EventHandler
-    public void onPhantomPreSpawn(com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent event) {
+    public void onPhantomPreSpawn(PhantomPreSpawnEvent event) {
         Entity spawningEntity = event.getSpawningEntity();
         if (spawningEntity instanceof Player
                 && boosterCache.getActiveBooster(BoosterType.PHANTOM).isPresent()) {

plugin/src/main/java/com/alttd/boosters/listeners/mcMMOListener.java

@@ -23,8 +23,9 @@ public class mcMMOListener implements Listener {
         String skillName = event.getSkill().name();
         BoosterType type = BoosterType.getByName(skillName);
         Optional<Booster> optionalBooster = boosterCache.getActiveBooster(type);
-        if (optionalBooster.isEmpty())
+        if (optionalBooster.isEmpty()) {
             return;
+        }
 
         Booster booster = optionalBooster.get();
         event.setRawXpGained(Math.round(booster.useMultiplier(event.getRawXpGained())));

settings.gradle.kts

@@ -1,5 +1,8 @@
 rootProject.name = "Boosters"
 
+val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME")
+val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD")
+
 include(":plugin")
 include(":velocity")
 
@@ -7,16 +10,29 @@ dependencyResolutionManagement {
     repositories {
 //        mavenLocal()
         mavenCentral()
+        maven {
+            url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
+            credentials {
+                username = nexusUser
+                password = nexusPass
+            }
+        }
+        maven {
+            url = uri("https://repo.alttd.com/repository/alttd/")
+            credentials {
+                username = nexusUser
+                password = nexusPass
+            }
+        }
         maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
         maven("https://oss.sonatype.org/content/groups/public/") // Adventure
-        maven("https://papermc.io/repo/repository/maven-public/") // Velocity
+        maven("https://repo.papermc.io/repo/repository/maven-public/") // Velocity
         maven("https://repo.spongepowered.org/maven") // Configurate
         maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO
 //        maven("https://maven.enginehub.org/repo/") // worldguard
-        maven { // mypet
+        maven {
-            name = "GitHubPackages"
+            name = "userderezzedRepoSnapshots"
-            url = uri("https://maven.pkg.github.com/MyPetORG/MyPet")
+            url = uri("https://repo.userderezzed.dev/snapshots")
-            credentials(PasswordCredentials::class)
         }
 
     }

velocity/build.gradle.kts

@@ -1,27 +1,23 @@
 plugins {
     `maven-publish`
-    id("io.github.goooler.shadow")
+    id("com.gradleup.shadow")
 }
 
 dependencies {
     // API
     implementation(project(":boosters-api")) {
-        exclude("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
+        exclude("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
     }
     // Velocity
-    compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") // Velocity
+    compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") // Velocity
     annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT")
     // DiscordLink
     compileOnly("com.alttd.proxydiscordlink:ProxyDiscordLink:1.0.0-BETA-SNAPSHOT") {
         exclude("net.kyori")
     }
 
-    implementation("mysql:mysql-connector-java:8.0.27") // mysql
+    implementation("mysql:mysql-connector-java:8.0.33") // mysql
     implementation("org.spongepowered", "configurate-yaml", "4.1.2")
-//    implementation("net.kyori", "adventure-text-minimessage", "4.1.0-SNAPSHOT") {
-//        exclude("net.kyori")
-//        exclude("net.kyori.examination")
-//    }
     //Luckperms
     compileOnly("net.luckperms:api:5.3")
 }
@@ -31,7 +27,6 @@ tasks {
     shadowJar {
         archiveFileName.set("${project.name}-${project.version}.jar")
         listOf(
-//            "net.kyori.adventure.text.minimessage",
             "org.spongepowered.configurate"
         ).forEach { relocate(it, "${rootProject.name}.lib.$it") }
     }

velocity/src/main/java/com/alttd/vboosters/VelocityBoosters.java

@@ -23,7 +23,7 @@ import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 // TODO use the version created in build.gradle.kts
 @Plugin(id = "boosterplugin", name = "BoosterPlugin", version = "1.0.0",
         description = "Easily manage all boosters on the Altitude Minecraft Server Network.",
-        authors = {"destro174", "teri"},
+        authors = {"destro174", "akastijn"},
         dependencies = {@Dependency(id = "luckperms"),@Dependency(id = "proxydiscordlink")}
 )
 public class VelocityBoosters {