always extend bukkitscriptevent

DenizenScript · Mar 6, 2019 · d0ea34e · d0ea34e
1 parent 19c9a35
commit d0ea34e
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 32 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java
@@ -1,11 +1,10 @@
 package net.aufdemrand.denizen.events.player;
 
-
 import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntryData;
@@ -16,7 +15,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-public class BiomeEnterExitScriptEvent extends ScriptEvent implements Listener {
+public class BiomeEnterExitScriptEvent extends BukkitScriptEvent implements Listener {
 
     // TODO: in area?
     // <--[event]

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemScrollScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemScrollScriptEvent.java
@@ -1,9 +1,9 @@
 package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntryData;
@@ -14,7 +14,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerItemHeldEvent;
 
-public class ItemScrollScriptEvent extends ScriptEvent implements Listener {
+public class ItemScrollScriptEvent extends BukkitScriptEvent implements Listener {
 
     // TODO: in area
     // TODO: item:x switch

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ListPingScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ListPingScriptEvent.java
@@ -1,7 +1,7 @@
 package net.aufdemrand.denizen.events.player;
 
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.objects.dObject;
@@ -12,7 +12,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.ServerListPingEvent;
 
-public class ListPingScriptEvent extends ScriptEvent implements Listener {
+public class ListPingScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClosesInvScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClosesInvScriptEvent.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dInventory;
 import net.aufdemrand.denizen.objects.notable.NotableManager;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntryData;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
@@ -15,7 +15,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 
-public class PlayerClosesInvScriptEvent extends ScriptEvent implements Listener {
+public class PlayerClosesInvScriptEvent extends BukkitScriptEvent implements Listener {
 
     // TODO: in area
     // <--[event]

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerOpensInvScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerOpensInvScriptEvent.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dInventory;
 import net.aufdemrand.denizen.objects.notable.NotableManager;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntryData;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
@@ -15,7 +15,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 
-public class PlayerOpensInvScriptEvent extends ScriptEvent implements Listener {
+public class PlayerOpensInvScriptEvent extends BukkitScriptEvent implements Listener {
 
     // TODO: in area
     // <--[event]

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ResourcePackStatusScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ResourcePackStatusScriptEvent.java
@@ -1,6 +1,7 @@
 package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;
@@ -9,7 +10,7 @@
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 
-public class ResourcePackStatusScriptEvent extends ScriptEvent {
+public class ResourcePackStatusScriptEvent extends BukkitScriptEvent {
 
     // <--[event]
     // @Events

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java
@@ -1,9 +1,9 @@
 package net.aufdemrand.denizen.events.world;
 
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dChunk;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
@@ -12,7 +12,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkLoadEvent;
 
-public class ChunkLoadScriptEvent extends ScriptEvent implements Listener {
+public class ChunkLoadScriptEvent extends BukkitScriptEvent implements Listener {
 
     // TODO: Replace in <world> with in <area>
     // <--[event]

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java
@@ -1,9 +1,9 @@
 package net.aufdemrand.denizen.events.world;
 
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dChunk;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
@@ -12,7 +12,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkUnloadEvent;
 
-public class ChunkUnloadScriptEvent extends ScriptEvent implements Listener {
+public class ChunkUnloadScriptEvent extends BukkitScriptEvent implements Listener {
 
     // TODO: replace in <world> with in <area>
     // <--[event]

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java
@@ -1,10 +1,9 @@
 package net.aufdemrand.denizen.events.world;
 
-
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
@@ -13,7 +12,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.SpawnChangeEvent;
 
-public class SpawnChangeScriptEvent extends ScriptEvent implements Listener {
+public class SpawnChangeScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java
@@ -1,9 +1,8 @@
 package net.aufdemrand.denizen.events.world;
 
-
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
@@ -13,7 +12,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.weather.WeatherChangeEvent;
 
-public class WeatherChangesScriptEvent extends ScriptEvent implements Listener {
+public class WeatherChangesScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldInitsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldInitsScriptEvent.java
@@ -1,9 +1,8 @@
 package net.aufdemrand.denizen.events.world;
 
-
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
@@ -12,7 +11,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
 
-public class WorldInitsScriptEvent extends ScriptEvent implements Listener {
+public class WorldInitsScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldLoadsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldLoadsScriptEvent.java
@@ -1,6 +1,7 @@
 package net.aufdemrand.denizen.events.world;
 
 
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.events.ScriptEvent;
@@ -12,7 +13,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldLoadEvent;
 
-public class WorldLoadsScriptEvent extends ScriptEvent implements Listener {
+public class WorldLoadsScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldSavesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldSavesScriptEvent.java
@@ -1,10 +1,9 @@
 package net.aufdemrand.denizen.events.world;
 
-
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
@@ -13,7 +12,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldSaveEvent;
 
-public class WorldSavesScriptEvent extends ScriptEvent implements Listener {
+public class WorldSavesScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java
@@ -1,9 +1,8 @@
 package net.aufdemrand.denizen.events.world;
 
-
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dWorld;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
@@ -12,7 +11,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldUnloadEvent;
 
-public class WorldUnloadsScriptEvent extends ScriptEvent implements Listener {
+public class WorldUnloadsScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events