move ParseableTag to its own class

DenizenScript · Oct 23, 2021 · 4714fb9 · 4714fb9
1 parent d1ab1a8
commit 4714fb9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 31 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java b/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java
@@ -10,6 +10,7 @@
 import com.denizenscript.denizencore.scripts.commands.Holdable;
 import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
 import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
+import com.denizenscript.denizencore.tags.ParseableTag;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.Deprecations;
 import com.denizenscript.denizencore.utilities.debugging.Debuggable;
@@ -67,7 +68,7 @@ public static class InternalArgument {
 
         public InternalArgument prefix = null;
 
-        public TagManager.ParseableTag value = null;
+        public ParseableTag value = null;
 
         public Argument aHArg = null;
 

diff --git a/src/main/java/com/denizenscript/denizencore/tags/Attribute.java b/src/main/java/com/denizenscript/denizencore/tags/Attribute.java
@@ -21,7 +21,7 @@ public static class AttributeComponent {
 
         public final String context;
 
-        public TagManager.ParseableTag contextParsed;
+        public ParseableTag contextParsed;
 
         public ObjectTagProcessor.TagData<?, ?> data;
 

diff --git a/src/main/java/com/denizenscript/denizencore/tags/ParseableTag.java b/src/main/java/com/denizenscript/denizencore/tags/ParseableTag.java
@@ -0,0 +1,36 @@
+package com.denizenscript.denizencore.tags;
+
+
+import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.ElementTag;
+
+import java.util.List;
+
+public class ParseableTag {
+
+    public ElementTag rawElement;
+
+    public List<TagManager.ParseableTagPiece> pieces;
+
+    public TagManager.ParseableTagPiece singleTag;
+
+    public boolean hasTag;
+
+    public final ObjectTag parse(TagContext context) {
+        if (rawElement != null) {
+            return rawElement;
+        }
+        else if (singleTag != null) {
+            return TagManager.readSingleTagObject(singleTag, context);
+        }
+        return TagManager.parseChainObject(pieces, context);
+    }
+
+    public ParseableTag() {
+    }
+
+    public ParseableTag(String text) {
+        rawElement = new ElementTag(text, true);
+        rawElement.isRawInput = true;
+    }
+}
diff --git a/src/main/java/com/denizenscript/denizencore/tags/TagManager.java b/src/main/java/com/denizenscript/denizencore/tags/TagManager.java
@@ -231,35 +231,6 @@ public static ObjectTag readSingleTagObject(TagContext context, ReplaceableTagEv
 
     public static ParseableTag DEFAULT_PARSEABLE_EMPTY = new ParseableTag("");
 
-    public static class ParseableTag {
-
-        public ElementTag rawElement;
-
-        public List<ParseableTagPiece> pieces;
-
-        public ParseableTagPiece singleTag;
-
-        public boolean hasTag;
-
-        public final ObjectTag parse(TagContext context) {
-            if (rawElement != null) {
-                return rawElement;
-            }
-            else if (singleTag != null) {
-                return readSingleTagObject(singleTag, context);
-            }
-            return parseChainObject(pieces, context);
-        }
-
-        public ParseableTag() {
-        }
-
-        public ParseableTag(String text) {
-            rawElement = new ElementTag(text, true);
-            rawElement.isRawInput = true;
-        }
-    }
-
     public static class ParseableTagPiece {
 
         public String content;