Change default config file location

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.

build.gradle.kts

@@ -0,0 +1,48 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+
+plugins {
+    id("java")
+    id("com.github.johnrengelman.shadow") version "7.1.0"
+}
+
+group = "com.alttd"
+version = "1.0.0-SNAPSHOT"
+description = "Altitude player flag plugin."
+
+apply<JavaLibraryPlugin>()
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+tasks {
+    withType<JavaCompile> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+
+    withType<Javadoc> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+
+    shadowJar {
+        dependsOn(getByName("relocateJars") as ConfigureShadowRelocation)
+        archiveFileName.set("${project.name}-${project.version}.jar")
+        minimize()
+        configurations = listOf(project.configurations.shadow.get())
+    }
+
+    build {
+        dependsOn(shadowJar)
+    }
+
+    create<ConfigureShadowRelocation>("relocateJars") {
+        target = shadowJar.get()
+        prefix = "${project.name}.lib"
+    }
+}
+
+dependencies {
+    compileOnly("com.alttd:Galaxy-API:1.19-R0.1-SNAPSHOT")
+}

gradlew

@@ -0,0 +1,234 @@
+#!/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 \
+        "$@"
+
+# 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,89 @@
+@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%" == "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%"=="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
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pom.xml

@@ -35,16 +35,15 @@
 
     <repositories>
         <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <id>Alttd-Nexus</id>
+            <url>https://repo.destro.xyz/snapshots</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><!-- Galaxy -->
+            <groupId>com.alttd</groupId>
+            <artifactId>Galaxy-API</artifactId>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     

settings.gradle.kts

@@ -0,0 +1,19 @@
+rootProject.name = "LiteFlags"
+
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
+        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/auth/AuthTimer.java

@@ -3,14 +3,14 @@ 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 java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-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.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -36,8 +36,8 @@ public class AuthTimer<taskID> {
                         final String code = MapCache.reauthedPlayers.get(uuid);
                         if (code == null)
                             return;
-                        player.sendMiniMessage(Config.AUTHENTICATE, List.of(
-                                Template.template("code", code)));
+                        player.sendMiniMessage(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

@@ -2,8 +2,8 @@ package com.liteflags.auth;
 
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.config.Config;
-import com.liteflags.util.Utilities;
-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;
@@ -15,8 +15,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));
         }
 
@@ -30,7 +39,7 @@ public class Authentication {
         MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey());
         AuthTimer.startTimer(player);
         player.sendMiniMessage(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;

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.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -20,6 +20,8 @@ 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;
@@ -36,11 +38,11 @@ public class CommandFlagList extends SubCommand {
                         Logger.warning("% is not a flagged player", playerName);
                         return;
                     }
-                    commandSender.sendMiniMessage(Config.ALERT_ACTIVE_FLAGS, List.of(
-                            Template.template("player", player.getName() == null ? playerName : player.getName()),
-                            Template.template("total_act_flags", String.valueOf( Methods.getTotalActiveFlags(player))),
-                            Template.template("console_flags", String.valueOf(Methods.consoleFlags)),
-                            Template.template("staff_flags", String.valueOf(Methods.staffFlags))
+                    commandSender.sendMiniMessage(Config.ALERT_ACTIVE_FLAGS, TagResolver.resolver(
+                            Placeholder.parsed("player", player.getName() == null ? playerName : player.getName()),
+                            Placeholder.unparsed("total_act_flags", String.valueOf( Methods.getTotalActiveFlags(player))),
+                            Placeholder.unparsed("console_flags", String.valueOf(Methods.consoleFlags)),
+                            Placeholder.unparsed("staff_flags", String.valueOf(Methods.staffFlags))
                     ));
                 });
             } else
