use the new BSED constructor more

DenizenScript · Nov 24, 2019 · f22f362 · f22f362
1 parent 290c1f8
commit f22f362
Show file tree

Hide file tree

Showing 33 changed files with 32 additions and 68 deletions.
diff --git a/...rc/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java b/...rc/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java
@@ -85,8 +85,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/...src/main/java/com/denizenscript/denizen/events/entity/EntityBreaksHangingScriptEvent.java b/...src/main/java/com/denizenscript/denizen/events/entity/EntityBreaksHangingScriptEvent.java
@@ -91,9 +91,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        // TODO: What if the hanging is an NPC?
-        return new BukkitScriptEntryData(breaker.isPlayer() ? breaker.getDenizenPlayer() : null,
-                breaker.isCitizensNPC() ? breaker.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(breaker);
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java
@@ -96,8 +96,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java
@@ -91,8 +91,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java
@@ -68,8 +68,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDeathScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDeathScriptEvent.java
@@ -159,8 +159,7 @@ else if (event instanceof PlayerDeathEvent && !isDefaultDetermination(determinat
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java
@@ -73,8 +73,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(entity.getBukkitEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(entity.getBukkitEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/entity/EntityEntersPortalScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/entity/EntityEntersPortalScriptEvent.java
@@ -71,8 +71,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/...src/main/java/com/denizenscript/denizen/events/entity/EntityEntersVehicleScriptEvent.java b/...src/main/java/com/denizenscript/denizen/events/entity/EntityEntersVehicleScriptEvent.java
@@ -77,8 +77,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/...n/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsPortalScriptEvent.java b/...n/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsPortalScriptEvent.java
@@ -71,8 +71,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/entity/EntityExitsVehicleScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/entity/EntityExitsVehicleScriptEvent.java
@@ -74,8 +74,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplodesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplodesScriptEvent.java
@@ -107,8 +107,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/...c/main/java/com/denizenscript/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java b/...c/main/java/com/denizenscript/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java
@@ -85,8 +85,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/...in/src/main/java/com/denizenscript/denizen/events/entity/EntityFormsBlockScriptEvent.java b/...in/src/main/java/com/denizenscript/denizen/events/entity/EntityFormsBlockScriptEvent.java
@@ -79,8 +79,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGlideScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGlideScriptEvent.java
@@ -80,8 +80,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityHealsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityHealsScriptEvent.java
@@ -91,8 +91,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityInteractScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityInteractScriptEvent.java
@@ -76,8 +76,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/entity/EntityPotionEffectScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/entity/EntityPotionEffectScriptEvent.java
@@ -110,8 +110,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityResurrectScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityResurrectScriptEvent.java
@@ -68,8 +68,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityShootsBowEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityShootsBowEvent.java
@@ -131,8 +131,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java
@@ -83,8 +83,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/.../src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java
@@ -70,8 +70,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySwimScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySwimScriptEvent.java
@@ -78,8 +78,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java
@@ -77,9 +77,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        // TODO: Store the player / npc?
-        return new BukkitScriptEntryData(owner.isPlayer() ? owner.getDenizenPlayer() : null,
-                owner.isCitizensNPC() ? owner.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(owner);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java
@@ -96,8 +96,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTeleportScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTeleportScriptEvent.java
@@ -119,9 +119,7 @@ else if (LocationTag.matches(determination)) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        // TODO: Store the player / npc?
-        return new BukkitScriptEntryData(pEvent != null ? EntityTag.getPlayerFrom(pEvent.getPlayer()) : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HangingBreaksScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HangingBreaksScriptEvent.java
@@ -79,8 +79,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity != null && entity.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                entity != null && entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ItemEnchantedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ItemEnchantedScriptEvent.java
@@ -114,8 +114,7 @@ else if (lower.startsWith("enchants:")) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java
@@ -112,8 +112,7 @@ public String getName() {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(shooter != null && shooter.isPlayer() ? EntityTag.getPlayerFrom(event.getEntity()) : null,
-                shooter != null && shooter.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(shooter);
     }
 
     @Override

diff --git a/...c/main/java/com/denizenscript/denizen/events/entity/VehicleCollidesEntityScriptEvent.java b/...c/main/java/com/denizenscript/denizen/events/entity/VehicleCollidesEntityScriptEvent.java
@@ -98,8 +98,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+        return new BukkitScriptEntryData(entity);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/VehicleDamagedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/VehicleDamagedScriptEvent.java
@@ -109,8 +109,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
     @Override
     public ScriptEntryData getScriptEntryData() {
         if (entity != null) {
-            return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                    entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+            return new BukkitScriptEntryData(entity);
         }
         return new BukkitScriptEntryData(null, null);
     }

diff --git a/...in/src/main/java/com/denizenscript/denizen/events/entity/VehicleDestroyedScriptEvent.java b/...in/src/main/java/com/denizenscript/denizen/events/entity/VehicleDestroyedScriptEvent.java
@@ -85,8 +85,7 @@ public String getName() {
     @Override
     public ScriptEntryData getScriptEntryData() {
         if (entity != null) {
-            return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
-                    entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
+            return new BukkitScriptEntryData(entity);
         }
         return new BukkitScriptEntryData(null, null);
     }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java
@@ -7,7 +7,6 @@
 import com.denizenscript.denizencore.objects.*;
 import com.denizenscript.denizen.utilities.Settings;
 import com.denizenscript.denizen.nms.NMSHandler;
-import com.denizenscript.denizen.nms.interfaces.BlockData;
 import com.denizenscript.denizen.nms.interfaces.BlockHelper;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.ListTag;