Update to 1.21.6 using cosmos

The Galaxy-API and mcMMO dependencies have been updated to newer versions and three new BoosterTypes - 'crossbows', 'maces', and 'tridents' - have been added. Also, the Java language version has been upgraded from version 17 to version 21.

.gitignore

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

Jenkinsfile

@@ -0,0 +1,20 @@
+pipeline {
+    agent any
+    stages {
+        stage('Gradle') {
+            steps {
+                sh './gradlew build'
+            }
+        }
+        stage('Archive') {
+            steps {
+                archiveArtifacts artifacts: 'build/libs/', followSymlinks: false
+            }
+        }
+        stage('discord') {
+            steps {
+                discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook
+            }
+        }
+    }
+}

api/build.gradle.kts

@@ -3,7 +3,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
+    compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") {
+        isChanging = true
+    }
     compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate
     compileOnly("net.luckperms:api:5.3") // Luckperms
 

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

@@ -58,13 +58,6 @@ abstract class AbstractConfig {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
-        readConfig(clazz, null);
-        try {
-            configLoader.save(config);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }
 
     protected void readConfig(Class<?> clazz, Object instance) {
@@ -114,7 +107,7 @@ abstract class AbstractConfig {
         saveConfig();
     }
 
-    protected static void setString(String path, String def) {
+    protected void setString(String path, String def) {
         try {
             if(config.node(splitPath(path)).virtual())
                 config.node(splitPath(path)).set(io.leangen.geantyref.TypeToken.get(String.class), def);
@@ -123,34 +116,53 @@ abstract class AbstractConfig {
         }
     }
 
-    protected static boolean getBoolean(String prefix, String path, boolean def) {
+    protected boolean getBoolean(String prefix, String path, boolean def) {
         set(prefix, path, def);
         return config.node(splitPath(path)).getBoolean(def);
     }
 
-    protected static double getDouble(String prefix, String path, double def) {
+    protected double getDouble(String prefix, String path, double def) {
         set(prefix, path, def);
         return config.node(splitPath(path)).getDouble(def);
     }
 
-    protected static int getInt(String prefix, String path, int def) {
+    protected int getInt(String prefix, String path, int def) {
         set(prefix, path, def);
         return config.node(splitPath(path)).getInt(def);
     }
 
-    protected static String getString(String prefix, String path, String def) {
+    protected String getString(String prefix, String path, String def) {
         setString(path, def);
         return config.node(splitPath(path)).getString(def);
     }
 
-    protected static Long getLong(String prefix, String path, Long def) {
+    protected Long getLong(String prefix, String path, Long def) {
         set(prefix, path, def);
         return config.node(splitPath(path)).getLong(def);
     }
 
-    protected static <T> List<String> getList(String prefix, String path, T def) {
+    private void setStringList(String prefix, String path, List<String> def) {
+        path = prefix + path;
+        System.out.println("Setting: " + def);
+        if(config.node(splitPath(path)).virtual()) {
             try {
-            set(prefix, path, def);
+                config.node(splitPath(path)).setList(TypeToken.get(String.class), def);
+            } catch (SerializationException e) {
+                e.printStackTrace();
+            }
+        } else {
+            try {
+                config.node(splitPath(path)).setList(TypeToken.get(String.class), def);
+            } catch (SerializationException e) {
+                e.printStackTrace();
+            }
+        }
+        saveConfig();
+    }
+
+    protected List<String> getStringList(String prefix, String path, List<String> def) {
+        try {
+            setStringList(prefix, path, def);
             return config.node(splitPath(path)).getList(TypeToken.get(String.class));
         } catch(SerializationException ex) {
             ex.printStackTrace();

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

@@ -27,7 +27,7 @@ public class BoosterFileStorage {
     }
 
     private void init() {
-        File CONFIG_PATH = new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs" + File.separator + "Boosters");
+        File CONFIG_PATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "Boosters");
         if (!CONFIG_PATH.exists()) {
             if (!CONFIG_PATH.mkdir())
                 logger.severe("Unable to create json storage directory");
@@ -123,14 +123,7 @@ public class BoosterFileStorage {
         parser.nextValue();
         double multiplier = parser.getValueAsDouble();
 
-        jsonToken = parser.nextToken();
+        return Optional.of(new Booster(boosterUUID, activatorName, boosterType, startingTime, duration, multiplier));
-        if (jsonToken != JsonToken.FIELD_NAME || !"running".equals(parser.getCurrentName()))
-            return error("Didn't find running at expected location");
-        parser.nextValue();
-        boolean running = parser.getValueAsBoolean();
-        parser.nextValue();
-
-        return Optional.of(new Booster(boosterUUID, activatorName, boosterType, startingTime, duration, multiplier, running));
     }
 
     private Optional<Booster> error(String error) {
@@ -160,7 +153,6 @@ public class BoosterFileStorage {
         generator.writeNumberField("startingTime", booster.getStartingTime().toEpochMilli());
         generator.writeNumberField("duration", booster.getDuration().toMillis());
         generator.writeNumberField("multiplier", booster.getMultiplier());
-        generator.writeBooleanField("running", booster.getRunning());
 
         generator.writeEndObject();
     }

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

@@ -11,8 +11,8 @@ public final class Config extends AbstractConfig {
 
     Config(Logger logger) {
         super(
-                new File(System.getProperty("user.home") + File.separator
+                new File(File.separator
-                        + "share" + File.separator
+                        + "mnt" + File.separator
                         + "configs" + File.separator
                         + "Boosters"),
                 "config.yml", logger, Config.class);
@@ -20,7 +20,7 @@ public final class Config extends AbstractConfig {
 
     public static void reload(Logger logger) {
         config = new Config(logger);
-        config.readConfig(Config.class, null);
+        config.readConfig(Config.class, config);
     }
 
     public static class LOGGING {
@@ -47,7 +47,7 @@ public final class Config extends AbstractConfig {
             UPDATE_FREQUENCY_MINUTES = config.getInt(prefix, "update-frequency-minutes", UPDATE_FREQUENCY_MINUTES);
             BOOST_ANNOUNCE_CHANNEL = config.getLong(prefix, "boost-announce-channel", BOOST_ANNOUNCE_CHANNEL);
             PLUGIN_MESSAGE_CHANNEL = config.getString(prefix, "plugin-message-channel", PLUGIN_MESSAGE_CHANNEL);
-            DONOR_RANKS = config.getList(prefix, "donor-ranks", DONOR_RANKS);
+//            DONOR_RANKS = config.getStringList(prefix, "donor-ranks", DONOR_RANKS);
         }
     }
 

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

@@ -15,7 +15,6 @@ public class Booster implements Comparable<Booster> {
     private Duration duration;
     private final BoosterType boosterType;
     private final Double multiplier;
-    private Boolean running;
 
     public Booster(UUID boosterUUID, BoosterType boosterType, String reason, Duration duration, double multiplier) {
         this.boosterUUID = boosterUUID;
@@ -23,7 +22,6 @@ public class Booster implements Comparable<Booster> {
         this.activatorName = reason;
         this.duration = duration;
         this.multiplier = multiplier;
-        this.running = false;
         this.startingTime = Instant.now();
     }
 
@@ -32,14 +30,13 @@ public class Booster implements Comparable<Booster> {
     }
 
     public Booster(UUID boosterUUID, String activatorName, BoosterType boosterType, Instant startingTime,
-                   Duration duration, double multiplier, boolean running) {
+                   Duration duration, double multiplier) {
         this.boosterUUID = boosterUUID;
         this.activatorName = activatorName;
         this.boosterType = boosterType;
         this.startingTime = startingTime;
         this.duration = duration;
         this.multiplier = multiplier;
-        this.running = running;
     }
 
     public void updateDuration() {
@@ -48,6 +45,10 @@ public class Booster implements Comparable<Booster> {
         duration = duration.minus(elapsedTime);
     }
 
+    public void updateTimeAfterReActivate() {
+        startingTime = Instant.now();
+    }
+
     public double useMultiplier(double exp) {
         return exp * (multiplier + 1);
     }
@@ -76,10 +77,6 @@ public class Booster implements Comparable<Booster> {
         return multiplier;
     }
 
-    public Boolean getRunning() {
-        return running;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -114,7 +111,6 @@ public class Booster implements Comparable<Booster> {
                 ", duration=" + duration +
                 ", boosterType=" + boosterType +
                 ", multiplier=" + multiplier +
-                ", running=" + running +
                 '}';
     }
 }

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

@@ -41,7 +41,14 @@ public class BoosterCache {
             return;
         }
         LinkedList<Booster> list = boosters.get(boosterType);
+        Booster oldActive = null;
+        if (list.size() > 1) {
+            oldActive = list.get(0);
+        }
         list.sort(Booster::compareTo);
+        if (oldActive != null && !list.get(0).getBoosterUUID().equals(oldActive.getBoosterUUID())) {
+            oldActive.updateDuration();
+        }
     }
 
     public synchronized Optional<Booster> getActiveBooster(BoosterType boosterType) {
@@ -101,6 +108,11 @@ public class BoosterCache {
         list.removeIf(filterBooster -> filterBooster.getBoosterUUID().equals(booster.getBoosterUUID()));
         boosters.put(boosterType, list);
         updateOrder(boosterType);
+        LinkedList<Booster> updatedBoosterList = boosters.get(boosterType);
+        if (updatedBoosterList.size() > 0) {
+            Booster nextBooster = updatedBoosterList.get(0);
+            nextBooster.updateTimeAfterReActivate();
+        }
         boosterFileStorage.saveBoosters(boosters.values().stream().flatMap(List::stream).collect(Collectors.toList()));
     }
 

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

@@ -26,6 +26,9 @@ public enum BoosterType {
     TAMING("taming", MCMMO),
     UNARMED("unarmed", MCMMO),
     WOODCUTTING("woodcutting", MCMMO),
+    CROSSBOWS("crossbows", MCMMO),
+    MACES("maces", MCMMO),
+    TRIDENTS("tridents", MCMMO),
 
     /**
      * MYPET - Boosts MyPet exp gains

build.gradle.kts

@@ -1,25 +1,25 @@
 plugins {
     `java-library`
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.1.0"
+    id("io.github.goooler.shadow") version "8.1.8"
 }
 
 allprojects {
     group = "com.alttd.boosters"
     version = "1.0.0-BETA-SNAPSHOT"
     description = "Easily manage all boosters on the Altitude Minecraft Server Network."
-}
 
-subprojects {
     apply<JavaLibraryPlugin>()
     apply(plugin = "maven-publish")
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
+}
 
+subprojects {
     tasks {
         withType<JavaCompile> {
             options.encoding = Charsets.UTF_8.name()
@@ -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-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-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-2021 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.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
+#
-##  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/HEAD/subprojects/plugins/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 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 +130,120 @@ 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" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    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, 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" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# 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

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,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 +41,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,11 +57,11 @@ 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
 
@@ -75,13 +76,15 @@ set CLASSPATH=%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,6 +1,6 @@
 plugins {
     `maven-publish`
-    id("com.github.johnrengelman.shadow")
+    id("io.github.goooler.shadow")
     id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
 }
 
@@ -8,11 +8,13 @@ dependencies {
     // API
     implementation(project(":boosters-api"))
     // Galaxy
-    compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
+    compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") {
+        isChanging = true
+    }
     // MyPet
     compileOnly("de.keyle:mypet:3.12-SNAPSHOT")
     // mcMMO
-    compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.1.206") {
+    compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.2.004") {
         exclude("com.sk89q.worldguard")
     }
 
@@ -37,8 +39,8 @@ tasks {
 bukkit {
     name = rootProject.name
     main = "$group.BoostersPlugin"
-    apiVersion = "1.18"
+    apiVersion = "1.21"
-    authors = listOf("destro174")
+    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))),

settings.gradle.kts

@@ -9,7 +9,7 @@ dependencyResolutionManagement {
         mavenCentral()
         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

velocity/build.gradle.kts

@@ -1,27 +1,23 @@
 plugins {
     `maven-publish`
-    id("com.github.johnrengelman.shadow")
+    id("io.github.goooler.shadow")
 }
 
 dependencies {
     // API
     implementation(project(":boosters-api")) {
-        exclude("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
+        exclude("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT")
     }
     // 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") }
     }