Add dObject identifySimple()'s

DenizenScript · Jan 20, 2014 · 73b4130 · 73b4130
1 parent ed9a870
commit 73b4130
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/src/main/java/net/gnomeffinway/depenizen/commands/McMMOCommands.java b/src/main/java/net/gnomeffinway/depenizen/commands/McMMOCommands.java
@@ -45,8 +45,8 @@ else if (!scriptEntry.hasObject("skill")
             		&& arg.matchesPrefix("skill"))
             	scriptEntry.addObject("skill", arg.asElement());
 
-            else if (!scriptEntry.hasObject("qty, q, quantity")
-            		&& arg.matchesPrefix("qty")
+            else if (!scriptEntry.hasObject("qty")
+            		&& arg.matchesPrefix("q, qty, quantity")
             		&& arg.matchesPrimitive(aH.PrimitiveType.Double))
             	scriptEntry.addObject("qty", arg.asElement());
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/dFaction.java b/src/main/java/net/gnomeffinway/depenizen/objects/dFaction.java
@@ -100,6 +100,12 @@ public String identify() {
         return "faction@" + faction.getName();
     }
 
+    @Override
+    public String identifySimple() {
+        // TODO: Properties?
+        return identify();
+    }
+
     @Override
     public String getAttribute(Attribute attribute) {
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/dJob.java b/src/main/java/net/gnomeffinway/depenizen/objects/dJob.java
@@ -134,6 +134,12 @@ public String identify() {
         return "job@" + job.getName() + (jobOwner == null ? "" : ("[" + jobOwner.getName() + "]"));
     }
 
+    @Override
+    public String identifySimple() {
+        // TODO: Properties?
+        return identify();
+    }
+
     @Override
     public String getAttribute(Attribute attribute) {
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/dNation.java b/src/main/java/net/gnomeffinway/depenizen/objects/dNation.java
@@ -88,6 +88,12 @@ public String identify() {
 		return "nation@" + nation.getName();
 	}
 
+    @Override
+    public String identifySimple() {
+        // TODO: Properties?
+        return identify();
+    }
+
 	@Override
 	public String getAttribute(Attribute attribute) {
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/dTown.java b/src/main/java/net/gnomeffinway/depenizen/objects/dTown.java
@@ -90,7 +90,13 @@ public String identify() {
 		return "town@" + town.getName();
 	}
 
-	@Override
+    @Override
+    public String identifySimple() {
+        // TODO: Properties?
+        return identify();
+    }
+
+    @Override
 	public String getAttribute(Attribute attribute) {
 
         // <--[tag]

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: Depenizen
 author: GnomeffinWay
 version: ${project.version} (build ${BUILD_NUMBER})
 main: net.gnomeffinway.depenizen.Depenizen
-depend: [Denizen]
+depend: [Denizen, Citizens]
 softdepend: [mcMMO, BattleNight, Towny, Factions, Votifier, Bungeefier, Jobs, Heroes, pvparena]
 
 commands: