minor cleanups

DenizenScript · Nov 28, 2021 · 5661e75 · 5661e75
1 parent 3d3bfea
commit 5661e75
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 70 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/events/core/ConsoleOutputScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/ConsoleOutputScriptEvent.java
@@ -3,8 +3,6 @@
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
-import com.denizenscript.denizencore.scripts.ScriptEntryData;
-import com.denizenscript.denizencore.DenizenCore;
 
 public class ConsoleOutputScriptEvent extends ScriptEvent {
 
@@ -32,13 +30,6 @@ public ConsoleOutputScriptEvent() {
 
     public String message = null;
 
-    public ScriptEntryData data = DenizenCore.implementation.getEmptyScriptEntryData();
-
-    @Override
-    public ScriptEntryData getScriptEntryData() {
-        return data;
-    }
-
     @Override
     public ObjectTag getContext(String name) {
         switch (name) {

diff --git a/src/main/java/com/denizenscript/denizencore/events/core/DeltaTimeScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/DeltaTimeScriptEvent.java
@@ -3,7 +3,6 @@
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
-import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.denizencore.DenizenCore;
 
 public class DeltaTimeScriptEvent extends ScriptEvent {
@@ -71,13 +70,6 @@ public boolean matches(ScriptPath path) {
         return super.matches(path);
     }
 
-    public ScriptEntryData data = null;
-
-    @Override
-    public ScriptEntryData getScriptEntryData() {
-        return data;
-    }
-
     @Override
     public String getName() {
         return "DeltaTime";
@@ -110,7 +102,6 @@ public void checkTime() {
             return;
         }
         second = new ElementTag(DenizenCore.serverTimeMillis / 1000);
-        data = DenizenCore.implementation.getEmptyScriptEntryData();
         fire();
     }
 }
diff --git a/src/main/java/com/denizenscript/denizencore/events/core/PreScriptReloadScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/PreScriptReloadScriptEvent.java
@@ -1,8 +1,6 @@
 package com.denizenscript.denizencore.events.core;
 
-import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.events.ScriptEvent;
-import com.denizenscript.denizencore.scripts.ScriptEntryData;
 
 public class PreScriptReloadScriptEvent extends ScriptEvent {
 
@@ -23,11 +21,6 @@ public PreScriptReloadScriptEvent() {
         registerCouldMatcher("pre script reload");
     }
 
-    @Override
-    public ScriptEntryData getScriptEntryData() {
-        return DenizenCore.implementation.getEmptyScriptEntryData();
-    }
-
     @Override
     public String getName() {
         return "PreScriptReload";

diff --git a/src/main/java/com/denizenscript/denizencore/events/core/RedisPubSubMessageScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/RedisPubSubMessageScriptEvent.java
@@ -1,10 +1,8 @@
 package com.denizenscript.denizencore.events.core;
 
-import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.scripts.ScriptEntryData;
 
 public class RedisPubSubMessageScriptEvent extends ScriptEvent {
 
@@ -39,11 +37,6 @@ public RedisPubSubMessageScriptEvent() {
         registerSwitches("channel");
     }
 
-    @Override
-    public ScriptEntryData getScriptEntryData() {
-        return DenizenCore.implementation.getEmptyScriptEntryData();
-    }
-
     @Override
     public boolean matches(ScriptPath path) {
         if (!runGenericSwitchCheck(path, "channel", channel)) {

diff --git a/src/main/java/com/denizenscript/denizencore/events/core/ReloadScriptsScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/ReloadScriptsScriptEvent.java
@@ -3,8 +3,6 @@
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
-import com.denizenscript.denizencore.scripts.ScriptEntryData;
-import com.denizenscript.denizencore.DenizenCore;
 
 public class ReloadScriptsScriptEvent extends ScriptEvent {
 
@@ -35,11 +33,6 @@ public ReloadScriptsScriptEvent() {
 
     public boolean hadError = false;
 
-    @Override
-    public ScriptEntryData getScriptEntryData() {
-        return DenizenCore.implementation.getEmptyScriptEntryData();
-    }
-
     @Override
     public ObjectTag getContext(String name) {
         switch (name) {

diff --git a/src/main/java/com/denizenscript/denizencore/events/core/ScriptGeneratesErrorScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/ScriptGeneratesErrorScriptEvent.java
@@ -1,6 +1,5 @@
 package com.denizenscript.denizencore.events.core;
 
-import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
@@ -49,7 +48,7 @@ public ScriptEntryData getScriptEntryData() {
         if (queue != null && queue.getLastEntryExecuted() != null) {
             return queue.getLastEntryExecuted().entryData;
         }
-        return DenizenCore.implementation.getEmptyScriptEntryData();
+        return super.getScriptEntryData();
     }
 
     @Override

diff --git a/...n/java/com/denizenscript/denizencore/events/core/ServerGeneratesExceptionScriptEvent.java b/...n/java/com/denizenscript/denizencore/events/core/ServerGeneratesExceptionScriptEvent.java
@@ -1,6 +1,5 @@
 package com.denizenscript.denizencore.events.core;
 
-import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
@@ -46,7 +45,7 @@ public ScriptEntryData getScriptEntryData() {
         if (queue != null && queue.getLastEntryExecuted() != null) {
             return queue.getLastEntryExecuted().entryData;
         }
-        return DenizenCore.implementation.getEmptyScriptEntryData();
+        return super.getScriptEntryData();
     }
 
     @Override

diff --git a/src/main/java/com/denizenscript/denizencore/events/core/SystemTimeScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/SystemTimeScriptEvent.java
@@ -3,8 +3,6 @@
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
-import com.denizenscript.denizencore.scripts.ScriptEntryData;
-import com.denizenscript.denizencore.DenizenCore;
 
 import java.util.Calendar;
 
@@ -43,17 +41,10 @@ public SystemTimeScriptEvent() {
 
     public ElementTag hour;
 
-    public ScriptEntryData data = null;
-
     public ElementTag minute;
 
     public long seconds;
 
-    @Override
-    public ScriptEntryData getScriptEntryData() {
-        return data;
-    }
-
     @Override
     public boolean matches(ScriptPath path) {
         String time = path.rawEventArgAt(2);
@@ -146,7 +137,6 @@ public void checkTime() {
         else {
             minute = new ElementTag(m);
         }
-        data = DenizenCore.implementation.getEmptyScriptEntryData();
         fire();
     }
 }
diff --git a/src/main/java/com/denizenscript/denizencore/events/core/TickScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/core/TickScriptEvent.java
@@ -3,8 +3,6 @@
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
-import com.denizenscript.denizencore.scripts.ScriptEntryData;
-import com.denizenscript.denizencore.DenizenCore;
 
 public class TickScriptEvent extends ScriptEvent {
 
@@ -35,13 +33,6 @@ public TickScriptEvent() {
 
     public long ticks = 0;
 
-    public ScriptEntryData data = DenizenCore.implementation.getEmptyScriptEntryData();
-
-    @Override
-    public ScriptEntryData getScriptEntryData() {
-        return data;
-    }
-
     @Override
     public ObjectTag getContext(String name) {
         if (name.equals("tick")) {

diff --git a/src/main/java/com/denizenscript/denizencore/objects/ObjectTag.java b/src/main/java/com/denizenscript/denizencore/objects/ObjectTag.java
@@ -64,6 +64,7 @@ public interface ObjectTag {
      *
      * @return the debug information
      */
+    @Deprecated
     default String debug() {
         return "<G>" + getPrefix() + "='<Y>" + debuggable() + "<G>'  ";
     }

diff --git a/src/main/java/com/denizenscript/denizencore/utilities/scheduling/AsyncSchedulable.java b/src/main/java/com/denizenscript/denizencore/utilities/scheduling/AsyncSchedulable.java
@@ -1,7 +1,5 @@
 package com.denizenscript.denizencore.utilities.scheduling;
 
-import com.denizenscript.denizencore.DenizenCore;
-
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
@@ -14,12 +12,7 @@ public AsyncSchedulable(Schedulable schedulable) {
         this.schedulable = schedulable;
         final Runnable runnable = schedulable.run;
         this.schedulable.run = () -> {
-            if (DenizenCore.MAIN_THREAD == Thread.currentThread()) {
-                executor.execute(runnable);
-            }
-            else {
-                runnable.run();
-            }
+            executor.execute(runnable);
         };
     }