Updates some KnarLib code

src/main/java/net/knarcraft/blacksmith/formatting/BlacksmithStringFormatter.java

@@ -6,6 +6,8 @@ import net.knarcraft.knarlib.property.ColorConversion;
 import net.knarcraft.knarlib.util.ColorHelper;
 import org.bukkit.entity.Player;
 
+import java.util.List;
+
 /**
  * A formatter for formatting displayed messages
  */
@@ -24,9 +26,8 @@ public final class BlacksmithStringFormatter {
      */
     public static void sendNPCMessage(NPC npc, Player player, String message) {
         player.sendMessage(BlacksmithPlugin.getStringFormatter().replacePlaceholders(
-                BlacksmithTranslatableMessage.NPC_TALK_FORMAT,
-                new String[]{"{npc}", "{message}"},
-                new String[]{npc.getName(), ColorHelper.translateColorCodes(message, ColorConversion.RGB)}));
+                BlacksmithTranslatableMessage.NPC_TALK_FORMAT, List.of("{npc}", "{message}"),
+                List.of(npc.getName(), ColorHelper.translateColorCodes(message, ColorConversion.RGB))));
     }
 
 }

src/main/java/net/knarcraft/blacksmith/formatting/BlacksmithTranslatableMessage.java

@@ -1,9 +1,11 @@
 package net.knarcraft.blacksmith.formatting;
 
 import net.knarcraft.blacksmith.BlacksmithPlugin;
-import net.knarcraft.knarlib.formatting.StringFormatter;
+import net.knarcraft.knarlib.formatting.StringReplacer;
 import net.knarcraft.knarlib.formatting.TranslatableMessage;
 
+import java.util.List;
+
 /**
  * An enum containing all translatable global messages
  *
@@ -144,8 +146,8 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      * @return <p>The message to display</p>
      */
     public static String getRawValueMessage(String rawValue) {
-        return StringFormatter.replacePlaceholder(BlacksmithPlugin.translate(
-                BlacksmithTranslatableMessage.RAW_VALUE), "{rawValue}", rawValue);
+        return BlacksmithPlugin.getStringFormatter().replacePlaceholder(BlacksmithTranslatableMessage.RAW_VALUE,
+                "{rawValue}", rawValue);
     }
 
     /**
@@ -156,9 +158,8 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      * @return <p>The string to display to a user</p>
      */
     public static String getValueChangedMessage(String setting, String newValue) {
-        return StringFormatter.replacePlaceholders(BlacksmithPlugin.translate(
-                        BlacksmithTranslatableMessage.VALUE_CHANGED), new String[]{"{setting}", "{newValue}"},
-                new String[]{setting, newValue});
+        return BlacksmithPlugin.getStringFormatter().replacePlaceholders(BlacksmithTranslatableMessage.VALUE_CHANGED,
+                List.of("{setting}", "{newValue}"), List.of(setting, newValue));
     }
 
     /**
@@ -171,10 +172,13 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      * @return <p>The string to display to a user</p>
      */
     public static String getItemValueChangedMessage(String setting, ItemType itemType, String item, String newValue) {
-        return StringFormatter.replacePlaceholders(BlacksmithPlugin.translate(
-                        BlacksmithTranslatableMessage.VALUE_FOR_ITEM_CHANGED),
-                new String[]{"{setting}", "{itemType}", "{item}", "{newValue}"},
-                new String[]{setting, itemType.getItemTypeName(), item, newValue});
+        StringReplacer stringReplacer = new StringReplacer(BlacksmithPlugin.getStringFormatter().getUnformattedMessage(
+                BlacksmithTranslatableMessage.VALUE_FOR_ITEM_CHANGED));
+        stringReplacer.add("{setting}", setting);
+        stringReplacer.add("{itemType}", itemType.getItemTypeName());
+        stringReplacer.add("{item}", item);
+        stringReplacer.add("{newValue}", newValue);
+        return stringReplacer.replace();
     }
 
     /**
@@ -185,9 +189,9 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      * @return <p>The string to display to a user</p>
      */
     public static String getCurrentValueMessage(String setting, String currentValue) {
-        return StringFormatter.replacePlaceholders(BlacksmithPlugin.translate(
-                        BlacksmithTranslatableMessage.CURRENT_VALUE), new String[]{"{setting}", "{currentValue}"},
-                new String[]{setting, currentValue});
+        return BlacksmithPlugin.getStringFormatter().replacePlaceholders(BlacksmithTranslatableMessage.CURRENT_VALUE,
+                List.of("{setting}", "{currentValue}"),
+                List.of(setting, currentValue));
     }
 
     /**
@@ -200,10 +204,13 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      * @return <p>The string to display to a user</p>
      */
     public static String getItemCurrentValueMessage(String setting, ItemType itemType, String item, String currentValue) {
-        return StringFormatter.replacePlaceholders(BlacksmithPlugin.translate(
-                        BlacksmithTranslatableMessage.CURRENT_VALUE_FOR_ITEM),
-                new String[]{"{setting}", "{itemType}", "{item}", "{currentValue}"},
-                new String[]{setting, itemType.getItemTypeName(), item, currentValue});
+        StringReplacer stringReplacer = new StringReplacer(BlacksmithPlugin.getStringFormatter().getUnformattedMessage(
+                BlacksmithTranslatableMessage.CURRENT_VALUE_FOR_ITEM));
+        stringReplacer.add("{setting}", setting);
+        stringReplacer.add("{itemType}", itemType.getItemTypeName());
+        stringReplacer.add("{item}", item);
+        stringReplacer.add("{currentValue}", currentValue);
+        return stringReplacer.replace();
     }
 
     @Override

src/main/java/net/knarcraft/blacksmith/formatting/ItemType.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.formatting;
 
 import net.knarcraft.blacksmith.BlacksmithPlugin;
+import net.knarcraft.knarlib.formatting.StringFormatter;
 
 /**
  * An enum representing all item types used in messages
@@ -16,9 +17,11 @@ public enum ItemType {
      * @return <p>The name of this item type</p>
      */
     public String getItemTypeName() {
+        StringFormatter stringFormatter = BlacksmithPlugin.getStringFormatter();
         return switch (this) {
-            case MATERIAL -> BlacksmithPlugin.translate(BlacksmithTranslatableMessage.ITEM_TYPE_MATERIAL);
-            case ENCHANTMENT -> BlacksmithPlugin.translate(BlacksmithTranslatableMessage.ITEM_TYPE_ENCHANTMENT);
+            case MATERIAL -> stringFormatter.getUnformattedMessage(BlacksmithTranslatableMessage.ITEM_TYPE_MATERIAL);
+            case ENCHANTMENT ->
+                    stringFormatter.getUnformattedMessage(BlacksmithTranslatableMessage.ITEM_TYPE_ENCHANTMENT);
         };
     }
 

src/main/java/net/knarcraft/blacksmith/formatting/TimeFormatter.java

@@ -53,7 +53,8 @@ public final class TimeFormatter {
      * @return <p>Text describing the time interval</p>
      */
     private static String getMessageFromInterval(TimeInterval interval) {
-        String text = BlacksmithPlugin.translate(BlacksmithTranslatableMessage.valueOf(interval.name()));
+        String text = BlacksmithPlugin.getStringFormatter().getUnformattedMessage(
+                BlacksmithTranslatableMessage.valueOf(interval.name()));
 
         //Choose a random entry if a comma-separated list is provided
         if (text.contains(",")) {