make a dedicated 'QueueTag' (instead of misusing ScriptQueue)

DenizenScript · Jul 13, 2019 · 4dbdc54 · 4dbdc54
1 parent 66264f1
commit 4dbdc54
Show file tree

Hide file tree

Showing 14 changed files with 462 additions and 490 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/objects/ObjectFetcher.java b/src/main/java/com/denizenscript/denizencore/objects/ObjectFetcher.java
@@ -1,7 +1,6 @@
 package com.denizenscript.denizencore.objects;
 
 import com.denizenscript.denizencore.objects.core.*;
-import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizencore.DenizenCore;
@@ -78,8 +77,8 @@ public static void _registerCoreObjects() throws NoSuchMethodException, ClassNot
         ElementTag.registerTags(); // TODO: Automate this once all classes have tag registries
         registerWithObjectFetcher(DurationTag.class);     // d@
         DurationTag.registerTags(); // TODO: Automate this once all classes have tag registries
-        registerWithObjectFetcher(ScriptQueue.class);  // q@
-        ScriptQueue.registerTags(); // TODO: Automate this once all classes have tag registries
+        registerWithObjectFetcher(QueueTag.class);  // q@
+        QueueTag.registerTags(); // TODO: Automate this once all classes have tag registries
         _initialize();
 
     }

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java
@@ -2,7 +2,6 @@
 
 import com.denizenscript.denizencore.objects.*;
 import com.denizenscript.denizencore.scripts.commands.queue.Comparable;
-import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.SQLEscaper;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
@@ -22,7 +21,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 public class ElementTag implements ObjectTag, ObjectTag.ObjectAttributable {
 
     // <--[language]
@@ -605,7 +603,7 @@ public ObjectTag run(Attribute attribute, ObjectTag object) {
 
         // <--[tag]
         // @attribute <ElementTag.as_queue>
-        // @returns ScriptQueue
+        // @returns QueueTag
         // @group conversion
         // @description
         // Returns the element as a ScriptQueue.
@@ -615,7 +613,7 @@ public ObjectTag run(Attribute attribute, ObjectTag object) {
             @Override
             public ObjectTag run(Attribute attribute, ObjectTag object) {
                 String element = ((ElementTag) object).element;
-                ScriptQueue obj = handleNull(element, ScriptQueue.valueOf(element), "ScriptQueue", attribute.hasAlternative());
+                QueueTag obj = handleNull(element, QueueTag.valueOf(element), "ScriptQueue", attribute.hasAlternative());
                 if (obj != null) {
                     return CoreUtilities.autoAttrib(obj, attribute.fulfill(1));
                 }