match upstream core changes (events, property tags)

DenizenScript · Aug 21, 2022 · 4f0f846 · 4f0f846
1 parent 720051c
commit 4f0f846
Show file tree

Hide file tree

Showing 113 changed files with 14 additions and 682 deletions.
diff --git a/...in/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopBoughtScriptEvent.java b/...in/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopBoughtScriptEvent.java
@@ -30,11 +30,9 @@ public class AreaShopBoughtScriptEvent extends BukkitScriptEvent implements List
     // -->
 
     public AreaShopBoughtScriptEvent() {
-        instance = this;
         registerCouldMatcher("areashop <'shop'> bought");
     }
 
-    public static AreaShopBoughtScriptEvent instance;
     public BoughtRegionEvent event;
     public AreaShopTag areaShop;
 
@@ -47,11 +45,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    @Override
-    public String getName() {
-        return "AreaShopBought";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(new PlayerTag(event.getRegion().getBuyer()), null);

diff --git a/...n/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopExpiresScriptEvent.java b/...n/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopExpiresScriptEvent.java
@@ -30,11 +30,9 @@ public class AreaShopExpiresScriptEvent extends BukkitScriptEvent implements Lis
     // -->
 
     public AreaShopExpiresScriptEvent() {
-        instance = this;
         registerCouldMatcher("areashop <'shop'> expires");
     }
 
-    public static AreaShopExpiresScriptEvent instance;
     public UnrentedRegionEvent event;
     public AreaShopTag areaShop;
 
@@ -47,11 +45,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    @Override
-    public String getName() {
-        return "AreaShopExpires";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(new PlayerTag(event.getOldRenter()), null);

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopRentedScriptEvent.java b/...in/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopRentedScriptEvent.java
@@ -32,11 +32,9 @@ public class AreaShopRentedScriptEvent extends BukkitScriptEvent implements List
     // -->
 
     public AreaShopRentedScriptEvent() {
-        instance = this;
         registerCouldMatcher("areashop <'shop'> rented");
     }
 
-    public static AreaShopRentedScriptEvent instance;
     public RentedRegionEvent event;
     public AreaShopTag areaShop;
 
@@ -49,11 +47,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    @Override
-    public String getName() {
-        return "AreaShopRented";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(new PlayerTag(event.getRegion().getRenter()), null);

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopResoldScriptEvent.java b/...in/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopResoldScriptEvent.java
@@ -31,11 +31,9 @@ public class AreaShopResoldScriptEvent extends BukkitScriptEvent implements List
     // -->
 
     public AreaShopResoldScriptEvent() {
-        instance = this;
         registerCouldMatcher("areashop <'shop'> resold");
     }
 
-    public static AreaShopResoldScriptEvent instance;
     public ResoldRegionEvent event;
     public AreaShopTag areaShop;
 
@@ -48,11 +46,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    @Override
-    public String getName() {
-        return "AreaShopResold";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(new PlayerTag(event.getRegion().getBuyer()), null);

diff --git a/...main/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopSoldScriptEvent.java b/...main/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopSoldScriptEvent.java
@@ -30,11 +30,9 @@ public class AreaShopSoldScriptEvent extends BukkitScriptEvent implements Listen
     // -->
 
     public AreaShopSoldScriptEvent() {
-        instance = this;
         registerCouldMatcher("areashop <'shop'> sold");
     }
 
-    public static AreaShopSoldScriptEvent instance;
     public SoldRegionEvent event;
     public AreaShopTag areaShop;
 
@@ -47,11 +45,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    @Override
-    public String getName() {
-        return "AreaShopSold";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(new PlayerTag(event.getOldBuyer()), null);

diff --git a/...script/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java b/...script/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java
@@ -37,26 +37,19 @@ public class PlayerCompletesSkyBlockChallengeScriptEvent extends BukkitScriptEve
     //
     // -->
 
-    public static PlayerCompletesSkyBlockChallengeScriptEvent instance;
     public ChallengeCompleteEvent event;
     public ElementTag challenge;
     public ElementTag xp_reward;
     public ElementTag money_reward;
 
     public PlayerCompletesSkyBlockChallengeScriptEvent() {
-        instance = this;
     }
 
     @Override
     public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("player completes skyblock challenge");
     }
 
-    @Override
-    public String getName() {
-        return "PlayerCompletesSkyBlockChallenge";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(event.getPlayer());

diff --git a/.../com/denizenscript/depenizen/bukkit/events/askyblock/PlayerEntersSkyBlockScriptEvent.java b/.../com/denizenscript/depenizen/bukkit/events/askyblock/PlayerEntersSkyBlockScriptEvent.java
@@ -40,19 +40,13 @@ public class PlayerEntersSkyBlockScriptEvent extends BukkitScriptEvent implement
     public PlayerTag owner;
 
     public PlayerEntersSkyBlockScriptEvent() {
-        instance = this;
     }
 
     @Override
     public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("skyblock player enters skyblock");
     }
 
-    @Override
-    public String getName() {
-        return "PlayerEntersSkyBlock";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(new PlayerTag(event.getPlayer()), null);

diff --git a/...a/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerExitsSkyBlockScriptEvent.java b/...a/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerExitsSkyBlockScriptEvent.java
@@ -33,26 +33,19 @@ public class PlayerExitsSkyBlockScriptEvent extends BukkitScriptEvent implements
     //
     // -->
 
-    public static PlayerExitsSkyBlockScriptEvent instance;
     public IslandExitEvent event;
     public LocationTag location;
     public LocationTag island_location;
     public PlayerTag owner;
 
     public PlayerExitsSkyBlockScriptEvent() {
-        instance = this;
     }
 
     @Override
     public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("player exits skyblock");
     }
 
-    @Override
-    public String getName() {
-        return "PlayerEntersSkyBlock";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(new PlayerTag(event.getPlayer()), null);

diff --git a/.../java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockCreatedScriptEvent.java b/.../java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockCreatedScriptEvent.java
@@ -33,26 +33,19 @@ public class SkyBlockCreatedScriptEvent extends BukkitScriptEvent implements Lis
     //
     // -->
 
-    public static SkyBlockCreatedScriptEvent instance;
     public IslandNewEvent event;
     public LocationTag location;
     public ElementTag schematic;
     public PlayerTag owner;
 
     public SkyBlockCreatedScriptEvent() {
-        instance = this;
     }
 
     @Override
     public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("skyblock island created");
     }
 
-    @Override
-    public String getName() {
-        return "SkyBlockCreated";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(owner, null);

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockResetScriptEvent.java b/...in/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockResetScriptEvent.java
@@ -31,25 +31,18 @@ public class SkyBlockResetScriptEvent extends BukkitScriptEvent implements Liste
     //
     // -->
 
-    public static SkyBlockResetScriptEvent instance;
     public IslandResetEvent event;
     public LocationTag location;
     public PlayerTag owner;
 
     public SkyBlockResetScriptEvent() {
-        instance = this;
     }
 
     @Override
     public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("skyblock island reset");
     }
 
-    @Override
-    public String getName() {
-        return "SkyBlockReset";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(owner, null);

diff --git a/...va/com/denizenscript/depenizen/bukkit/events/bigdoors/BigDoorsDoorTogglesScriptEvent.java b/...va/com/denizenscript/depenizen/bukkit/events/bigdoors/BigDoorsDoorTogglesScriptEvent.java
@@ -33,11 +33,9 @@ public class BigDoorsDoorTogglesScriptEvent extends BukkitScriptEvent implements
     // -->
 
     public BigDoorsDoorTogglesScriptEvent() {
-        instance = this;
         registerCouldMatcher("bigdoors door toggles|opens|closes");
     }
 
-    public static BigDoorsDoorTogglesScriptEvent instance;
     public DoorEventTogglePrepare event;
     public Door door;
     public DoorEventToggle.ToggleType toggleType;
@@ -57,11 +55,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    @Override
-    public String getName() {
-        return "BigDoorsDoorToggles";
-    }
-
     @Override
     public ObjectTag getContext(String name) {
         if (name.equals("door")) {

diff --git a/...n/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerJoinsScriptEvent.java b/...n/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerJoinsScriptEvent.java
@@ -40,6 +40,7 @@ public BungeePlayerJoinsScriptEvent() {
 
     public static BungeePlayerJoinsScriptEvent instance;
 
+
     public String name;
 
     public UUID uuid;
@@ -51,11 +52,6 @@ public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("bungee player joins network");
     }
 
-    @Override
-    public String getName() {
-        return "BungeePlayerJoins";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         OfflinePlayer player = null;

diff --git a/...n/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerQuitsScriptEvent.java b/...n/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerQuitsScriptEvent.java
@@ -51,11 +51,6 @@ public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("bungee player leaves network");
     }
 
-    @Override
-    public String getName() {
-        return "BungeePlayerQuits";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         OfflinePlayer player = null;

diff --git a/...com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerServerSwitchScriptEvent.java b/...com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerServerSwitchScriptEvent.java
@@ -60,11 +60,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    @Override
-    public String getName() {
-        return "BungeePlayerServerSwitch";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         OfflinePlayer player = null;

diff --git a/...com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerCommandScriptEvent.java b/...com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerCommandScriptEvent.java
@@ -82,11 +82,6 @@ public void destroy() {
         BungeeBridge.instance.checkBroadcastProxyCommand();
     }
 
-    @Override
-    public String getName() {
-        return "BungeeProxyServerCommand";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         OfflinePlayer player = null;

diff --git a/...om/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java b/...om/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java
@@ -86,11 +86,6 @@ public void destroy() {
         BungeeBridge.instance.checkBroadcastProxyPing();
     }
 
-    @Override
-    public String getName() {
-        return "BungeeProxyServerListPing";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(null, null);

diff --git a/...java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerConnectScriptEvent.java b/...java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerConnectScriptEvent.java
@@ -38,11 +38,6 @@ public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("bungee server connects");
     }
 
-    @Override
-    public String getName() {
-        return "BungeeServerConnects";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(null, null);

diff --git a/...a/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerDisconnectScriptEvent.java b/...a/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerDisconnectScriptEvent.java
@@ -38,11 +38,6 @@ public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("bungee server disconnects");
     }
 
-    @Override
-    public String getName() {
-        return "BungeeServerDisconnects";
-    }
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(null, null);

diff --git a/...va/com/denizenscript/depenizen/bukkit/events/crackshot/CrackShotLandmineTriggerEvent.java b/...va/com/denizenscript/depenizen/bukkit/events/crackshot/CrackShotLandmineTriggerEvent.java
@@ -38,7 +38,6 @@ public class CrackShotLandmineTriggerEvent extends BukkitScriptEvent implements
     public WeaponTriggerEvent event;
 
     public CrackShotLandmineTriggerEvent() {
-        instance = this;
     }
 
     @Override
@@ -51,11 +50,6 @@ public boolean couldMatch(ScriptPath path) {
         return path.eventLower.startsWith("crackshot landmine triggered");
     }
 
-    @Override
-    public String getName() {
-        return "CrackShotLandmineTriggered";
-    }
-
     @Override
     public ObjectTag getContext(String name) {
         if (name.equals("victim")) {