From 0b5ed25131d0df9415ee3b3ee506262a8c41934a Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Sun, 14 Jun 2020 03:32:17 -0700 Subject: [PATCH] use new equalsIgnoreCase --- .../paper/events/UnknownCommandScriptEvent.java | 2 +- .../denizen/events/BukkitScriptEvent.java | 12 ++++++------ .../events/entity/EntitySpawnScriptEvent.java | 3 ++- .../player/PlayerChangesGamemodeScriptEvent.java | 2 +- .../events/player/PlayerClicksBlockScriptEvent.java | 3 ++- .../events/player/PlayerDamagesBlockScriptEvent.java | 2 +- .../events/player/PlayerJoinsScriptEvent.java | 2 +- .../events/player/PlayerQuitsScriptEvent.java | 2 +- .../events/player/PlayerRespawnsScriptEvent.java | 2 +- .../denizenscript/denizen/objects/LocationTag.java | 2 +- .../com/denizenscript/denizen/objects/PlayerTag.java | 2 +- .../properties/entity/EntityAreaEffectCloud.java | 4 ++-- .../denizen/objects/properties/item/ItemPotion.java | 4 ++-- .../scripts/commands/server/ExecuteCommand.java | 2 +- .../containers/core/EconomyScriptContainer.java | 4 ++-- .../denizen/tags/core/ServerTagBase.java | 9 +++++---- .../denizenscript/denizen/utilities/Utilities.java | 4 ++-- .../utilities/command/manager/CommandContext.java | 2 +- .../utilities/command/manager/CommandManager.java | 2 +- 19 files changed, 34 insertions(+), 31 deletions(-) diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/UnknownCommandScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/UnknownCommandScriptEvent.java index 6bb84fbf27..ccec5e6039 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/UnknownCommandScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/UnknownCommandScriptEvent.java @@ -76,7 +76,7 @@ public String getName() { public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag) { String determination = determinationObj.toString(); - if (CoreUtilities.toLowerCase(determination).equals("none")) { + if (CoreUtilities.equalsIgnoreCase(determination, "none")) { event.setMessage(null); } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java index ec7f623ed5..cb01678575 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java @@ -36,12 +36,12 @@ public boolean couldMatchInArea(String lower) { } String in = CoreUtilities.getXthArg(index + 1, lower); - if (InventoryTag.matches(in) || in.equalsIgnoreCase("inventory") || isRegexMatchable(in)) { + if (InventoryTag.matches(in) || CoreUtilities.equalsIgnoreCase(in, "inventory") || isRegexMatchable(in)) { return false; } - if (in.equalsIgnoreCase("notable")) { + if (CoreUtilities.equalsIgnoreCase(in, "notable")) { String next = CoreUtilities.getXthArg(index + 2, lower); - if (!next.equalsIgnoreCase("cuboid") && !next.equalsIgnoreCase("ellipsoid")) { + if (!CoreUtilities.equalsIgnoreCase(next, "cuboid") && !CoreUtilities.equalsIgnoreCase(next, "ellipsoid")) { return false; } } @@ -50,7 +50,7 @@ public boolean couldMatchInArea(String lower) { public boolean couldMatchEnum(String text, final Enum[] enumVals) { for (Enum val : enumVals) { - if (val.name().equalsIgnoreCase(text)) { + if (CoreUtilities.equalsIgnoreCase(val.name(), text)) { return true; } } @@ -401,7 +401,7 @@ else if (lower.equals("ellipsoid")) { return EllipsoidTag.getNotableEllipsoidsContaining(location).size() > 0; } else if (WorldTag.matches(it)) { - return CoreUtilities.toLowerCase(location.getWorld().getName()).equals(lower); + return CoreUtilities.equalsIgnoreCase(location.getWorld().getName(), lower); } else if (CuboidTag.matches(it)) { CuboidTag cuboid = CuboidTag.valueOf(it, getTagContext(path)); @@ -428,7 +428,7 @@ else if (EllipsoidTag.matches(it)) { public boolean runWithCheck(ScriptPath path, ItemTag held) { String with = path.switches.get("with"); if (with != null) { - if (with.equalsIgnoreCase("item")) { + if (CoreUtilities.equalsIgnoreCase(with, "item")) { return true; } if (held == null || !tryItem(held, with)) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java index 5c6eccfdda..a1427bee96 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java @@ -7,6 +7,7 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; +import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Entity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -73,7 +74,7 @@ public boolean matches(ScriptPath path) { } if (path.eventArgLowerAt(2).equals("because") - && !path.eventArgLowerAt(3).equalsIgnoreCase(reason.toString())) { + && !CoreUtilities.equalsIgnoreCase(path.eventArgLowerAt(3), reason.toString())) { return false; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesGamemodeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesGamemodeScriptEvent.java index e6e57f5065..dcc26eaae6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesGamemodeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesGamemodeScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptPath path) { public boolean matches(ScriptPath path) { String mode = path.eventArgLowerAt(4); if (mode.length() > 0) { - if (!CoreUtilities.toLowerCase(gamemode.asString()).equals(mode)) { + if (!CoreUtilities.equalsIgnoreCase(gamemode.asString(), mode)) { return false; } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java index cd0fb3758f..6d696bab50 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java @@ -7,6 +7,7 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; +import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.Material; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; @@ -80,7 +81,7 @@ private boolean runUsingCheck(ScriptPath path) { Debug.echoError("Invalid USING hand in " + getName() + " for '" + path.event + "' in " + path.container.getName()); return false; } - if (!using.equals("either_hand") && !using.equalsIgnoreCase(hand.identify())) { + if (!using.equals("either_hand") && !CoreUtilities.equalsIgnoreCase(using, hand.identify())) { return false; } return true; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java index 82a4347879..6459656075 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java @@ -86,7 +86,7 @@ public String getName() { @Override public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag) { - if (CoreUtilities.toLowerCase(determinationObj.toString()).equals("instabreak")) { + if (CoreUtilities.equalsIgnoreCase(determinationObj.toString(), "instabreak")) { event.setInstaBreak(true); return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJoinsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJoinsScriptEvent.java index 0989bfcf6f..dc6363a988 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJoinsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJoinsScriptEvent.java @@ -57,7 +57,7 @@ public String getName() { public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag) { String determination = determinationObj.toString(); - if (CoreUtilities.toLowerCase(determination).equals("none")) { + if (CoreUtilities.equalsIgnoreCase(determination, "none")) { event.setJoinMessage(null); return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerQuitsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerQuitsScriptEvent.java index bafb3cafb3..1cd555eff2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerQuitsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerQuitsScriptEvent.java @@ -57,7 +57,7 @@ public String getName() { public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag) { String determination = determinationObj.toString(); - if (CoreUtilities.toLowerCase(determination).equals("none")) { + if (CoreUtilities.equalsIgnoreCase(determination, "none")) { event.setQuitMessage(null); return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRespawnsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRespawnsScriptEvent.java index 49d4143e4d..b47ea812f1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRespawnsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRespawnsScriptEvent.java @@ -68,7 +68,7 @@ public String getName() { @Override public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { String determination = determinationObj.toString(); - if (!CoreUtilities.toLowerCase(determination).equals("none")) { + if (!CoreUtilities.equalsIgnoreCase(determination, "none")) { LocationTag loc = LocationTag.valueOf(determination, getTagContext(path)); if (loc != null) { event.setRespawnLocation(loc); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java index 6a7e6fc0cb..7128d7fad9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java @@ -701,7 +701,7 @@ public boolean equals(Object o) { if ((other.getWorldName() == null && getWorldName() != null) || (getWorldName() == null && other.getWorldName() != null) || (getWorldName() != null && other.getWorldName() != null - && !getWorldName().equalsIgnoreCase(other.getWorldName()))) { + && !CoreUtilities.equalsIgnoreCase(getWorldName(), other.getWorldName()))) { return false; } return Math.floor(getX()) == Math.floor(other.getX()) diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java index a2c3cb300f..d446af46a5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java @@ -883,7 +883,7 @@ public static void registerTags() { if (obj instanceof EntityTag) { filterEntity = (EntityTag) obj; } - else if (CoreUtilities.toLowerCase(obj.toString()).equals("npc")) { + else if (CoreUtilities.equalsIgnoreCase(obj.toString(), "npc")) { valid = EntityTag.isCitizensNPC(entity); } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java index 2a2b6f2269..e107390ef6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java @@ -499,8 +499,8 @@ public void adjust(Mechanism mechanism) { else { try { PotionType type = PotionType.valueOf(data.get(0)); - boolean extended = type.isExtendable() && CoreUtilities.toLowerCase(data.get(1)).equals("true"); - boolean upgraded = type.isUpgradeable() && CoreUtilities.toLowerCase(data.get(2)).equals("true"); + boolean extended = type.isExtendable() && CoreUtilities.equalsIgnoreCase(data.get(1), "true"); + boolean upgraded = type.isUpgradeable() && CoreUtilities.equalsIgnoreCase(data.get(2), "true"); if (extended && upgraded) { Debug.echoError("Potion cannot be both upgraded and extended"); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java index 154f7c3818..537529e882 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java @@ -385,8 +385,8 @@ public void adjust(Mechanism mechanism) { String[] d1 = data.get(0).split(","); PotionMeta meta = (PotionMeta) item.getItemStack().getItemMeta(); meta.setBasePotionData(new PotionData(PotionType.valueOf(d1[0].toUpperCase()), - CoreUtilities.toLowerCase(d1[2]).equals("true"), - CoreUtilities.toLowerCase(d1[1]).equals("true"))); + CoreUtilities.equalsIgnoreCase(d1[2], "true"), + CoreUtilities.equalsIgnoreCase(d1[1], "true"))); if (d1.length > 3) { meta.setColor(ColorTag.valueOf(d1[3].replace("&comma", ","), mechanism.context).getColor()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java index 23c4b29b05..7675474a00 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java @@ -165,7 +165,7 @@ public void execute(ScriptEntry scriptEntry) { break; case AS_OP: - if (CoreUtilities.toLowerCase(command).equals("stop")) { + if (CoreUtilities.equalsIgnoreCase(command, "stop")) { Debug.echoError("Please use as_server to execute 'stop'."); return; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EconomyScriptContainer.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EconomyScriptContainer.java index 3f8b180ef5..7c1618d10e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EconomyScriptContainer.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/EconomyScriptContainer.java @@ -333,10 +333,10 @@ public boolean createPlayerAccount(String s, String s1) { } public ServicePriority getPriority() { - String prioString = CoreUtilities.toLowerCase(getString("priority", "normal")); + String prioString = getString("priority", "normal"); // Enumeration name casing is weird for ServicePriority. for (ServicePriority prio : ServicePriority.values()) { - if (CoreUtilities.toLowerCase(prio.name()).equals(prioString)) { + if (CoreUtilities.equalsIgnoreCase(prio.name(), prioString)) { return prio; } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java index 2dddbf9bce..ce2a2d7fd7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java @@ -1253,8 +1253,9 @@ else if (recipe instanceof CookingRecipe) { if ((attribute.startsWith("npcs_named") || attribute.startsWith("list_npcs_named")) && Depends.citizens != null && attribute.hasContext(1)) { listDeprecateWarn(attribute); ListTag npcs = new ListTag(); + String name = attribute.getContext(1); for (NPC npc : CitizensAPI.getNPCRegistry()) { - if (npc.getName().equalsIgnoreCase(attribute.getContext(1))) { + if (CoreUtilities.equalsIgnoreCase(npc.getName(), name)) { npcs.addObject(NPCTag.mirrorCitizensNPC(npc)); } } @@ -1566,7 +1567,7 @@ else if (recipe instanceof CookingRecipe) { Player matchPlayer = null; String matchInput = CoreUtilities.toLowerCase(attribute.getContext(1)); for (Player player : Bukkit.getOnlinePlayers()) { - if (CoreUtilities.toLowerCase(player.getName()).equals(matchInput)) { + if (CoreUtilities.equalsIgnoreCase(player.getName(), matchInput)) { matchPlayer = player; break; } @@ -1594,7 +1595,7 @@ else if (CoreUtilities.toLowerCase(player.getName()).contains(matchInput) && mat UUID matchPlayer = null; String matchInput = CoreUtilities.toLowerCase(attribute.getContext(1)); for (Map.Entry entry : PlayerTag.getAllPlayers().entrySet()) { - if (CoreUtilities.toLowerCase(entry.getKey()).equals(matchInput)) { + if (CoreUtilities.equalsIgnoreCase(entry.getKey(), matchInput)) { matchPlayer = entry.getValue(); break; } @@ -1627,7 +1628,7 @@ else if (CoreUtilities.toLowerCase(entry.getKey()).contains(matchInput) && match ListTag npcs = new ListTag(); for (NPC npc : CitizensAPI.getNPCRegistry()) { if (npc.hasTrait(AssignmentTrait.class) && npc.getTrait(AssignmentTrait.class).hasAssignment() - && npc.getTrait(AssignmentTrait.class).getAssignment().getName().equalsIgnoreCase(script.getName())) { + && CoreUtilities.equalsIgnoreCase(npc.getTrait(AssignmentTrait.class).getAssignment().getName(), script.getName())) { npcs.addObject(NPCTag.mirrorCitizensNPC(npc)); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java index bb29ca225e..37f8a234ed 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java @@ -96,7 +96,7 @@ public static boolean canReadFile(File f) { !f.getCanonicalPath().startsWith(new File(".").getCanonicalPath())) { return false; } - if (!CoreUtilities.toLowerCase(Settings.fileLimitPath()).equals("none") + if (!CoreUtilities.equalsIgnoreCase(Settings.fileLimitPath(), "none") && !f.getCanonicalPath().startsWith(new File("./" + Settings.fileLimitPath()).getCanonicalPath())) { return false; } @@ -357,7 +357,7 @@ public static void extractFile(File jarFile, String fileName, String destDir) { java.util.Enumeration myEnum = jar.entries(); while (myEnum.hasMoreElements()) { java.util.jar.JarEntry file = (java.util.jar.JarEntry) myEnum.nextElement(); - if (file.getName().equalsIgnoreCase(fileName)) { + if (CoreUtilities.equalsIgnoreCase(file.getName(), fileName)) { java.io.File f = new java.io.File(destDir + "/" + file.getName()); if (file.isDirectory()) { continue; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java index c3196e5a4d..651373043b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java @@ -238,7 +238,7 @@ public int length() { } public boolean matches(String command) { - return args[0].equalsIgnoreCase(command); + return CoreUtilities.equalsIgnoreCase(args[0], command); } public static Location parseLocation(Location currentLocation, String flag) throws CommandException { diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java index e66f7b4b03..f8231adb18 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java @@ -85,7 +85,7 @@ private void executeHelp(String[] args, CommandSender sender) throws CommandExce private void executeMethod(String[] args, CommandSender sender, Object[] methodArgs) throws CommandException { String cmdName = CoreUtilities.toLowerCase(args[0]); String modifier = args.length > 1 ? args[1] : ""; - boolean help = CoreUtilities.toLowerCase(modifier).equals("help"); + boolean help = CoreUtilities.equalsIgnoreCase(modifier, "help"); Method method = commands.get(cmdName + " " + CoreUtilities.toLowerCase(modifier)); if (method == null && !help) {