add script check for event item validator

DenizenScript · May 22, 2018 · 1513a0d · 1513a0d
1 parent 0449406
commit 1513a0d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/com/denizenscript/denizen2sponge/events/D2SpongeEventHelper.java b/src/main/java/com/denizenscript/denizen2sponge/events/D2SpongeEventHelper.java
@@ -5,9 +5,9 @@
 import com.denizenscript.denizen2core.tags.objects.IntegerTag;
 import com.denizenscript.denizen2core.tags.objects.ListTag;
 import com.denizenscript.denizen2core.tags.objects.MapTag;
-import com.denizenscript.denizen2core.tags.objects.TextTag;
 import com.denizenscript.denizen2core.utilities.Action;
 import com.denizenscript.denizen2core.utilities.CoreUtilities;
+import com.denizenscript.denizen2sponge.spongescripts.ItemScript;
 import com.denizenscript.denizen2sponge.tags.objects.*;
 import com.denizenscript.denizen2sponge.utilities.UtilLocation;
 import com.denizenscript.denizen2sponge.utilities.Utilities;
@@ -178,6 +178,7 @@ else if (Utilities.getIdWithoutDefaultPrefix(opt.get().getId()).equals(type)) {
     // type: (ItemTypeTag) checks if the item type matches.
     // Quantity: (IntegerTag) checks if the quantity is at least a value.
     // Flagged: (TextTag) checks if the item has a flag.
+    // Script: (ScriptTag) checks if the item was created by a specific script.
     // -->
 
     public static boolean checkItem(ItemTag itm, ScriptEvent.ScriptEventData data, Action<String> error) {
@@ -207,11 +208,17 @@ public static boolean checkItem(ItemTag itm, ScriptEvent.ScriptEventData data, A
                     return false;
                 }
             }
-            if (t.equals("quantity")) {
+            else if (t.equals("quantity")) {
                 if (itm.getInternal().getQuantity() < IntegerTag.getFor(error, v).getInternal()) {
                     return false;
                 }
             }
+            else if (t.equals("script")) {
+                ItemScript src = itm.getSourceScript();
+                if (src == null || !src.itemScriptName.equals(CoreUtilities.toLowerCase(v))) {
+                    return false;
+                }
+            }
             else if (t.equals("flagged")) {
                 boolean poss = false;
                 MapTag flags;

diff --git a/src/main/java/com/denizenscript/denizen2sponge/spongescripts/ItemScript.java b/src/main/java/com/denizenscript/denizen2sponge/spongescripts/ItemScript.java
@@ -76,8 +76,11 @@ public class ItemScript extends CommandScript {
 
     public ItemScript(String name, YAMLConfiguration section) {
         super(name, section);
+        itemScriptName = CoreUtilities.toLowerCase(name);
     }
 
+    public final String itemScriptName;
+
     @Override
     public boolean init() {
         if (super.init()) {
@@ -94,7 +97,7 @@ public boolean init() {
                 Debug.error("Item generation for " + ColorSet.emphasis + title + ColorSet.warning + ": " + ex.getMessage());
                 return false;
             }
-            Denizen2Sponge.itemScripts.put(CoreUtilities.toLowerCase(title), this);
+            Denizen2Sponge.itemScripts.put(itemScriptName, this);
             return true;
         }
         return false;