remove some old unused stuff

DenizenScript · Feb 24, 2019 · b4cd82a · b4cd82a
1 parent 29198c3
commit b4cd82a
Show file tree

Hide file tree

Showing 123 changed files with 170 additions and 706 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -51,7 +51,6 @@
 import net.aufdemrand.denizencore.DenizenImplementation;
 import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.events.ScriptEvent;
-import net.aufdemrand.denizencore.interfaces.dExternal;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.aH;
@@ -320,8 +319,6 @@ public NotableManager notableManager() {
 
     public Depends depends = new Depends();
 
-    public RuntimeCompiler runtimeCompiler;
-
     private BukkitWorldScriptHelper ws_helper;
 
     public final static long startTime = System.currentTimeMillis();
@@ -528,10 +525,6 @@ public void onEnable() {
                 // Register Speech AI
                 CitizensAPI.getSpeechFactory().register(DenizenChat.class, "denizen_chat");
             }
-
-            // Compile and load Denizen externals
-            runtimeCompiler = new RuntimeCompiler(this);
-            runtimeCompiler.loader();
         }
         catch (Exception e) {
             dB.echoError(e);
@@ -1013,12 +1006,6 @@ public void onDisable() {
         // Save offline player inventories
         InventoryScriptHelper._savePlayerInventories();
 
-        // Unload loaded dExternals
-        for (dExternal external : RuntimeCompiler.loadedExternals) {
-            external.unload();
-        }
-        RuntimeCompiler.loadedExternals.clear();
-
         //Disable core members
         getCommandRegistry().disableCoreMembers();
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java b/plugin/src/main/java/net/aufdemrand/denizen/DenizenCommandHandler.java
@@ -317,20 +317,19 @@ public void save(CommandContext args, CommandSender sender) throws CommandExcept
     /*
      * DENIZEN RELOAD
      */
-    @Command(aliases = {"denizen"}, usage = "reload (saves|notables|config|scripts|externals) (-a)",
+    @Command(aliases = {"denizen"}, usage = "reload (saves|notables|config|scripts) (-a)",
             desc = "Reloads various Denizen files from disk to memory.", modifiers = {"reload"},
             min = 1, max = 3, permission = "denizen.basic", flags = "a")
     public void reload(CommandContext args, CommandSender sender) throws CommandException {
 
         // Get reload type
         if (args.hasFlag('a')) {
             denizen.reloadConfig();
-            denizen.runtimeCompiler.reload();
             DenizenCore.reloadScripts();
             denizen.notableManager().reloadNotables();
             denizen.reloadSaves();
             CommandScriptHelper.syncDenizenCommands();
-            Messaging.send(sender, "Denizen/saves.yml, Denizen/notables.yml, Denizen/config.yml, Denizen/scripts/..., and Denizen/externals/... reloaded from disk to memory.");
+            Messaging.send(sender, "Denizen/saves.yml, Denizen/notables.yml, Denizen/config.yml, and Denizen/scripts/... reloaded from disk to memory.");
             if (ScriptHelper.hadError()) {
                 Messaging.sendError(sender, "There was an error loading your scripts, check the console for details!");
             }
@@ -376,15 +375,10 @@ else if (args.getString(1).equalsIgnoreCase("scripts")) {
                 ReloadScriptsScriptEvent.instance.fire();
                 return;
             }
-            else if (args.getString(1).equalsIgnoreCase("externals")) {
-                denizen.runtimeCompiler.reload();
-                Messaging.send(sender, "Denizen/externals/... reloaded from disk to memory.");
-                return;
-            }
         }
 
         Messaging.send(sender, "");
-        Messaging.send(sender, "<f>Specify which parts to reload. Valid options are: SAVES, NOTABLES, CONFIG, SCRIPTS, EXTERNALS");
+        Messaging.send(sender, "<f>Specify which parts to reload. Valid options are: SAVES, NOTABLES, CONFIG, SCRIPTS");
         Messaging.send(sender, "<b>Example: /denizen reload scripts");
         Messaging.send(sender, "<f>Use '-a' to reload all parts.");
         Messaging.send(sender, "");

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/exceptions/RequirementCheckException.java b/plugin/src/main/java/net/aufdemrand/denizen/exceptions/RequirementCheckException.java
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java
@@ -4,7 +4,6 @@
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Duration;
 import net.aufdemrand.denizencore.objects.aH;
@@ -66,7 +65,7 @@ else if (arg.matchesPrefix("script", "s")) {
 
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
         // Fetch objects
         dScript script = (dScript) scriptEntry.getObject("script");
         Duration duration = (Duration) scriptEntry.getObject("duration");

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EventCommand.java
@@ -2,7 +2,6 @@
 
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.events.OldEventManager;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.aH;
@@ -44,7 +43,7 @@ else if (!scriptEntry.hasObject("events")) {
 
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         dList events = (dList) scriptEntry.getObject("events");
         dList context = (dList) scriptEntry.getObject("context");

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
@@ -14,7 +13,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
     }
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
         dB.echoError("The 'FAIL' command is deprecated. Use flags instead!");
     }
 }
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FileCopyCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FileCopyCommand.java
@@ -4,7 +4,6 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.Utilities;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
@@ -51,7 +50,7 @@ else if (!scriptEntry.hasObject("overwrite")
     }
 
     @Override
-    public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(final ScriptEntry scriptEntry) {
         Element origin = scriptEntry.getElement("origin");
         Element destination = scriptEntry.getElement("destination");
         Element overwrite = scriptEntry.getElement("overwrite");

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
@@ -14,7 +13,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
     }
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
         dB.echoError("The 'FINISH' command is deprecated. Use flags instead!");
     }
 }

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java
@@ -9,7 +9,6 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.DenizenCore;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Duration;
 import net.aufdemrand.denizencore.objects.Element;
@@ -195,7 +194,7 @@ else if (flagArgs[1].equals("//") || flagArgs[1].equals("/")) {
 
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         dObject flag_target = scriptEntry.getdObject("flag_target");
         Duration duration = (Duration) scriptEntry.getObject("duration");
@@ -242,7 +241,8 @@ else if (flag_target instanceof dEntity) {
             flag = DenizenAPI.getCurrentInstance().flagManager().getEntityFlag((dEntity) flag_target, name.asString());
         }
         else {
-            throw new CommandExecutionException("Could not fetch a flag for this entity: " + flag_target.debug());
+            dB.echoError("Could not fetch a flag for this entity: " + flag_target.debug());
+            return;
         }
 
         // Do the action!

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
@@ -140,7 +139,7 @@ else if (!scriptEntry.hasObject("path")) {
     }
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         if (scriptEntry.dbCallShouldDebug()) {
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LogCommand.java
@@ -4,7 +4,6 @@
 import net.aufdemrand.denizen.utilities.Utilities;
 import net.aufdemrand.denizen.utilities.debugging.DebugLog;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
@@ -56,7 +55,7 @@ else if (!scriptEntry.hasObject("message")) {
     }
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
         if (!Settings.allowLogging()) {
             dB.echoError("Logging disabled by administrator.");
             return;

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NoteCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NoteCommand.java
@@ -2,7 +2,6 @@
 
 import net.aufdemrand.denizen.objects.notable.NotableManager;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
@@ -48,15 +47,15 @@ else if (arg.matches("remove")) {
     }
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         String object = (String) scriptEntry.getObject("object");
         Element id = scriptEntry.getElement("id");
         Element remove = scriptEntry.getElement("remove");
 
-        if (scriptEntry.dbCallShouldDebug()) {
+        if (scriptEntry.dbCallShouldDebug()) {
 
-            dB.report(scriptEntry, getName(), aH.debugObj("object", object) + id.debug() + remove.debug());
+            dB.report(scriptEntry, getName(), aH.debugObj("object", object) + id.debug() + remove.debug());
 
         }
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Duration;
 import net.aufdemrand.denizencore.objects.aH;
@@ -58,7 +57,7 @@ else if ((arg.matchesArgumentType(ScriptQueue.class)
     }
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         ScriptQueue queue = (ScriptQueue) scriptEntry.getObject("queue");
         Action action = (Action) scriptEntry.getObject("action");

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java
@@ -1,7 +1,6 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
@@ -62,7 +61,7 @@ else if (!scriptEntry.hasObject("possibilities")
 
     @SuppressWarnings("unchecked")
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         int possibilities = 0;
         ScriptQueue queue = scriptEntry.getResidingQueue();
@@ -90,9 +89,9 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
         scriptEntry.addObject("possibilities", new Element(possibilities));
         scriptEntry.addObject("selected", new Element(selected));
 
-        if (scriptEntry.dbCallShouldDebug()) {
+        if (scriptEntry.dbCallShouldDebug()) {
 
-            dB.report(scriptEntry, getName(), aH.debugObj("possibilities", possibilities) + aH.debugObj("choice", selected + 1));
+            dB.report(scriptEntry, getName(), aH.debugObj("possibilities", possibilities) + aH.debugObj("choice", selected + 1));
 
         }
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java
@@ -1,9 +1,7 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
-import net.aufdemrand.denizencore.exceptions.ScriptEntryCreationException;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
@@ -75,7 +73,7 @@ else if (arg.matchesOne("{")) {
 
     @SuppressWarnings("unchecked")
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         Element stop = scriptEntry.getElement("stop");
         Element next = scriptEntry.getElement("next");
@@ -152,15 +150,9 @@ else if (callback != null && callback.asBoolean()) {
                     dB.echoDebug(scriptEntry, DebugElement.Header, "Repeat loop " + data.index);
                     scriptEntry.getResidingQueue().addDefinition(as_name.asString(), String.valueOf(data.index));
                     List<ScriptEntry> bracedCommands = BracedCommand.getBracedCommands(scriptEntry.getOwner()).get(0).value;
-                    ScriptEntry callbackEntry = null;
-                    try {
-                        callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()},
-                                (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null));
-                        callbackEntry.copyFrom(scriptEntry);
-                    }
-                    catch (ScriptEntryCreationException e) {
-                        dB.echoError(e);
-                    }
+                    ScriptEntry callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()},
+                            (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null));
+                    callbackEntry.copyFrom(scriptEntry);
                     callbackEntry.setOwner(scriptEntry.getOwner());
                     bracedCommands.add(callbackEntry);
                     for (int i = 0; i < bracedCommands.size(); i++) {
@@ -205,15 +197,9 @@ else if (callback != null && callback.asBoolean()) {
             datum.target = target;
             datum.index = 1;
             scriptEntry.setData(datum);
-            ScriptEntry callbackEntry = null;
-            try {
-                callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()},
-                        (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null));
-                callbackEntry.copyFrom(scriptEntry);
-            }
-            catch (ScriptEntryCreationException e) {
-                dB.echoError(e);
-            }
+            ScriptEntry callbackEntry = new ScriptEntry("REPEAT", new String[] {"\0CALLBACK", "as:" + as_name.asString()},
+                    (scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null));
+            callbackEntry.copyFrom(scriptEntry);
             callbackEntry.setOwner(scriptEntry);
             bracedCommandsList.add(callbackEntry);
             scriptEntry.getResidingQueue().addDefinition(as_name.asString(), "1");

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java
@@ -4,7 +4,6 @@
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.*;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
@@ -63,7 +62,7 @@ else if (arg.matchesArgumentList(dPlayer.class)) {
     }
 
     @Override
-    public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
+    public void execute(ScriptEntry scriptEntry) {
 
         // We allow players to be a single player or multiple players
         dObject player = scriptEntry.getdObject("players");