event cleanup step 5: player part 2

DenizenScript · Oct 31, 2019 · 626ec5d · 626ec5d
1 parent 5d7519d
commit 626ec5d
Show file tree

Hide file tree

Showing 54 changed files with 135 additions and 243 deletions.
diff --git 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
@@ -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<PlayerTag> players = recs.filter(PlayerTag.class, path.container, true);

diff --git a/...n/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/...n/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/...c/main/java/com/denizenscript/denizen/events/player/PlayerChangesGamemodeScriptEvent.java b/...c/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/...n/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java b/...n/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/.../src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java b/.../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
@@ -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/...n/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java b/...n/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<String> 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<String> 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
@@ -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/...n/java/com/denizenscript/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java b/...n/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
@@ -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/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerCraftsItemScriptEvent.java b/...in/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/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java b/...in/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
@@ -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
@@ -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/...src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java b/...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
@@ -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/...n/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java b/...n/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
@@ -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