String.toLowerCase() -> CoreUtilities.toLowerCase(String)

DenizenScript · Jan 19, 2016 · 4bf00f3 · 4bf00f3
1 parent b5c7cc6
commit 4bf00f3
Show file tree

Hide file tree

Showing 44 changed files with 161 additions and 134 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Settings.java b/src/main/java/net/aufdemrand/denizen/Settings.java
@@ -2,6 +2,7 @@
 
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.objects.Duration;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 
 public class Settings {
 
@@ -132,7 +133,8 @@ public static String healthTraitRespawnDelay() {
 
     public static boolean triggerEnabled(String triggerName) {
         return DenizenAPI.getCurrentInstance().getConfig()
-                .getBoolean("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Enabled", true);
+                .getBoolean("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase()
+                        + CoreUtilities.toLowerCase(triggerName.substring(1)) + ".Enabled", true);
     }
 
     /*
@@ -144,7 +146,8 @@ public static boolean triggerEnabled(String triggerName) {
 
     public static double triggerDefaultCooldown(String triggerName) {
         return Duration.valueOf(DenizenAPI.getCurrentInstance().getConfig()
-                .getString("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Cooldown", "5s")).getSeconds();
+                .getString("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase()
+                        + CoreUtilities.toLowerCase(triggerName.substring(1)) + ".Cooldown", "5s")).getSeconds();
     }
 
     /*
@@ -157,7 +160,8 @@ public static double triggerDefaultCooldown(String triggerName) {
 
     public static double triggerDefaultRange(String triggerName) {
         return DenizenAPI.getCurrentInstance().getConfig()
-                .getDouble("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Range", -1);
+                .getDouble("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase()
+                        + CoreUtilities.toLowerCase(triggerName.substring(1)) + ".Range", -1);
     }
 
     /*
@@ -169,7 +173,8 @@ public static double triggerDefaultRange(String triggerName) {
 
     public static String triggerDefaultCooldownType(String triggerName) {
         return DenizenAPI.getCurrentInstance().getConfig()
-                .getString("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase() + triggerName.substring(1).toLowerCase() + ".Cooldown Type", "Player");
+                .getString("Triggers." + String.valueOf(triggerName.charAt(0)).toUpperCase()
+                        + CoreUtilities.toLowerCase(triggerName.substring(1)) + ".Cooldown Type", "Player");
     }
 
     /*

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java
@@ -10,6 +10,7 @@
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.objects.dObject;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
@@ -57,7 +58,7 @@ public boolean shouldInitialize(Set<String> events) {
                 if (cmd != null) {
                     dList split = dList.valueOf(cmd);
                     for (String str : split) {
-                        cmds.add(new CommandHandlerData(str.toLowerCase(), cmd));
+                        cmds.add(new CommandHandlerData(CoreUtilities.toLowerCase(str), cmd));
                     }
                 }
                 pass = true;
@@ -91,7 +92,7 @@ public void breakDown() {
 
     private List<String> getAll(String cmd) {
         List<String> newEvents = new ArrayList<String>();
-        cmd = cmd.toLowerCase();
+        cmd = CoreUtilities.toLowerCase(cmd);
         for (CommandHandlerData chd : cmds) {
             if (chd.name.equalsIgnoreCase(cmd)) {
                 newEvents.add(chd.event + " command");

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java
@@ -55,7 +55,7 @@ public boolean shouldInitialize(Set<String> events) {
                 }
                 else {
                     // Add this to the watch list, regardless of whether it's valid, in case it becomes valid later
-                    cuboids_to_watch.add(m.group(1).toLowerCase());
+                    cuboids_to_watch.add(CoreUtilities.toLowerCase(m.group(1)));
                 }
 
                 // We'll set should_register to true, but keep iterating through the matches

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -192,7 +192,7 @@ public void onEntityDamaged(EntityDamageEvent event) {
         entity = new dEntity(event.getEntity());
         damage = new Element(event.getDamage());
         final_damage = new Element(event.getFinalDamage());
-        cause = new Element(event.getCause().name().toLowerCase());
+        cause = new Element(CoreUtilities.toLowerCase(event.getCause().name()));
         damager = null;
         projectile = null;
         held = null;

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java
@@ -185,7 +185,7 @@ public void onEntityKilled(EntityDamageEvent event) {
         }
         damage = new Element(event.getDamage());
         final_damage = new Element(event.getFinalDamage());
-        cause = new Element(event.getCause().name().toLowerCase());
+        cause = new Element(CoreUtilities.toLowerCase(event.getCause().name()));
         damager = null;
         projectile = null;
         if (event instanceof EntityDamageByEntityEvent) {

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java
@@ -81,7 +81,7 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         Integer pos = lower.indexOf(" because ") + 9;
         if (pos > 9) {
             Integer end = lower.indexOf(" ", pos) < 0 ? lower.length() : lower.indexOf(" ", pos);
-            if (!lower.substring(pos, end).equals(reason.toString().toLowerCase())) {
+            if (!lower.substring(pos, end).equals(CoreUtilities.toLowerCase(reason.toString()))) {
                 return false;
             }
         }

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java
@@ -88,7 +88,7 @@ public void destroy() {
 
     @Override
     public boolean applyDetermination(ScriptContainer container, String determination) {
-        String dlow = determination.toLowerCase();
+        String dlow = CoreUtilities.toLowerCase(determination);
         if (dlow.startsWith("origin:")) {
             dLocation new_from = dLocation.valueOf(determination.substring("origin:".length()));
             if (new_from != null) {

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java
@@ -59,7 +59,7 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         }
 
         if (lower.contains("because")) {
-            if (!CoreUtilities.getXthArg(3, lower).equals(reason.toString().toLowerCase())) {
+            if (!CoreUtilities.getXthArg(3, lower).equals(CoreUtilities.toLowerCase(reason.toString()))) {
                 return false;
             }
         }

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java
@@ -62,12 +62,12 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String arg2 = CoreUtilities.getXthArg(1, lower);
         String tamed = arg2.equals("jumps") ? arg1 : arg2;
 
-        if (!entity.matchesEntity(tamed) || !tamed.equals(variant.toString().toLowerCase())) {
+        if (!entity.matchesEntity(tamed) || !tamed.equals(CoreUtilities.toLowerCase(variant.toString()))) {
             return false;
         }
 
         if (CoreUtilities.getXthArg(2, lower).equals("jumps")) {
-            if (!arg1.equals(color.toString().toLowerCase())) {
+            if (!arg1.equals(CoreUtilities.toLowerCase(color.toString()))) {
                 return false;
             }
         }

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java
@@ -67,10 +67,10 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String biome_test = lower.substring(lower.lastIndexOf(" ") + 1);
         String direction = lower.substring(lower.indexOf(" ") + 1, lower.lastIndexOf(" ") - 1);
 
-        return !(old_biome.toString().toLowerCase().equals(new_biome.toString().toLowerCase()))
+        return !(CoreUtilities.toLowerCase(old_biome.toString()).equals(CoreUtilities.toLowerCase(new_biome.toString())))
                 && (biome_test.equals("biome")
-                || (direction.equals("enters") && biome_test.equals(new_biome.toString().toLowerCase()))
-                || (direction.equals("exits") && biome_test.equals(old_biome.toString().toLowerCase())));
+                || (direction.equals("enters") && biome_test.equals(CoreUtilities.toLowerCase(new_biome.toString())))
+                || (direction.equals("exits") && biome_test.equals(CoreUtilities.toLowerCase(old_biome.toString()))));
     }
 
     @Override

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java
@@ -89,7 +89,7 @@ public void destroy() {
 
     @Override
     public boolean applyDetermination(ScriptContainer container, String determination) {
-        if (determination.toLowerCase().equals("instabreak")) {
+        if (CoreUtilities.toLowerCase(determination).equals("instabreak")) {
             instabreak = true;
         }
         return super.applyDetermination(container, determination);

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java
@@ -51,7 +51,7 @@ public PlayerStepsOnScriptEvent() {
 
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {
-        return s.toLowerCase().startsWith("player steps on");
+        return CoreUtilities.toLowerCase(s).startsWith("player steps on");
     }
 
     @Override

diff --git a/src/main/java/net/aufdemrand/denizen/listeners/ListenerRegistry.java b/src/main/java/net/aufdemrand/denizen/listeners/ListenerRegistry.java
@@ -13,6 +13,7 @@
 import net.aufdemrand.denizencore.interfaces.dRegistry;
 import net.aufdemrand.denizencore.objects.dScript;
 import net.aufdemrand.denizencore.scripts.containers.core.TaskScriptContainer;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.citizensnpcs.api.CitizensAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -77,7 +78,7 @@ public void addListenerFor(dPlayer player,
             playerListeners = new HashMap<String, AbstractListener>();
         }
         // Insert instance into hash-map
-        playerListeners.put(id.toLowerCase(), instance);
+        playerListeners.put(CoreUtilities.toLowerCase(id), instance);
         listeners.put(player.getName(), playerListeners);
     }
 
@@ -102,7 +103,7 @@ public void removeListenerFor(dPlayer player, String id) {
             return;
         }
         // Remove instance from hash-map
-        playerListeners.remove(id.toLowerCase());
+        playerListeners.remove(CoreUtilities.toLowerCase(id));
         listeners.put(player.getName(), playerListeners);
     }
 
@@ -165,8 +166,8 @@ public void finish(dPlayer player,
     public AbstractListener getListenerFor(dPlayer player, String listenerId) {
         if (listeners.containsKey(player.getName())) {
             Map<String, AbstractListener> playerListeners = listeners.get(player.getName());
-            if (playerListeners.containsKey(listenerId.toLowerCase())) {
-                return playerListeners.get(listenerId.toLowerCase());
+            if (playerListeners.containsKey(CoreUtilities.toLowerCase(listenerId))) {
+                return playerListeners.get(CoreUtilities.toLowerCase(listenerId));
             }
         }
         return null;

diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemListenerInstance.java
@@ -7,6 +7,7 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.objects.dList;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
@@ -73,7 +74,7 @@ else if (arg.matchesPrefix("cuboid, c")
     public void increment(String object, int amount) {
         items_so_far = items_so_far + amount;
         dB.log(ChatColor.YELLOW + "// " + player.getName() + " " +
-                type.toString().toLowerCase() + "ed " + amount + " " + object + ".");
+                CoreUtilities.toLowerCase(type.toString()) + "ed " + amount + " " + object + ".");
         check();
     }
 
@@ -106,7 +107,7 @@ public void listenItem(InventoryClickEvent event) {
                 final ItemStack item = new ItemStack(event.getCurrentItem());
 
                 //if item isn't a required item, then return
-                if (!items.contains(item.getType().name().toLowerCase())
+                if (!items.contains(CoreUtilities.toLowerCase(item.getType().name()))
                         && !items.contains(String.valueOf(item.getTypeId())) && !items.contains("*")) {
                     return;
                 }

diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/KillListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/KillListenerInstance.java
@@ -11,6 +11,7 @@
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.tags.ReplaceableTagEvent;
 import net.aufdemrand.denizencore.tags.TagManager;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.citizensnpcs.api.CitizensAPI;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.EntityType;
@@ -273,7 +274,9 @@ else if (type == KillType.NPC) {
                 }
                 // Cannot be 'else if' since dNPC.valueOf will return true for names now, as well as ids.
                 // Check against name of NPC (n@fullwall, aufdemrand, etc)... object notation is optional.
-                if (npc.getName().equalsIgnoreCase(target.toLowerCase().replace("n@", ""))) {
+
+                if (CoreUtilities.toLowerCase(npc.getName())
+                        .equals(CoreUtilities.toLowerCase(target).replace("n@", ""))) {
                     count_it = true;
                 }
             }

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/ConstantsTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/ConstantsTrait.java
@@ -6,6 +6,7 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.scripts.ScriptRegistry;
 import net.aufdemrand.denizencore.tags.TagManager;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.aufdemrand.denizencore.utilities.text.StringHolder;
 import net.citizensnpcs.api.command.exception.CommandException;
 import net.citizensnpcs.api.persistence.Persist;
@@ -46,13 +47,13 @@ public String getConstant(String name) {
 
         getAssignmentConstants();
 
-        if (constants.containsKey(name.toLowerCase())) // TODO: shouldDebug
+        if (constants.containsKey(CoreUtilities.toLowerCase(name))) // TODO: shouldDebug
         {
-            return TagManager.tag(constants.get(name.toLowerCase()),
+            return TagManager.tag(constants.get(CoreUtilities.toLowerCase(name)),
                     new BukkitTagContext(null, DenizenAPI.getDenizenNPC(npc), false, null, true, null));
         }
-        else if (getAssignmentConstants().containsKey(name.toLowerCase())) {
-            return TagManager.tag(assignmentConstants.get(name.toLowerCase()),
+        else if (getAssignmentConstants().containsKey(CoreUtilities.toLowerCase(name))) {
+            return TagManager.tag(assignmentConstants.get(CoreUtilities.toLowerCase(name)),
                     new BukkitTagContext(null, DenizenAPI.getDenizenNPC(npc), false, null, true, null));
         }
         return null;
@@ -95,7 +96,7 @@ public Map<String, String> getAllConstants() {
      * @param value value of the constant
      */
     public void setConstant(String name, String value) {
-        constants.put(name.toLowerCase(), value);
+        constants.put(CoreUtilities.toLowerCase(name), value);
     }
 
 
@@ -107,8 +108,8 @@ public void setConstant(String name, String value) {
      * @param name name of the constant, case in-sensitive
      */
     public void removeConstant(String name) {
-        if (constants.containsKey(name.toLowerCase())) {
-            constants.remove(name.toLowerCase());
+        if (constants.containsKey(CoreUtilities.toLowerCase(name))) {
+            constants.remove(CoreUtilities.toLowerCase(name));
         }
     }
 
@@ -158,7 +159,7 @@ public Map<String, String> rebuildAssignmentConstants() {
             if (ScriptRegistry.getScriptContainer(assignment).contains("DEFAULT CONSTANTS")) {
                 for (StringHolder constant : ScriptRegistry.getScriptContainer(assignment)
                         .getConfigurationSection("DEFAULT CONSTANTS").getKeys(false)) {
-                    assignmentConstants.put(constant.str.toLowerCase(),
+                    assignmentConstants.put(CoreUtilities.toLowerCase(constant.str),
                             ScriptRegistry.getScriptContainer(assignment)
                                     .getString("DEFAULT CONSTANTS." + constant.str.toUpperCase(), ""));
                 }

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -12,6 +12,7 @@
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.tags.TagManager;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.event.DespawnReason;
 import net.citizensnpcs.api.persistence.Persist;
@@ -291,7 +292,7 @@ public void onDamage(EntityDamageEvent event) {
         // Save entityId for EntityDeath event
         entityId = npc.getEntity().getEntityId();
 
-        String deathCause = event.getCause().toString().toLowerCase().replace('_', ' ');
+        String deathCause = CoreUtilities.toLowerCase(event.getCause().toString()).replace('_', ' ');
         Map<String, dObject> context = new HashMap<String, dObject>();
         context.put("damage", new Element(event.getDamage()));
         context.put("death_cause", new Element(deathCause));

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dBiome.java b/src/main/java/net/aufdemrand/denizen/objects/dBiome.java
@@ -108,7 +108,7 @@ public String getObjectType() {
 
     @Override
     public String identify() {
-        return "b@" + biome.getName().toLowerCase();
+        return "b@" + CoreUtilities.toLowerCase(biome.getName());
     }
 
     @Override

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java
@@ -44,7 +44,7 @@ public static dChunk valueOf(String string, TagContext context) {
             return null;
         }
 
-        string = string.toLowerCase().replace("ch@", "");
+        string = CoreUtilities.toLowerCase(string).replace("ch@", "");
 
         ////////
         // Match location formats
@@ -71,10 +71,9 @@ public static dChunk valueOf(String string, TagContext context) {
 
 
     public static boolean matches(String string) {
-        if (string.toLowerCase().startsWith("ch@")) {
+        if (CoreUtilities.toLowerCase(string).startsWith("ch@")) {
             return true;
         }
-
         else {
             return false;
         }

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java b/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java
@@ -137,7 +137,7 @@ public static dCuboid valueOf(String string, TagContext context) {
 
     public static boolean matches(String string) {
         // Starts with cu@? Assume match.
-        if (string.toLowerCase().startsWith("cu@")) {
+        if (CoreUtilities.toLowerCase(string).startsWith("cu@")) {
             return true;
         }
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -1577,7 +1577,7 @@ public String getAttribute(Attribute attribute) {
                 else {
                     search = CoreUtilities.toLowerCase(search);
                     for (String flag : allFlags) {
-                        if (flag.toLowerCase().contains(search)) {
+                        if (CoreUtilities.toLowerCase(flag).contains(search)) {
                             searchFlags.add(flag);
                         }
                     }