Update Jenkinsfile

The configuration file location in the Config constructor was changed. The previous default was under the user's home directory, now it has been moved to the "/mnt/configs/LiteFlags" directory.

.gitignore

@@ -36,3 +36,4 @@ target/
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+*.bat

Jenkinsfile

@@ -0,0 +1,32 @@
+pipeline {
+    agent any
+    stages {
+        stage('Gradle') {
+            steps {
+                withCredentials([usernamePassword(credentialsId: 'alttd-snapshot-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+                sh '''
+                  set +x
+                  chmod +x gradlew
+                  ./gradlew build -PalttdSnapshotUsername=$USERNAME -PalttdSnapshotPassword=$PASSWORD
+                '''
+                }
+            }
+        }
+        stage('Archive') {
+            steps {
+                archiveArtifacts artifacts: 'build/libs/', followSymlinks: false
+            }
+        }
+        stage('discord') {
+            when {
+                anyOf {
+                    branch 'main'
+                    branch 'master'
+                }
+            }
+            steps {
+                discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook
+            }
+        }
+    }
+}

build.gradle.kts

@@ -0,0 +1,23 @@
+plugins {
+    id("java")
+}
+
+group = "com.alttd"
+version = "1.1.0-SNAPSHOT"
+description = "Altitude player flag plugin."
+
+apply<JavaLibraryPlugin>()
+
+tasks {
+    withType<JavaCompile> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+
+    withType<Javadoc> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+}
+
+dependencies {
+    compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,240 @@
+#!/bin/sh
+
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   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/master/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
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+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.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+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                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | 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
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    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.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+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
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+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

@@ -0,0 +1,91 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+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!
+set EXIT_CODE=%ERRORLEVEL%
+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
+
+:omega

pom.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>groupId</groupId>
-    <artifactId>LiteFlags</artifactId>
-    <version>1.0</version>
-
-    <properties>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
-    </properties>
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <defaultGoal>clean package</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>io.papermc.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-</project>

settings.gradle.kts

@@ -0,0 +1,36 @@
+rootProject.name = "LiteFlags"
+
+val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME")
+val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD")
+
+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")
+        maven("https://jitpack.io") { // Vault
+            content { includeGroup("com.github.milkbowl") }
+        }
+    }
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+}
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}

src/main/java/com/liteflags/LiteFlags.java

@@ -2,16 +2,16 @@ package com.liteflags;
 
 import com.liteflags.auth.AuthTimer;
 import com.liteflags.commands.CommandManager;
+import com.liteflags.config.Config;
 import com.liteflags.data.database.DatabaseConnection;
 import com.liteflags.events.ChatEvent;
 import com.liteflags.events.LoginEvent;
 import com.liteflags.events.LogoutEvent;
 import com.liteflags.events.MoveEvent;
-import java.sql.SQLException;
-
-import com.liteflags.config.Config;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.sql.SQLException;
+
 public class LiteFlags extends JavaPlugin {
     private static LiteFlags instance;
     public DatabaseConnection database;

src/main/java/com/liteflags/auth/AuthTimer.java

@@ -3,17 +3,15 @@ package com.liteflags.auth;
 import com.liteflags.LiteFlags;
 import com.liteflags.config.Config;
 import com.liteflags.data.maps.MapCache;
-import com.liteflags.util.Utilities;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import net.kyori.adventure.text.minimessage.Template;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 public class AuthTimer<taskID> {
     public LiteFlags flags;
     public static Map<UUID, Integer> taskID = new HashMap<>();
@@ -34,10 +32,11 @@ public class AuthTimer<taskID> {
                         AuthTimer.endTask(player);
                     } else {
                         final String code = MapCache.reauthedPlayers.get(uuid);
-                        if (code == null)
+                        if (code == null) {
                             return;
-                        player.sendMiniMessage(Config.AUTHENTICATE, List.of(
+                        }
-                                Template.template("code", code)));
+                        player.sendRichMessage(Config.AUTHENTICATE, TagResolver.resolver(
+                                Placeholder.unparsed("code", code)));
                         Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), Config.AUTH_MESSAGE_COMMAND
                                 .replaceAll("<player>", player.getName())
                                 .replaceAll("<code>", code));

src/main/java/com/liteflags/auth/Authentication.java

@@ -1,12 +1,11 @@
 package com.liteflags.auth;
 
-import com.liteflags.data.maps.MapCache;
 import com.liteflags.config.Config;
-import com.liteflags.util.Utilities;
+import com.liteflags.data.maps.MapCache;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Player;
 
-import java.util.List;
 import java.util.Random;
 
 public class Authentication {
@@ -15,8 +14,17 @@ public class Authentication {
         StringBuilder salt = new StringBuilder();
         Random rnd = new Random();
 
+        boolean hasCaps = false;
+
         while (salt.length() < 6) {
             int index = (int) (rnd.nextFloat() * (float) randChars.length());
+            if (index < 26) { //Hot fix for too many caps and the chat filter blocking it
+                if (hasCaps) {
+                    index += 26;
+                } else {
+                    hasCaps = true;
+                }
+            }
             salt.append(randChars.charAt(index));
         }
 
@@ -24,13 +32,14 @@ public class Authentication {
     }
 
     public static void checkAuthStatus(Player player) {
-        if (player.hasPermission("liteflags.authentication.success"))
+        if (player.hasPermission("liteflags.authentication.success")) {
             return;
+        }
 
         MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey());
         AuthTimer.startTimer(player);
-        player.sendMiniMessage(Config.AUTHENTICATE,
+        player.sendRichMessage(Config.AUTHENTICATE,
-                List.of(Template.template("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
+                               TagResolver.resolver(Placeholder.unparsed("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
 
     }
 }

src/main/java/com/liteflags/commands/CommandManager.java

@@ -4,8 +4,6 @@ import com.liteflags.LiteFlags;
 import com.liteflags.commands.subcommands.*;
 import com.liteflags.config.Config;
 import com.liteflags.util.Logger;
-import com.liteflags.util.Utilities;
-import net.kyori.adventure.text.minimessage.Template;
 import org.bukkit.Bukkit;
 import org.bukkit.command.*;
 import org.bukkit.entity.Player;
@@ -20,7 +18,7 @@ import java.util.stream.Collectors;
 
 public class CommandManager implements CommandExecutor, TabExecutor {
     private final List<SubCommand> subCommands;
-    private SubCommand flagPlayer = new CommandFlagPlayer();
+    private final SubCommand flagPlayer = new CommandFlagPlayer();
 
     public CommandManager() {
         LiteFlags liteFlags = LiteFlags.getInstance();
@@ -46,21 +44,21 @@ public class CommandManager implements CommandExecutor, TabExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) {
         if (!commandSender.hasPermission("liteflags.use")) {
-            commandSender.sendMiniMessage(Config.NO_PERMISSION, null);
+            commandSender.sendRichMessage(Config.NO_PERMISSION);
             return true;
         }
         if (args.length == 0) {
-            commandSender.sendMiniMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", subCommands.stream()
+            commandSender.sendRichMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", subCommands.stream()
                     .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
                     .map(SubCommand::getHelpMessage)
-                    .collect(Collectors.joining("\n"))), null);
+                    .collect(Collectors.joining("\n"))));
             return true;
         }
 
         SubCommand subCommand = getSubCommand(args[0]);
 
         if (!commandSender.hasPermission(subCommand.getPermission())) {
-            commandSender.sendMiniMessage(Config.NO_PERMISSION, null);
+            commandSender.sendRichMessage(Config.NO_PERMISSION);
             return true;
         }
 
@@ -77,16 +75,17 @@ public class CommandManager implements CommandExecutor, TabExecutor {
                                .map(SubCommand::getName)
                                .filter(Objects::nonNull)
                                .filter(name -> args.length == 0 || name.startsWith(args[0].toLowerCase()))
-                    .collect(Collectors.toList()));
+                               .toList());
             res.addAll(Bukkit.getOnlinePlayers().stream()
                                .map(Player::getName)
                                .filter(name -> args.length == 0 || name.startsWith(args[0].toLowerCase()))
-                    .collect(Collectors.toList()));
+                               .toList());
         } else {
             SubCommand subCommand = getSubCommand(args[0]);
-            if (subCommand != null && commandSender.hasPermission(subCommand.getPermission()))
+            if (subCommand != null && commandSender.hasPermission(subCommand.getPermission())) {
                 res.addAll(subCommand.getTabComplete(commandSender, args));
             }
+        }
         return res;
     }
 

src/main/java/com/liteflags/commands/subcommands/CommandFlagList.java

@@ -10,8 +10,8 @@ import com.liteflags.util.Logger;
 import com.liteflags.util.Utilities;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -20,10 +20,10 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 public class CommandFlagList extends SubCommand {
     @Override
@@ -36,28 +36,30 @@ public class CommandFlagList extends SubCommand {
                         Logger.warning("% is not a flagged player", playerName);
                         return;
                     }
-                    commandSender.sendMiniMessage(Config.ALERT_ACTIVE_FLAGS, List.of(
+                    commandSender.sendRichMessage(Config.ALERT_ACTIVE_FLAGS, TagResolver.resolver(
-                            Template.template("player", player.getName() == null ? playerName : player.getName()),
+                            Placeholder.parsed("player", player.getName() == null ? playerName : player.getName()),
-                            Template.template("total_act_flags", String.valueOf( Methods.getTotalActiveFlags(player))),
+                            Placeholder.unparsed("total_act_flags", String.valueOf(Methods.getTotalActiveFlags(player))),
-                            Template.template("console_flags", String.valueOf(Methods.consoleFlags)),
+                            Placeholder.unparsed("console_flags", String.valueOf(Methods.consoleFlags)),
-                            Template.template("staff_flags", String.valueOf(Methods.staffFlags))
+                            Placeholder.unparsed("staff_flags", String.valueOf(Methods.staffFlags))
                                                                                                  ));
                 });
-            } else
+            } else {
-                commandSender.sendMiniMessage(Config.NO_ACTIVE_FLAGS, null);
+                commandSender.sendRichMessage(Config.NO_ACTIVE_FLAGS);
+            }
         } else if (args.length == 2 || args.length == 3) {
             List<String> body;
             if (args.length == 3) {
                 if (!args[2].equals("full")) {
-                    commandSender.sendMiniMessage(getHelpMessage(), null);
+                    commandSender.sendRichMessage(getHelpMessage());
                     return true;
                 }
                 body = Config.PLAYER_FLAG_LIST_LONG;
-            } else
+            } else {
                 body = Config.PLAYER_FLAG_LIST_SHORT;
+            }
             OfflinePlayer player = Bukkit.getServer().getOfflinePlayerIfCached(args[1]);
             if (player == null) {
-                commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[1])));
+                commandSender.sendRichMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[1])));
                 return true;
             }
             new BukkitRunnable() {
@@ -66,8 +68,9 @@ public class CommandFlagList extends SubCommand {
                     sendFlagMessage(commandSender, player, body);
                 }
             }.runTask(LiteFlags.getInstance());
-        } else
+        } else {
-            commandSender.sendMiniMessage(getHelpMessage(), null);
+            commandSender.sendRichMessage(getHelpMessage());
+        }
         return true;
     }
 
@@ -79,11 +82,12 @@ public class CommandFlagList extends SubCommand {
     @Override
     public List<String> getTabComplete(CommandSender commandSender, String[] args) {
         ArrayList<String> res = new ArrayList<>();
-        if (args.length == 2)
+        if (args.length == 2) {
             res.addAll(Bukkit.getOnlinePlayers().stream()
                                .map(Player::getName)
                                .filter(name -> args[1].isEmpty() || name.toLowerCase().startsWith(args[1].toLowerCase()))
-                    .collect(Collectors.toList()));
+                               .toList());
+        }
         return res;
     }
 
@@ -106,44 +110,54 @@ public class CommandFlagList extends SubCommand {
             Component message = null;
             while (resultSet.next()) {
                 if (message == null) {
-                    message = miniMessage.deserialize(Config.PLAYER_FLAGS_HEADER, TemplateResolver.templates(List.of(
+                    message = miniMessage.deserialize(Config.PLAYER_FLAGS_HEADER, TagResolver.resolver(List.of(
-                            Template.template("player", targetName),
+                            Placeholder.unparsed("player", targetName),
-                            Template.template("flag_amount", String.valueOf(resultSet.getString("total_flags")))
+                            Placeholder.unparsed("flag_amount", String.valueOf(resultSet.getString("total_flags")))
                                                                                                               )));
                 }
-                long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time"));
+                int dbExpireTime = resultSet.getInt("expire_time");
-                long timeFlagged = TimeUnit.SECONDS.toMinutes(resultSet.getInt("time_flagged"));
+                Instant expireTime = dbExpireTime == 0 ? Instant.MIN : Instant.ofEpochSecond(dbExpireTime);
-                long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
+                //                long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time"));
-                int convertedExpireTime = (int) expireTime - (int) currentTime;
+                Instant timeFlagged = Instant.ofEpochSecond(resultSet.getInt("time_flagged"));
-                int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
+                //                long timeFlagged = TimeUnit.SECONDS.toMinutes(resultSet.getInt("time_flagged"));
+                Instant currentTime = Instant.now();
+                //                long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
+                Duration convertedExpireTime = Duration.between(currentTime, expireTime);
+                //                int convertedExpireTime = (int) expireTime - (int) currentTime;
+                Duration convertedFlaggedTime = Duration.between(currentTime, timeFlagged);
+                //                int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
                 String id = String.valueOf(resultSet.getInt("id"));
-                List<Template> templates = List.of(Template.template("player", targetPlayer.getName()),
+                TagResolver templates = TagResolver.resolver(Placeholder.unparsed("player", targetPlayer.getName()),
-                        Template.template("flag", resultSet.getString("reason")),
+                                                             Placeholder.unparsed("flag", resultSet.getString("reason")),
-                        Template.template("staff", resultSet.getString("flagged_by")),
+                                                             Placeholder.unparsed("staff", resultSet.getString("flagged_by")),
-                        Template.template("flag_length", resultSet.getString("flag_length")),
+                                                             Placeholder.unparsed("flag_length", resultSet.getString("flag_length")),
-                        Template.template("reason", resultSet.getString("reason")),
+                                                             Placeholder.unparsed("reason", resultSet.getString("reason")),
-                        Template.template("flag_time", Utilities.convertTime(convertedFlaggedTime)),
+                                                             Placeholder.unparsed("flag_time", Utilities.convertTime(convertedFlaggedTime)),
-                        Template.template("expire_time", Utilities.convertTime(convertedExpireTime)),
+                                                             Placeholder.unparsed("expire_time", Utilities.convertTime(convertedExpireTime)),
-                        Template.template("nl", "\n"),
+                                                             Placeholder.unparsed("nl", "\n"),
-                        Template.template("id", id)
+                                                             Placeholder.unparsed("id", id)
                                                             );
                 String str = String.join("\n", body)
                         .replaceAll("<remove_button>", "<white>" +
                                                        "<hover:show_text:\"Click to remove this flag\">" +
                                                        "<click:run_command:/flag remove " + id + " " + targetPlayer.getName() + ">" +
                                                        "[<red>✖</red>]</click></hover></white>");
-                if (convertedExpireTime < 0 && expireTime != 0L) //Not active
+                if (convertedExpireTime.isNegative() && !expireTime.equals(Instant.MIN)) //Not active
+                {
                     str = str.replaceAll("<active>", Config.EXPIRED_FLAGS);
-                else //Active
+                } else //Active
+                {
                     str = str.replaceAll("<active>", Config.ACTIVE_FLAGS);
+                }
                 str = "\n" + str;
                 Logger.info(str);
-                message = message.append(miniMessage.deserialize(str, TemplateResolver.templates(templates)));
+                message = message.append(miniMessage.deserialize(str, TagResolver.resolver(templates)));
             }
             if (message == null) {
-                commandSender.sendMiniMessage(Config.NO_FLAGS_FOUND, List.of(Template.template("target", targetName)));
+                commandSender.sendRichMessage(Config.NO_FLAGS_FOUND, TagResolver.resolver(Placeholder.unparsed("target", targetName)));
-            } else
+            } else {
                 commandSender.sendMessage(message);
+            }
         } catch (SQLException exception) {
             exception.printStackTrace();
         }

src/main/java/com/liteflags/commands/subcommands/CommandFlagPlayer.java

@@ -7,43 +7,49 @@ import com.liteflags.data.database.Database;
 import com.liteflags.data.database.Methods;
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.util.Utilities;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
+import java.util.Optional;
 
 public class CommandFlagPlayer extends SubCommand {
     @Override
     public boolean onCommand(CommandSender commandSender, String[] args) {
         if (args.length < 2) {
-            commandSender.sendMiniMessage(getHelpMessage(), null);
+            commandSender.sendRichMessage(getHelpMessage());
             return true;
         }
 
         OfflinePlayer target = Bukkit.getServer().getOfflinePlayerIfCached(args[0]);
         if (target == null) {
-            commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[2])));
+            commandSender.sendRichMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[0])));
             return true;
         }
 
         if (Config.MAX_ACTIVE_FLAGS >= 0 && Methods.getTotalActiveFlags(target) >= Config.MAX_ACTIVE_FLAGS) {
-            commandSender.sendMiniMessage(Config.ACTIVE_FLAGS_LIMIT, List.of(
+            commandSender.sendRichMessage(Config.ACTIVE_FLAGS_LIMIT, TagResolver.resolver(
-                    Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName())
+                    Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName())
                                                                                          ));
             return true;
         }
 
         if (args[1].equals("*")) {
+            if (!commandSender.hasPermission(getPermission() + ".variable-time")) {
+                commandSender.sendRichMessage(Config.VARIABLE_LENGTH_NOT_ALLOWED);
+                return true;
+            }
             permFlag(commandSender, args, target);
         } else {
             tempFlag(commandSender, args, target);
@@ -57,7 +63,7 @@ public class CommandFlagPlayer extends SubCommand {
             return;
         }
 
-        String reason = String.join(" ", Arrays.copyOfRange(args, 3, args.length));
+        String reason = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
 
         new BukkitRunnable() {
             @Override
@@ -70,11 +76,11 @@ public class CommandFlagPlayer extends SubCommand {
             MapCache.activeFlags.add(target.getName());
         }
 
-        Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TemplateResolver.templates(List.of(
+        ComponentLike message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TagResolver.resolver(List.of(
-                Template.template("staff", sender.getName()),
+                Placeholder.unparsed("staff", sender.getName()),
-                Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
+                Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
-                Template.template("flag_length", "Permanent"),
+                Placeholder.unparsed("flag_length", "Permanent"),
-                Template.template("reason", reason)
+                Placeholder.unparsed("reason", reason)
                                                                                                                          )));
 
         Bukkit.getOnlinePlayers().stream()
@@ -83,29 +89,28 @@ public class CommandFlagPlayer extends SubCommand {
     }
 
     private void tempFlag(CommandSender commandSender, String[] args, OfflinePlayer target) {
-        if (args[1].length() < 2) {
+        Optional<Duration> flagDurationIfExists = getFlagDurationIfExists(args[1]);
-            commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, List.of(Template.template("arg", args[1])));
+        Instant expireTime = Instant.now();
+        int firstArg = 2;
+        Duration flagDuration;
+        if (flagDurationIfExists.isPresent() && !commandSender.hasPermission(getPermission() + ".variable-time")) {
+            commandSender.sendRichMessage(Config.VARIABLE_LENGTH_NOT_ALLOWED);
             return;
         }
-
+        if (flagDurationIfExists.isEmpty()) {
-        String time = args[1].substring(0, args[1].length() - 1);
+            firstArg = 1;
-        String letter = args[1].substring(args[1].length() - 1);
+            flagDuration = Duration.ofDays(Config.DEFAULT_FLAG_LENGTH_DAYS);
-        String[] validTimes = new String[]{"d", "h", "m"};
+        } else {
-        if (!time.matches("[1-9][0-9]{0,8}") || !Arrays.asList(validTimes).contains(letter)) {
+            flagDuration = flagDurationIfExists.get();
-            commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, List.of(Template.template("arg", args[1])));
-            return;
         }
+        expireTime = expireTime.plusSeconds(flagDuration.toSeconds());
+        String reason = String.join(" ", Arrays.copyOfRange(args, firstArg, args.length));
 
-        int number = Integer.parseInt(time);
+        Instant finalExpireTime = expireTime;
-        int timeInMin = this.convertTimeToMinutes(number, letter);
-        long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
-        int conTime = (int) currentTime + timeInMin;
-        String reason = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
-
         new BukkitRunnable() {
             @Override
             public void run() {
-                Database.addFlag(target.getUniqueId(), (int) TimeUnit.MINUTES.toSeconds(conTime), reason, commandSender.getName(), Utilities.convertTime(timeInMin));
+                Database.addFlag(target.getUniqueId(), finalExpireTime, reason, commandSender.getName(), Utilities.convertTime(flagDuration));
             }
         }.runTask(LiteFlags.getInstance());
 
@@ -113,11 +118,11 @@ public class CommandFlagPlayer extends SubCommand {
             MapCache.activeFlags.add(target.getName());
         }
 
-        Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TemplateResolver.templates(List.of(
+        ComponentLike message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TagResolver.resolver(List.of(
-                Template.template("staff", commandSender.getName()),
+                Placeholder.unparsed("staff", commandSender.getName()),
-                Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
+                Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
-                Template.template("flag_length", Utilities.convertTime(timeInMin)),
+                Placeholder.unparsed("flag_length", Utilities.convertTime(flagDuration)),
-                Template.template("reason", reason)
+                Placeholder.unparsed("reason", reason)
                                                                                                                          )));
 
         Bukkit.getOnlinePlayers().stream()
@@ -125,11 +130,36 @@ public class CommandFlagPlayer extends SubCommand {
                 .forEach(player -> player.sendMessage(message));
     }
 
-    public int convertTimeToMinutes(int number, String dhm) {
+    Optional<Duration> getFlagDurationIfExists(String timeArg) {
-        if (dhm.equalsIgnoreCase("d")) {
+        if (timeArg.length() < 2) {
-            return 1440 * number;
+            return Optional.empty();
-        } else {
+        }
-            return dhm.equalsIgnoreCase("h") ? 60 * number : number;
+
+        String time = timeArg.substring(0, timeArg.length() - 1);
+        String letter = timeArg.substring(timeArg.length() - 1);
+        String[] validTimes = new String[]{"d", "h", "m"};
+        if (!time.matches("[1-9][0-9]{0,8}") || !Arrays.asList(validTimes).contains(letter)) {
+            return Optional.empty();
+        }
+
+        int number = Integer.parseInt(time);
+        return convertTimeToExpireTime(number, letter);
+    }
+
+    public Optional<Duration> convertTimeToExpireTime(int number, String dhm) {
+        switch (dhm.toLowerCase()) {
+            case "d" -> {
+                return Optional.of(Duration.ofDays(number));
+            }
+            case "h" -> {
+                return Optional.of(Duration.ofHours(number));
+            }
+            case "m" -> {
+                return Optional.of(Duration.ofMinutes(number));
+            }
+            default -> {
+                return Optional.empty();
+            }
         }
     }
 
@@ -141,11 +171,13 @@ public class CommandFlagPlayer extends SubCommand {
     @Override
     public List<String> getTabComplete(CommandSender commandSender, String[] args) {
         ArrayList<String> res = new ArrayList<>();
-        if (args.length == 2)
+        if (args.length == 2 && commandSender.hasPermission(getPermission() + ".variable-time")) {
             for (int i = 1; i <= 9; i++) {
-                if (args[1].isEmpty() || args[1].startsWith(String.valueOf(i)))
+                if (args[1].isEmpty() || args[1].startsWith(String.valueOf(i))) {
                     res.add(i + "d");
                 }
+            }
+        }
         return res;
     }
 

src/main/java/com/liteflags/commands/subcommands/CommandFlagRemove.java

@@ -4,8 +4,8 @@ import com.liteflags.commands.SubCommand;
 import com.liteflags.config.Config;
 import com.liteflags.data.database.Database;
 import com.liteflags.util.Logger;
-import com.liteflags.util.Utilities;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -20,42 +20,42 @@ public class CommandFlagRemove extends SubCommand {
         OfflinePlayer target = Bukkit.getServer().getOfflinePlayerIfCached(args[2]);
 
         if (target == null) {
-            commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[2])));
+            commandSender.sendRichMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[2])));
             return true;
         }
         if (args.length == 4) {
             if (args[3].isEmpty() || !args[3].equalsIgnoreCase("-c")) {
-                commandSender.sendMiniMessage(getHelpMessage(), null);
+                commandSender.sendRichMessage(getHelpMessage());
                 return true;
             }
             String flagReason = Database.getFlagReason(target.getUniqueId(), id);
             flagReason = flagReason == null ? "Flag not found" : flagReason;
             if (Database.removeFlag(target.getUniqueId(), id)) {
-                commandSender.sendMiniMessage(Config.FLAG_REMOVED, List.of(
+                commandSender.sendRichMessage(Config.FLAG_REMOVED, TagResolver.resolver(
-                        Template.template("flag_reason", flagReason),
+                        Placeholder.unparsed("flag_reason", flagReason),
-                        Template.template("target", target.getName() == null ? target.getUniqueId().toString() : target.getName())
+                        Placeholder.unparsed("target", target.getName() == null ? target.getUniqueId().toString() : target.getName())
                                                                                        ));
                 Logger.info("% has removed the flag '%' from %'s flag history.", commandSender.getName(), flagReason, target.getName());
             } else {
-                commandSender.sendMiniMessage(Config.NO_FLAG_FOUND, List.of(
+                commandSender.sendRichMessage(Config.NO_FLAG_FOUND, TagResolver.resolver(
-                        Template.template("target", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
+                        Placeholder.unparsed("target", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
-                        Template.template("id", String.valueOf(id))
+                        Placeholder.unparsed("id", String.valueOf(id))
                                                                                         ));
             }
         } else if (args.length == 3) {
             String flagReason = Database.getFlagReason(target.getUniqueId(), id);
             String name = target.getName();
-//            commandSender.sendMiniMessage("<white>Are you sure you want to remove the flag <flag_reason> from " +
+            //            commandSender.sendRichMessage("<white>Are you sure you want to remove the flag <flag_reason> from " +
-//                    "<yellow><target_name></yellow>'s flag history? " +
+            //                    "<yellow><target_name></yellow>'s flag history? " +
-//                    "<hover:Click to confirm><click:run_command:/flag remove " + id + " " + target.getName() + " -c>[<green>Confirm</green>]</click></hover></white>", List.of(
+            //                    "<hover:Click to confirm><click:run_command:/flag remove " + id + " " + target.getName() + " -c>[<green>Confirm</green>]</click></hover></white>", List.of(
-//                    Template.template("flag_reason", flagReason == null ? "Unknown" : flagReason),
+            //                    Placeholder.unparsed("flag_reason", flagReason == null ? "Unknown" : flagReason),
-//                    Template.template("target_name", name == null ? target.getUniqueId().toString() : name),
+            //                    Placeholder.unparsed("target_name", name == null ? target.getUniqueId().toString() : name),
-//                    Template.template("id", String.valueOf(id))
+            //                    Placeholder.unparsed("id", String.valueOf(id))
-//            ));
+            //            ));
-            commandSender.sendMiniMessage(Config.FLAG_CONFIRM, List.of(
+            commandSender.sendRichMessage(Config.FLAG_CONFIRM, TagResolver.resolver(
-                    Template.template("flag_reason", flagReason == null ? "Unknown" : flagReason),
+                    Placeholder.parsed("flag_reason", flagReason == null ? "Unknown" : flagReason),
-                    Template.template("target_name", name == null ? target.getUniqueId().toString() : name),
+                    Placeholder.parsed("target_name", name == null ? target.getUniqueId().toString() : name),
-                    Template.template("id", String.valueOf(id))
+                    Placeholder.parsed("id", String.valueOf(id))
                                                                                    ));
         }
         return true;

src/main/java/com/liteflags/commands/subcommands/CommandHelp.java

@@ -3,8 +3,6 @@ package com.liteflags.commands.subcommands;
 import com.liteflags.commands.CommandManager;
 import com.liteflags.commands.SubCommand;
 import com.liteflags.config.Config;
-import com.liteflags.util.Utilities;
-import net.kyori.adventure.text.minimessage.Template;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
@@ -22,10 +20,10 @@ public class CommandHelp extends SubCommand {
 
     @Override
     public boolean onCommand(CommandSender commandSender, String[] args) {
-        commandSender.sendMiniMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", commandManager.getSubCommands().stream()
+        commandSender.sendRichMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", commandManager.getSubCommands().stream()
                 .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
                 .map(SubCommand::getHelpMessage)
-                .collect(Collectors.joining("\n"))), null);
+                .collect(Collectors.joining("\n"))));
         return true;
     }
 

src/main/java/com/liteflags/commands/subcommands/CommandReload.java

@@ -2,7 +2,6 @@ package com.liteflags.commands.subcommands;
 
 import com.liteflags.commands.SubCommand;
 import com.liteflags.config.Config;
-import com.liteflags.util.Utilities;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
@@ -12,7 +11,7 @@ public class CommandReload extends SubCommand {
     @Override
     public boolean onCommand(CommandSender commandSender, String[] args) {
         Config.reload();
-        commandSender.sendMiniMessage(Config.CONFIG_RELOADED, null);
+        commandSender.sendRichMessage(Config.CONFIG_RELOADED);
         return false;
     }
 

src/main/java/com/liteflags/config/AbstractConfig.java

@@ -114,8 +114,7 @@ abstract class AbstractConfig {
         final ConfigurationSection section = yaml.getConfigurationSection(path);
         if (section != null) {
             for (String key : section.getKeys(false)) {
-                @SuppressWarnings("unchecked")
+                @SuppressWarnings("unchecked") final T val = (T) section.get(key);
-                final T val = (T) section.get(key);
                 if (val != null) {
                     builder.put(key, val);
                 }

src/main/java/com/liteflags/config/Config.java

@@ -9,8 +9,9 @@ public final class Config extends AbstractConfig {
 
     static Config config;
     static int version;
+
     public Config() {
-        super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs" + File.separator + "LiteFlags"), "config.yml");
+        super(new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "LiteFlags"), "config.yml");
     }
 
     public static void reload() {
@@ -51,13 +52,16 @@ public final class Config extends AbstractConfig {
     public static String FLAG_CONFIRM = "<white>Are you sure you want to remove the flag <flag_reason> from " +
                                         "<yellow><target_name></yellow>'s flag history? " +
                                         "<hover:show_text:\"Click to confirm\"><click:run_command:\"/flag remove <id> <target_name> -c\">[<green>Confirm</green>]</click></hover></white>";
+    public static String VARIABLE_LENGTH_NOT_ALLOWED = "<red>You do not have permission to set a flag at a custom length</red>";
+
     private static void loadMessages() {
         ALERT_ACTIVE_FLAGS = config.getString("messages.alert-active-flags", ALERT_ACTIVE_FLAGS);
         PLAYER_FLAGS_HEADER = config.getString("messages.player-flags-header", PLAYER_FLAGS_HEADER);
         PLAYER_FLAG_LIST_SHORT = config.getList("messages.player-flag-list-short", PLAYER_FLAG_LIST_SHORT).stream()
                 .filter(object -> object instanceof String) //TODO check if this is needed
                 .map(object -> Objects.toString(object, null))
-                .collect(Collectors.toList());;
+                .collect(Collectors.toList());
+        ;
         PLAYER_FLAG_LIST_LONG = config.getList("messages.player-flag-list-long", PLAYER_FLAG_LIST_LONG).stream()
                 .filter(object -> object instanceof String) //TODO check if this is needed
                 .map(object -> Objects.toString(object, null))
@@ -79,6 +83,7 @@ public final class Config extends AbstractConfig {
         NO_FLAG_FOUND = config.getString("messages.no-flag-found", NO_FLAG_FOUND);
         INVALID_TIME_ARGUMENT = config.getString("messages.invalid-time-argument", INVALID_TIME_ARGUMENT);
         FLAG_CONFIRM = config.getString("messages.flag-confirm", FLAG_CONFIRM);
+        VARIABLE_LENGTH_NOT_ALLOWED = config.getString("messages.variable-length-not-allowed", VARIABLE_LENGTH_NOT_ALLOWED);
     }
 
     public static String HELP_MESSAGE_WRAPPER = "<gold>LiteFlags help:\n<commands></gold>";
@@ -90,6 +95,7 @@ public final class Config extends AbstractConfig {
     public static String HELP_FLAG_REMOVE = "<green><gold>/flag remove <player> <id>></gold>: Remove a specific flag from a player " +
                                             "(easier to use from /flag list <player>)";
     public static String HELP_RELOAD = "<green><gold>/flag reload</gold>: Reload the config for LiteFlags</green>";
+
     private static void loadHelp() {
         HELP_MESSAGE_WRAPPER = config.getString("help.help-wrapper", HELP_MESSAGE_WRAPPER);
         HELP_MESSAGE = config.getString("help.help", HELP_MESSAGE);
@@ -104,6 +110,7 @@ public final class Config extends AbstractConfig {
     public static String USERNAME = "root";
     public static String PASSWORD = "root";
     public static String DRIVERS = "mysql";
+
     private static void loadDatabaseSettings() {
         IP = config.getString("database.ip", IP);
         PORT = config.getString("database.port", PORT);
@@ -121,6 +128,8 @@ public final class Config extends AbstractConfig {
     public static String TIME_FORMAT = "Days";
     public static String AUTH_MESSAGE_COMMAND = "cmi titlemessage <player> -keep:80 &7You need to authenticate! <nl>&7Type &6<code> &7in chat to authenticate. (CaSe SeNsiTiVe)";
     public static String AUTH_SUCCESS_COMMAND = "lp user <player> permission settemp <permission> true <expire_time>";
+    public static int DEFAULT_FLAG_LENGTH_DAYS = 30;
+
     private static void loadSettings() {
         MAX_ACTIVE_FLAGS = config.getInt("settings.max-active-flags", MAX_ACTIVE_FLAGS);
         MAX_FLAGS_LISTED = config.getInt("settings.max-flags-listed", MAX_FLAGS_LISTED);
@@ -130,6 +139,7 @@ public final class Config extends AbstractConfig {
         TIME_FORMAT = config.getString("settings.time-format", TIME_FORMAT);
         AUTH_MESSAGE_COMMAND = config.getString("settings.auth-message-command", AUTH_MESSAGE_COMMAND);
         AUTH_SUCCESS_COMMAND = config.getString("settings.auth-success-command", AUTH_SUCCESS_COMMAND);
+        DEFAULT_FLAG_LENGTH_DAYS = config.getInt("settings.default-flag-length-days", DEFAULT_FLAG_LENGTH_DAYS);
     }
 
 }

src/main/java/com/liteflags/data/database/Database.java

@@ -6,7 +6,9 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.time.Instant;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 public class Database {
     public static void createTables() {
@@ -43,6 +45,26 @@ public class Database {
 
     }
 
+    public static void addFlag(UUID uuid, Instant expireTime, String reason, String flaggedBy, String flagLength) {
+        int timeFlagged = (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis());
+        String sql = "INSERT INTO player_flags (uuid, expire_time, reason, flagged_by, time_flagged, flag_length) VALUES (?, ?, ?, ?, ?, ?)";
+
+        try {
+            PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
+
+            statement.setString(1, uuid.toString());
+            statement.setLong(2, expireTime.getEpochSecond());
+            statement.setString(3, reason);
+            statement.setString(4, flaggedBy);
+            statement.setInt(5, timeFlagged);
+            statement.setString(6, flagLength);
+            statement.execute();
+        } catch (SQLException var21) {
+            var21.printStackTrace();
+        }
+
+    }
+
     public static boolean removeFlag(UUID uuid, int id) {
         String sql = "DELETE FROM player_flags WHERE uuid = ? AND id = ?";
 
@@ -50,8 +72,9 @@ public class Database {
             PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
             statement.setString(1, uuid.toString());
             statement.setInt(2, id);
-            if (statement.executeUpdate() > 0)
+            if (statement.executeUpdate() > 0) {
                 return true;
+            }
         } catch (SQLException var16) {
             var16.printStackTrace();
         }
@@ -90,18 +113,18 @@ public class Database {
         }
 
     }
-//
+    //
-//    public static boolean hasFlag(UUID uuid, int id) {
+    //    public static boolean hasFlag(UUID uuid, int id) {
-//        try {
+    //        try {
-//            if (getStringResult("SELECT * FROM player_flags WHERE uuid = ?", uuid.toString()).next()) {
+    //            if (getStringResult("SELECT * FROM player_flags WHERE uuid = ?", uuid.toString()).next()) {
-//                return true;
+    //                return true;
-//            }
+    //            }
-//        } catch (SQLException var2) {
+    //        } catch (SQLException var2) {
-//            var2.printStackTrace();
+    //            var2.printStackTrace();
-//        }
+    //        }
-//
+    //
-//        return false;
+    //        return false;
-//    }
+    //    }
 
     public static void addPlayerCache(UUID uuid, String playerName) {
         String sql = "INSERT INTO player_cache (uuid, player_name) VALUES (?, ?) ON DUPLICATE KEY UPDATE player_name = ?";

src/main/java/com/liteflags/events/ChatEvent.java

@@ -6,8 +6,8 @@ import com.liteflags.data.database.Database;
 import com.liteflags.data.database.Methods;
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.util.Logger;
-import com.liteflags.util.Utilities;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -15,7 +15,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class ChatEvent implements Listener {
@@ -33,7 +32,7 @@ public class ChatEvent implements Listener {
         if (e.getMessage().equals(value)) {
             e.setCancelled(true);
 
-            player.sendMiniMessage(Config.AUTHENTICATE_SUCCESS, null);
+            player.sendRichMessage(Config.AUTHENTICATE_SUCCESS);
 
             final int min = Config.MIN_RANDOM_RE_AUTH;
             final int max = Config.MAX_RANDOM_RE_AUTH;
@@ -69,8 +68,8 @@ public class ChatEvent implements Listener {
 
         } else {
             e.setCancelled(true);
-            player.sendMiniMessage(Config.AUTHENTICATE_FAILED, List.of(
+            player.sendRichMessage(Config.AUTHENTICATE_FAILED, TagResolver.resolver(
-                    Template.template("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
+                    Placeholder.unparsed("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
             Logger.info(player.getName() + " tried talking while authenticating: " + e.getMessage());
         }
     }

src/main/java/com/liteflags/events/LoginEvent.java

@@ -5,10 +5,10 @@ import com.liteflags.auth.Authentication;
 import com.liteflags.config.Config;
 import com.liteflags.data.database.Methods;
 import com.liteflags.data.maps.MapCache;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -36,11 +36,11 @@ public class LoginEvent implements Listener {
 
                 MapCache.activeFlags.add(player.getName());
 
-                Component message = MiniMessage.miniMessage().deserialize(Config.ALERT_ACTIVE_FLAGS, TemplateResolver.templates(List.of(
+                ComponentLike message = MiniMessage.miniMessage().deserialize(Config.ALERT_ACTIVE_FLAGS, TagResolver.resolver(List.of(
-                        Template.template("player", player.getName()),
+                        Placeholder.parsed("player", player.getName()),
-                        Template.template("total_act_flags", String.valueOf(Methods.getTotalActiveFlags(player))),
+                        Placeholder.unparsed("total_act_flags", String.valueOf(Methods.getTotalActiveFlags(player))),
-                        Template.template("console_flags", String.valueOf(Methods.consoleFlags)),
+                        Placeholder.unparsed("console_flags", String.valueOf(Methods.consoleFlags)),
-                        Template.template("staff_flags", String.valueOf(Methods.staffFlags))
+                        Placeholder.unparsed("staff_flags", String.valueOf(Methods.staffFlags))
                                                                                                                                      )));
 
                 Bukkit.getOnlinePlayers().stream()

src/main/java/com/liteflags/events/MoveEvent.java

@@ -10,7 +10,8 @@ public class MoveEvent implements Listener {
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent e) {
         Player player = e.getPlayer();
-        if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString()))
+        if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
             e.setCancelled(true);
         }
+    }
 }

src/main/java/com/liteflags/util/Logger.java

@@ -10,24 +10,21 @@ public class Logger {
         logger = LiteFlags.getInstance().getLogger();
     }
 
-    public static void info(String info, String... variables)
+    public static void info(String info, String... variables) {
-    {
         for (String variable : variables) {
             info = info.replaceFirst("%", variable);
         }
         logger.info(info);
     }
 
-    public static void warning(String warning, String... variables)
+    public static void warning(String warning, String... variables) {
-    {
         for (String variable : variables) {
             warning = warning.replaceFirst("%", variable);
         }
         logger.warning(warning);
     }
 
-    public static void severe(String severe, String... variables)
+    public static void severe(String severe, String... variables) {
-    {
         for (String variable : variables) {
             severe = severe.replaceFirst("%", variable);
         }

src/main/java/com/liteflags/util/Utilities.java

@@ -1,18 +1,20 @@
 package com.liteflags.util;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 public class Utilities {
-    public static String convertTime(int time) {
+    public static String convertTime(Duration time) {
-        int days = (int) TimeUnit.MINUTES.toDays(time);
+        int days = Math.abs((int) time.toDaysPart());
-        int hours = (int) (TimeUnit.MINUTES.toHours(time) - TimeUnit.DAYS.toHours(days));
+        int hours = Math.abs(time.toHoursPart());
-        int minutes = (int) (TimeUnit.MINUTES.toMinutes(time) - TimeUnit.HOURS.toMinutes(hours) - TimeUnit.DAYS.toMinutes(days));
+        int minutes = Math.abs(time.toMinutesPart());
 
         String timeString = formatTime(days, " day");
-        timeString += (timeString.length() == 0 ? "" : ", ") + formatTime(hours, " hour");
+        timeString += (timeString.length() == 0 ? "" : (hours == 0 ? "" : ", ")) + formatTime(hours, " hour");
-        timeString += (timeString.length() == 0 ? "" : ", ") + formatTime(minutes, " minute");
+        timeString += (timeString.length() == 0 ? "" : (minutes == 0 ? "" : ", ")) + formatTime(minutes, " minute");
 
-        if (timeString.length() == 0) timeString = "0 minutes";
+        if (timeString.length() == 0) {
+            timeString = "0 minutes";
+        }
 
         return timeString;
     }