From b6a9ef6c56163bfdad7ff048f1bb6906fbb45db8 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Sun, 13 Oct 2019 05:33:52 -0700 Subject: [PATCH] version scripts are now deprecated --- .../denizen/DenizenCommandHandler.java | 19 ------ .../denizen/DenizenCoreImplementation.java | 1 - .../core/VersionScriptContainer.java | 32 +-------- .../utilities/ScriptVersionChecker.java | 65 ------------------- .../utilities/debugging/StatsRecord.java | 10 +-- 5 files changed, 3 insertions(+), 124 deletions(-) delete mode 100644 plugin/src/main/java/com/denizenscript/denizen/utilities/ScriptVersionChecker.java diff --git a/plugin/src/main/java/com/denizenscript/denizen/DenizenCommandHandler.java b/plugin/src/main/java/com/denizenscript/denizen/DenizenCommandHandler.java index d9329213ed..3a0fa973f7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/DenizenCommandHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/DenizenCommandHandler.java @@ -3,9 +3,7 @@ import com.denizenscript.denizen.nms.NMSHandler; import com.denizenscript.denizen.objects.LocationTag; import com.denizenscript.denizen.objects.notable.NotableManager; -import com.denizenscript.denizen.scripts.containers.core.VersionScriptContainer; import com.denizenscript.denizen.utilities.DenizenAPI; -import com.denizenscript.denizen.utilities.ScriptVersionChecker; import com.denizenscript.denizen.utilities.command.manager.Command; import com.denizenscript.denizen.utilities.command.manager.CommandContext; import com.denizenscript.denizen.utilities.command.manager.Paginator; @@ -18,7 +16,6 @@ import com.denizenscript.denizencore.scripts.ScriptRegistry; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.debugging.FutureWarning; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -300,22 +297,6 @@ public void version(CommandContext args, CommandSender sender) throws CommandExc } - /* - * DENIZEN SCRIPTVERSIONS - */ - @Command( - aliases = {"denizen"}, usage = "scriptversions", - desc = "Shows the currently loaded version of your scripts and checks them against the script repo.", modifiers = {"scriptversions"}, - min = 1, max = 3, permission = "denizen.basic") - public void scriptcheck(CommandContext args, CommandSender sender) throws CommandException { - sender.sendMessage(ChatColor.GREEN + "Checking " + VersionScriptContainer.scripts.size() + " script(s)!"); - for (VersionScriptContainer cont : VersionScriptContainer.scripts) { - ScriptVersionChecker svc = new ScriptVersionChecker(cont); - svc.runme(sender); - } - } - - /* * DENIZEN SAVE */ diff --git a/plugin/src/main/java/com/denizenscript/denizen/DenizenCoreImplementation.java b/plugin/src/main/java/com/denizenscript/denizen/DenizenCoreImplementation.java index db26b106e5..fcdd7abbc7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/DenizenCoreImplementation.java +++ b/plugin/src/main/java/com/denizenscript/denizen/DenizenCoreImplementation.java @@ -214,7 +214,6 @@ else if (arg.matchesPrefix("npc, npcid") && !if_ignore) { @Override public void refreshScriptContainers() { - VersionScriptContainer.scripts.clear(); ItemScriptHelper.item_scripts.clear(); ItemScriptHelper.item_scripts_by_hash_id.clear(); InventoryScriptHelper.inventory_scripts.clear(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/VersionScriptContainer.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/VersionScriptContainer.java index 7322629b91..f19a94371a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/VersionScriptContainer.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/VersionScriptContainer.java @@ -1,41 +1,13 @@ package com.denizenscript.denizen.scripts.containers.core; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; +import com.denizenscript.denizencore.utilities.Deprecations; import com.denizenscript.denizencore.utilities.YamlConfiguration; -import java.util.ArrayList; -import java.util.List; - public class VersionScriptContainer extends ScriptContainer { - // <--[language] - // @name Version Script Containers - // @group Script Container System - // @description - // Version script containers are used to identify a public script's version, author, and etc. basic information. - // - // These are primarily for use with the public script repository, and as such generally contain - // an 'ID:' key identifying the script repo ID of the script. - // - // - // Version_Script_Name: - // - // type: version - // - // # This is sample information, for script repository script number zero, 'dSentry'. - // id: 0 - // version: 0.7.3 - // name: dSentry - // author: mcmonkey - // - // - // - // --> - - public static List scripts = new ArrayList<>(); - public VersionScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) { super(configurationSection, scriptContainerName); - scripts.add(this); + Deprecations.versionScripts.warn(this); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/ScriptVersionChecker.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/ScriptVersionChecker.java deleted file mode 100644 index dd9fc99724..0000000000 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/ScriptVersionChecker.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.denizenscript.denizen.utilities; - - -import com.denizenscript.denizen.utilities.debugging.Debug; -import com.denizenscript.denizen.scripts.containers.core.VersionScriptContainer; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -public class ScriptVersionChecker { - - public final VersionScriptContainer container; - - public ScriptVersionChecker(VersionScriptContainer vers) { - container = vers; - } - - public void runme(final CommandSender sender) { - Bukkit.getScheduler().runTaskAsynchronously(DenizenAPI.getCurrentInstance(), new Runnable() { - @Override - public void run() { - try { - final String ID = container.getString("ID"); - URL url = new URL("http://one.denizenscript.com/denizen/repo/version/" + ID); - HttpURLConnection uc = (HttpURLConnection) url.openConnection(); - uc.setDoInput(true); - uc.setDoOutput(false); - uc.setConnectTimeout(10000); - uc.connect(); - BufferedReader in = new BufferedReader(new InputStreamReader(uc.getInputStream())); - final String Result = in.readLine(); - in.close(); - Bukkit.getScheduler().runTask(DenizenAPI.getCurrentInstance(), new Runnable() { - @Override - public void run() { - String vers = container.getString("VERSION"); - String name = container.getString("NAME"); - if (Result.equalsIgnoreCase(vers)) { - sender.sendMessage(ChatColor.AQUA + name + ChatColor.GREEN + " is up to date!"); - } - else { - sender.sendMessage(ChatColor.AQUA + name + ChatColor.RED + " is NOT up to date!"); - sender.sendMessage(ChatColor.RED + "Your version: " + vers + ", repo version: " + Result); - sender.sendMessage(ChatColor.RED + "Update at: http://one.denizenscript.com/denizen/repo/entry/" + ID); - } - } - }); - } - catch (final Throwable ex) { - Bukkit.getScheduler().runTask(DenizenAPI.getCurrentInstance(), new Runnable() { - @Override - public void run() { - Debug.echoError(ex); - } - }); - } - } - }); - } -} diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/StatsRecord.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/StatsRecord.java index 55b27c815d..e9a044bec7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/StatsRecord.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/StatsRecord.java @@ -1,8 +1,6 @@ package com.denizenscript.denizen.utilities.debugging; -import com.denizenscript.denizen.scripts.containers.core.VersionScriptContainer; import com.denizenscript.denizen.utilities.DenizenAPI; -import com.denizenscript.denizencore.tags.core.EscapeTagBase; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -26,15 +24,9 @@ public void run() { uc.setConnectTimeout(10000); uc.connect(); // Safely connected at this point - // Get some general info - StringBuilder sb = new StringBuilder(); - for (VersionScriptContainer cont : VersionScriptContainer.scripts) { - sb.append(EscapeTagBase.escape(cont.getString("ID"))).append("|"); - } // Create the final message pack and upload it uc.getOutputStream().write(("postid=pluginstats&plugin_st_players=" + Bukkit.getOnlinePlayers().size() - + "&plugin_st_motd=" + URLEncoder.encode(Bukkit.getServer().getMotd().replace(ChatColor.COLOR_CHAR, (char) 0x01)) - + "&plugin_st_known_scripts=" + sb.toString()) + + "&plugin_st_motd=" + URLEncoder.encode(Bukkit.getServer().getMotd().replace(ChatColor.COLOR_CHAR, (char) 0x01))) .getBytes(StandardCharsets.UTF_8)); // Wait for a response from the server in = new BufferedReader(new InputStreamReader(uc.getInputStream()));