Update requirements

DenizenScript · Jan 12, 2015 · 65f9504 · 65f9504
1 parent 81e225e
commit 65f9504
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 22 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -10,6 +10,7 @@
 import java.util.logging.Logger;
 
 import net.aufdemrand.denizen.tags.BukkitTagContext;
+import net.aufdemrand.denizen.tags.core.*;
 import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizen.events.bukkit.SavesReloadEvent;
 import net.aufdemrand.denizen.events.bukkit.ScriptReloadEvent;
@@ -262,6 +263,21 @@ public void onEnable() {
             dB.echoError(e);
         }
 
+        try {
+            ScriptRegistry._registerType("interact", InteractScriptContainer.class);
+            ScriptRegistry._registerType("book", BookScriptContainer.class);
+            ScriptRegistry._registerType("item", ItemScriptContainer.class);
+            ScriptRegistry._registerType("entity", EntityScriptContainer.class);
+            ScriptRegistry._registerType("assignment", AssignmentScriptContainer.class);
+            ScriptRegistry._registerType("format", FormatScriptContainer.class);
+            ScriptRegistry._registerType("inventory", InventoryScriptContainer.class);
+            ScriptRegistry._registerType("command", CommandScriptContainer.class);
+            ScriptRegistry._registerType("map", MapScriptContainer.class);
+        }
+        catch (Exception e) {
+            dB.echoError(e);
+        }
+
         try {
             // Ensure the Scripts and Midi folder exist
             new File(getDataFolder() + "/scripts").mkdirs();
@@ -351,6 +367,22 @@ public void onEnable() {
 
         try {
             tagManager().registerCoreTags();
+
+            new CuboidTags(this);
+            new EntityTags(this);
+            new LocationTags(this);
+            new PlayerTags(this);
+            new UtilTags(this);
+            new TextTags(this);
+            new ParseTags(this);
+            if (Depends.citizens != null) {
+                new NPCTags(this);
+                new AnchorTags(this);
+                new ConstantTags(this);
+            }
+            new FlagTags(this);
+            new NotableLocationTags(this);
+
             eventManager = new OldEventManager();
             eventManager().registerCoreMembers();
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/RequirementChecker.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/RequirementChecker.java
@@ -1,16 +1,15 @@
 package net.aufdemrand.denizen.scripts.requirements;
 
-import net.aufdemrand.denizen.Denizen;
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
-import net.aufdemrand.denizen.objects.aH;
-import net.aufdemrand.denizen.objects.dScript;
+import net.aufdemrand.denizencore.objects.aH;
+import net.aufdemrand.denizencore.objects.dScript;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.ChatColor;
 
 import java.util.List;
-import net.aufdemrand.denizen.tags.TagManager;
+import net.aufdemrand.denizencore.tags.TagManager;
 
 /**
  * This class implements requirement checking for scripts.

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/EnchantedRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/EnchantedRequirement.java
@@ -3,8 +3,8 @@
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
-import net.aufdemrand.denizen.objects.aH.ArgumentType;
+import net.aufdemrand.denizencore.objects.aH;
+import net.aufdemrand.denizencore.objects.aH.ArgumentType;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
 import java.util.List;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/FlaggedRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/FlaggedRequirement.java
@@ -5,7 +5,7 @@
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
 import java.util.List;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/HoldingRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/HoldingRequirement.java
@@ -4,7 +4,7 @@
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
 import net.aufdemrand.denizen.objects.dItem;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
 import java.util.List;
@@ -27,7 +27,7 @@ else if(aH.matchesArg("EXACT, EXACTLY, EQUALS", thisArg)) {
                 exact = true;
             }
 
-            else itemToCheck = aH.getItemFrom(thisArg);
+            else itemToCheck = dItem.valueOf(thisArg);
         }
 
         if (itemToCheck != null)

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/InGroupRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/InGroupRequirement.java
@@ -7,7 +7,7 @@
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.depends.Depends;
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java
@@ -6,7 +6,7 @@
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
 public class ItemRequirement extends AbstractRequirement {

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/LiquidRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/LiquidRequirement.java
@@ -1,9 +1,10 @@
 package net.aufdemrand.denizen.scripts.requirements.core;
 
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
+import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.block.Block;
 
@@ -29,7 +30,7 @@ public boolean check(RequirementsContext context, List<String> args) throws Requ
         for (String thisArg : args) {
 
             if (aH.matchesLocation(thisArg)) {
-                blockToCheck = aH.getLocationFrom(thisArg).getBlock();
+                blockToCheck = dLocation.valueOf(thisArg).getBlock();
                 if (blockToCheck != null)
                     dB.echoDebug(context.getScriptContainer(), "...block to check is type '" + blockToCheck.getType().toString() + "'");
             }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/MoneyRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/MoneyRequirement.java
@@ -3,7 +3,7 @@
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.depends.Depends;
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/OxygenRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/OxygenRequirement.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
 import net.aufdemrand.denizen.utilities.debugging.dB;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PermissionRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PermissionRequirement.java
@@ -7,7 +7,7 @@
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.depends.Depends;
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PoweredRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PoweredRequirement.java
@@ -1,9 +1,10 @@
 package net.aufdemrand.denizen.scripts.requirements.core;
 
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
+import net.aufdemrand.denizen.objects.dLocation;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.block.Block;
 
@@ -20,7 +21,7 @@ public boolean check(RequirementsContext context, List<String> args) throws Requ
         for (String thisArg : args) {
 
             if (aH.matchesLocation(thisArg)) {
-                blockToCheck = aH.getLocationFrom(thisArg).getBlock();
+                blockToCheck = dLocation.valueOf(thisArg).getBlock();
                 if (blockToCheck != null)
                     dB.echoDebug(context.getScriptContainer(), "...block to check is type '" + blockToCheck.getType().toString() + "'");
             }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ProcedureRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ProcedureRequirement.java
@@ -14,7 +14,7 @@ public class ProcedureRequirement extends AbstractRequirement{
     public boolean check(RequirementsContext context, List<String> args) throws RequirementCheckException {
 
         // Deprecated
-         dB.log("This command is deprecated! Use instead: valueof <proc:name_of_procedure_script>");
+         dB.log("This requirement is deprecated! Use instead: valueof <proc[name_of_procedure_script]>");
 
         return false;
     }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ScriptRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ScriptRequirement.java
@@ -5,8 +5,8 @@
 import net.aufdemrand.denizen.scripts.commands.core.FinishCommand;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
-import net.aufdemrand.denizen.objects.aH.ArgumentType;
+import net.aufdemrand.denizencore.objects.aH;
+import net.aufdemrand.denizencore.objects.aH.ArgumentType;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
 import java.util.List;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java
@@ -3,7 +3,7 @@
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
-import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizencore.objects.aH;
 
 import java.util.List;