From bc2c38263a2f31a1914a0b2eb2679d07b1c51813 Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Sat, 10 Sep 2022 13:08:17 +0200
Subject: [PATCH] Add more util methods for Minimessage

---
 src/main/java/com/alttd/playershops/gui/GuiIcon.java        | 2 +-
 src/main/java/com/alttd/playershops/gui/HomeGui.java        | 2 +-
 src/main/java/com/alttd/playershops/gui/ListPlayersGui.java | 2 +-
 .../java/com/alttd/playershops/gui/ShopManagementGui.java   | 2 +-
 src/main/java/com/alttd/playershops/utils/Logger.java       | 6 +++---
 src/main/java/com/alttd/playershops/utils/Util.java         | 4 ++++
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/alttd/playershops/gui/GuiIcon.java b/src/main/java/com/alttd/playershops/gui/GuiIcon.java
index 5fd33b3..8618892 100644
--- a/src/main/java/com/alttd/playershops/gui/GuiIcon.java
+++ b/src/main/java/com/alttd/playershops/gui/GuiIcon.java
@@ -69,7 +69,7 @@ public enum GuiIcon {
     }
 
     private Component format(String s) {
-        return Util.parseMiniMessage(s, null);
+        return Util.parseMiniMessage(s);
     }
 
     @Override
diff --git a/src/main/java/com/alttd/playershops/gui/HomeGui.java b/src/main/java/com/alttd/playershops/gui/HomeGui.java
index 579bf63..821ab91 100644
--- a/src/main/java/com/alttd/playershops/gui/HomeGui.java
+++ b/src/main/java/com/alttd/playershops/gui/HomeGui.java
@@ -10,7 +10,7 @@ public class HomeGui extends AbstractGui {
 
     public HomeGui(UUID uuid) {
         super(uuid);
-        this.inventory = Bukkit.createInventory(this, INV_SIZE, Util.parseMiniMessage("Config.gui.home-title", null));
+        this.inventory = Bukkit.createInventory(this, INV_SIZE, Util.parseMiniMessage("Config.gui.home-title"));
         initInvContents();
         makeMenuBar();
     }
diff --git a/src/main/java/com/alttd/playershops/gui/ListPlayersGui.java b/src/main/java/com/alttd/playershops/gui/ListPlayersGui.java
index b1f3b24..3474393 100644
--- a/src/main/java/com/alttd/playershops/gui/ListPlayersGui.java
+++ b/src/main/java/com/alttd/playershops/gui/ListPlayersGui.java
@@ -15,7 +15,7 @@ public class ListPlayersGui extends AbstractGui {
     private List<UUID> owners;
     public ListPlayersGui(UUID uuid) {
         super(uuid);
-        this.inventory = Bukkit.createInventory(this, INV_SIZE, Util.parseMiniMessage("Config.gui.list-players-title", null));
+        this.inventory = Bukkit.createInventory(this, INV_SIZE, Util.parseMiniMessage("Config.gui.list-players-title"));
         initInvContents();
         makeMenuBar();
     }
diff --git a/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java b/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
index 8211270..95a762e 100644
--- a/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
+++ b/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
@@ -25,7 +25,7 @@ public class ShopManagementGui extends AbstractGui {
 
     public ShopManagementGui(UUID uuid, PlayerShop shop) {
         super(uuid);
-        this.inventory = Bukkit.createInventory(this, INV_SIZE, Util.parseMiniMessage("Config.gui.management-title", null));
+        this.inventory = Bukkit.createInventory(this, INV_SIZE, Util.parseMiniMessage("Config.gui.management-title"));
         this.shop = shop;
         initInvContents();
         makeMenuBar();
diff --git a/src/main/java/com/alttd/playershops/utils/Logger.java b/src/main/java/com/alttd/playershops/utils/Logger.java
index f59b12a..b8ddc73 100644
--- a/src/main/java/com/alttd/playershops/utils/Logger.java
+++ b/src/main/java/com/alttd/playershops/utils/Logger.java
@@ -13,7 +13,7 @@ public class Logger {
      * @param str Message to be logged.
      */
     public static void info(String str) {
-        getLogger().info(Util.parseMiniMessage(str, null));
+        getLogger().info(Util.parseMiniMessage(str));
     }
 
     /**
@@ -22,7 +22,7 @@ public class Logger {
      * @param str Message to be logged.
      */
     public static void warn(String str) {
-        getLogger().warn(Util.parseMiniMessage(str, null));
+        getLogger().warn(Util.parseMiniMessage(str));
     }
 
     /**
@@ -31,7 +31,7 @@ public class Logger {
      * @param str Message to be logged.
      */
     public static void error(String str) {
-        getLogger().error(Util.parseMiniMessage("<red>" + str, null));
+        getLogger().error(Util.parseMiniMessage("<red>" + str));
     }
 
     static ComponentLogger getLogger() {
diff --git a/src/main/java/com/alttd/playershops/utils/Util.java b/src/main/java/com/alttd/playershops/utils/Util.java
index ec9309c..2056d97 100644
--- a/src/main/java/com/alttd/playershops/utils/Util.java
+++ b/src/main/java/com/alttd/playershops/utils/Util.java
@@ -51,6 +51,10 @@ public class Util {
         return miniMessage;
     }
 
+    public static Component parseMiniMessage(String message) {
+        return parseMiniMessage(message, null);
+    }
+
     public static Component parseMiniMessage(String message, TagResolver tagResolver) {
         message = parseColors(message);
         if (tagResolver == null) {