@@ -57,7 +59,7 @@ public class CommandFlagList extends SubCommand {
                 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.sendMiniMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[1])));
                 return true;
             }
             new BukkitRunnable() {
@@ -83,7 +85,7 @@ public class CommandFlagList extends SubCommand {
             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,42 +108,48 @@ 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(
-                            Template.template("player", targetName),
-                            Template.template("flag_amount", String.valueOf(resultSet.getString("total_flags")))
+                    message = miniMessage.deserialize(Config.PLAYER_FLAGS_HEADER, TagResolver.resolver(List.of(
+                            Placeholder.unparsed("player", targetName),
+                            Placeholder.unparsed("flag_amount", String.valueOf(resultSet.getString("total_flags")))
                     )));
                 }
-                long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time"));
-                long timeFlagged = TimeUnit.SECONDS.toMinutes(resultSet.getInt("time_flagged"));
-                long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
-                int convertedExpireTime = (int) expireTime - (int) currentTime;
-                int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
+                int dbExpireTime = resultSet.getInt("expire_time");
+                Instant expireTime = dbExpireTime == 0 ? Instant.MIN : Instant.ofEpochSecond(dbExpireTime);
+//                long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time"));
+                Instant timeFlagged = Instant.ofEpochSecond(resultSet.getInt("time_flagged"));
+//                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()),
-                        Template.template("flag", resultSet.getString("reason")),
-                        Template.template("staff", resultSet.getString("flagged_by")),
-                        Template.template("flag_length", resultSet.getString("flag_length")),
-                        Template.template("reason", resultSet.getString("reason")),
-                        Template.template("flag_time", Utilities.convertTime(convertedFlaggedTime)),
-                        Template.template("expire_time", Utilities.convertTime(convertedExpireTime)),
-                        Template.template("nl", "\n"),
-                        Template.template("id", id)
+                TagResolver templates = TagResolver.resolver(Placeholder.unparsed("player", targetPlayer.getName()),
+                        Placeholder.unparsed("flag", resultSet.getString("reason")),
+                        Placeholder.unparsed("staff", resultSet.getString("flagged_by")),
+                        Placeholder.unparsed("flag_length", resultSet.getString("flag_length")),
+                        Placeholder.unparsed("reason", resultSet.getString("reason")),
+                        Placeholder.unparsed("flag_time", Utilities.convertTime(convertedFlaggedTime)),
+                        Placeholder.unparsed("expire_time", Utilities.convertTime(convertedExpireTime)),
+                        Placeholder.unparsed("nl", "\n"),
+                        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
                     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.sendMiniMessage(Config.NO_FLAGS_FOUND, TagResolver.resolver(Placeholder.unparsed("target", targetName)));
             } else
                 commandSender.sendMessage(message);
         } catch (SQLException exception) {

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

@@ -9,17 +9,20 @@ import com.liteflags.data.maps.MapCache;
 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.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+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.Optional;
 import java.util.concurrent.TimeUnit;
 
 public class CommandFlagPlayer extends SubCommand {
@@ -32,18 +35,22 @@ public class CommandFlagPlayer extends SubCommand {
 
         OfflinePlayer target = Bukkit.getServer().getOfflinePlayerIfCached(args[0]);
         if (target == null) {
-            commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[2])));
+            commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[2])));
             return true;
         }
 
         if (Config.MAX_ACTIVE_FLAGS >= 0 && Methods.getTotalActiveFlags(target) >= Config.MAX_ACTIVE_FLAGS) {
-            commandSender.sendMiniMessage(Config.ACTIVE_FLAGS_LIMIT, List.of(
-                    Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName())
+            commandSender.sendMiniMessage(Config.ACTIVE_FLAGS_LIMIT, TagResolver.resolver(
+                    Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName())
             ));
             return true;
         }
 
         if (args[1].equals("*")) {
+            if (!commandSender.hasPermission(getPermission() + ".variable-time")) {
+                commandSender.sendMiniMessage(Config.VARIABLE_LENGTH_NOT_ALLOWED, null);
+                return true;
+            }
             permFlag(commandSender, args, target);
         } else {
             tempFlag(commandSender, args, target);
@@ -57,7 +64,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 +77,11 @@ public class CommandFlagPlayer extends SubCommand {
             MapCache.activeFlags.add(target.getName());
         }
 
-        Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TemplateResolver.templates(List.of(
-                Template.template("staff", sender.getName()),
-                Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
-                Template.template("flag_length", "Permanent"),
-                Template.template("reason", reason)
+        Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TagResolver.resolver(List.of(
+                Placeholder.unparsed("staff", sender.getName()),
+                Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
+                Placeholder.unparsed("flag_length", "Permanent"),
+                Placeholder.unparsed("reason", reason)
         )));
 
         Bukkit.getOnlinePlayers().stream()
@@ -83,29 +90,28 @@ public class CommandFlagPlayer extends SubCommand {
     }
 
     private void tempFlag(CommandSender commandSender, String[] args, OfflinePlayer target) {
-        if (args[1].length() < 2) {
-            commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, List.of(Template.template("arg", args[1])));
+        Optional<Duration> flagDurationIfExists = getFlagDurationIfExists(args[1]);
+        Instant expireTime = Instant.now();
+        int firstArg = 2;
+        Duration flagDuration;
+        if (flagDurationIfExists.isPresent() && !commandSender.hasPermission(getPermission() + ".variable-time")) {
+            commandSender.sendMiniMessage(Config.VARIABLE_LENGTH_NOT_ALLOWED, null);
             return;
         }
-
-        String time = args[1].substring(0, args[1].length() - 1);
-        String letter = args[1].substring(args[1].length() - 1);
-        String[] validTimes = new String[]{"d", "h", "m"};
-        if (!time.matches("[1-9][0-9]{0,8}") || !Arrays.asList(validTimes).contains(letter)) {
-            commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, List.of(Template.template("arg", args[1])));
-            return;
+        if (flagDurationIfExists.isEmpty()) {
+            firstArg = 1;
+            flagDuration = Duration.ofDays(Config.DEFAULT_FLAG_LENGTH_DAYS);
+        } else {
+            flagDuration = flagDurationIfExists.get();
         }
+        expireTime = expireTime.plusSeconds(flagDuration.toSeconds());
+        String reason = String.join(" ", Arrays.copyOfRange(args, firstArg, args.length));
 
-        int number = Integer.parseInt(time);
-        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));
-
+        Instant finalExpireTime = expireTime;
         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 +119,11 @@ public class CommandFlagPlayer extends SubCommand {
             MapCache.activeFlags.add(target.getName());
         }
 
-        Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TemplateResolver.templates(List.of(
-                Template.template("staff", commandSender.getName()),
-                Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
-                Template.template("flag_length", Utilities.convertTime(timeInMin)),
-                Template.template("reason", reason)
+        Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TagResolver.resolver(List.of(
+                Placeholder.unparsed("staff", commandSender.getName()),
+                Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
+                Placeholder.unparsed("flag_length", Utilities.convertTime(flagDuration)),
+                Placeholder.unparsed("reason", reason)
         )));
 
         Bukkit.getOnlinePlayers().stream()
@@ -125,11 +131,36 @@ public class CommandFlagPlayer extends SubCommand {
                 .forEach(player -> player.sendMessage(message));
     }
 
-    public int convertTimeToMinutes(int number, String dhm) {
-        if (dhm.equalsIgnoreCase("d")) {
-            return 1440 * number;
-        } else {
-            return dhm.equalsIgnoreCase("h") ? 60 * number : number;
+    Optional<Duration> getFlagDurationIfExists(String timeArg) {
+        if (timeArg.length() < 2) {
+            return Optional.empty();
+        }
+
+        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,7 +172,7 @@ 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)))
                     res.add(i + "d");

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.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -20,7 +20,7 @@ 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.sendMiniMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[2])));
             return true;
         }
         if (args.length == 4) {
@@ -31,15 +31,15 @@ public class CommandFlagRemove extends SubCommand {
             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(
-                        Template.template("flag_reason", flagReason),
-                        Template.template("target", target.getName() == null ? target.getUniqueId().toString() : target.getName())
+                commandSender.sendMiniMessage(Config.FLAG_REMOVED, TagResolver.resolver(
+                        Placeholder.unparsed("flag_reason", flagReason),
+                        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(
-                        Template.template("target", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
-                        Template.template("id", String.valueOf(id))
+                commandSender.sendMiniMessage(Config.NO_FLAG_FOUND, TagResolver.resolver(
+                        Placeholder.unparsed("target", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
+                        Placeholder.unparsed("id", String.valueOf(id))
                 ));
             }
         } else if (args.length == 3) {
@@ -48,14 +48,14 @@ public class CommandFlagRemove extends SubCommand {
 //            commandSender.sendMiniMessage("<white>Are you sure you want to remove the flag <flag_reason> from " +
 //                    "<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(
-//                    Template.template("flag_reason", flagReason == null ? "Unknown" : flagReason),
-//                    Template.template("target_name", name == null ? target.getUniqueId().toString() : name),
-//                    Template.template("id", String.valueOf(id))
+//                    Placeholder.unparsed("flag_reason", flagReason == null ? "Unknown" : flagReason),
+//                    Placeholder.unparsed("target_name", name == null ? target.getUniqueId().toString() : name),
+//                    Placeholder.unparsed("id", String.valueOf(id))
 //            ));
-            commandSender.sendMiniMessage(Config.FLAG_CONFIRM, List.of(
-                    Template.template("flag_reason", flagReason == null ? "Unknown" : flagReason),
-                    Template.template("target_name", name == null ? target.getUniqueId().toString() : name),
-                    Template.template("id", String.valueOf(id))
+            commandSender.sendMiniMessage(Config.FLAG_CONFIRM, TagResolver.resolver(
+                    Placeholder.parsed("flag_reason", flagReason == null ? "Unknown" : flagReason),
+                    Placeholder.parsed("target_name", name == null ? target.getUniqueId().toString() : name),
+                    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;

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

@@ -10,7 +10,7 @@ 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,6 +51,7 @@ 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);
@@ -79,6 +80,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>";
@@ -121,6 +123,7 @@ 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 +133,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 = ?";
 

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.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -69,8 +69,8 @@ public class ChatEvent implements Listener {
 
         } else {
             e.setCancelled(true);
-            player.sendMiniMessage(Config.AUTHENTICATE_FAILED, List.of(
-                    Template.template("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
+            player.sendMiniMessage(Config.AUTHENTICATE_FAILED, TagResolver.resolver(
+                    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

@@ -7,8 +7,8 @@ import com.liteflags.data.database.Methods;
 import com.liteflags.data.maps.MapCache;
 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.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+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(
-                        Template.template("player", player.getName()),
-                        Template.template("total_act_flags", String.valueOf(Methods.getTotalActiveFlags(player))),
-                        Template.template("console_flags", String.valueOf(Methods.consoleFlags)),
-                        Template.template("staff_flags", String.valueOf(Methods.staffFlags))
+                Component message = MiniMessage.miniMessage().deserialize(Config.ALERT_ACTIVE_FLAGS, TagResolver.resolver(List.of(
+                        Placeholder.parsed("player", player.getName()),
+                        Placeholder.unparsed("total_act_flags", String.valueOf(Methods.getTotalActiveFlags(player))),
+                        Placeholder.unparsed("console_flags", String.valueOf(Methods.consoleFlags)),
+                        Placeholder.unparsed("staff_flags", String.valueOf(Methods.staffFlags))
                 )));
 
                 Bukkit.getOnlinePlayers().stream()

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

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