Skip to content

Commit

Permalink
more event cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Nov 14, 2021
1 parent e495aba commit 3d79a1e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 85 deletions.
4 changes: 2 additions & 2 deletions paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerEquipsArmorScriptEvent.java
View file
Expand Up @@ -21,8 +21,8 @@ public class PlayerEquipsArmorScriptEvent extends BukkitScriptEvent implements L

// <--[event]
// @Events
// player (equips|unequips) armor|helmet|chestplate|leggings|boots
// player (equips|unequips) <item>
// player equips|unequips armor|helmet|chestplate|leggings|boots
// player equips|unequips <item>
//
// @Plugin Paper
//
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java
View file
Expand Up @@ -364,7 +364,7 @@ public static boolean couldMatchBlock(String text) {
}

public static boolean couldMatchBlock(String text, Function<Material, Boolean> requirement) {
if (text.equals("block") || text.equals("material") || text.startsWith("vanilla_tagged:")) {
if (text.equals("block") || text.equals("material") || text.startsWith("vanilla_tagged:") || text.startsWith("material_flagged:")) {
return true;
}
if (text.equals("item")) {
Expand Down
23 changes: 2 additions & 21 deletions plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGlideScriptEvent.java
View file
Expand Up @@ -14,12 +14,7 @@ public class EntityGlideScriptEvent extends BukkitScriptEvent implements Listene

// <--[event]
// @Events
// entity toggles gliding
// entity starts gliding
// entity stops gliding
// <entity> (starts/stops/toggles) gliding
//
// @Regex ^on [^\s]+ (toggles|starts|stops) gliding$
// <entity> toggles|starts|stops gliding
//
// @Group Entity
//
Expand All @@ -41,27 +36,13 @@ public class EntityGlideScriptEvent extends BukkitScriptEvent implements Listene

public EntityGlideScriptEvent() {
instance = this;
registerCouldMatcher("<entity> toggles|starts|stops gliding");
}

public static EntityGlideScriptEvent instance;
public EntityTag entity;
public boolean state;

@Override
public boolean couldMatch(ScriptPath path) {
if (!path.eventArgLowerAt(2).equals("gliding")) {
return false;
}
String cmd = path.eventArgLowerAt(1);
if (!cmd.equals("starts") && !cmd.equals("stops") && !cmd.equals("toggles")) {
return false;
}
if (!couldMatchEntity(path.eventArgLowerAt(0))) {
return false;
}
return true;
}

@Override
public boolean matches(ScriptPath path) {

Expand Down
23 changes: 2 additions & 21 deletions plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySwimScriptEvent.java
View file
Expand Up @@ -14,12 +14,7 @@ public class EntitySwimScriptEvent extends BukkitScriptEvent implements Listener

// <--[event]
// @Events
// entity toggles swimming
// entity starts swimming
// entity stops swimming
// <entity> (starts/stops/toggles) swimming
//
// @Regex ^on [^\s]+ (toggles|starts|stops) swimming$
// <entity> toggles|starts|stops swimming
//
// @Group Entity
//
Expand All @@ -41,27 +36,13 @@ public class EntitySwimScriptEvent extends BukkitScriptEvent implements Listener

public EntitySwimScriptEvent() {
instance = this;
registerCouldMatcher("<entity> toggles|starts|stops swimming");
}

public static EntitySwimScriptEvent instance;
public EntityTag entity;
public boolean state;

@Override
public boolean couldMatch(ScriptPath path) {
if (!path.eventArgLowerAt(2).equals("swimming")) {
return false;
}
String cmd = path.eventArgLowerAt(1);
if (!cmd.equals("starts") && !cmd.equals("stops") && !cmd.equals("toggles")) {
return false;
}
if (!couldMatchEntity(path.eventArgLowerAt(0))) {
return false;
}
return true;
}

@Override
public boolean matches(ScriptPath path) {

Expand Down
8 changes: 2 additions & 6 deletions plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerHoldsItemEvent.java
View file
Expand Up @@ -22,12 +22,7 @@ public class PlayerHoldsItemEvent extends BukkitScriptEvent implements Listener

// <--[event]
// @Events
// player raises <item>
// player lowers <item>
// player toggles <item>
// player (raises/lowers/toggles) <item>
//
// @Regex ^on player (toggles|raises|lowers) [^\s]+$
// player raises|lowers|toggles <item>
//
// @Synonyms player raises shield, player raises spyglass
//
Expand All @@ -46,6 +41,7 @@ public class PlayerHoldsItemEvent extends BukkitScriptEvent implements Listener

public PlayerHoldsItemEvent() {
instance = this;
registerCouldMatcher("player raises|lowers|toggles <item>");
}

public static PlayerHoldsItemEvent instance;
Expand Down
19 changes: 2 additions & 17 deletions plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java
View file
Expand Up @@ -14,11 +14,7 @@ public class PlayerSneakScriptEvent extends BukkitScriptEvent implements Listene

// <--[event]
// @Events
// player toggles sneaking
// player starts sneaking
// player stops sneaking
//
// @Regex ^on player (toggles|starts|stops) sneaking$
// player toggles|starts|stops sneaking
//
// @Group Player
//
Expand All @@ -37,24 +33,13 @@ public class PlayerSneakScriptEvent extends BukkitScriptEvent implements Listene

public PlayerSneakScriptEvent() {
instance = this;
registerCouldMatcher("player toggles|starts|stops sneaking");
}

public static PlayerSneakScriptEvent instance;
public boolean state;
public PlayerToggleSneakEvent event;

@Override
public boolean couldMatch(ScriptPath path) {
if (!path.eventArgLowerAt(0).equals("player") || !path.eventArgLowerAt(2).equals("sneaking")) {
return false;
}
String middleWord = path.eventArgAt(1);
if (!(middleWord.equals("starts") || middleWord.equals("stops") || middleWord.equals("toggles"))) {
return false;
}
return true;
}

@Override
public boolean matches(ScriptPath path) {
String cmd = path.eventArgLowerAt(1);
Expand Down
19 changes: 2 additions & 17 deletions plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java
View file
Expand Up @@ -14,11 +14,7 @@ public class PlayerSprintScriptEvent extends BukkitScriptEvent implements Listen

// <--[event]
// @Events
// player toggles sprinting
// player starts sprinting
// player stops sprinting
//
// @Regex ^on player (toggles|starts|stops) sprinting$
// player toggles|starts|stops sprinting
//
// @Group Player
//
Expand All @@ -37,24 +33,13 @@ public class PlayerSprintScriptEvent extends BukkitScriptEvent implements Listen

public PlayerSprintScriptEvent() {
instance = this;
registerCouldMatcher("player toggles|starts|stops sprinting");
}

public static PlayerSprintScriptEvent instance;
public boolean state;
public PlayerToggleSprintEvent event;

@Override
public boolean couldMatch(ScriptPath path) {
if (!path.eventArgLowerAt(0).equals("player") || !path.eventArgLowerAt(2).equals("sprinting")) {
return false;
}
String middleWord = path.eventArgAt(1);
if (!(middleWord.equals("starts") || middleWord.equals("stops") || middleWord.equals("toggles"))) {
return false;
}
return true;
}

@Override
public boolean matches(ScriptPath path) {
String cmd = path.eventArgLowerAt(1);
Expand Down

0 comments on commit 3d79a1e

Please sign in to comment.