global ScriptEvent isEnabled instance of doing it in every event sepa…

…rately
DenizenScript · Dec 22, 2023 · ac2ab6f · ac2ab6f
1 parent fba327b
commit ac2ab6f
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 72 deletions.
diff --git a/paper/pom.xml b/paper/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerHearsSoundScriptEvent.java b/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerHearsSoundScriptEvent.java
@@ -52,7 +52,6 @@ public PlayerHearsSoundScriptEvent() {
     }
 
     public static PlayerHearsSoundScriptEvent instance;
-    public static boolean enabled;
 
     public Player player;
     public String soundName;
@@ -81,15 +80,15 @@ public ScriptEntryData getScriptEntryData() {
     @Override
     public void init() {
         NetworkInterceptHelper.enable();
-        enabled = true;
+        super.init();
     }
 
     @Override
     public void destroy() {
-        enabled = false;
         entity = null;
         player = null;
         location = null;
+        super.destroy();
     }
 
     @Override

diff --git a/...rc/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java b/...rc/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java
@@ -88,8 +88,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    public boolean enabled = false;
-
     @Override
     public ScriptEntryData getScriptEntryData() {
         return new BukkitScriptEntryData(player, null);
@@ -109,16 +107,9 @@ public ObjectTag getContext(String name) {
     @Override
     public void init() {
         NetworkInterceptHelper.enable();
-        enabled = true;
         super.init();
     }
 
-    @Override
-    public void destroy() {
-        enabled = false;
-        super.destroy();
-    }
-
     public void run(Player pl, String reason) {
         player = new PlayerTag(pl);
         this.reason = new ElementTag(reason);

diff --git a/...rc/main/java/com/denizenscript/denizen/events/player/PlayerReceivesPacketScriptEvent.java b/...rc/main/java/com/denizenscript/denizen/events/player/PlayerReceivesPacketScriptEvent.java
@@ -55,17 +55,10 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    public static boolean enabled;
-
     @Override
     public void init() {
         NetworkInterceptHelper.enable();
-        enabled = true;
-    }
-
-    @Override
-    public void destroy() {
-        enabled = false;
+        super.destroy();
     }
 
     @Override

diff --git a/.../java/com/denizenscript/denizen/events/player/PlayerReceivesTablistUpdateScriptEvent.java b/.../java/com/denizenscript/denizen/events/player/PlayerReceivesTablistUpdateScriptEvent.java
@@ -89,17 +89,10 @@ public TabPacketData(String mode, UUID id, boolean isListed, String name, String
 
     public TabPacketData data;
 
-    public static boolean enabled = false;
-
     @Override
     public void init() {
         NetworkInterceptHelper.enable();
-        enabled = true;
-    }
-
-    @Override
-    public void destroy() {
-        enabled = false;
+        super.init();
     }
 
     @Override

diff --git a/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerSendPacketScriptEvent.java b/...in/src/main/java/com/denizenscript/denizen/events/player/PlayerSendPacketScriptEvent.java
@@ -55,17 +55,10 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    public static boolean enabled;
-
     @Override
     public void init() {
         NetworkInterceptHelper.enable();
-        enabled = true;
-    }
-
-    @Override
-    public void destroy() {
-        enabled = false;
+        super.init();
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java
@@ -44,7 +44,6 @@ public PlayerSteersEntityScriptEvent() {
     }
 
     public static PlayerSteersEntityScriptEvent instance;
-    public boolean enabled;
     public EntityTag entity;
     public PlayerTag player;
     public ElementTag sideways;
@@ -85,12 +84,7 @@ public boolean matches(ScriptPath path) {
     @Override
     public void init() {
         NetworkInterceptHelper.enable();
-        enabled = true;
-    }
-
-    @Override
-    public void destroy() {
-        enabled = false;
+        super.init();
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java
@@ -46,17 +46,10 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    public boolean enabled;
-
     @Override
     public void init() {
         NetworkInterceptHelper.enable();
-        enabled = true;
-    }
-
-    @Override
-    public void destroy() {
-        enabled = false;
+        super.init();
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/BlockHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/BlockHelper.java
@@ -97,5 +97,4 @@ default Color getMapColor(Block block) { // TODO: once 1.20 is the minimum suppo
     default void setVanillaTags(Material material, Set<String> tags) {
         throw new UnsupportedOperationException();
     }
-
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java
@@ -26,7 +26,7 @@ public class DenizenPacketHandler {
     public static HashSet<UUID> forceNoclip = new HashSet<>();
 
     public void receivePacket(final Player player, final PacketInResourcePackStatus resourcePackStatus) {
-        if (!ResourcePackStatusScriptEvent.instance.enabled) {
+        if (!ResourcePackStatusScriptEvent.instance.eventData.isEnabled) {
             return;
         }
         Bukkit.getScheduler().runTask(Denizen.getInstance(), () -> {
@@ -38,7 +38,7 @@ public void receivePacket(final Player player, final PacketInResourcePackStatus
     }
 
     public boolean receivePacket(final Player player, final PacketInSteerVehicle steerVehicle, Runnable allow) {
-        if (PlayerSteersEntityScriptEvent.instance.enabled) {
+        if (PlayerSteersEntityScriptEvent.instance.eventData.isEnabled) {
             Runnable process = () -> {
                 if (!player.isInsideVehicle()) {
                     return;
@@ -73,7 +73,7 @@ public static boolean isHoldingRaisable(Player player) {
     }
 
     public void receivePlacePacket(final Player player) {
-        if (!PlayerRaiseLowerItemScriptEvent.instance.enabled) {
+        if (!PlayerRaiseLowerItemScriptEvent.instance.eventData.isEnabled) {
             return;
         }
         if (isHoldingRaisable(player)) {
@@ -84,7 +84,7 @@ public void receivePlacePacket(final Player player) {
     }
 
     public void receiveDigPacket(final Player player) {
-        if (Denizen.supportsPaper || !PlayerRaiseLowerItemScriptEvent.instance.enabled) {
+        if (Denizen.supportsPaper || !PlayerRaiseLowerItemScriptEvent.instance.eventData.isEnabled) {
             return;
         }
         if (isHoldingRaisable(player)) {

diff --git a/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -292,7 +292,7 @@ public boolean processActionbarPacket(Packet<?> packet, GenericFutureListener<?
     }
 
     public boolean processSoundPacket(Packet<?> packet) {
-        if (!PlayerHearsSoundScriptEvent.enabled) {
+        if (!PlayerHearsSoundScriptEvent.instance.eventData.isEnabled) {
             return false;
         }
         // (Player player, String name, String category, boolean isCustom, Entity entity, Location location, float volume, float pitch)

diff --git a/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java b/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java
@@ -32,7 +32,7 @@ public DenizenPacketListenerImpl(DenizenNetworkManagerImpl networkManager, Serve
 
     @Override
     public void handlePlayerInput(final ServerboundPlayerInputPacket packet) {
-        if (!PlayerSteersEntityScriptEvent.instance.enabled) {
+        if (!PlayerSteersEntityScriptEvent.instance.eventData.isEnabled) {
             super.handlePlayerInput(packet);
             return;
         }

diff --git a/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -314,7 +314,7 @@ public void send(Packet<?> packet, GenericFutureListener<? extends Future<? supe
     }
 
     public boolean processTablistPacket(Packet<?> packet, GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
-        if (!PlayerReceivesTablistUpdateScriptEvent.enabled) {
+        if (!PlayerReceivesTablistUpdateScriptEvent.instance.eventData.isEnabled) {
             return false;
         }
         if (packet instanceof ClientboundPlayerInfoPacket) {
@@ -416,7 +416,7 @@ public boolean processActionbarPacket(Packet<?> packet, GenericFutureListener<?
     }
 
     public boolean processSoundPacket(Packet<?> packet) {
-        if (!PlayerHearsSoundScriptEvent.enabled) {
+        if (!PlayerHearsSoundScriptEvent.instance.eventData.isEnabled) {
             return false;
         }
         if (packet instanceof ClientboundSoundPacket) {

diff --git a/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenPacketListenerImpl.java b/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenPacketListenerImpl.java
@@ -32,7 +32,7 @@ public DenizenPacketListenerImpl(DenizenNetworkManagerImpl networkManager, Serve
 
     @Override
     public void handlePlayerInput(final ServerboundPlayerInputPacket packet) {
-        if (!PlayerSteersEntityScriptEvent.instance.enabled) {
+        if (!PlayerSteersEntityScriptEvent.instance.eventData.isEnabled) {
             super.handlePlayerInput(packet);
             return;
         }

diff --git a/...com/denizenscript/denizen/nms/v1_19/impl/network/handlers/AbstractListenerPlayInImpl.java b/...com/denizenscript/denizen/nms/v1_19/impl/network/handlers/AbstractListenerPlayInImpl.java
@@ -142,7 +142,7 @@ public boolean handlePacketIn(Packet<ServerGamePacketListener> packet) {
         if (NMSHandler.debugPackets) {
             debugPacketOutput(packet);
         }
-        if (PlayerSendPacketScriptEvent.enabled) {
+        if (PlayerSendPacketScriptEvent.instance.eventData.isEnabled) {
             if (PlayerSendPacketScriptEvent.fireFor(player.getBukkitEntity(), packet)) {
                 if (NMSHandler.debugPackets) {
                     DenizenNetworkManagerImpl.doPacketOutput("Denied packet-in " + packet.getClass().getCanonicalName() + " from " + player.getScoreboardName() + " due to event");

diff --git a/.../com/denizenscript/denizen/nms/v1_19/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_19/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -346,7 +346,7 @@ public boolean processPacket(Packet<?> packet, PacketSendListener genericfuturel
             }
             return true;
         }
-        if (PlayerReceivesPacketScriptEvent.enabled) {
+        if (PlayerReceivesPacketScriptEvent.instance.eventData.isEnabled) {
             if (PlayerReceivesPacketScriptEvent.fireFor(player.getBukkitEntity(), packet)) {
                 if (NMSHandler.debugPackets) {
                     doPacketOutput("DENIED PACKET " + packet.getClass().getCanonicalName() + " DENIED FROM SEND TO " + player.getScoreboardName() + " due to event");
@@ -362,7 +362,7 @@ public boolean processPacket(Packet<?> packet, PacketSendListener genericfuturel
     public static boolean tablistBreakOnlyOnce = false;
 
     public boolean processTablistPacket(Packet<?> packet, PacketSendListener genericfuturelistener) {
-        if (!PlayerReceivesTablistUpdateScriptEvent.enabled) {
+        if (!PlayerReceivesTablistUpdateScriptEvent.instance.eventData.isEnabled) {
             return false;
         }
         if (packet instanceof ClientboundPlayerInfoUpdatePacket) {
@@ -485,7 +485,7 @@ public boolean processActionbarPacket(Packet<?> packet, PacketSendListener gener
     }
 
     public boolean processSoundPacket(Packet<?> packet) {
-        if (!PlayerHearsSoundScriptEvent.enabled) {
+        if (!PlayerHearsSoundScriptEvent.instance.eventData.isEnabled) {
             return false;
         }
         if (packet instanceof ClientboundSoundPacket) {

diff --git a/.../com/denizenscript/denizen/nms/v1_19/impl/network/handlers/DenizenPacketListenerImpl.java b/.../com/denizenscript/denizen/nms/v1_19/impl/network/handlers/DenizenPacketListenerImpl.java
@@ -32,7 +32,7 @@ public DenizenPacketListenerImpl(DenizenNetworkManagerImpl networkManager, Serve
 
     @Override
     public void handlePlayerInput(final ServerboundPlayerInputPacket packet) {
-        if (!PlayerSteersEntityScriptEvent.instance.enabled) {
+        if (!PlayerSteersEntityScriptEvent.instance.eventData.isEnabled) {
             super.handlePlayerInput(packet);
             return;
         }

diff --git a/...com/denizenscript/denizen/nms/v1_20/impl/network/handlers/AbstractListenerPlayInImpl.java b/...com/denizenscript/denizen/nms/v1_20/impl/network/handlers/AbstractListenerPlayInImpl.java
@@ -166,7 +166,7 @@ public boolean handlePacketIn(Packet<?> packet) {
         if (NMSHandler.debugPackets) {
             debugPacketOutput(packet);
         }
-        if (PlayerSendPacketScriptEvent.enabled) {
+        if (PlayerSendPacketScriptEvent.instance.eventData.isEnabled) {
             if (PlayerSendPacketScriptEvent.fireFor(player.getBukkitEntity(), packet)) {
                 if (NMSHandler.debugPackets) {
                     DenizenNetworkManagerImpl.doPacketOutput("Denied packet-in " + packet.getClass().getCanonicalName() + " from " + player.getScoreboardName() + " due to event");

diff --git a/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -381,7 +381,7 @@ public Packet<ClientGamePacketListener> processPacketHandlersFor(Packet<ClientGa
                 packet = processed;
             }
         }
-        if (PlayerReceivesPacketScriptEvent.enabled & PlayerReceivesPacketScriptEvent.fireFor(player.getBukkitEntity(), packet)) {
+        if (PlayerReceivesPacketScriptEvent.instance.eventData.isEnabled & PlayerReceivesPacketScriptEvent.fireFor(player.getBukkitEntity(), packet)) {
             if (NMSHandler.debugPackets) {
                 doPacketOutput("DENIED PACKET - " + packet.getClass().getCanonicalName() + " DENIED FROM SEND TO " + player.getScoreboardName() + " due to event");
             }

diff --git a/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenPacketListenerImpl.java b/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenPacketListenerImpl.java
@@ -33,7 +33,7 @@ public DenizenPacketListenerImpl(DenizenNetworkManagerImpl networkManager, Serve
 
     @Override
     public void handlePlayerInput(final ServerboundPlayerInputPacket packet) {
-        if (!PlayerSteersEntityScriptEvent.instance.enabled) {
+        if (!PlayerSteersEntityScriptEvent.instance.eventData.isEnabled) {
             super.handlePlayerInput(packet);
             return;
         }

diff --git a/...t/denizen/nms/v1_20/impl/network/handlers/packet/PlayerHearsSoundEventPacketHandlers.java b/...t/denizen/nms/v1_20/impl/network/handlers/packet/PlayerHearsSoundEventPacketHandlers.java
@@ -17,7 +17,7 @@ public static void registerHandlers() {
     }
 
     public static Packet<ClientGamePacketListener> processSoundPacket(DenizenNetworkManagerImpl networkManager, Packet<ClientGamePacketListener> packet) {
-        if (!PlayerHearsSoundScriptEvent.enabled) {
+        if (!PlayerHearsSoundScriptEvent.instance.eventData.isEnabled) {
             return packet;
         }
         if (packet instanceof ClientboundSoundPacket) {

diff --git a/...ript/denizen/nms/v1_20/impl/network/handlers/packet/TablistUpdateEventPacketHandlers.java b/...ript/denizen/nms/v1_20/impl/network/handlers/packet/TablistUpdateEventPacketHandlers.java
@@ -33,7 +33,7 @@ public static void registerHandlers() {
 
     // TODO: properly rebundle the packet instead of splitting it up
     public static Packet<ClientGamePacketListener> processTablistPacket(DenizenNetworkManagerImpl networkManager, Packet<ClientGamePacketListener> packet) {
-        if (!PlayerReceivesTablistUpdateScriptEvent.enabled) {
+        if (!PlayerReceivesTablistUpdateScriptEvent.instance.eventData.isEnabled) {
             return packet;
         }
         if (packet instanceof ClientboundPlayerInfoUpdatePacket) {