From 602caa3ce5806fa280bb3b9cb93cefff3b78d5b1 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Wed, 6 Nov 2019 00:33:51 -0800 Subject: [PATCH] remove util.dsc Anyone who wants to run this can just grab the script themselves. No need for it to be forced into every server. This file only originally existed because the precursor to 'foreach' was script-based. --- .../DenizenCoreImplementation.java | 17 ------- plugin/src/main/resources/util.dsc | 47 ------------------- 2 files changed, 64 deletions(-) delete mode 100644 plugin/src/main/resources/util.dsc diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java index 0ba20cd4c4..5b9fdc5c06 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java @@ -17,21 +17,16 @@ import com.denizenscript.denizencore.objects.core.ListTag; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.ScriptEntryData; -import com.denizenscript.denizencore.scripts.ScriptHelper; import com.denizenscript.denizencore.scripts.queues.ScriptQueue; import com.denizenscript.denizencore.tags.TagContext; import com.denizenscript.denizencore.tags.TagManager; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.YamlConfiguration; import com.denizenscript.denizencore.utilities.debugging.Debuggable; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import java.util.function.Consumer; public class DenizenCoreImplementation implements DenizenImplementation { @@ -128,18 +123,6 @@ public void onScriptReload() { Bukkit.getServer().getPluginManager().callEvent(new ScriptReloadEvent()); } - @Override - public List getOutsideScripts() { - List files = new ArrayList<>(); - try { - files.add(ScriptHelper.loadConfig("Denizen.jar/util.dsc", DenizenAPI.getCurrentInstance().getResource("util.dsc"))); - } - catch (IOException e) { - Debug.echoError(e); - } - return files; - } - @Override public boolean shouldDebug(Debuggable debug) { return Debug.shouldDebug(debug); diff --git a/plugin/src/main/resources/util.dsc b/plugin/src/main/resources/util.dsc deleted file mode 100644 index 0406de10ce..0000000000 --- a/plugin/src/main/resources/util.dsc +++ /dev/null @@ -1,47 +0,0 @@ - -# Load Tester - -BUILTIN_Load_Tester: - type: command - name: testload - debug: false - description: Tests server load. - usage: /testload <<>power<>> - allowed help: - - determine >> - permission: denizen.testload - script: - - # double check the permission - - if !>>: - - stop - - - define n - - # if no number specified, stress test with 1000 queues - - if <[n]> == null: - - narrate 'Invalid integer, assuming 1000.' - - define n 1000 - - # initialize the progress flag - # this will count up each time a queue was completed - - flag server stress_test_counter:0 - - # keep track of the start time - - define start_time - - # repeat the run command - # each run will create a new queue, and increase the counter - - repeat <[n]>: - - run locally test instantly - - # ...and end time, to compare against the start time - - define end_time - - - narrate 'Completed of <[n]> total queues in <[end_time].sub_int[<[start_time]>].div[1000]> seconds.' - - # cleanup - - flag server stress_test_counter:! - - test: - - flag server stress_test_counter:++