diff --git a/src/main/java/com/denizenscript/denizencore/objects/ObjectTag.java b/src/main/java/com/denizenscript/denizencore/objects/ObjectTag.java index e95c48e6..725a1c42 100644 --- a/src/main/java/com/denizenscript/denizencore/objects/ObjectTag.java +++ b/src/main/java/com/denizenscript/denizencore/objects/ObjectTag.java @@ -151,9 +151,4 @@ default ObjectTag getNextObjectTypeDown() { default ObjectTag specialTagProcessing(Attribute attribute) { return null; } - - interface ObjectAttributable extends ObjectTag { - - T asObjectType(Class type, TagContext context); - } } diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/CustomObjectTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/CustomObjectTag.java index 0578783a..65809325 100644 --- a/src/main/java/com/denizenscript/denizencore/objects/core/CustomObjectTag.java +++ b/src/main/java/com/denizenscript/denizencore/objects/core/CustomObjectTag.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.regex.Matcher; -public class CustomObjectTag implements ObjectTag, ObjectTag.ObjectAttributable, Adjustable { +public class CustomObjectTag implements ObjectTag, Adjustable { // <--[language] // @name Custom Objects @@ -125,11 +125,6 @@ public boolean isUnique() { return false; } - @Override - public T asObjectType(Class type, TagContext context) { - return null; - } - @Override public ObjectTag getObjectAttribute(Attribute attribute) { if (attribute == null) { diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/DurationTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/DurationTag.java index 63e8ce6b..48499fd3 100644 --- a/src/main/java/com/denizenscript/denizencore/objects/core/DurationTag.java +++ b/src/main/java/com/denizenscript/denizencore/objects/core/DurationTag.java @@ -11,7 +11,6 @@ import java.text.SimpleDateFormat; import java.util.Date; -import java.util.HashMap; /** diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java index 4d332ecb..9113a328 100644 --- a/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java +++ b/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java @@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -public class ElementTag implements ObjectTag, ObjectTag.ObjectAttributable { +public class ElementTag implements ObjectTag { // <--[language] // @name ElementTags @@ -2573,11 +2573,6 @@ public static void registerTag(String name, TagRunnable.ObjectForm runnable) { tagProcessor.registerTag(name, runnable); } - @Override - public T asObjectType(Class type, TagContext context) { - return null; - } - @Override public ObjectTag getObjectAttribute(Attribute attribute) { return tagProcessor.getObjectAttribute(this, attribute); diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/ListTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/ListTag.java index f121f21c..0ce81e31 100644 --- a/src/main/java/com/denizenscript/denizencore/objects/core/ListTag.java +++ b/src/main/java/com/denizenscript/denizencore/objects/core/ListTag.java @@ -21,7 +21,7 @@ import java.util.*; import java.util.regex.Pattern; -public class ListTag extends ArrayList implements ObjectTag, ObjectTag.ObjectAttributable { +public class ListTag extends ArrayList implements ObjectTag { // <--[language] // @name ListTag @@ -1987,11 +1987,6 @@ public ObjectTag getNextObjectTypeDown() { return (flag != null && size() == 1) ? getObject(0) : new ElementTag(identifyList()); } - @Override - public T asObjectType(Class type, TagContext context) { - return null; - } - @Override public ObjectTag specialTagProcessing(Attribute attribute) { String attrLow = attribute.getAttributeWithoutContext(1); diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/QueueTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/QueueTag.java index 19f996e8..feb09320 100644 --- a/src/main/java/com/denizenscript/denizencore/objects/core/QueueTag.java +++ b/src/main/java/com/denizenscript/denizencore/objects/core/QueueTag.java @@ -11,7 +11,7 @@ import com.denizenscript.denizencore.utilities.CoreUtilities; import com.denizenscript.denizencore.utilities.debugging.Debug; -public class QueueTag implements ObjectTag, ObjectTag.ObjectAttributable, Adjustable { +public class QueueTag implements ObjectTag, Adjustable { // <--[language] // @name QueueTag @@ -314,11 +314,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return tagProcessor.getObjectAttribute(this, attribute); } - @Override - public T asObjectType(Class type, TagContext context) { - return null; - } - public void ensure() { while (queue.replacementQueue != null) { queue = queue.replacementQueue; diff --git a/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java b/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java index 44d0df26..eadf77c1 100644 --- a/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java +++ b/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java @@ -148,12 +148,6 @@ public static T asType(ObjectTag inp, Class type, TagCo if (type == ElementTag.class) { return (T) new ElementTag(inp.toString()); } - if (inp instanceof ObjectTag.ObjectAttributable) { - T temp = ((ObjectTag.ObjectAttributable) inp).asObjectType(type, context); - if (temp != null) { - return temp; - } - } return ObjectFetcher.getObjectFrom(type, inp.toString(), context); }