From 96fc873f32dac6441c5e2f0c2baf26fb00a3c040 Mon Sep 17 00:00:00 2001 From: xjboss Date: Sat, 22 Jul 2017 19:55:46 +0800 Subject: [PATCH] Temporary remove KCauldron auto update --- src/main/java/kcauldron/KCauldronCommand.java | 8 ++++++-- .../java/kcauldron/updater/DefaultUpdateCallback.java | 2 ++ src/main/java/kcauldron/updater/KVersionRetriever.java | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/kcauldron/KCauldronCommand.java b/src/main/java/kcauldron/KCauldronCommand.java index 72d292a..534431e 100644 --- a/src/main/java/kcauldron/KCauldronCommand.java +++ b/src/main/java/kcauldron/KCauldronCommand.java @@ -38,8 +38,8 @@ public class KCauldronCommand extends Command { super(NAME); StringBuilder builder = new StringBuilder(); - builder.append(String.format("/%s check - Check to update\n", NAME)); - builder.append(String.format("/%s update [version] - Update to specified or latest version\n", NAME)); + //builder.append(String.format("/%s check - Check to update\n", NAME)); + //builder.append(String.format("/%s update [version] - Update to specified or latest version\n", NAME)); builder.append(String.format("/%s tps - Show tps statistics\n", NAME)); builder.append(String.format("/%s restart - Restart server\n", NAME)); builder.append(String.format("/%s dump - Dump statistics into kcauldron.dump file\n", NAME)); @@ -80,10 +80,14 @@ public class KCauldronCommand extends Command { if ("check".equals(action)) { if (!testPermission(sender, CHECK)) return true; + /* sender.sendMessage(ChatColor.GREEN + "Initiated version check..."); KVersionRetriever.startServer(new CommandSenderUpdateCallback(sender), false); + */ } else if ("update".equals(action)) { + /* KCauldronUpdater.initUpdate(sender, args.length > 1 ? args[1] : null); + */ } else if ("tps".equals(action)) { if (!testPermission(sender, TPS)) return true; diff --git a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java b/src/main/java/kcauldron/updater/DefaultUpdateCallback.java index 2980c31..ad00986 100644 --- a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java +++ b/src/main/java/kcauldron/updater/DefaultUpdateCallback.java @@ -21,6 +21,7 @@ public class DefaultUpdateCallback implements IVersionCheckCallback { public void onPlayerJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); if (hasPermission(player)) { + /* if (KCauldron.isLegacy()) { player.sendMessage(ChatColor.YELLOW + "We're running on legacy version on KCauldron, please update your version"); } @@ -30,6 +31,7 @@ public class DefaultUpdateCallback implements IVersionCheckCallback { if (mHasUpdate) { sendUpdate(player); } + */ } } diff --git a/src/main/java/kcauldron/updater/KVersionRetriever.java b/src/main/java/kcauldron/updater/KVersionRetriever.java index a351958..92ba75b 100644 --- a/src/main/java/kcauldron/updater/KVersionRetriever.java +++ b/src/main/java/kcauldron/updater/KVersionRetriever.java @@ -14,7 +14,6 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.LaxRedirectStrategy; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; - public class KVersionRetriever implements Runnable, UncaughtExceptionHandler { private static final boolean DEBUG; private static final KLog sLogger; @@ -76,7 +75,7 @@ public class KVersionRetriever implements Runnable, UncaughtExceptionHandler { } } } - + @Deprecated private void check() { try { HttpUriRequest request = RequestBuilder