Update dObjects, entity properties

DenizenScript · Jan 12, 2015 · 0f97148 · 0f97148
1 parent 0c86940
commit 0f97148
Show file tree

Hide file tree

Showing 27 changed files with 104 additions and 89 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/TriggerTrait.java
@@ -2,8 +2,8 @@
 
 import net.aufdemrand.denizen.Settings;
 import net.aufdemrand.denizen.npc.dNPCRegistry;
-import net.aufdemrand.denizen.objects.Element;
-import net.aufdemrand.denizen.objects.dObject;
+import net.aufdemrand.denizencore.objects.Element;
+import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.scripts.commands.npc.EngageCommand;
 import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -1,6 +1,7 @@
 package net.aufdemrand.denizen.objects;
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizencore.objects.*;
 import net.aufdemrand.denizencore.objects.aH.Argument;
 import net.aufdemrand.denizencore.objects.aH.PrimitiveType;
@@ -149,7 +150,8 @@ public static dInventory valueOf(String string, dPlayer player, dNPC npc) {
         // Handle objects with properties through the object fetcher
         Matcher m = ObjectFetcher.DESCRIBED_PATTERN.matcher(string);
         if (m.matches()) {
-            return ObjectFetcher.getObjectFrom(dInventory.class, string, player, npc);
+            return ObjectFetcher.getObjectFrom(dInventory.class, string,
+                    new BukkitTagContext(player, npc, false, null, false, null));
         }
 
         // Match in@scriptName for Inventory Scripts, as well as in@notableName

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dItem.java b/src/main/java/net/aufdemrand/denizen/objects/dItem.java
@@ -2,6 +2,7 @@
 
 import net.aufdemrand.denizen.objects.notable.*;
 import net.aufdemrand.denizen.objects.properties.item.*;
+import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizencore.objects.*;
 import net.aufdemrand.denizencore.objects.notable.Note;
 import net.aufdemrand.denizencore.objects.properties.Property;
@@ -73,7 +74,7 @@ public static dItem valueOf(String string, dPlayer player, dNPC npc) {
         // Handle objects with properties through the object fetcher
         m = ObjectFetcher.DESCRIBED_PATTERN.matcher(string);
         if (m.matches()) {
-            return ObjectFetcher.getObjectFrom(dItem.class, string, player, npc);
+            return ObjectFetcher.getObjectFrom(dItem.class,  string, new BukkitTagContext(player, npc, false, null, true, null));
         }
 
         ////////

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAge.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAge.java
@@ -1,8 +1,9 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.Property;
-import net.aufdemrand.denizen.tags.Attribute;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.objects.properties.Property;
+import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.trait.Age;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAngry.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityAngry.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.EntityType;
 import org.bukkit.entity.Wolf;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java
@@ -1,8 +1,9 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.Property;
-import net.aufdemrand.denizen.tags.Attribute;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.objects.properties.Property;
+import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizen.utilities.entity.RabbitType;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import org.bukkit.DyeColor;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCritical.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityCritical.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.Arrow;
 import org.bukkit.entity.EntityType;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFirework.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFirework.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-import net.aufdemrand.denizen.objects.Mechanism;
+import net.aufdemrand.denizencore.objects.Mechanism;
 import net.aufdemrand.denizen.objects.dEntity;
 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 net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFramed.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityFramed.java
@@ -1,8 +1,9 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.Property;
-import net.aufdemrand.denizen.tags.Attribute;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.objects.properties.Property;
+import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.Material;
 import org.bukkit.Rotation;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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 net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.trait.ZombieModifier;
 import org.bukkit.entity.EntityType;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityItem.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityItem.java
@@ -1,8 +1,9 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.Property;
-import net.aufdemrand.denizen.tags.Attribute;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.objects.properties.Property;
+import net.aufdemrand.denizencore.tags.Attribute;
 import org.bukkit.Material;
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.EntityType;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.EntityType;
 import org.bukkit.entity.Horse;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityKnockback.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityKnockback.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.Arrow;
 import org.bukkit.entity.EntityType;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.Art;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Painting;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotion.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotion.java
@@ -1,8 +1,9 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.Property;
-import net.aufdemrand.denizen.tags.Attribute;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.objects.properties.Property;
+import net.aufdemrand.denizencore.tags.Attribute;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ThrownPotion;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPowered.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPowered.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.Creeper;
 import org.bukkit.entity.EntityType;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.EntityType;
 import org.bukkit.entity.Villager;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRotation.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityRotation.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.block.BlockFace;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Hanging;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySitting.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySitting.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.EntityType;
 import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.Wolf;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySize.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySize.java
@@ -1,8 +1,9 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.Property;
-import net.aufdemrand.denizen.tags.Attribute;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.objects.properties.Property;
+import net.aufdemrand.denizencore.tags.Attribute;
 import org.bukkit.entity.Slime;
 
 public class EntitySize implements Property {

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySkeleton.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntitySkeleton.java
@@ -1,11 +1,11 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
-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.dEntity;
-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.entity.EntityType;
 import org.bukkit.entity.Skeleton;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java
@@ -1,8 +1,9 @@
 package net.aufdemrand.denizen.objects.properties.entity;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.Property;
-import net.aufdemrand.denizen.tags.Attribute;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.objects.properties.Property;
+import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.*;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java
@@ -2,10 +2,10 @@
 
 import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;
-import net.aufdemrand.denizen.objects.dScript;
-import net.aufdemrand.denizen.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizencore.objects.dScript;
+import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
-import net.aufdemrand.denizen.tags.TagManager;
+import net.aufdemrand.denizencore.tags.TagManager;
 import net.aufdemrand.denizen.objects.dItem;
 
 import net.aufdemrand.denizencore.utilities.YamlConfiguration;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java
@@ -2,11 +2,11 @@
 
 import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;
-import net.aufdemrand.denizen.objects.dScript;
-import net.aufdemrand.denizen.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizencore.objects.dScript;
+import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
-import net.aufdemrand.denizen.tags.TagManager;
+import net.aufdemrand.denizencore.tags.TagManager;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.utilities.YamlConfiguration;
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java
@@ -6,9 +6,10 @@
 import java.util.regex.Pattern;
 
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizencore.objects.*;
+import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
-import net.aufdemrand.denizen.tags.TagManager;
+import net.aufdemrand.denizencore.tags.TagManager;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.utilities.YamlConfiguration;
 import org.bukkit.Material;