use new 'register' method, and tweak pseudoobject format

self-registering constructor, same as most other tag things use. Exclude DurationTag/ElementTag because there's a PR on those waiting
DenizenScript · Nov 18, 2022 · 61f6544 · 61f6544
1 parent df1539c
commit 61f6544
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 33 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/BinaryTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/BinaryTag.java
@@ -149,7 +149,7 @@ public Object getJavaObject() {
         return data;
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         // <--[tag]
         // @attribute <BinaryTag.length>

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/JavaReflectedObjectTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/JavaReflectedObjectTag.java
@@ -152,7 +152,7 @@ public Object getJavaObject() {
         return object;
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         // <--[tag]
         // @attribute <JavaReflectedObjectTag.simple_class_name>

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/ListTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/ListTag.java
@@ -733,7 +733,7 @@ public int parseIndex(String index, Attribute attribute, boolean strict) {
         return integerIndex - 1;
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         // <--[tag]
         // @attribute <ListTag.combine>

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/MapTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/MapTag.java
@@ -317,7 +317,7 @@ public ListTag keys() {
         return result;
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         // <--[tag]
         // @attribute <MapTag.size>

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/QueueTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/QueueTag.java
@@ -145,7 +145,7 @@ public void reapplyTracker(AbstractFlagTracker tracker) {
         // Nothing to do.
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         AbstractFlagTracker.registerFlagHandlers(tagProcessor);
 

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/ScriptTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/ScriptTag.java
@@ -226,7 +226,7 @@ public void reapplyTracker(AbstractFlagTracker tracker) {
         // Nothing to do.
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         AbstractFlagTracker.registerFlagHandlers(tagProcessor);
 

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/SecretTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/SecretTag.java
@@ -153,7 +153,7 @@ public boolean isUnique() {
         return true;
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         // <--[tag]
         // @attribute <SecretTag.key>

diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/TimeTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/TimeTag.java
@@ -240,7 +240,7 @@ public void reapplyTracker(AbstractFlagTracker tracker) {
         // Nothing to do.
     }
 
-    public static void registerTags() {
+    public static void register() {
 
         AbstractFlagTracker.registerFlagHandlers(tagProcessor);
 

diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java
@@ -199,7 +199,6 @@ public static void patchPatchMethodMethodsField() {
     }
 
     public static void webGet(final ScriptEntry scriptEntry, final ElementTag data, Method method, String urlText, DurationTag timeout, MapTag headers, String saveFile, boolean hideFailure, boolean urlIsSecret) {
-        BufferedReader buffIn = null;
         HttpURLConnection uc = null;
         try {
             long timeStart = CoreUtilities.monotonicMillis();
@@ -334,22 +333,5 @@ public boolean tick(float seconds) {
                 }
             });
         }
-        finally {
-            try {
-                if (buffIn != null) {
-                    buffIn.close();
-                }
-            }
-            catch (Exception e) {
-                if (!hideFailure) {
-                    if (urlIsSecret) {
-                        Debug.echoError("WebGet encountered an exception of type '" + e.getClass().getCanonicalName() + "' but hid the exception text due to secret URL presence.");
-                    }
-                    else {
-                        Debug.echoError(e);
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/src/main/java/com/denizenscript/denizencore/tags/PseudoObjectTagBase.java b/src/main/java/com/denizenscript/denizencore/tags/PseudoObjectTagBase.java
@@ -47,7 +47,7 @@ public ObjectTag getNextObjectTypeDown() {
 
     public ObjectType<T> type = new ObjectType<>();
 
-    public abstract void registerTags();
+    public abstract void register();
 
     @Override
     public ObjectTag getObjectAttribute(Attribute attribute) {
@@ -60,6 +60,6 @@ public PseudoObjectTagBase() {
         type.clazz = tagProcessor.type;
         type.longName = DebugInternals.getClassNameOpti(getClass());
         ObjectFetcher.objectsByClass.put(type.clazz, type);
-        registerTags();
+        register();
     }
 }
diff --git a/src/main/java/com/denizenscript/denizencore/tags/TagManager.java b/src/main/java/com/denizenscript/denizencore/tags/TagManager.java
@@ -41,7 +41,7 @@ public static void registerCoreTags() {
         new ProcedureScriptTagBase();
         new StaticTagBase();
         new TernaryTagBase();
-        UtilTagBase.register();
+        new UtilTagBase();
     }
 
     public static class TagBaseData {

diff --git a/src/main/java/com/denizenscript/denizencore/tags/core/UtilTagBase.java b/src/main/java/com/denizenscript/denizencore/tags/core/UtilTagBase.java
@@ -29,14 +29,13 @@ public class UtilTagBase extends PseudoObjectTagBase<UtilTagBase> {
 
     public static UtilTagBase instance;
 
-    public static void register() {
-        instance = new UtilTagBase();
+    public UtilTagBase() {
+        instance = this;
         TagManager.registerStaticTagBaseHandler(UtilTagBase.class, "util", (t) -> instance);
     }
 
     @Override
-    public void registerTags() {
-
+    public void register() {
         tagProcessor.registerTag(ElementTag.class, "random", (attribute, object) -> {
             attribute.fulfill(1);