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 c919446607..ec887d0af3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java @@ -3,12 +3,10 @@ import com.denizenscript.denizen.objects.*; import com.denizenscript.denizen.objects.notable.NotableManager; import com.denizenscript.denizen.utilities.DenizenAPI; -import com.denizenscript.denizen.tags.BukkitTagContext; import com.denizenscript.denizencore.utilities.Deprecations; import com.denizenscript.denizencore.utilities.debugging.Debug; import com.denizenscript.denizencore.events.ScriptEvent; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.tags.TagContext; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.Location; import org.bukkit.entity.*; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java index c0a939893d..c95a597a11 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java @@ -98,7 +98,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag) { String determination = determinationObj.toString(); String lower = CoreUtilities.toLowerCase(determination); - if (lower.startsWith("format:")) { + if (path.eventLower.startsWith("format:")) { String name = determination.substring("format:".length()); FormatScriptContainer formatscr = ScriptRegistry.getScriptContainer(name); if (formatscr == null) { @@ -118,7 +118,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { } return true; } - else if (lower.startsWith("raw_format:")) { + else if (path.eventLower.startsWith("raw_format:")) { String form = determination.substring("raw_format:".length()); if (pcEvent != null) { pcEvent.setFormat(form); @@ -128,7 +128,7 @@ else if (lower.startsWith("raw_format:")) { } return true; } - else if (lower.startsWith("recipients:")) { + else if (path.eventLower.startsWith("recipients:")) { String rec_new = determination.substring("recipients:".length()); ListTag recs = ListTag.valueOf(rec_new); List players = recs.filter(PlayerTag.class, path.container, true); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java index 40cddb5431..c9a1246c75 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java @@ -92,7 +92,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { Block block = event.getBlock(); if (determinationObj instanceof ElementTag) { String lower = CoreUtilities.toLowerCase(determination); - if (lower.equals("nothing")) { + if (path.eventLower.equals("nothing")) { cancelled = true; block.setType(Material.AIR); return true; 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 52cd90e7b9..d7b5f7c199 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 @@ -7,7 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -41,8 +40,8 @@ public PlayerChangesGamemodeScriptEvent() { public PlayerGameModeChangeEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player changes gamemode"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player changes gamemode"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java index 59c784b0f5..8e47555844 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java @@ -6,9 +6,7 @@ import com.denizenscript.denizencore.objects.core.ListTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.tags.core.EscapeTagBase; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.block.BlockState; import org.bukkit.block.Sign; import org.bukkit.event.EventHandler; @@ -58,11 +56,12 @@ public PlayerChangesSignScriptEvent() { public SignChangeEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - String sign = CoreUtilities.getXthArg(2, lower); - return lower.startsWith("player changes") - && (sign.equals("sign") || MaterialTag.matches(sign)); + public boolean couldMatch(ScriptPath path) { + if (!path.eventLower.startsWith("player changes")) { + return false; + } + String sign = path.eventArgAt(2); + return (sign.equals("sign") || MaterialTag.matches(sign)); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java index bd5828ccf6..e3a7bc0f42 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java @@ -7,7 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -43,8 +42,8 @@ public PlayerChangesWorldScriptEvent() { public PlayerChangedWorldEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player changes world"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player changes world"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java index 432791523a..c5ee3f659e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerExpChangeEvent; @@ -48,8 +46,8 @@ public PlayerChangesXPScriptEvent() { public PlayerTag player; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player changes xp"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player changes xp"); } @Override 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 44dc0ae969..bff10f133d 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,7 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.Material; import org.bukkit.event.Event; @@ -125,14 +124,13 @@ public boolean nonSwitchWithCheck(ScriptPath path, ItemTag held) { private static final HashSet matchHelpList = new HashSet<>(Arrays.asList("at", "entity", "npc", "player", "vehicle", "projectile", "hanging")); @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return (lower.startsWith("player clicks") - || lower.startsWith("player left clicks") - || (lower.startsWith("player right clicks") - && !matchHelpList.contains(CoreUtilities.getXthArg(3, lower)) - && !EntityTag.matches(CoreUtilities.getXthArg(3, lower)))) - && couldMatchIn(lower); // Avoid matching "clicks in inventory" + public boolean couldMatch(ScriptPath path) { + return (path.eventLower.startsWith("player clicks") + || path.eventLower.startsWith("player left clicks") + || (path.eventLower.startsWith("player right clicks") + && !matchHelpList.contains(path.eventArgLowerAt(3)) + && !EntityTag.matches(path.eventArgLowerAt(3)))) + && couldMatchIn(path.eventLower); // Avoid matching "clicks in inventory" } private static final HashSet withHelpList = new HashSet<>(Arrays.asList("with", "using", "in")); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java index df1a9e8f37..06acef8258 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java @@ -7,7 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -43,9 +42,8 @@ public PlayerClosesInvScriptEvent() { public InventoryCloseEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player closes "); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player closes "); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java index 1af50119c3..1f0223c248 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java @@ -6,8 +6,6 @@ import com.denizenscript.denizencore.objects.core.ListTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerAdvancementDoneEvent; @@ -38,9 +36,8 @@ public PlayerCompletesAdvancementScriptEvent() { public PlayerAdvancementDoneEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player completes advancement"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player completes advancement"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java index 7828d1e3d0..32236e4ee8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java @@ -9,8 +9,6 @@ import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.objects.core.ScriptTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerItemConsumeEvent; @@ -50,8 +48,8 @@ public PlayerConsumesScriptEvent() { public PlayerItemConsumeEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player consumes"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player consumes"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCraftsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCraftsItemScriptEvent.java index 248cf5802c..cfca01b3a5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCraftsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerCraftsItemScriptEvent.java @@ -9,8 +9,6 @@ import com.denizenscript.denizencore.objects.core.ListTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.Material; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; @@ -56,9 +54,8 @@ public PlayerCraftsItemScriptEvent() { public PlayerTag player; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return CoreUtilities.getXthArg(0, lower).equals("player") && CoreUtilities.getXthArg(1, lower).equals("crafts"); + public boolean couldMatch(ScriptPath path) { + return path.eventArgLowerAt(0).equals("player") && path.eventArgLowerAt(1).equals("crafts"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java index 2090221e97..bdf5c50cfc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java @@ -10,8 +10,6 @@ import com.denizenscript.denizencore.objects.core.ListTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -59,9 +57,8 @@ public PlayerDragsInInvScriptEvent() { public InventoryDragEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player drags"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player drags"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java index 8e4e3802da..34774d7f42 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java @@ -8,8 +8,6 @@ import com.denizenscript.denizen.objects.PlayerTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Item; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -50,8 +48,8 @@ public PlayerDropsItemScriptEvent() { public PlayerDropItemEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player drops"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player drops"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEditsBookScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEditsBookScriptEvent.java index d1223256df..ec92419e9d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEditsBookScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEditsBookScriptEvent.java @@ -12,8 +12,6 @@ import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.objects.core.ScriptTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerEditBookEvent; @@ -53,9 +51,8 @@ public class PlayerEditsBookScriptEvent extends BukkitScriptEvent implements Lis BookMeta bookMeta; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player edits book") || lower.startsWith("player signs book"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player edits book") || path.eventLower.startsWith("player signs book"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java index 3b05493b5a..e0b94cdf9c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java @@ -8,8 +8,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerBucketEmptyEvent; @@ -54,9 +52,8 @@ public PlayerEmptiesBucketScriptEvent() { @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player empties"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player empties"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java index f5012bfe5e..16463d3fe1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerBedEnterEvent; @@ -43,8 +41,8 @@ public PlayerEntersBedScriptEvent() { public PlayerBedEnterEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player enters bed"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player enters bed"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java index daf4eff954..b7680fc3c2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java @@ -8,8 +8,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerBucketFillEvent; @@ -53,9 +51,8 @@ public PlayerFillsBucketScriptEvent() { @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player fills"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player fills"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java index 1e286a5425..7d51d290a4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java @@ -8,8 +8,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; @@ -56,8 +54,8 @@ public PlayerFishesScriptEvent() { public PlayerFishEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player fishes"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player fishes"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java index f40d3204e7..254dcebc9a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerToggleFlightEvent; @@ -45,9 +43,9 @@ public PlayerFlyingScriptEvent() { public PlayerToggleFlightEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.getXthArg(2, CoreUtilities.toLowerCase(s)).equals("flying") - || CoreUtilities.getXthArg(2, CoreUtilities.toLowerCase(s)).equals("flight"); + public boolean couldMatch(ScriptPath path) { + return path.eventArgLowerAt(2).equals("flying") + || path.eventArgLowerAt(2).equals("flight"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java index c56dc98e67..743c3f82c9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java @@ -10,8 +10,6 @@ import com.denizenscript.denizen.utilities.inventory.SlotHelper; import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -57,11 +55,10 @@ public PlayerItemTakesDamageScriptEvent() { } @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return (lower.startsWith("players") || lower.startsWith("player")) && - CoreUtilities.getXthArg(2, lower).equals("takes") && - CoreUtilities.getXthArg(3, lower).equals("damage"); + public boolean couldMatch(ScriptPath path) { + return (path.eventLower.startsWith("players") || path.eventLower.startsWith("player")) && + path.eventArgLowerAt(2).equals("takes") && + path.eventArgLowerAt(3).equals("damage"); } @Override 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 0366e87633..97a5c1ae72 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 @@ -7,7 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -44,8 +43,8 @@ public PlayerJoinsScriptEvent() { public PlayerJoinEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player join"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player join"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java index 3dc8a518e2..5fbb7b3f02 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizen.objects.PlayerTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; @@ -44,8 +42,8 @@ public PlayerJumpScriptEvent() { public PlayerTag player; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player jumps"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player jumps"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java index 90aed0c4d5..19f94171da 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java @@ -9,7 +9,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -56,8 +55,8 @@ public boolean isFlying() { } @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player kicked"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player kicked"); } @Override @@ -77,16 +76,16 @@ public String getName() { public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag) { String lower = CoreUtilities.toLowerCase(determinationObj.toString()); - if (lower.startsWith("message:")) { - message = new ElementTag(lower.substring("message:".length())); + if (path.eventLower.startsWith("message:")) { + message = new ElementTag(path.eventLower.substring("message:".length())); return true; } - else if (lower.startsWith("reason:")) { - reason = new ElementTag(lower.substring("reason:".length())); + else if (path.eventLower.startsWith("reason:")) { + reason = new ElementTag(path.eventLower.substring("reason:".length())); return true; } - else if (lower.startsWith("fly_cooldown:")) { - DurationTag duration = DurationTag.valueOf(lower.substring("fly_cooldown:".length())); + else if (path.eventLower.startsWith("fly_cooldown:")) { + DurationTag duration = DurationTag.valueOf(path.eventLower.substring("fly_cooldown:".length())); if (duration != null) { NMSHandler.getPlayerHelper().setFlyKickCooldown(player.getPlayerEntity(), (int) duration.getTicks()); cancelled = true; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java index 4ece213112..941488196f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java @@ -6,8 +6,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.PlayerLeashEntityEvent; @@ -45,8 +43,8 @@ public PlayerLeashesEntityScriptEvent() { public PlayerLeashEntityEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player leashes"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player leashes"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java index b28dc007ce..e5f3b8b6eb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizen.objects.PlayerTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerBedLeaveEvent; @@ -43,8 +41,8 @@ public PlayerLeavesBedScriptEvent() { public PlayerBedLeaveEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player leaves bed"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player leaves bed"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java index 000f174484..e1798758cb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java @@ -8,8 +8,6 @@ import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerLevelChangeEvent; @@ -45,8 +43,8 @@ public PlayerLevelsUpScriptEvent() { public PlayerLevelChangeEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player levels up"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player levels up"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLoginScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLoginScriptEvent.java index 65304dd417..acd77d209a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLoginScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLoginScriptEvent.java @@ -7,7 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -45,14 +44,13 @@ public PlayerLoginScriptEvent() { public PlayerLoginEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player") && (lower.contains("logs in") || lower.contains("login")); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player") && (path.eventLower.contains("logs in") || path.eventLower.contains("login")); } @Override - public boolean matches(ScriptContainer scriptContainer, String s) { - if (CoreUtilities.toLowerCase(s).contains("first") && PlayerTag.isNoted(event.getPlayer())) { + public boolean matches(ScriptPath path) { + if (path.eventLower.contains("first") && PlayerTag.isNoted(event.getPlayer())) { return false; } return true; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java index 91f3cfef21..67cd57730d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java @@ -9,8 +9,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerItemMendEvent; @@ -54,8 +52,8 @@ public PlayerMendsItemScriptEvent() { public LocationTag location; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player mends"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player mends"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java index 8fd44041f8..8a6565c04e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java @@ -7,7 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -42,9 +41,8 @@ public PlayerOpensInvScriptEvent() { public InventoryOpenEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player opens"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player opens"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPicksUpScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPicksUpScriptEvent.java index 5ac21630e5..cf1f1af69f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPicksUpScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPicksUpScriptEvent.java @@ -8,7 +8,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Item; import org.bukkit.event.EventHandler; @@ -62,12 +61,11 @@ public PlayerPicksUpScriptEvent() { private static final Set editedItems = new HashSet<>(); @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - if (CoreUtilities.xthArgEquals(3, lower, "from")) { + public boolean couldMatch(ScriptPath path) { + if (path.eventArgLowerAt(3).equals("from")) { return false; } - return lower.startsWith("player picks up") || lower.startsWith("player takes"); + return path.eventLower.startsWith("player picks up") || path.eventLower.startsWith("player takes"); } @Override @@ -89,7 +87,7 @@ public String getName() { public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { String determination = determinationObj.toString(); String lower = CoreUtilities.toLowerCase(determination); - if (lower.startsWith("item:")) { + if (path.eventLower.startsWith("item:")) { item = ItemTag.valueOf(determination.substring("item:".length()), path.container); itemChanged = true; return true; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java index 4661045eaf..7c88f22e18 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java @@ -6,8 +6,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockPlaceEvent; @@ -51,10 +49,9 @@ public PlayerPlacesBlockScriptEvent() { public BlockPlaceEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - String mat = CoreUtilities.getXthArg(2, lower); - return lower.startsWith("player places") + public boolean couldMatch(ScriptPath path) { + String mat = path.eventArgLowerAt(2); + return path.eventLower.startsWith("player places") && (!mat.equals("hanging") && !mat.equals("painting") && !mat.equals("item_frame") && !mat.equals("leash_hitch")); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java index b2ed914fff..599bbf208c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Entity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -48,9 +46,8 @@ public PlayerPlacesHangingScriptEvent() { public HangingPlaceEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player places"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player places"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java index caf3b35cf0..1a1a9291cf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java @@ -9,8 +9,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -57,9 +55,8 @@ public PlayerPreparesAnvilCraftScriptEvent() { public ElementTag newName; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player prepares anvil craft"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player prepares anvil craft"); } @Override 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 e9d50b151b..e90d792d4f 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 @@ -7,7 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -44,8 +43,8 @@ public PlayerQuitsScriptEvent() { public PlayerQuitEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player quit"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player quit"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesCommandsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesCommandsScriptEvent.java index bff53a912f..f0bee9a3f6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesCommandsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesCommandsScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizencore.objects.core.ListTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerCommandSendEvent; @@ -44,8 +42,8 @@ public PlayerReceivesCommandsScriptEvent() { public PlayerCommandSendEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player receives commands"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player receives commands"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesMessageScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesMessageScriptEvent.java index 2c0c990ee9..02527cc69e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesMessageScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerReceivesMessageScriptEvent.java @@ -6,7 +6,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; public class PlayerReceivesMessageScriptEvent extends BukkitScriptEvent { @@ -52,8 +51,8 @@ public PlayerReceivesMessageScriptEvent() { public boolean loaded; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player receives message"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player receives message"); } @Override @@ -81,12 +80,12 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag && !isDefaultDetermination(determinationObj)) { String determination = determinationObj.toString(); String lower = CoreUtilities.toLowerCase(determination); - if (lower.startsWith("message:")) { + if (path.eventLower.startsWith("message:")) { message = new ElementTag(determination.substring("message:".length())); messageModified = true; return true; } - if (lower.startsWith("raw_json:")) { + if (path.eventLower.startsWith("raw_json:")) { rawJson = new ElementTag(determination.substring("raw_json:".length())); rawJsonModified = true; 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 21838764d9..0941e4d865 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 @@ -7,7 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -42,8 +41,8 @@ public PlayerRespawnsScriptEvent() { public PlayerRespawnEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player respawns"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player respawns"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java index 3cb8dc128c..c483a2871e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java @@ -5,8 +5,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import com.denizenscript.denizencore.utilities.Deprecations; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -46,9 +44,8 @@ public class PlayerRightClicksEntityScriptEvent extends BukkitScriptEvent implem ItemTag item; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player right clicks"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player right clicks"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java index 7c1c7aa07e..3ae170c1ef 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerRiptideEvent; @@ -41,8 +39,8 @@ public PlayerRiptideScriptEvent() { private ItemTag item; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player activates riptide"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player activates riptide"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java index 239bcaf149..20ac868c9e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java @@ -6,7 +6,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Sheep; import org.bukkit.event.EventHandler; @@ -45,8 +44,8 @@ public PlayerShearsScriptEvent() { public PlayerShearEntityEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player shears"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player shears"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java index 08d0255bd8..eb00941abc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerToggleSneakEvent; @@ -45,8 +43,8 @@ public PlayerSneakScriptEvent() { public PlayerToggleSneakEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.getXthArg(2, CoreUtilities.toLowerCase(s)).equals("sneaking"); + public boolean couldMatch(ScriptPath path) { + return path.eventArgLowerAt(2).equals("sneaking"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java index d6916f1641..c69b826baf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerToggleSprintEvent; @@ -45,8 +43,8 @@ public PlayerSprintScriptEvent() { public PlayerToggleSprintEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.getXthArg(2, CoreUtilities.toLowerCase(s)).startsWith("sprint"); + public boolean couldMatch(ScriptPath path) { + return path.eventArgLowerAt(2).startsWith("sprint"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java index 63ef399d51..8395c3de2b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; @@ -46,9 +44,8 @@ public PlayerStandsOnScriptEvent() { MaterialTag material; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player stands on"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player stands on"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java index ad2b6ac3cd..c218961630 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java @@ -9,7 +9,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.Statistic; import org.bukkit.event.EventHandler; @@ -52,8 +51,8 @@ public PlayerStatisticIncrementsScriptEvent() { public PlayerStatisticIncrementEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player statistic"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player statistic"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java index c3df78439e..3a8e81de39 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; public class PlayerSteersEntityScriptEvent extends BukkitScriptEvent { @@ -50,8 +48,8 @@ public PlayerSteersEntityScriptEvent() { public ElementTag dismount; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.getXthArg(1, CoreUtilities.toLowerCase(s)).startsWith("steers"); + public boolean couldMatch(ScriptPath path) { + return path.eventArgLowerAt(1).startsWith("steers"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java index 1927f467aa..d08ec49475 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java @@ -5,8 +5,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; @@ -49,8 +47,8 @@ public PlayerStepsOnScriptEvent() { public PlayerMoveEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player steps on"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player steps on"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSwapsItemsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSwapsItemsScriptEvent.java index 3ae9ab2d0f..8c3cf52b1a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSwapsItemsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSwapsItemsScriptEvent.java @@ -7,7 +7,6 @@ import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -48,8 +47,8 @@ public PlayerSwapsItemsScriptEvent() { public PlayerSwapHandItemsEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player swaps items"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player swaps items"); } @Override @@ -67,11 +66,11 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { if (determinationObj instanceof ElementTag) { String determination = determinationObj.toString(); String lower = CoreUtilities.toLowerCase(determination); - if (lower.startsWith("main:")) { + if (path.eventLower.startsWith("main:")) { event.setMainHandItem(ItemTag.valueOf(determination.substring("main:".length()), path.container).getItemStack()); return true; } - else if (lower.startsWith("offhand:")) { + else if (path.eventLower.startsWith("offhand:")) { event.setOffHandItem(ItemTag.valueOf(determination.substring("offhand:".length()), path.container).getItemStack()); return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java index a58c138a00..29205e2570 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java @@ -9,8 +9,6 @@ import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.FurnaceExtractEvent; @@ -50,10 +48,9 @@ public PlayerTakesFromFurnaceScriptEvent() { public FurnaceExtractEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player takes") - && (CoreUtilities.getXthArg(4, lower).equals("furnace")); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player takes") + && (path.eventArgLowerAt(4).equals("furnace")); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java index 4be2a01796..545eb0cc43 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java @@ -9,8 +9,6 @@ import com.denizenscript.denizencore.events.ScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerTakeLecternBookEvent; @@ -48,10 +46,9 @@ public PlayerTakesFromLecternScriptEvent() { public PlayerTakeLecternBookEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player takes") - && (CoreUtilities.getXthArg(4, lower).equals("lectern")); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player takes") + && (path.eventArgLowerAt(4).equals("lectern")); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java index d486f960f5..565cd57ee6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; @@ -51,9 +49,8 @@ public PlayerThrowsEggScriptEvent() { public PlayerEggThrowEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player throws") && lower.contains("egg"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player throws") && path.eventLower.contains("egg"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java index e511bf18af..ade5471464 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java @@ -6,8 +6,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerPortalEvent; @@ -46,8 +44,8 @@ public PlayerUsesPortalScriptEvent() { public PlayerPortalEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player uses portal"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player uses portal"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java index 49ec8f2467..6dfac21f23 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java @@ -7,8 +7,6 @@ import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; -import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; @@ -48,9 +46,8 @@ public PlayerWalkScriptEvent() { public PlayerMoveEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - String lower = CoreUtilities.toLowerCase(s); - return lower.startsWith("player walks") && !CoreUtilities.xthArgEquals(2, lower, "over"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player walks") && !path.eventArgLowerAt(2).equals("over"); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java index 243ad399cb..6ba8698673 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java @@ -9,7 +9,6 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -46,8 +45,8 @@ public PlayerWalksOverScriptEvent() { public PlayerMoveEvent event; @Override - public boolean couldMatch(ScriptContainer scriptContainer, String s) { - return CoreUtilities.toLowerCase(s).startsWith("player walks over"); + public boolean couldMatch(ScriptPath path) { + return path.eventLower.startsWith("player walks over"); } @Override