more event regexes

src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java

@@ -20,13 +20,16 @@
 
 public class BiomeEnterExitScriptEvent extends ScriptEvent implements Listener {
 
+    // TODO: in area?
     // <--[event]
     // @Events
     // player enters <biome>
     // player exits <biome>
     // player enters biome
     // player exits biome
     //
+    // @Regex ^on player (enters|exits) [^\s]+$
+    //
     // @Warning Cancelling this event will fire a similar event immediately after.
     //
     // @Cancellable true

src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java

@@ -29,10 +29,13 @@
 
 public class ChatScriptEvent extends ScriptEvent implements Listener {
 
+    // TODO: in area
     // <--[event]
     // @Events
     // player chats
     //
+    // @Regex ^on player chats$
+    //
     // @Cancellable true
     //
     // @Warning Using this will forcibly sync the chat thread.

src/main/java/net/aufdemrand/denizen/events/player/ItemScrollScriptEvent.java

@@ -18,11 +18,15 @@
 
 public class ItemScrollScriptEvent extends ScriptEvent implements Listener {
 
+    // TODO: in area
+    // TODO: item:x switch
     // <--[event]
     // @Events
     // player scrolls their hotbar
     // player holds item
     //
+    // @Regex ^on player (scrolls their hotbar|holds item)$
+    //
     // @Cancellable true
     //
     // @Triggers when a player scrolls through their hotbar.

src/main/java/net/aufdemrand/denizen/events/player/ListPingScriptEvent.java

@@ -20,6 +20,8 @@ public class ListPingScriptEvent extends ScriptEvent implements Listener {
     // @Events
     // server list ping
     //
+    // @Regex ^on server list ping$
+    //
     // @Triggers when the server is pinged for a client's server list.
     // @Context
     // <context.motd> returns the MOTD that will show.

src/main/java/net/aufdemrand/denizen/events/player/PlayerAnimatesScriptEvent.java

@@ -23,6 +23,8 @@ public class PlayerAnimatesScriptEvent extends BukkitScriptEvent implements List
     // @Events
     // player animates (<animation>) (in <area>)
     //
+    // @Regex ^on player animates [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player performs an animation.

src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java

@@ -22,14 +22,17 @@
 
 public class PlayerBreaksBlockScriptEvent extends BukkitScriptEvent implements Listener {
 
+    // TODO: de-collide with breaks item
     // <--[event]
     // @Events
     // player breaks block (in <area>)
     // player breaks <material> (in <area>)
     // player breaks block (in <area>)
     // player breaks <material> (in <area>)
     //
-    // @Switch with <item>|<material>
+    // @Regex ^on player breaks [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
+    // @Switch with <item>
     //
     // @Cancellable true
     //

src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksItemScriptEvent.java

@@ -26,6 +26,8 @@ public class PlayerBreaksItemScriptEvent extends BukkitScriptEvent implements Li
     // player breaks item (in <area>)
     // player breaks <item> (in <area>)
     //
+    // @Regex ^on player breaks [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player breaks the item they are holding.

src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesGamemodeScriptEvent.java

@@ -22,6 +22,7 @@ public class PlayerChangesGamemodeScriptEvent extends BukkitScriptEvent implemen
     // @Events
     // player changes gamemode (to <gamemode>)
     //
+    // @Regex ^on player changes gamemode( to [^\s]+)?$
     // @Cancellable true
     //
     // @Triggers when a player's gamemode is changed.

src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java

@@ -23,10 +23,10 @@ public class PlayerChangesSignScriptEvent extends BukkitScriptEvent implements L
 
     // <--[event]
     // @Events
-    // player changes sign
-    // player changes sign in <area>
-    // player changes <material>
-    // player changes <material> in <area>
+    // player changes sign (in <area>)
+    // player changes <material> (in <area>)
+    //
+    // @Regex ^on player changes [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
     //
     // @Cancellable true
     //

src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesWorldScriptEvent.java

@@ -23,6 +23,8 @@ public class PlayerChangesWorldScriptEvent extends BukkitScriptEvent implements
     // @Events
     // player changes world (from <world>) (to <world>)
     //
+    // @Regex ^on player world( from [^\s]+)?( to [^\s]+)?( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable false
     //
     // @Triggers when a player moves to a different world.

src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesXPScriptEvent.java

@@ -19,10 +19,13 @@
 
 public class PlayerChangesXPScriptEvent extends BukkitScriptEvent implements Listener {
 
+    // TODO: in area
     // <--[event]
     // @Events
     // player changes xp
     //
+    // @Regex ^on player changes xp$
+    //
     // @Cancellable true
     //
     // @Triggers when a player's experience amount changes.

src/main/java/net/aufdemrand/denizen/events/player/PlayerClosesInvScriptEvent.java

@@ -18,13 +18,17 @@
 
 public class PlayerClosesInvScriptEvent extends ScriptEvent implements Listener {
 
+    // TODO: in area
     // <--[event]
     // @Events
     // player closes inventory
     // player closes <inventory type>
     // npc closes inventory
     // npc closes <inventory type>
     //
+    // @Regex ^on (player|npc) closes [^\s]+$
+    //
+    //
     // @Triggers when a player closes an inventory. (EG, chests, not the player's main inventory.)
     //
     // @Context

src/main/java/net/aufdemrand/denizen/events/player/PlayerConsumesScriptEvent.java

@@ -24,6 +24,8 @@ public class PlayerConsumesScriptEvent extends BukkitScriptEvent implements List
     // player consumes item (in <area>)
     // player consumes <item> (in <area>)
     //
+    // @Regex ^on player consumes [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player consumes an item.

src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java

@@ -23,6 +23,8 @@ public class PlayerDamagesBlockScriptEvent extends BukkitScriptEvent implements
     // player damages block (in <area>)
     // player damages <material> (in <area>)
     //
+    // @Regex ^on player damages [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a block is damaged by a player.

src/main/java/net/aufdemrand/denizen/events/player/PlayerDropsItemScriptEvent.java

@@ -24,6 +24,8 @@ public class PlayerDropsItemScriptEvent extends BukkitScriptEvent implements Lis
     // player drops item (in <area>)
     // player drops <item> (in <area>)
     //
+    // @Regex ^on player drops [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player drops an item.

src/main/java/net/aufdemrand/denizen/events/player/PlayerEntersBedScriptEvent.java

@@ -22,6 +22,8 @@ public class PlayerEntersBedScriptEvent extends BukkitScriptEvent implements Lis
     // @Events
     // player enters bed (in <area>)
     //
+    // @Regex ^on player enters bed( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player enters a bed.

src/main/java/net/aufdemrand/denizen/events/player/PlayerFishesScriptEvent.java

@@ -25,6 +25,8 @@ public class PlayerFishesScriptEvent extends BukkitScriptEvent implements Listen
     // @Events
     // player fishes (<entity>) (while <state>) (in <area>)
     //
+    // @Regex ^on player fishes( [^\s]+)?( while [^\s]+)?( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player uses a fishing rod.

src/main/java/net/aufdemrand/denizen/events/player/PlayerFlyingScriptEvent.java

@@ -24,6 +24,8 @@ public class PlayerFlyingScriptEvent extends BukkitScriptEvent implements Listen
     // player starts flying (in <area>)
     // player stops flying (in <area>)
     //
+    // @Regex ^on player (toggles|starts|stops) flying( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player starts or stops flying.

src/main/java/net/aufdemrand/denizen/events/player/PlayerJoinsScriptEvent.java

@@ -23,6 +23,8 @@ public class PlayerJoinsScriptEvent extends BukkitScriptEvent implements Listene
     // player joins
     // player join
     //
+    // @Regex ^on player (joins|join)$
+    //
     // @Cancellable false
     //
     // @Triggers when a player joins the server.

src/main/java/net/aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java

@@ -22,6 +22,8 @@ public class PlayerJumpScriptEvent extends BukkitScriptEvent implements Listener
     // @Events
     // player jumps (in <area>)
     //
+    // @Regex ^on player jumps( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Triggers when a player jumps.
     //
     // @Context

src/main/java/net/aufdemrand/denizen/events/player/PlayerKickedScriptEvent.java

@@ -22,6 +22,8 @@ public class PlayerKickedScriptEvent extends BukkitScriptEvent implements Listen
     // @Events
     // player kicked
     //
+    // @Regex ^on player kicked$
+    //
     // @Cancellable true
     //
     // @Triggers when a player kicked the server.

src/main/java/net/aufdemrand/denizen/events/player/PlayerLeashesScriptEvent.java

@@ -22,6 +22,8 @@ public class PlayerLeashesScriptEvent extends BukkitScriptEvent implements Liste
     // player leashes entity (in <area>)
     // player leashes <entity> (in <area>)
     //
+    // @Regex ^on player leashes [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player leashes an entity.

src/main/java/net/aufdemrand/denizen/events/player/PlayerLeavesBedScriptEvent.java

@@ -22,6 +22,8 @@ public class PlayerLeavesBedScriptEvent extends BukkitScriptEvent implements Lis
     // @Events
     // player leaves bed (in <area>)
     //
+    // @Regex ^on player leaves bed( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player leaves a bed.

src/main/java/net/aufdemrand/denizen/events/player/PlayerLevelsScriptEvent.java

@@ -22,7 +22,9 @@ public class PlayerLevelsScriptEvent extends BukkitScriptEvent implements Listen
 
     // <--[event]
     // @Events
-    // player levels up (from <level>/to <level>)
+    // player levels up (from <level>) (to <level>)
+    //
+    // @Regex ^on player levels up( from [^\s]+)?( to [^\s]+)?$
     //
     // @Cancellable false
     //
@@ -52,12 +54,12 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         List<String> data = CoreUtilities.split(lower, ' ');
         for (int index = 0; index < data.size(); index++) {
             if (data.get(index).equals("from")) {
-                if (aH.getIntegerFrom(data.get(index+1)) != event.getOldLevel()){
+                if (aH.getIntegerFrom(data.get(index + 1)) != event.getOldLevel()){
                     return false;
                 }
             }
             if (data.get(index).equals("to")) {
-                if (aH.getIntegerFrom(data.get(index+1)) != event.getNewLevel()){
+                if (aH.getIntegerFrom(data.get(index + 1)) != event.getNewLevel()){
                     return false;
                 }
             }

src/main/java/net/aufdemrand/denizen/events/player/PlayerLoginScriptEvent.java

@@ -24,6 +24,8 @@ public class PlayerLoginScriptEvent extends BukkitScriptEvent implements Listene
     // player logs in (for the first time)
     // player (first) login
     //
+    // @Regex ^on player (logs in( for the first time)?|( first)? login)$
+    //
     // @Cancellable false
     //
     // @Triggers when a player logs in to the server.

src/main/java/net/aufdemrand/denizen/events/player/PlayerOpensInvScriptEvent.java

@@ -18,11 +18,14 @@
 
 public class PlayerOpensInvScriptEvent extends ScriptEvent implements Listener {
 
+    // TODO: in area
     // <--[event]
     // @Events
     // player opens inventory
     // player opens <inventory type>
     //
+    // @Regex ^on player opens [^\s]+$
+    //
     // @Triggers when a player opens an inventory. (EG, chests, not the player's main inventory.)
     //
     // @Context

src/main/java/net/aufdemrand/denizen/events/player/PlayerPicksUpScriptEvent.java

@@ -26,6 +26,8 @@ public class PlayerPicksUpScriptEvent extends BukkitScriptEvent implements Liste
     // player takes item (in <area>)
     // player takes <item> (in <area>)
     //
+    // @Regex ^on player (picks up|takes) [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player picks up an item.

src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java

@@ -23,6 +23,8 @@ public class PlayerPlacesBlockScriptEvent extends BukkitScriptEvent implements L
     // player places block (in <area>)
     // player places <material> (in <area>)
     //
+    // @Regex ^on player places [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player places a block.

src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesHangingScriptEvent.java

@@ -18,11 +18,14 @@
 
 public class PlayerPlacesHangingScriptEvent extends BukkitScriptEvent implements Listener {
 
+    // TODO: de-collide with places block
     // <--[event]
     // @Events
     // player places hanging (in <area>)
     // player places <hanging> (in <area>)
     //
+    // @Regex ^on player places [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a hanging entity (painting or itemframe) is placed.

src/main/java/net/aufdemrand/denizen/events/player/PlayerQuitsScriptEvent.java

@@ -23,6 +23,8 @@ public class PlayerQuitsScriptEvent extends BukkitScriptEvent implements Listene
     // player quits
     // player quit
     //
+    // @Regex ^on player (quit|quits)$
+    //
     // @Cancellable false
     //
     // @Triggers when a player quit the server.

src/main/java/net/aufdemrand/denizen/events/player/PlayerRespawnsScriptEvent.java

@@ -22,6 +22,8 @@ public class PlayerRespawnsScriptEvent extends BukkitScriptEvent implements List
     // @Events
     // player respawns (at bed/elsewhere)
     //
+    // @Regex ^on player respawns( at (bed|elsewhere))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player respawns.

src/main/java/net/aufdemrand/denizen/events/player/PlayerShearsScriptEvent.java

@@ -24,6 +24,8 @@ public class PlayerShearsScriptEvent extends BukkitScriptEvent implements Listen
     // player shears <entity> (in <area>)
     // player shears <color> sheep (in <area>)
     //
+    // @Regex ^on player shears [^\s]+( sheep)?( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player shears an entity.

src/main/java/net/aufdemrand/denizen/events/player/PlayerSneakScriptEvent.java

@@ -24,6 +24,8 @@ public class PlayerSneakScriptEvent extends BukkitScriptEvent implements Listene
     // player starts sneaking (in <area>)
     // player stops sneaking (in <area>)
     //
+    // @Regex ^on player (toggles|starts|stops) sneaking( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player starts or stops sneaking.

src/main/java/net/aufdemrand/denizen/events/player/PlayerSprintScriptEvent.java

@@ -23,7 +23,9 @@ public class PlayerSprintScriptEvent extends BukkitScriptEvent implements Listen
     // player toggles sprinting (in <area>)
     // player starts sprinting (in <area>)
     // player stops sprinting (in <area>)
-    // 
+    //
+    // @Regex ^on player (toggles|starts\stops) sprinting( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Cancellable true
     //
     // @Triggers when a player starts or stops sprinting.

src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java

@@ -24,6 +24,8 @@ public class PlayerStepsOnScriptEvent extends BukkitScriptEvent implements Liste
     // player steps on block (in <area>)
     // player steps on <material> (in <area>)
     //
+    // @Regex ^on player steps on [^\s]+( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
+    //
     // @Warning This event may fire very rapidly.
     //
     // @Cancellable true