Restructure Events directory.

DenizenScript · Jun 19, 2015 · 1405c87 · 1405c87
1 parent bce96e3
commit 1405c87
Show file tree

Hide file tree

Showing 64 changed files with 67 additions and 79 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -7,8 +7,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.aufdemrand.denizen.events.block.*;
 import net.aufdemrand.denizen.events.core.*;
-import net.aufdemrand.denizen.events.scriptevents.*;
+import net.aufdemrand.denizen.events.entity.*;
+import net.aufdemrand.denizen.events.player.*;
+import net.aufdemrand.denizen.events.world.*;
 import net.aufdemrand.denizen.objects.properties.bukkit.BukkitElementProperties;
 import net.aufdemrand.denizen.objects.properties.bukkit.BukkitListProperties;
 import net.aufdemrand.denizen.objects.properties.bukkit.BukkitQueueProperties;
@@ -77,7 +80,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
-import sun.security.jgss.krb5.Krb5Util;
 
 // <--[language]
 // @name dObjects

diff --git a/...s/scriptevents/BlockBuiltScriptEvent.java → ...n/events/block/BlockBuiltScriptEvent.java b/...s/scriptevents/BlockBuiltScriptEvent.java → ...n/events/block/BlockBuiltScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dMaterial;

diff --git a/...s/scriptevents/BlockBurnsScriptEvent.java → ...n/events/block/BlockBurnsScriptEvent.java b/...s/scriptevents/BlockBurnsScriptEvent.java → ...n/events/block/BlockBurnsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dMaterial;

diff --git a/...riptevents/BlockDispensesScriptEvent.java → ...ents/block/BlockDispensesScriptEvent.java b/...riptevents/BlockDispensesScriptEvent.java → ...ents/block/BlockDispensesScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/...s/scriptevents/BlockFadesScriptEvent.java → ...n/events/block/BlockFadesScriptEvent.java b/...s/scriptevents/BlockFadesScriptEvent.java → ...n/events/block/BlockFadesScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dMaterial;

diff --git a/...s/scriptevents/BlockFallsScriptEvent.java → ...n/events/block/BlockFallsScriptEvent.java b/...s/scriptevents/BlockFallsScriptEvent.java → ...n/events/block/BlockFallsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dMaterial;

diff --git a/...s/scriptevents/BlockFormsScriptEvent.java → ...n/events/block/BlockFormsScriptEvent.java b/...s/scriptevents/BlockFormsScriptEvent.java → ...n/events/block/BlockFormsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dMaterial;

diff --git a/...s/scriptevents/BlockGrowsScriptEvent.java → ...n/events/block/BlockGrowsScriptEvent.java b/...s/scriptevents/BlockGrowsScriptEvent.java → ...n/events/block/BlockGrowsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dMaterial;

diff --git a/...scriptevents/BlockIgnitesScriptEvent.java → ...events/block/BlockIgnitesScriptEvent.java b/...scriptevents/BlockIgnitesScriptEvent.java → ...events/block/BlockIgnitesScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/...scriptevents/BlockPhysicsScriptEvent.java → ...events/block/BlockPhysicsScriptEvent.java b/...scriptevents/BlockPhysicsScriptEvent.java → ...events/block/BlockPhysicsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dCuboid;
 import net.aufdemrand.denizen.objects.dEllipsoid;
@@ -17,7 +17,6 @@
 import org.bukkit.event.block.BlockPhysicsEvent;
 
 import java.util.HashMap;
