From f7ddf641aa4ea4d27e4d4728ced756505af237bf Mon Sep 17 00:00:00 2001
From: PikaMug <unconfigured@null.spigotmc.org>
Date: Tue, 7 Jan 2020 03:28:11 -0500
Subject: [PATCH] Replace all unnecessary regex usage

---
 .../me/blackvein/quests/QuestFactory.java     |  4 ++--
 .../me/blackvein/quests/actions/Action.java   |  4 ++--
 .../quests/actions/ActionFactory.java         |  4 ++--
 .../quests/prompts/DateTimePrompt.java        |  2 +-
 .../quests/prompts/GUIDisplayPrompt.java      |  2 +-
 .../quests/prompts/ItemStackPrompt.java       |  2 +-
 .../blackvein/quests/prompts/MobsPrompt.java  |  2 +-
 .../quests/prompts/RequirementsPrompt.java    | 18 +++++++--------
 .../quests/prompts/StageMainPrompt.java       |  2 +-
 .../java/me/blackvein/quests/util/Lang.java   | 22 +++++++++----------
 .../me/blackvein/quests/util/MiscUtil.java    |  4 +++-
 11 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/QuestFactory.java b/main/src/main/java/me/blackvein/quests/QuestFactory.java
index 733f82a27..cb7382110 100644
--- a/main/src/main/java/me/blackvein/quests/QuestFactory.java
+++ b/main/src/main/java/me/blackvein/quests/QuestFactory.java
@@ -1244,7 +1244,7 @@ public class QuestFactory implements ConversationAbandonedListener {
                 }
                 if (found == null) {
                     String error = Lang.get("questWGInvalidRegion");
-                    error = error.replaceAll("<region>", ChatColor.RED + input + ChatColor.YELLOW);
+                    error = error.replace("<region>", ChatColor.RED + input + ChatColor.YELLOW);
                     player.sendMessage(ChatColor.YELLOW + error);
                     return new RegionPrompt();
                 } else {
@@ -1379,7 +1379,7 @@ public class QuestFactory implements ConversationAbandonedListener {
                     saveQuest(context, newSection);
                     data.save(new File(plugin.getDataFolder(), "quests.yml"));
                     context.getForWhom().sendRawMessage(ChatColor.GREEN
-                            + Lang.get("questEditorSaved").replaceAll("<command>", "/questadmin " 
+                            + Lang.get("questEditorSaved").replace("<command>", "/questadmin " 
                             + Lang.get("COMMAND_QUESTADMIN_RELOAD")));
                 } catch (IOException e) {
                     e.printStackTrace();
diff --git a/main/src/main/java/me/blackvein/quests/actions/Action.java b/main/src/main/java/me/blackvein/quests/actions/Action.java
index d5cefddf8..22a98fcc2 100644
--- a/main/src/main/java/me/blackvein/quests/actions/Action.java
+++ b/main/src/main/java/me/blackvein/quests/actions/Action.java
@@ -330,7 +330,7 @@ public class Action {
         if (commands.isEmpty() == false) {
             for (String s : commands) {
                 plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), 
-                        s.replaceAll("<player>", quester.getPlayer().getName()));
+                        s.replace("<player>", quester.getPlayer().getName()));
             }
         }
         if (potionEffects.isEmpty() == false) {
@@ -364,7 +364,7 @@ public class Action {
             quest.failQuest(quester);
         }
         if (timer > 0) {
-            player.sendMessage(Lang.get(player, "timerStart").replaceAll("<time>", String.valueOf(timer)));
+            player.sendMessage(Lang.get(player, "timerStart").replace("<time>", String.valueOf(timer)));
             if (timer > 60) {
                 quester.getTimers().put(new ActionTimer(quester, quest, 60, false)
                         .runTaskLater(plugin, (timer-60)*20).getTaskId(), quest);
diff --git a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
index ff0ce5cbd..0adb5ad41 100644
--- a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
+++ b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
@@ -2705,9 +2705,9 @@ public class ActionFactory implements ConversationAbandonedListener {
     }
     
     public Effect getProperEffect(String properName) {
-        properName = properName.replaceAll("_", "").replaceAll(" ", "").toUpperCase();
+        properName = properName.replace("_", "").replace(" ", "").toUpperCase();
         for (Effect eff : Effect.values()) {
-            if (eff.name().replaceAll("_", "").equalsIgnoreCase(properName)) {
+            if (eff.name().replace("_", "").equalsIgnoreCase(properName)) {
                 return eff;
             }
         }
diff --git a/main/src/main/java/me/blackvein/quests/prompts/DateTimePrompt.java b/main/src/main/java/me/blackvein/quests/prompts/DateTimePrompt.java
index 16000619c..2b6fa12ad 100644
--- a/main/src/main/java/me/blackvein/quests/prompts/DateTimePrompt.java
+++ b/main/src/main/java/me/blackvein/quests/prompts/DateTimePrompt.java
@@ -350,7 +350,7 @@ public class DateTimePrompt extends FixedSetPrompt {
         public Prompt acceptInput(ConversationContext cc, String input) {
             if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) {
                 try {
-                    double amt = Double.parseDouble(input.replaceAll("UTC", "").replace(":", "."));
+                    double amt = Double.parseDouble(input.replace("UTC", "").replace(":", "."));
                     if (amt < -12.0 || amt > 14.0) {
                         cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("invalidRange")
                             .replace("<least>", "-12:00").replace("<greatest>", "14:00"));
diff --git a/main/src/main/java/me/blackvein/quests/prompts/GUIDisplayPrompt.java b/main/src/main/java/me/blackvein/quests/prompts/GUIDisplayPrompt.java
index 36c8143d0..6e1fe1749 100644
--- a/main/src/main/java/me/blackvein/quests/prompts/GUIDisplayPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/prompts/GUIDisplayPrompt.java
@@ -72,7 +72,7 @@ public class GUIDisplayPrompt extends NumericPrompt {
                 if (quest.getGUIDisplay() != null) {
                     if (ItemUtil.compareItems(stack, quest.getGUIDisplay(), false) == 0) {
                         String error = Lang.get("questGUIError");
-                        error = error.replaceAll("<quest>", ChatColor.DARK_PURPLE + quest.getName() + ChatColor.RED);
+                        error = error.replace("<quest>", ChatColor.DARK_PURPLE + quest.getName() + ChatColor.RED);
                         context.getForWhom().sendRawMessage(ChatColor.RED + error);
                         failed = true;
                         break;
diff --git a/main/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java b/main/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
index 3d4e9cf2e..94c5d3954 100644
--- a/main/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
@@ -427,7 +427,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
             @Override
             public String getPromptText(ConversationContext cc) {
                 String text = Lang.get("itemCreateEnterLevel");
-                text = text.replaceAll("<enchantment>", enchantment);
+                text = text.replace("<enchantment>", enchantment);
                 return ChatColor.AQUA + text;
             }
 
diff --git a/main/src/main/java/me/blackvein/quests/prompts/MobsPrompt.java b/main/src/main/java/me/blackvein/quests/prompts/MobsPrompt.java
index 870eef58e..d54f183aa 100644
--- a/main/src/main/java/me/blackvein/quests/prompts/MobsPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/prompts/MobsPrompt.java
@@ -78,7 +78,7 @@ public class MobsPrompt extends FixedSetPrompt {
                         = (LinkedList<String>) context.getSessionData(pref + CK.S_MOB_KILL_LOCATIONS_NAMES);
                 for (int i = 0; i < mobs.size(); i++) {
                     String msg = Lang.get("blocksWithin");
-                    msg = msg.replaceAll("<amount>", ChatColor.DARK_PURPLE + "" + radii.get(i) + ChatColor.GRAY);
+                    msg = msg.replace("<amount>", ChatColor.DARK_PURPLE + "" + radii.get(i) + ChatColor.GRAY);
                     text += ChatColor.GRAY + "     - " + ChatColor.BLUE 
                             + MiscUtil.getPrettyMobName(MiscUtil.getProperMobType(mobs.get(i))) + ChatColor.GRAY + " x " 
                             + ChatColor.DARK_AQUA + amnts.get(i) + ChatColor.GRAY + msg + ChatColor.YELLOW 
diff --git a/main/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java b/main/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
index e185d5ac3..d5abea46d 100644
--- a/main/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
@@ -367,11 +367,11 @@ public class RequirementsPrompt extends NumericPrompt {
         public String getPromptText(ConversationContext context) {
             String text = Lang.get("reqMoneyPrompt");
             if (plugin.getDependencies().getVaultEconomy() != null) {
-                text = text.replaceAll("<money>", ChatColor.DARK_PURPLE+ ((plugin.getDependencies().getVaultEconomy()
+                text = text.replace("<money>", ChatColor.DARK_PURPLE+ ((plugin.getDependencies().getVaultEconomy()
                         .currencyNamePlural().isEmpty() ? Lang.get("money") : plugin.getDependencies().getVaultEconomy()
                         .currencyNamePlural())) + ChatColor.YELLOW);
             } else {
-                text = text.replaceAll("<money>", ChatColor.DARK_PURPLE + Lang.get("money") + ChatColor.YELLOW);
+                text = text.replace("<money>", ChatColor.DARK_PURPLE + Lang.get("money") + ChatColor.YELLOW);
             }
             return ChatColor.YELLOW + text;
         }
@@ -468,7 +468,7 @@ public class RequirementsPrompt extends NumericPrompt {
                 for (String s : args) {
                     if (plugin.getQuest(s) == null) {
                         String text = Lang.get("reqNotAQuestName");
-                        text = text.replaceAll("<quest>", ChatColor.LIGHT_PURPLE + s + ChatColor.RED);
+                        text = text.replace("<quest>", ChatColor.LIGHT_PURPLE + s + ChatColor.RED);
                         context.getForWhom().sendRawMessage(text);
                         return new QuestListPrompt(isRequiredQuest);
                     }
@@ -628,7 +628,7 @@ public class RequirementsPrompt extends NumericPrompt {
                         booleans.add(false);
                     } else {
                         String text = Lang.get("reqTrueFalseError");
-                        text = text.replaceAll("<input>", ChatColor.LIGHT_PURPLE + s + ChatColor.RED);
+                        text = text.replace("<input>", ChatColor.LIGHT_PURPLE + s + ChatColor.RED);
                         context.getForWhom().sendRawMessage(ChatColor.RED + text);
                         return new RemoveItemsPrompt();
                     }
@@ -823,7 +823,7 @@ public class RequirementsPrompt extends NumericPrompt {
                 text += ChatColor.GOLD + descriptions.get(temp) + "\n";
             }
             String lang = Lang.get("stageEditorCustomDataPrompt");
-            lang = lang.replaceAll("<data>", temp);
+            lang = lang.replace("<data>", temp);
             text += ChatColor.YELLOW + lang;
             return text;
         }
@@ -921,7 +921,7 @@ public class RequirementsPrompt extends NumericPrompt {
                         return new mcMMOSkillsPrompt();
                     } else {
                         String text = Lang.get("reqMcMMOError");
-                        text = text.replaceAll("<input>", ChatColor.RED + s + ChatColor.YELLOW);
+                        text = text.replace("<input>", ChatColor.RED + s + ChatColor.YELLOW);
                         cc.getForWhom().sendRawMessage(ChatColor.YELLOW + text);
                         return new mcMMOSkillsPrompt();
                     }
@@ -957,7 +957,7 @@ public class RequirementsPrompt extends NumericPrompt {
                         amounts.add(i);
                     } catch (NumberFormatException nfe) {
                         String text = Lang.get("reqNotANumber");
-                        text = text.replaceAll("<input>", ChatColor.RED + s + ChatColor.YELLOW);
+                        text = text.replace("<input>", ChatColor.RED + s + ChatColor.YELLOW);
                         cc.getForWhom().sendRawMessage(ChatColor.YELLOW + text);
                         return new mcMMOAmountsPrompt();
                     }
@@ -1052,7 +1052,7 @@ public class RequirementsPrompt extends NumericPrompt {
                         return new HeroesPrompt();
                     } else {
                         String text = Lang.get("reqHeroesNotPrimary");
-                        text = text.replaceAll("<class>", ChatColor.LIGHT_PURPLE + hc.getName() + ChatColor.RED);
+                        text = text.replace("<class>", ChatColor.LIGHT_PURPLE + hc.getName() + ChatColor.RED);
                         cc.getForWhom().sendRawMessage(ChatColor.RED + text);
                         return new HeroesPrimaryPrompt();
                     }
@@ -1104,7 +1104,7 @@ public class RequirementsPrompt extends NumericPrompt {
                         return new HeroesPrompt();
                     } else {
                         String text = Lang.get("reqHeroesNotSecondary");
-                        text = text.replaceAll("<class>", ChatColor.LIGHT_PURPLE + hc.getName() + ChatColor.RED);
+                        text = text.replace("<class>", ChatColor.LIGHT_PURPLE + hc.getName() + ChatColor.RED);
                         cc.getForWhom().sendRawMessage(ChatColor.RED + text);
                         return new HeroesSecondaryPrompt();
                     }
diff --git a/main/src/main/java/me/blackvein/quests/prompts/StageMainPrompt.java b/main/src/main/java/me/blackvein/quests/prompts/StageMainPrompt.java
index 41260b2b2..7aa087456 100644
--- a/main/src/main/java/me/blackvein/quests/prompts/StageMainPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/prompts/StageMainPrompt.java
@@ -1792,7 +1792,7 @@ public class StageMainPrompt extends NumericPrompt {
                 text += ChatColor.GOLD + descriptions.get(temp) + "\n";
             }
             String msg = Lang.get("stageEditorCustomDataPrompt");
-            msg = msg.replaceAll("<data>", ChatColor.BOLD + temp + ChatColor.RESET + ChatColor.YELLOW);
+            msg = msg.replace("<data>", ChatColor.BOLD + temp + ChatColor.RESET + ChatColor.YELLOW);
             text += ChatColor.YELLOW + msg;
             return text;
         }
diff --git a/main/src/main/java/me/blackvein/quests/util/Lang.java b/main/src/main/java/me/blackvein/quests/util/Lang.java
index d6ba13b8d..e9a0ee1c3 100644
--- a/main/src/main/java/me/blackvein/quests/util/Lang.java
+++ b/main/src/main/java/me/blackvein/quests/util/Lang.java
@@ -118,7 +118,7 @@ public class Lang {
     public static String getModified(String key, String[] tokens) {
         String orig = langMap.get(key);
         for (int i = 0; i < tokens.length; i++) {
-            orig = orig.replaceAll("%" + (i + 1), tokens[i]);
+            orig = orig.replace("%" + (i + 1), tokens[i]);
         }
         return orig;
     }
@@ -182,30 +182,30 @@ public class Lang {
         String cmdCancel = allStrings.get("cmdCancel");
         String cmdDone = allStrings.get("cmdDone");
         
-        String strAdd = allStrings.get("strAdd").replaceAll("<command>", cmdAdd);
-        String strClear = allStrings.get("strClear").replaceAll("<command>", cmdClear);
-        String strCancel = allStrings.get("strCancel").replaceAll("<command>", cmdCancel);
-        String strDone = allStrings.get("strDone").replaceAll("<command>", cmdDone);
+        String strAdd = allStrings.get("strAdd").replace("<command>", cmdAdd);
+        String strClear = allStrings.get("strClear").replace("<command>", cmdClear);
+        String strCancel = allStrings.get("strCancel").replace("<command>", cmdCancel);
+        String strDone = allStrings.get("strDone").replace("<command>", cmdDone);
         String strSpace = allStrings.get("strSpace");
         String strSemicolon = allStrings.get("strSemicolon");
         for (Entry<String, String> entry : allStrings.entrySet()) {
             if (entry.getValue().contains("<add>")) {
-                allStrings.put(entry.getKey(), entry.getValue().replaceAll("<add>", strAdd));
+                allStrings.put(entry.getKey(), entry.getValue().replace("<add>", strAdd));
             }
             if (entry.getValue().contains("<clear>")) {
-                allStrings.put(entry.getKey(), entry.getValue().replaceAll("<clear>", strClear));
+                allStrings.put(entry.getKey(), entry.getValue().replace("<clear>", strClear));
             }
             if (entry.getValue().contains("<cancel>")) {
-                allStrings.put(entry.getKey(), entry.getValue().replaceAll("<cancel>", strCancel));
+                allStrings.put(entry.getKey(), entry.getValue().replace("<cancel>", strCancel));
             }
             if (entry.getValue().contains("<done>")) {
-                allStrings.put(entry.getKey(), entry.getValue().replaceAll("<done>", strDone));
+                allStrings.put(entry.getKey(), entry.getValue().replace("<done>", strDone));
             } 
             if (entry.getValue().contains("<space>")) {
-                allStrings.put(entry.getKey(), entry.getValue().replaceAll("<space>", strSpace));
+                allStrings.put(entry.getKey(), entry.getValue().replace("<space>", strSpace));
             }
             if (entry.getValue().contains("<semicolon>")) {
-                allStrings.put(entry.getKey(), entry.getValue().replaceAll("<semicolon>", strSemicolon));
+                allStrings.put(entry.getKey(), entry.getValue().replace("<semicolon>", strSemicolon));
             }
         }
         langMap.putAll(allStrings);
diff --git a/main/src/main/java/me/blackvein/quests/util/MiscUtil.java b/main/src/main/java/me/blackvein/quests/util/MiscUtil.java
index 22b6e4bde..d32377dd3 100644
--- a/main/src/main/java/me/blackvein/quests/util/MiscUtil.java
+++ b/main/src/main/java/me/blackvein/quests/util/MiscUtil.java
@@ -248,13 +248,15 @@ public class MiscUtil {
      * @param lineColor Color to use at start of each new line
      * @return Converted text
      */
-    public static LinkedList<String> makeLines(String input, String wordDelimiter, int lineLength, ChatColor lineColor) {
+    public static LinkedList<String> makeLines(String input, String wordDelimiter, int lineLength
+            , ChatColor lineColor) {
         LinkedList<String> toReturn = new LinkedList<String>();
         String[] split = input.split(wordDelimiter);
         String line = "";
         int currentLength = 0;
         for (String piece : split) {
             if ((currentLength + piece.length()) > (lineLength + 1)) {
+                // TODO - determine whether replaceAll and carots (^) are necessary here
                 if (lineColor != null) {
                     toReturn.add(lineColor + line.replaceAll("^" + wordDelimiter, ""));
                 } else {