Final cleaning - IT COMPILES!

DenizenScript · Jan 12, 2015 · 6604f53 · 6604f53
1 parent c4f52f0
commit 6604f53
Show file tree

Hide file tree

Showing 32 changed files with 21 additions and 45 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java b/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java
@@ -1,17 +1,15 @@
 package net.aufdemrand.denizen;
 
 
-import net.aufdemrand.denizen.events.EventManager;
 import net.aufdemrand.denizen.listeners.AbstractListener;
-import net.aufdemrand.denizen.objects.Element;
 import net.aufdemrand.denizen.objects.dLocation;
-import net.aufdemrand.denizen.objects.dObject;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.objects.notable.NotableManager;
+import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
 import net.aufdemrand.denizencore.DenizenCore;
+import net.aufdemrand.denizencore.objects.Element;
+import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptHelper;
-import net.aufdemrand.denizen.scripts.ScriptRegistry;
-import net.aufdemrand.denizen.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.command.Command;
 import net.aufdemrand.denizen.utilities.command.CommandContext;
@@ -20,6 +18,8 @@
 import net.aufdemrand.denizen.utilities.command.messaging.Messaging;
 import net.aufdemrand.denizen.utilities.debugging.DebugSubmit;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.scripts.ScriptRegistry;
+import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -181,14 +181,14 @@ public void debug(CommandContext args, CommandSender sender) throws CommandExcep
         }
         if (args.hasFlag('e')) {
             if (!dB.showDebug) dB.toggle();
-            dB.showEventsTrimming = !dB.showEventsTrimming;
-            Messaging.sendInfo(sender, (dB.showEventsTrimming ? "Denizen dBugger is now logging all " +
+            net.aufdemrand.denizencore.utilities.debugging.dB.showEventsTrimming = !net.aufdemrand.denizencore.utilities.debugging.dB.showEventsTrimming;
+            Messaging.sendInfo(sender, (net.aufdemrand.denizencore.utilities.debugging.dB.showEventsTrimming ? "Denizen dBugger is now logging all " +
                     "world events." : "Denizen dBugger is now hiding world events."));
 
         } if (args.hasFlag('b')) {
             if (!dB.showDebug) dB.toggle();
-            dB.showScriptBuilder = !dB.showScriptBuilder;
-            Messaging.sendInfo(sender, (dB.showScriptBuilder ? "Denizen dBugger is now logging the " +
+            net.aufdemrand.denizencore.utilities.debugging.dB.showScriptBuilder = !net.aufdemrand.denizencore.utilities.debugging.dB.showScriptBuilder;
+            Messaging.sendInfo(sender, (net.aufdemrand.denizencore.utilities.debugging.dB.showScriptBuilder ? "Denizen dBugger is now logging the " +
                     "ScriptBuilder." : "Denizen dBugger is now hiding ScriptBuilder logging."));
 
         } if (args.hasFlag('r')) {
@@ -371,7 +371,7 @@ public void reload(CommandContext args, CommandSender sender) throws CommandExce
             context.put("all", Element.TRUE);
             context.put("sender", new Element(sender.getName()));
             context.put("haderror", new Element(ScriptHelper.hadError()));
-            EventManager.doEvents(events, null, (sender instanceof Player) ? new dPlayer((Player) sender) : null, context);
+            BukkitWorldScriptHelper.doEvents(events, null, (sender instanceof Player) ? new dPlayer((Player) sender) : null, context);
             return;
         }
         // Reload a specific item
@@ -400,7 +400,7 @@ public void reload(CommandContext args, CommandSender sender) throws CommandExce
                 context.put("all", Element.FALSE);
                 context.put("haderror", new Element(ScriptHelper.hadError()));
                 context.put("sender", new Element(sender.getName()));
-                EventManager.doEvents(events, null, (sender instanceof Player) ? new dPlayer((Player) sender) : null, context);
+                BukkitWorldScriptHelper.doEvents(events, null, (sender instanceof Player) ? new dPlayer((Player) sender) : null, context);
                 return;
             }
             else if (args.getString(1).equalsIgnoreCase("externals")) {

diff --git a/src/main/java/net/aufdemrand/denizen/NPCCommandHandler.java b/src/main/java/net/aufdemrand/denizen/NPCCommandHandler.java
@@ -3,10 +3,10 @@
 import net.aufdemrand.denizen.npc.traits.*;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.objects.dPlayer;
-import net.aufdemrand.denizen.scripts.ScriptRegistry;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.command.messaging.Messaging;
 import net.aufdemrand.denizen.utilities.depends.Depends;
+import net.aufdemrand.denizencore.scripts.ScriptRegistry;
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.command.Command;
 import net.citizensnpcs.api.command.CommandContext;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/BlockPhysicsSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/BlockPhysicsSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/ChunkLoadSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/ChunkLoadSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/ChunkUnloadSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/ChunkUnloadSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.dChunk;
 import net.aufdemrand.denizencore.objects.dObject;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityCombustSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityCombustSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityDamageSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityDamageSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityInteractSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityInteractSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/ItemMoveSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/ItemMoveSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/ItemScrollSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/ItemScrollSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/ListPingSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/ListPingSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dList;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/PlayerEquipsArmorSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/PlayerEquipsArmorSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/PlayerJumpSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/PlayerJumpSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/PlayerStepsOnSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/PlayerStepsOnSmartEvent.java
@@ -1,13 +1,11 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/PlayerWalkSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/PlayerWalkSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizencore.objects.dObject;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/RedstoneSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/RedstoneSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizen.objects.dLocation;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java
@@ -2,7 +2,6 @@
 
 import net.aufdemrand.denizen.Settings;
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dObject;

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/VehicleCollisionSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/VehicleCollisionSmartEvent.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.events.core;
 
 import net.aufdemrand.denizen.scripts.containers.core.BukkitWorldScriptHelper;
-import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.OldSmartEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizencore.objects.*;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java
@@ -9,7 +9,6 @@
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.objects.Duration;
 
 /**
  * <p>Sets a 'cooldown' period on a script. Can be per-player or globally.</p>

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java
@@ -1,6 +1,5 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
-import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/item/TakeCommand.java
@@ -7,7 +7,6 @@
 import net.aufdemrand.denizen.objects.*;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.BookMeta;
 
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ProximityTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ProximityTrigger.java
@@ -11,7 +11,6 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/DenizenAPI.java b/src/main/java/net/aufdemrand/denizen/utilities/DenizenAPI.java
@@ -3,8 +3,6 @@
 import net.aufdemrand.denizen.Denizen;
 import net.aufdemrand.denizen.npc.dNPCRegistry;
 import net.aufdemrand.denizen.objects.dNPC;
-import net.aufdemrand.denizen.scripts.commands.BukkitCommandRegistry;
-import net.aufdemrand.denizencore.scripts.queues.ScriptEngine;
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommand.java b/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommand.java
@@ -3,8 +3,12 @@
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizen.scripts.containers.core.CommandScriptContainer;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
-import net.aufdemrand.denizen.tags.TagManager;
 import net.aufdemrand.denizen.utilities.depends.Depends;
+import net.aufdemrand.denizencore.objects.Element;
+import net.aufdemrand.denizencore.objects.aH;
+import net.aufdemrand.denizencore.objects.dList;
+import net.aufdemrand.denizencore.objects.dObject;
+import net.aufdemrand.denizencore.tags.TagManager;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.ChatColor;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/ScoreboardHelper.java b/src/main/java/net/aufdemrand/denizen/utilities/ScoreboardHelper.java
@@ -3,11 +3,11 @@
 import java.util.*;
 
 import com.google.common.base.Splitter;
-import net.aufdemrand.denizen.objects.aH.Argument;
 import net.aufdemrand.denizen.objects.dPlayer;
 
 import net.aufdemrand.denizen.scripts.commands.server.ScoreboardCommand;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.objects.aH;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
@@ -104,7 +104,7 @@ public static void _recallScoreboards() {
                 o.setDisplayName(obj);
 
                 // Only set display slot if it's valid
-                if (Argument.valueOf(displaySlot).matchesEnum(DisplaySlot.values())) {
+                if (aH.Argument.valueOf(displaySlot).matchesEnum(DisplaySlot.values())) {
                     o.setDisplaySlot(DisplaySlot.valueOf(displaySlot.toUpperCase()));
                 }
 

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java
@@ -11,10 +11,10 @@
 import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
-import net.aufdemrand.denizen.tags.TagManager;
 
 import net.aufdemrand.denizen.utilities.blocks.SafeBlock;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.tags.TagManager;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/debugging/LogInterceptor.java b/src/main/java/net/aufdemrand/denizen/utilities/debugging/LogInterceptor.java
@@ -4,7 +4,6 @@
 import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dObject;
-import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/CraftFakeArrow.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/CraftFakeArrow.java
@@ -7,7 +7,6 @@
 import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_8_R1.entity.CraftArrow;
 import org.bukkit.entity.Arrow;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/EntityMovement.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/EntityMovement.java
@@ -6,7 +6,6 @@
 import net.minecraft.server.v1_8_R1.GenericAttributes;
 import net.minecraft.server.v1_8_R1.NavigationAbstract;
 import net.minecraft.server.v1_8_R1.PathEntity;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_8_R1.entity.CraftEntity;
 import org.bukkit.entity.Entity;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/maps/DenizenMapManager.java b/src/main/java/net/aufdemrand/denizen/utilities/maps/DenizenMapManager.java
@@ -1,8 +1,8 @@
 package net.aufdemrand.denizen.utilities.maps;
 
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.utilities.NaturalOrderComparator;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.utilities.NaturalOrderComparator;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;