From fac01fd807c7e76f3cbeeae24caade0e5f54239e Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Mon, 7 Nov 2022 00:15:19 +0100 Subject: [PATCH] Performs some minor fixes and improvements --- src/main/java/net/knarcraft/knarlib/KnarLib.java | 2 +- .../knarlib/formatting/StringFormatter.java | 14 ++++++++++++-- .../knarlib/formatting/TranslatableTimeUnit.java | 3 ++- .../knarcraft/knarlib/formatting/Translator.java | 3 ++- .../net/knarcraft/knarlib/util/UpdateChecker.java | 4 ++-- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/knarcraft/knarlib/KnarLib.java b/src/main/java/net/knarcraft/knarlib/KnarLib.java index 83da2f3..9a6baf3 100644 --- a/src/main/java/net/knarcraft/knarlib/KnarLib.java +++ b/src/main/java/net/knarcraft/knarlib/KnarLib.java @@ -23,7 +23,7 @@ public final class KnarLib { * * @param plugin

The plugin instance to use

*/ - public static void setPlugin(final JavaPlugin plugin) { + public static void setPlugin(JavaPlugin plugin) { KnarLib.plugin = plugin; } diff --git a/src/main/java/net/knarcraft/knarlib/formatting/StringFormatter.java b/src/main/java/net/knarcraft/knarlib/formatting/StringFormatter.java index 3f1feb8..692915d 100644 --- a/src/main/java/net/knarcraft/knarlib/formatting/StringFormatter.java +++ b/src/main/java/net/knarcraft/knarlib/formatting/StringFormatter.java @@ -21,7 +21,7 @@ public final class StringFormatter { * @param sender

The command sender to display the message to

* @param message

The translatable message to display

*/ - public static void displaySuccessMessage(CommandSender sender, TranslatableTimeUnit message) { + public static void displaySuccessMessage(CommandSender sender, TranslatableMessage message) { sender.sendMessage(ChatColor.GREEN + getFormattedMessage(Translator.getTranslatedMessage(message))); } @@ -41,10 +41,20 @@ public final class StringFormatter { * @param sender

The command sender to display the message to

* @param message

The translatable message to display

*/ - public static void displayErrorMessage(CommandSender sender, TranslatableTimeUnit message) { + public static void displayErrorMessage(CommandSender sender, TranslatableMessage message) { sender.sendMessage(ChatColor.DARK_RED + getFormattedMessage(Translator.getTranslatedMessage(message))); } + /** + * Displays a message signifying an unsuccessful action + * + * @param sender

The command sender to display the message to

+ * @param message

The translatable message to display

+ */ + public static void displayErrorMessage(CommandSender sender, String message) { + sender.sendMessage(ChatColor.DARK_RED + getFormattedMessage(message)); + } + /** * Gets the formatted version of any chat message * diff --git a/src/main/java/net/knarcraft/knarlib/formatting/TranslatableTimeUnit.java b/src/main/java/net/knarcraft/knarlib/formatting/TranslatableTimeUnit.java index d073a0b..314ddcb 100644 --- a/src/main/java/net/knarcraft/knarlib/formatting/TranslatableTimeUnit.java +++ b/src/main/java/net/knarcraft/knarlib/formatting/TranslatableTimeUnit.java @@ -3,7 +3,8 @@ package net.knarcraft.knarlib.formatting; /** * An enum containing all translatable time units * - *

These time units must have a translatable message to use the time formatter

+ *

These time units must have a translatable message if you want to use the time formatter. Register one value with + * the translator's "registerMessageCategory" method!

*/ public enum TranslatableTimeUnit implements TranslatableMessage { diff --git a/src/main/java/net/knarcraft/knarlib/formatting/Translator.java b/src/main/java/net/knarcraft/knarlib/formatting/Translator.java index a407e20..76a4c6f 100644 --- a/src/main/java/net/knarcraft/knarlib/formatting/Translator.java +++ b/src/main/java/net/knarcraft/knarlib/formatting/Translator.java @@ -12,6 +12,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStreamReader; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -22,7 +23,7 @@ import java.util.logging.Level; */ public final class Translator { - private static List messageCategories; + private static final List messageCategories = new ArrayList<>(); private static Map translatedMessages; private static Map backupTranslatedMessages; diff --git a/src/main/java/net/knarcraft/knarlib/util/UpdateChecker.java b/src/main/java/net/knarcraft/knarlib/util/UpdateChecker.java index e200fb2..3d130a9 100644 --- a/src/main/java/net/knarcraft/knarlib/util/UpdateChecker.java +++ b/src/main/java/net/knarcraft/knarlib/util/UpdateChecker.java @@ -57,13 +57,13 @@ public final class UpdateChecker { String oldVersion = getVersionMethod.get(); //If there is a newer version, notify the user if (isVersionHigher(oldVersion, newVersion)) { - plugin.getLogger().log(Level.INFO, getUpdateAvailableString(newVersion, oldVersion)); + plugin.getLogger().log(Level.WARNING, getUpdateAvailableString(newVersion, oldVersion)); if (setVersionMethod != null) { setVersionMethod.accept(newVersion); } } } catch (IOException e) { - plugin.getLogger().log(Level.WARNING, "Unable to get newest version."); + plugin.getLogger().log(Level.WARNING, "Unable to get the newest plugin version."); } }