From f32c58a1ff98b62c5ecdbe38c6bf102275dfda85 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Sun, 11 Jan 2015 20:10:36 -0800 Subject: [PATCH] Wall of updates --- .../denizen/npc/actions/ActionHandler.java | 14 +++++++------- .../aufdemrand/denizen/objects/dChunk.java | 7 ++++--- .../aufdemrand/denizen/objects/dColor.java | 10 +++++++--- .../aufdemrand/denizen/objects/dCuboid.java | 11 ++++++----- .../denizen/objects/dEllipsoid.java | 13 +++++++------ .../aufdemrand/denizen/objects/dEntity.java | 9 +++++---- .../denizen/objects/dInventory.java | 17 +++++++++-------- .../net/aufdemrand/denizen/objects/dItem.java | 11 +++++++---- .../aufdemrand/denizen/objects/dLocation.java | 13 +++++++------ .../aufdemrand/denizen/objects/dMaterial.java | 10 +++++++--- .../net/aufdemrand/denizen/objects/dNPC.java | 3 ++- .../aufdemrand/denizen/objects/dPlayer.java | 3 ++- .../aufdemrand/denizen/objects/dPlugin.java | 10 +++++++--- .../aufdemrand/denizen/objects/dWorld.java | 7 ++++--- .../objects/properties/item/ItemApple.java | 10 +++++----- .../core/InteractScriptContainer.java | 4 ++-- .../scripts/triggers/AbstractTrigger.java | 8 ++++---- .../scripts/triggers/core/ChatTrigger.java | 6 ++++-- .../scripts/triggers/core/ClickTrigger.java | 2 +- .../scripts/triggers/core/DamageTrigger.java | 4 +++- .../triggers/core/ProximityTrigger.java | 2 +- .../denizen/tags/core/AnchorTags.java | 4 ++-- .../denizen/tags/core/ConstantTags.java | 8 ++++---- .../denizen/tags/core/CuboidTags.java | 6 +++--- .../denizen/tags/core/EntityTags.java | 6 +++--- .../denizen/tags/core/FlagTags.java | 4 ++-- .../denizen/tags/core/LocationTags.java | 6 +++--- .../aufdemrand/denizen/tags/core/NPCTags.java | 19 +++++++++++-------- .../tags/core/NotableLocationTags.java | 6 +++--- .../denizen/tags/core/ParseTags.java | 8 ++++---- .../denizen/tags/core/PlayerTags.java | 6 +++--- 31 files changed, 139 insertions(+), 108 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java b/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java index 8f5e5c4262..f01cc9477b 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java +++ b/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java @@ -3,15 +3,15 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.objects.dNPC; -import net.aufdemrand.denizen.objects.dObject; +import net.aufdemrand.denizencore.objects.dObject; import net.aufdemrand.denizen.objects.dPlayer; -import net.aufdemrand.denizen.scripts.ScriptBuilder; -import net.aufdemrand.denizen.scripts.ScriptEntry; -import net.aufdemrand.denizen.scripts.commands.core.DetermineCommand; -import net.aufdemrand.denizen.scripts.queues.ScriptQueue; +import net.aufdemrand.denizencore.scripts.ScriptBuilder; +import net.aufdemrand.denizencore.scripts.ScriptEntry; +import net.aufdemrand.denizencore.scripts.commands.core.DetermineCommand; +import net.aufdemrand.denizencore.scripts.queues.ScriptQueue; import net.aufdemrand.denizen.scripts.containers.core.AssignmentScriptContainer; -import net.aufdemrand.denizen.objects.aH; -import net.aufdemrand.denizen.scripts.queues.core.InstantQueue; +import net.aufdemrand.denizencore.objects.aH; +import net.aufdemrand.denizencore.scripts.queues.core.InstantQueue; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.utilities.debugging.dB.DebugElement; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java index 11065aec59..40b06bee81 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java @@ -1,8 +1,9 @@ package net.aufdemrand.denizen.objects; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; import net.citizensnpcs.api.CitizensAPI; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dColor.java b/src/main/java/net/aufdemrand/denizen/objects/dColor.java index 930a81a466..3fc9b759b3 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dColor.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dColor.java @@ -4,12 +4,16 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.Fetchable; +import net.aufdemrand.denizencore.objects.aH; +import net.aufdemrand.denizencore.objects.dObject; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Color; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.DyeColor; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java b/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java index 9e387b145d..0d09eb691c 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java @@ -8,12 +8,13 @@ import java.util.regex.Pattern; import net.aufdemrand.denizen.Settings; -import net.aufdemrand.denizen.objects.notable.Notable; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.notable.Notable; import net.aufdemrand.denizen.objects.notable.NotableManager; -import net.aufdemrand.denizen.objects.notable.Note; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.objects.notable.Note; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.blocks.SafeBlock; import net.aufdemrand.denizen.utilities.debugging.dB; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEllipsoid.java b/src/main/java/net/aufdemrand/denizen/objects/dEllipsoid.java index dfb86385b9..1df6d4de21 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dEllipsoid.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dEllipsoid.java @@ -1,11 +1,12 @@ package net.aufdemrand.denizen.objects; -import net.aufdemrand.denizen.objects.notable.Notable; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.notable.Notable; import net.aufdemrand.denizen.objects.notable.NotableManager; -import net.aufdemrand.denizen.objects.notable.Note; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.objects.notable.Note; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Location; @@ -33,7 +34,7 @@ public static dEllipsoid valueOf(String string) { if (NotableManager.isType(string, dEllipsoid.class)) return (dEllipsoid) NotableManager.getSavedObject(string); - List split = CoreUtilities.Split(string, ','); + List split = CoreUtilities.split(string, ','); if (split.size() != 7) return null; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java index 7b55c3e284..0a147599b3 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java @@ -1,15 +1,16 @@ package net.aufdemrand.denizen.objects; import net.aufdemrand.denizen.npc.traits.HealthTrait; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; import net.aufdemrand.denizen.objects.properties.entity.EntityAge; import net.aufdemrand.denizen.objects.properties.entity.EntityColor; import net.aufdemrand.denizen.objects.properties.entity.EntityTame; -import net.aufdemrand.denizen.scripts.ScriptRegistry; +import net.aufdemrand.denizencore.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.containers.core.EntityScriptContainer; import net.aufdemrand.denizen.scripts.containers.core.EntityScriptHelper; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizen.utilities.entity.Rotation; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java index dbc6053737..8445508f41 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java @@ -1,17 +1,18 @@ package net.aufdemrand.denizen.objects; import net.aufdemrand.denizen.BukkitScriptEntryData; -import net.aufdemrand.denizen.objects.aH.Argument; -import net.aufdemrand.denizen.objects.aH.PrimitiveType; -import net.aufdemrand.denizen.objects.notable.Notable; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.aH.Argument; +import net.aufdemrand.denizencore.objects.aH.PrimitiveType; +import net.aufdemrand.denizencore.objects.notable.Notable; import net.aufdemrand.denizen.objects.notable.NotableManager; -import net.aufdemrand.denizen.objects.notable.Note; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.scripts.ScriptRegistry; +import net.aufdemrand.denizencore.objects.notable.Note; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.containers.core.InventoryScriptContainer; import net.aufdemrand.denizen.scripts.containers.core.InventoryScriptHelper; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.nbt.ImprovedOfflinePlayer; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dItem.java b/src/main/java/net/aufdemrand/denizen/objects/dItem.java index fa963b868e..2cdf6615f7 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dItem.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dItem.java @@ -2,14 +2,17 @@ import net.aufdemrand.denizen.objects.notable.*; import net.aufdemrand.denizen.objects.properties.item.*; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.scripts.ScriptRegistry; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.notable.Note; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.containers.core.BookScriptContainer; import net.aufdemrand.denizen.scripts.containers.core.ItemScriptContainer; import net.aufdemrand.denizen.scripts.containers.core.ItemScriptHelper; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.objects.notable.Notable; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java index a34ba148c2..55ad07c4f1 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java @@ -1,13 +1,14 @@ package net.aufdemrand.denizen.objects; import net.aufdemrand.denizen.Settings; -import net.aufdemrand.denizen.objects.notable.Notable; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.notable.Notable; import net.aufdemrand.denizen.objects.notable.NotableManager; -import net.aufdemrand.denizen.objects.notable.Note; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.tags.core.EscapeTags; +import net.aufdemrand.denizencore.objects.notable.Note; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.tags.Attribute; +import net.aufdemrand.denizencore.tags.core.EscapeTags; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.PathFinder; import net.aufdemrand.denizen.utilities.Utilities; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java b/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java index f41de54027..04d0152070 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java @@ -6,15 +6,19 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.Fetchable; +import net.aufdemrand.denizencore.objects.aH; +import net.aufdemrand.denizencore.objects.dObject; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; import net.aufdemrand.denizen.utilities.blocks.SafeBlock; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Material; import org.bukkit.material.MaterialData; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.tags.Attribute; public class dMaterial implements dObject { diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java index 814f6022d3..9b21c17939 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java @@ -4,6 +4,7 @@ import net.aufdemrand.denizen.npc.dNPCRegistry; import net.aufdemrand.denizen.npc.examiners.PathBlockExaminer; import net.aufdemrand.denizen.npc.traits.*; +import net.aufdemrand.denizencore.objects.*; import net.aufdemrand.denizencore.objects.properties.Property; import net.aufdemrand.denizencore.objects.properties.PropertyParser; import net.aufdemrand.denizen.scripts.commands.npc.EngageCommand; @@ -545,7 +546,7 @@ && getCitizen().getTrait(Anchors.class).getAnchor(attribute.getContext(1)) != nu return new Element(0).getAttribute(attribute.fulfill(2)); if (FlagManager.npcHasFlag(this, flag_name)) return new dList(DenizenAPI.getCurrentInstance().flagManager() - .getNPCFlag(getId(), flag_name)) + .getNPCFlag(getId(), flag_name).toString(), true) .getAttribute(attribute.fulfill(1)); return new Element(identify()).getAttribute(attribute); } diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java index 0f42921126..c379c843ca 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java @@ -1,6 +1,7 @@ package net.aufdemrand.denizen.objects; import net.aufdemrand.denizen.flags.FlagManager; +import net.aufdemrand.denizencore.objects.*; import net.aufdemrand.denizencore.objects.properties.Property; import net.aufdemrand.denizencore.objects.properties.PropertyParser; import net.aufdemrand.denizen.scripts.commands.core.FailCommand; @@ -574,7 +575,7 @@ public String getAttribute(Attribute attribute) { return new Element(0).getAttribute(attribute.fulfill(2)); if (FlagManager.playerHasFlag(this, flag_name)) return new dList(DenizenAPI.getCurrentInstance().flagManager() - .getPlayerFlag(this, flag_name)) + .getPlayerFlag(this, flag_name).toString(), true) .getAttribute(attribute.fulfill(1)); return new Element(identify()).getAttribute(attribute); } diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlugin.java b/src/main/java/net/aufdemrand/denizen/objects/dPlugin.java index 7c877b711b..79415701a4 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dPlugin.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dPlugin.java @@ -1,11 +1,15 @@ package net.aufdemrand.denizen.objects; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.Fetchable; +import net.aufdemrand.denizencore.objects.dList; +import net.aufdemrand.denizencore.objects.dObject; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.debugging.dB; public class dPlugin implements dObject { diff --git a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java index 4496c4bfe9..834d823480 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java @@ -1,8 +1,9 @@ package net.aufdemrand.denizen.objects; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.objects.*; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.objects.properties.PropertyParser; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizencore.utilities.CoreUtilities; diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemApple.java b/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemApple.java index 862e006ee2..9056547e8d 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemApple.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemApple.java @@ -1,11 +1,11 @@ package net.aufdemrand.denizen.objects.properties.item; -import net.aufdemrand.denizen.objects.Element; -import net.aufdemrand.denizen.objects.Mechanism; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.Mechanism; import net.aufdemrand.denizen.objects.dItem; -import net.aufdemrand.denizen.objects.dObject; -import net.aufdemrand.denizen.objects.properties.Property; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.objects.dObject; +import net.aufdemrand.denizencore.objects.properties.Property; +import net.aufdemrand.denizencore.tags.Attribute; import org.bukkit.Material; public class ItemApple implements Property { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java index 0e634e4abe..7eb4f28d75 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.objects.dPlayer; -import net.aufdemrand.denizen.scripts.ScriptEntry; -import net.aufdemrand.denizen.scripts.containers.ScriptContainer; +import net.aufdemrand.denizencore.scripts.ScriptEntry; +import net.aufdemrand.denizencore.scripts.containers.ScriptContainer; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; import net.aufdemrand.denizen.scripts.requirements.RequirementsMode; import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java index 72ddd8e6e1..3469983e34 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java @@ -3,12 +3,12 @@ import net.aufdemrand.denizencore.interfaces.RegistrationableInstance; import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.npc.traits.TriggerTrait; -import net.aufdemrand.denizen.objects.dObject; +import net.aufdemrand.denizencore.objects.dObject; import net.aufdemrand.denizen.objects.dPlayer; -import net.aufdemrand.denizen.scripts.ScriptEntry; -import net.aufdemrand.denizen.scripts.queues.ScriptQueue; +import net.aufdemrand.denizencore.scripts.ScriptEntry; +import net.aufdemrand.denizencore.scripts.queues.ScriptQueue; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptContainer; -import net.aufdemrand.denizen.scripts.queues.core.TimedQueue; +import net.aufdemrand.denizencore.scripts.queues.core.TimedQueue; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.utilities.debugging.dB.DebugElement; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java index 83df74c591..6afce487b6 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java @@ -4,12 +4,14 @@ import net.aufdemrand.denizen.objects.*; import net.aufdemrand.denizen.npc.traits.ChatbotTrait; import net.aufdemrand.denizen.npc.traits.TriggerTrait; -import net.aufdemrand.denizen.scripts.commands.core.DetermineCommand; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.dObject; +import net.aufdemrand.denizencore.scripts.commands.core.DetermineCommand; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptContainer; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper; import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.entity.Rotation; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java index 2180305e7f..e2d3ffeeb5 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.scripts.containers.core.InteractScriptContainer; import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.objects.dItem; import net.aufdemrand.denizen.utilities.debugging.dB; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java index e17e5de224..9159751e76 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java @@ -6,7 +6,9 @@ import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper; import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.dObject; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.citizensnpcs.api.CitizensAPI; import org.bukkit.Bukkit; 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 index 7678d64a05..9180780d18 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ProximityTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ProximityTrigger.java @@ -5,7 +5,7 @@ import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.npc.traits.TriggerTrait; import net.aufdemrand.denizen.objects.dPlayer; -import net.aufdemrand.denizen.scripts.ScriptRegistry; +import net.aufdemrand.denizencore.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptContainer; import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.utilities.DenizenAPI; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/AnchorTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/AnchorTags.java index 31fe59b989..1b34449a54 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/AnchorTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/AnchorTags.java @@ -2,8 +2,8 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java index dcb256fd68..711ab8edce 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java @@ -2,11 +2,11 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; import net.aufdemrand.denizen.npc.traits.ConstantsTrait; -import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.objects.Element; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.Attribute; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java index 9be85b2e97..6e03b5cc41 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java @@ -1,10 +1,10 @@ package net.aufdemrand.denizen.tags.core; import net.aufdemrand.denizen.Denizen; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; import net.aufdemrand.denizen.objects.dCuboid; -import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.Attribute; +import net.aufdemrand.denizencore.tags.TagManager; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java index d8b0be5895..e52027742a 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java @@ -1,10 +1,10 @@ package net.aufdemrand.denizen.tags.core; import net.aufdemrand.denizen.Denizen; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; import net.aufdemrand.denizen.objects.dEntity; -import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.Attribute; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; public class EntityTags{ diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/FlagTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/FlagTags.java index f46574d186..bfe47b4869 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/FlagTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/FlagTags.java @@ -2,11 +2,11 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; import net.aufdemrand.denizen.flags.FlagManager; import net.aufdemrand.denizen.flags.FlagManager.Value; import net.aufdemrand.denizen.objects.dPlayer; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java index c357dbe8e9..f32e86218a 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java @@ -1,11 +1,11 @@ package net.aufdemrand.denizen.tags.core; import net.aufdemrand.denizen.Denizen; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.objects.dLocation; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.TagManager; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java index 01c55e17fc..6b56086ea8 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java @@ -1,14 +1,17 @@ package net.aufdemrand.denizen.tags.core; import net.aufdemrand.denizen.Denizen; -import net.aufdemrand.denizen.events.EventManager; +import net.aufdemrand.denizencore.events.EventManager; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.events.OldEventManager; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.dObject; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; import net.aufdemrand.denizen.events.core.NPCNavigationSmartEvent; import net.aufdemrand.denizen.objects.*; import net.aufdemrand.denizen.npc.traits.AssignmentTrait; -import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.Attribute; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; @@ -106,7 +109,7 @@ public void navComplete(NavigationCompleteEvent event) { // Do world script event 'On NPC Completes Navigation' if (NPCNavigationSmartEvent.IsActive()) - EventManager.doEvents(Arrays.asList + OldEventManager.doEvents(Arrays.asList ("npc completes navigation"), npc, null, null); // Do the assignment script action @@ -145,7 +148,7 @@ public void navBegin(NavigationBeginEvent event) { // Do world script event 'On NPC Completes Navigation' if (NPCNavigationSmartEvent.IsActive()) - EventManager.doEvents(Arrays.asList + OldEventManager.doEvents(Arrays.asList ("npc begins navigation"), npc, null, null); if (!event.getNPC().hasTrait(AssignmentTrait.class)) return; @@ -201,7 +204,7 @@ public void navCancel(NavigationCancelEvent event) { dNPC npc = DenizenAPI.getDenizenNPC(event.getNPC()); if (NPCNavigationSmartEvent.IsActive()) - EventManager.doEvents(Arrays.asList + OldEventManager.doEvents(Arrays.asList ("npc cancels navigation"), npc, null, null); if (!event.getNPC().hasTrait(AssignmentTrait.class)) return; @@ -248,7 +251,7 @@ public void navStuck(NavigationStuckEvent event) { // Do world script event 'On NPC stuck' if (NPCNavigationSmartEvent.IsActive()) { - String determination = EventManager.doEvents(Arrays.asList + String determination = OldEventManager.doEvents(Arrays.asList ("npc stuck"), npc, null, context); if (determination.equalsIgnoreCase("none")) event.setAction(null); diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java index d468d06f91..d219938ca0 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java @@ -1,11 +1,11 @@ package net.aufdemrand.denizen.tags.core; import net.aufdemrand.denizen.Denizen; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.objects.notable.NotableManager; -import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.Attribute; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java index 295b40e716..bc7fe02947 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ParseTags.java @@ -3,10 +3,10 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; -import net.aufdemrand.denizen.objects.Element; -import net.aufdemrand.denizen.scripts.ScriptEntry; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.scripts.ScriptEntry; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java index 31ffc1c6cc..77062823ea 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java @@ -2,10 +2,10 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizen.tags.ReplaceableTagEvent; -import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizencore.tags.ReplaceableTagEvent; +import net.aufdemrand.denizencore.tags.Attribute; import net.aufdemrand.denizen.objects.*; -import net.aufdemrand.denizen.tags.TagManager; +import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.Bukkit;