-import java.util.List;
 
 public class BlockPhysicsScriptEvent extends ScriptEvent implements Listener {
 

diff --git a/...scriptevents/BlockSpreadsScriptEvent.java → ...events/block/BlockSpreadsScriptEvent.java b/...scriptevents/BlockSpreadsScriptEvent.java → ...events/block/BlockSpreadsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.block;
 
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dMaterial;

diff --git a/...riptevents/CreeperPoweredScriptEvent.java → ...nts/entity/CreeperPoweredScriptEvent.java b/...riptevents/CreeperPoweredScriptEvent.java → ...nts/entity/CreeperPoweredScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/...vents/EntityBreaksHangingScriptEvent.java → ...ntity/EntityBreaksHangingScriptEvent.java b/...vents/EntityBreaksHangingScriptEvent.java → ...ntity/EntityBreaksHangingScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dCuboid;
@@ -15,7 +15,6 @@
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;

diff --git a/...events/EntityChangesBlockScriptEvent.java → ...entity/EntityChangesBlockScriptEvent.java b/...events/EntityChangesBlockScriptEvent.java → ...entity/EntityChangesBlockScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...riptevents/EntityCombustsScriptEvent.java → ...nts/entity/EntityCombustsScriptEvent.java b/...riptevents/EntityCombustsScriptEvent.java → ...nts/entity/EntityCombustsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;

diff --git a/...criptevents/EntityDamagedScriptEvent.java → ...ents/entity/EntityDamagedScriptEvent.java b/...criptevents/EntityDamagedScriptEvent.java → ...ents/entity/EntityDamagedScriptEvent.java
@@ -1,9 +1,8 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;

diff --git a/.../scriptevents/EntityDeathScriptEvent.java → ...events/entity/EntityDeathScriptEvent.java b/.../scriptevents/EntityDeathScriptEvent.java → ...events/entity/EntityDeathScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...criptevents/EntityDespawnScriptEvent.java → ...ents/entity/EntityDespawnScriptEvent.java b/...criptevents/EntityDespawnScriptEvent.java → ...ents/entity/EntityDespawnScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;

diff --git a/...events/EntityEntersPortalScriptEvent.java → ...entity/EntityEntersPortalScriptEvent.java b/...events/EntityEntersPortalScriptEvent.java → ...entity/EntityEntersPortalScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;

diff --git a/...tevents/EntityExitsPortalScriptEvent.java → .../entity/EntityExitsPortalScriptEvent.java b/...tevents/EntityExitsPortalScriptEvent.java → .../entity/EntityExitsPortalScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;

diff --git a/...riptevents/EntityExplodesScriptEvent.java → ...nts/entity/EntityExplodesScriptEvent.java b/...riptevents/EntityExplodesScriptEvent.java → ...nts/entity/EntityExplodesScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;

diff --git a/...events/scriptevents/EntityFormsBlock.java → ...nizen/events/entity/EntityFormsBlock.java b/...events/scriptevents/EntityFormsBlock.java → ...nizen/events/entity/EntityFormsBlock.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/.../scriptevents/EntityHealsScriptEvent.java → ...events/entity/EntityHealsScriptEvent.java b/.../scriptevents/EntityHealsScriptEvent.java → ...events/entity/EntityHealsScriptEvent.java
@@ -1,10 +1,9 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.events.ScriptEvent;
-import net.aufdemrand.denizencore.objects.Duration;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.objects.dObject;

diff --git a/...riptevents/EntityInteractScriptEvent.java → ...nts/entity/EntityInteractScriptEvent.java b/...riptevents/EntityInteractScriptEvent.java → ...nts/entity/EntityInteractScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...scriptevents/EntityKilledScriptEvent.java → ...vents/entity/EntityKilledScriptEvent.java b/...scriptevents/EntityKilledScriptEvent.java → ...vents/entity/EntityKilledScriptEvent.java
@@ -1,9 +1,8 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;

diff --git a/.../scriptevents/EntitySpawnScriptEvent.java → ...events/entity/EntitySpawnScriptEvent.java b/.../scriptevents/EntitySpawnScriptEvent.java → ...events/entity/EntitySpawnScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dCuboid;

diff --git a/...criptevents/EntityTargetsScriptEvent.java → ...ents/entity/EntityTargetsScriptEvent.java b/...criptevents/EntityTargetsScriptEvent.java → ...ents/entity/EntityTargetsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...riptevents/EntityTeleportScriptEvent.java → ...nts/entity/EntityTeleportScriptEvent.java b/...riptevents/EntityTeleportScriptEvent.java → ...nts/entity/EntityTeleportScriptEvent.java
@@ -1,9 +1,8 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
-import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.Element;

diff --git a/...criptevents/HangingBreaksScriptEvent.java → ...ents/entity/HangingBreaksScriptEvent.java b/...criptevents/HangingBreaksScriptEvent.java → ...ents/entity/HangingBreaksScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...ents/VehicleCollidesBlockScriptEvent.java → ...tity/VehicleCollidesBlockScriptEvent.java b/...ents/VehicleCollidesBlockScriptEvent.java → ...tity/VehicleCollidesBlockScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/...nts/VehicleCollidesEntityScriptEvent.java → ...ity/VehicleCollidesEntityScriptEvent.java b/...nts/VehicleCollidesEntityScriptEvent.java → ...ity/VehicleCollidesEntityScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;

diff --git a/.../scriptevents/VehicleMoveScriptEvent.java → ...events/entity/VehicleMoveScriptEvent.java b/.../scriptevents/VehicleMoveScriptEvent.java → ...events/entity/VehicleMoveScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.entity;
 
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/...riptevents/BiomeEnterExitScriptEvent.java → ...nts/player/BiomeEnterExitScriptEvent.java b/...riptevents/BiomeEnterExitScriptEvent.java → ...nts/player/BiomeEnterExitScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;

diff --git a/.../events/scriptevents/ChatScriptEvent.java → ...enizen/events/player/ChatScriptEvent.java b/.../events/scriptevents/ChatScriptEvent.java → ...enizen/events/player/ChatScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.Settings;

diff --git a/...s/scriptevents/ItemScrollScriptEvent.java → .../events/player/ItemScrollScriptEvent.java b/...s/scriptevents/ItemScrollScriptEvent.java → .../events/player/ItemScrollScriptEvent.java
@@ -1,7 +1,6 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
-import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/...nts/scriptevents/ListPingScriptEvent.java → ...en/events/player/ListPingScriptEvent.java b/...nts/scriptevents/ListPingScriptEvent.java → ...en/events/player/ListPingScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.events.ScriptEvent;

diff --git a/...tevents/PlayerBreaksBlockScriptEvent.java → .../player/PlayerBreaksBlockScriptEvent.java b/...tevents/PlayerBreaksBlockScriptEvent.java → .../player/PlayerBreaksBlockScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...tevents/PlayerChangesSignScriptEvent.java → .../player/PlayerChangesSignScriptEvent.java b/...tevents/PlayerChangesSignScriptEvent.java → .../player/PlayerChangesSignScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...events/PlayerDamagesBlockScriptEvent.java → ...player/PlayerDamagesBlockScriptEvent.java b/...events/PlayerDamagesBlockScriptEvent.java → ...player/PlayerDamagesBlockScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...s/scriptevents/PlayerJumpScriptEvent.java → .../events/player/PlayerJumpScriptEvent.java b/...s/scriptevents/PlayerJumpScriptEvent.java → .../events/player/PlayerJumpScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;

diff --git a/...tevents/PlayerPlacesBlockScriptEvent.java → .../player/PlayerPlacesBlockScriptEvent.java b/...tevents/PlayerPlacesBlockScriptEvent.java → .../player/PlayerPlacesBlockScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...vents/PlayerPlacesHangingScriptEvent.java → ...layer/PlayerPlacesHangingScriptEvent.java b/...vents/PlayerPlacesHangingScriptEvent.java → ...layer/PlayerPlacesHangingScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...criptevents/PlayerStepsOnScriptEvent.java → ...ents/player/PlayerStepsOnScriptEvent.java b/...criptevents/PlayerStepsOnScriptEvent.java → ...ents/player/PlayerStepsOnScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...ts/PlayerTakesFromFurnaceScriptEvent.java → ...er/PlayerTakesFromFurnaceScriptEvent.java b/...ts/PlayerTakesFromFurnaceScriptEvent.java → ...er/PlayerTakesFromFurnaceScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...ptevents/PlayerUsesPortalScriptEvent.java → ...s/player/PlayerUsesPortalScriptEvent.java b/...ptevents/PlayerUsesPortalScriptEvent.java → ...s/player/PlayerUsesPortalScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;
@@ -14,9 +14,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerPortalEvent;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 
 public class PlayerUsesPortalScriptEvent extends ScriptEvent implements Listener {
 

diff --git a/...s/scriptevents/PlayerWalkScriptEvent.java → .../events/player/PlayerWalkScriptEvent.java b/...s/scriptevents/PlayerWalkScriptEvent.java → .../events/player/PlayerWalkScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/...events/ResourcePackStatusScriptEvent.java → ...player/ResourcePackStatusScriptEvent.java b/...events/ResourcePackStatusScriptEvent.java → ...player/ResourcePackStatusScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.player;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dPlayer;

diff --git a/...events/scriptevents/BrewsScriptEvent.java → ...enizen/events/world/BrewsScriptEvent.java b/...events/scriptevents/BrewsScriptEvent.java → ...enizen/events/world/BrewsScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
 import net.aufdemrand.denizen.objects.dInventory;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/.../scriptevents/BucketEmptyScriptEvent.java → .../events/world/BucketEmptyScriptEvent.java b/.../scriptevents/BucketEmptyScriptEvent.java → .../events/world/BucketEmptyScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...s/scriptevents/BucketFillScriptEvent.java → ...n/events/world/BucketFillScriptEvent.java b/...s/scriptevents/BucketFillScriptEvent.java → ...n/events/world/BucketFillScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;

diff --git a/...ts/scriptevents/ChunkLoadScriptEvent.java → ...en/events/world/ChunkLoadScriptEvent.java b/...ts/scriptevents/ChunkLoadScriptEvent.java → ...en/events/world/ChunkLoadScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
 import net.aufdemrand.denizen.objects.dChunk;
 import net.aufdemrand.denizen.objects.dWorld; // Deprecated in favor of context.chunk.world

diff --git a/.../scriptevents/ChunkUnloadScriptEvent.java → .../events/world/ChunkUnloadScriptEvent.java b/.../scriptevents/ChunkUnloadScriptEvent.java → .../events/world/ChunkUnloadScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
 import net.aufdemrand.denizen.objects.dChunk;
 import net.aufdemrand.denizen.objects.dWorld;

diff --git a/...ptevents/FurnaceBurnsItemScriptEvent.java → ...ts/world/FurnaceBurnsItemScriptEvent.java b/...ptevents/FurnaceBurnsItemScriptEvent.java → ...ts/world/FurnaceBurnsItemScriptEvent.java
@@ -1,6 +1,5 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
-import net.aufdemrand.denizen.objects.dInventory;
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.utilities.DenizenAPI;

diff --git a/...tevents/FurnaceSmeltsItemScriptEvent.java → ...s/world/FurnaceSmeltsItemScriptEvent.java b/...tevents/FurnaceSmeltsItemScriptEvent.java → ...s/world/FurnaceSmeltsItemScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/...nts/scriptevents/ItemMoveScriptEvent.java → ...zen/events/world/ItemMoveScriptEvent.java b/...nts/scriptevents/ItemMoveScriptEvent.java → ...zen/events/world/ItemMoveScriptEvent.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.events.scriptevents;
+package net.aufdemrand.denizen.events.world;
 
 import net.aufdemrand.denizen.objects.dInventory;
 import net.aufdemrand.denizen.objects.dItem;