Changed command system (#304)

* Save Cacheable expansions data on shutdown * Prepare for 1.16 * 1.16.1 is out apparently * Further fixes, still not done * Inline JSONMessages & fix for 1.16 * Done :O * Done for real now, (hopefully) * Changed to static instead of DI for plugin instance * Cleanup * Modified tab completions. Removed extra command. * Apparently this is needed * Started cleaning stuff up basically just pushing so I can continue on laptop * did more cleaning, probs like half way done * more cleaning. reverted back to a min arg system somewhat similar to what frosty had, but less boilerplate. * Started debugging and fixing runtime/compile errors * Fixed bugs, still needs thorough testing * Re-enable metrics * relocated stuff again * - Remove json message relocation - uncomment other relocations - reformat pom - remove useless scope declaration - Fix metrics constructor - Switch commands to use inline json message Co-authored-by: iGabyTM <contactgabytm@gmail.com> Co-authored-by: darbyjack <admin@glaremasters.me> Co-authored-by: PiggyPiglet <noreply@piggypiglet.me>
2026-06-30 07:15:56 +02:00 · 2020-07-13 21:27:59 +02:00
parent 82fa8d7393
commit 3e396a97b0
60 changed files with 4253 additions and 2750 deletions
@@ -35,83 +35,83 @@ import java.net.URL;

 public class UpdateChecker implements Listener {

-  private final int RESOURCE_ID = 6245;
-  private final PlaceholderAPIPlugin plugin;
-  private String spigotVersion;
-  private final String pluginVersion;
-  private boolean updateAvailable;
+    private final int RESOURCE_ID = 6245;
+    private final PlaceholderAPIPlugin plugin;
+    private final String pluginVersion;
+    private String spigotVersion;
+    private boolean updateAvailable;

-  public UpdateChecker(PlaceholderAPIPlugin i) {
-    plugin = i;
-    pluginVersion = i.getDescription().getVersion();
-  }
-
-  public boolean hasUpdateAvailable() {
-    return updateAvailable;
-  }
-
-  public String getSpigotVersion() {
-    return spigotVersion;
-  }
-
-  public void fetch() {
-    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-      try {
-        HttpsURLConnection con = (HttpsURLConnection) new URL(
-            "https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID).openConnection();
-        con.setRequestMethod("GET");
-        spigotVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
-      } catch (Exception ex) {
-        plugin.getLogger().info("Failed to check for updates on spigot.");
-        return;
-      }
-
-      if (spigotVersion == null || spigotVersion.isEmpty()) {
-        return;
-      }
-
-      updateAvailable = spigotIsNewer();
-
-      if (!updateAvailable) {
-        return;
-      }
-
-      Bukkit.getScheduler().runTask(plugin, () -> {
-        plugin.getLogger()
-            .info("An update for PlaceholderAPI (v" + getSpigotVersion() + ") is available at:");
-        plugin.getLogger()
-            .info("https://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID + "/");
-        Bukkit.getPluginManager().registerEvents(this, plugin);
-      });
-    });
-  }
-
-  private boolean spigotIsNewer() {
-    if (spigotVersion == null || spigotVersion.isEmpty()) {
-        return false;
+    public UpdateChecker(PlaceholderAPIPlugin i) {
+        plugin = i;
+        pluginVersion = i.getDescription().getVersion();
    }

-    String plV = toReadable(pluginVersion);
-    String spV = toReadable(spigotVersion);
-    return plV.compareTo(spV) < 0;
-  }
-
-  private String toReadable(String version) {
-    if (version.contains("-DEV-")) {
-      version = version.split("-DEV-")[0];
+    public boolean hasUpdateAvailable() {
+        return updateAvailable;
    }

-    return version.replaceAll("\\.", "");
-  }
-
-  @EventHandler(priority = EventPriority.MONITOR)
-  public void onJoin(PlayerJoinEvent e) {
-    if (e.getPlayer().hasPermission("placeholderapi.updatenotify")) {
-      Msg.msg(e.getPlayer(),
-          "&bAn update for &fPlaceholder&7API &e(&fPlaceholder&7API &fv" + getSpigotVersion()
-              + "&e)"
-          , "&bis available at &ehttps://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID
-              + "/");
+    public String getSpigotVersion() {
+        return spigotVersion;
+    }
+
+    public void fetch() {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            try {
+                HttpsURLConnection con = (HttpsURLConnection) new URL(
+                        "https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID).openConnection();
+                con.setRequestMethod("GET");
+                spigotVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
+            } catch (Exception ex) {
+                plugin.getLogger().info("Failed to check for updates on spigot.");
+                return;
+            }
+
+            if (spigotVersion == null || spigotVersion.isEmpty()) {
+                return;
+            }
+
+            updateAvailable = spigotIsNewer();
+
+            if (!updateAvailable) {
+                return;
+            }
+
+            Bukkit.getScheduler().runTask(plugin, () -> {
+                plugin.getLogger()
+                        .info("An update for PlaceholderAPI (v" + getSpigotVersion() + ") is available at:");
+                plugin.getLogger()
+                        .info("https://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID + "/");
+                Bukkit.getPluginManager().registerEvents(this, plugin);
+            });
+        });
+    }
+
+    private boolean spigotIsNewer() {
+        if (spigotVersion == null || spigotVersion.isEmpty()) {
+            return false;
+        }
+
+        String plV = toReadable(pluginVersion);
+        String spV = toReadable(spigotVersion);
+        return plV.compareTo(spV) < 0;
+    }
+
+    private String toReadable(String version) {
+        if (version.contains("-DEV-")) {
+            version = version.split("-DEV-")[0];
+        }
+
+        return version.replaceAll("\\.", "");
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onJoin(PlayerJoinEvent e) {
+        if (e.getPlayer().hasPermission("placeholderapi.updatenotify")) {
+            Msg.msg(e.getPlayer(),
+                    "&bAn update for &fPlaceholder&7API &e(&fPlaceholder&7API &fv" + getSpigotVersion()
+                            + "&e)"
+                    , "&bis available at &ehttps://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID
+                            + "/");
+        }
    }
-  }
 }