diff --git a/pom.xml b/pom.xml index 2dd2510..d89e68b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 9.0_Snapshot_1 + 9.0 jar T2CodeLib diff --git a/src/main/java/net/t2code/lib/Bungee/BMain.java b/src/main/java/net/t2code/lib/Bungee/BMain.java index d56d855..1a7ea3b 100644 --- a/src/main/java/net/t2code/lib/Bungee/BMain.java +++ b/src/main/java/net/t2code/lib/Bungee/BMain.java @@ -12,11 +12,11 @@ public final class BMain extends Plugin { public static String Version; public static String Autor; - public static String Prefix = Util.Prefix; - public static Integer SpigotID = Util.SpigotID; - public static Integer BstatsID = Util.BstatsID; - public static String Spigot = Util.Spigot; - public static String Discord = Util.Discord; + public static String Prefix = Util.getPrefix(); + public static Integer SpigotID = Util.getSpigotID(); + public static Integer BstatsID = Util.getBstatsID(); + public static String Spigot = Util.getSpigot(); + public static String Discord = Util.getDiscord(); @Override diff --git a/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java b/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java index f7895bd..01281a7 100644 --- a/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java +++ b/src/main/java/net/t2code/lib/Spigot/Lib/update/UpdateAPI.java @@ -6,6 +6,7 @@ import net.md_5.bungee.api.chat.TextComponent; import net.t2code.lib.Spigot.Lib.messages.TextBuilder; import net.t2code.lib.Spigot.Lib.messages.send; +import net.t2code.lib.Spigot.system.Main; import net.t2code.lib.Spigot.system.config.SelectLibConfig; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/net/t2code/lib/Spigot/system/JoinEvent.java b/src/main/java/net/t2code/lib/Spigot/system/JoinEvent.java index 6b109a2..9fac496 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/JoinEvent.java +++ b/src/main/java/net/t2code/lib/Spigot/system/JoinEvent.java @@ -14,6 +14,6 @@ public class JoinEvent implements Listener { @EventHandler public void onJoinEvent(PlayerLoginEvent event) { Player player = event.getPlayer(); - UpdateAPI.join(Main.plugin, Util.Prefix, "t2code.lib.updatemsg", event.getPlayer(), Main.spigot, Main.discord); + UpdateAPI.join(Main.plugin, Util.getPrefix(), "t2code.lib.updatemsg", event.getPlayer(), Main.spigot, Main.discord); } } \ No newline at end of file diff --git a/src/main/java/net/t2code/lib/Spigot/system/Main.java b/src/main/java/net/t2code/lib/Spigot/system/Main.java index 4b3bf7e..fc4fae4 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/Main.java +++ b/src/main/java/net/t2code/lib/Spigot/system/Main.java @@ -21,6 +21,7 @@ import org.bukkit.plugin.java.JavaPlugin; import java.io.File; import java.util.List; +import java.util.Objects; public final class Main extends JavaPlugin { @@ -35,11 +36,11 @@ public final class Main extends JavaPlugin { public static List autor; public static String version; - public static String prefix = Util.Prefix; - public static Integer spigotID = Util.SpigotID; - public static Integer bstatsID = Util.BstatsID; - public static String spigot = Util.Spigot; - public static String discord = Util.Discord; + public static String prefix = Util.getPrefix(); + public static Integer spigotID = Util.getSpigotID(); + public static Integer bstatsID = Util.getBstatsID(); + public static String spigot = Util.getSpigot(); + public static String discord = Util.getDiscord(); @Override public void onEnable() { @@ -47,8 +48,19 @@ public final class Main extends JavaPlugin { plugin = this; autor = plugin.getDescription().getAuthors(); version = plugin.getDescription().getVersion(); + UpdateAPI.onUpdateCheck(plugin, prefix, spigot, spigotID, discord); + new UpdateChecker(this, 12345).getVersion(ver -> { + if (this.getDescription().getVersion().equals(version)) { + if (Double.parseDouble(ver) < Double.parseDouble(version)) { + send.console(prefix + " §4 §e-------------------"); + send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected. Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!"); + send.console(prefix + " §4 §e-------------------"); + } + } + }); Long long_; long_ = T2CodeTemplate.onLoadHeader(prefix, autor, version, spigot, discord); + //send.console("§4 _|_|_|_|_| _|_| _|_|_| _| "); //send.console("§4 _| _| _| _| _|_| _|_|_| _|_| "); //send.console("§4 _| _| _| _| _| _| _| _|_|_|_| "); @@ -97,7 +109,7 @@ public final class Main extends JavaPlugin { LanguagesCreate.langCreate(); SelectLibConfig.onSelect(); SelectLibMsg.onSelect(prefix); - UpdateAPI.onUpdateCheck(plugin, prefix, spigot, spigotID, discord); + Metrics.Bstats(plugin, bstatsID); Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin); T2CodeTemplate.onLoadFooter(prefix, long_); diff --git a/src/main/java/net/t2code/lib/Spigot/system/UpdateChecker.java b/src/main/java/net/t2code/lib/Spigot/system/UpdateChecker.java new file mode 100644 index 0000000..c4f092d --- /dev/null +++ b/src/main/java/net/t2code/lib/Spigot/system/UpdateChecker.java @@ -0,0 +1,33 @@ +package net.t2code.lib.Spigot.system; + +import org.bukkit.Bukkit; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.java.JavaPlugin; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Scanner; +import java.util.function.Consumer; + +public class UpdateChecker { + private final JavaPlugin plugin; + private final int resourceId; + + public UpdateChecker(JavaPlugin plugin, int resourceId) { + this.plugin = plugin; + this.resourceId = resourceId; + } + + public void getVersion(final Consumer consumer) { + Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> { + try (InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + this.resourceId).openStream(); Scanner scanner = new Scanner(inputStream)) { + if (scanner.hasNext()) { + consumer.accept(scanner.next()); + } + } catch (IOException exception) { + plugin.getLogger().info("Unable to check for updates: " + exception.getMessage()); + } + }); + } +} diff --git a/src/main/java/net/t2code/lib/Util.java b/src/main/java/net/t2code/lib/Util.java index 498f2ba..b38bef5 100644 --- a/src/main/java/net/t2code/lib/Util.java +++ b/src/main/java/net/t2code/lib/Util.java @@ -1,9 +1,35 @@ package net.t2code.lib; public class Util { - public static String Prefix = "§8[§4T2Code§5Lib§8]"; - public static Integer SpigotID = 96388; - public static Integer BstatsID = 12518; - public static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID; - public static String Discord = "http://dc.t2code.net"; + private static Boolean Snapshot = true; + + private static String Prefix = "§8[§4T2Code§5Lib§8]"; + private static Integer SpigotID = 96388; + private static Integer BstatsID = 12518; + private static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID; + private static String Discord = "http://dc.t2code.net"; + + public static String getPrefix() { + return Prefix; + } + + public static Integer getSpigotID() { + return SpigotID; + } + + public static Integer getBstatsID() { + return BstatsID; + } + + public static String getSpigot() { + return Spigot; + } + + public static String getDiscord() { + return Discord; + } + + public static Boolean getSnapshot(){ + return Snapshot; + } } diff --git a/target/classes/bungee.yml b/target/classes/bungee.yml index 4329b66..742d3ec 100644 --- a/target/classes/bungee.yml +++ b/target/classes/bungee.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 9.0_Snapshot_1 +version: 9.0 main: net.t2code.lib.Bungee.BMain author: JaTiTV, Jkobs description: Libarie from T2Code Plugins \ No newline at end of file diff --git a/target/classes/net/t2code/lib/Bungee/BMain.class b/target/classes/net/t2code/lib/Bungee/BMain.class index 6513b3a..5e14011 100644 Binary files a/target/classes/net/t2code/lib/Bungee/BMain.class and b/target/classes/net/t2code/lib/Bungee/BMain.class differ diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$1.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$1.class index a2f2a0f..41eb840 100644 Binary files a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$1.class and b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$1.class differ diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$2.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$2.class index 84769dc..45e5678 100644 Binary files a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$2.class and b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$2.class differ diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3$1.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3$1.class index ff4b6e0..cb0ac2f 100644 Binary files a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3$1.class and b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3$1.class differ diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3.class index c01b93a..5db194f 100644 Binary files a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3.class and b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI$3.class differ diff --git a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI.class b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI.class index 37c2f4e..4ec7435 100644 Binary files a/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI.class and b/target/classes/net/t2code/lib/Spigot/Lib/update/UpdateAPI.class differ diff --git a/target/classes/net/t2code/lib/Spigot/system/JoinEvent.class b/target/classes/net/t2code/lib/Spigot/system/JoinEvent.class index d4388f0..0d46335 100644 Binary files a/target/classes/net/t2code/lib/Spigot/system/JoinEvent.class and b/target/classes/net/t2code/lib/Spigot/system/JoinEvent.class differ diff --git a/target/classes/net/t2code/lib/Spigot/system/Main.class b/target/classes/net/t2code/lib/Spigot/system/Main.class index 45ffcc7..694b433 100644 Binary files a/target/classes/net/t2code/lib/Spigot/system/Main.class and b/target/classes/net/t2code/lib/Spigot/system/Main.class differ diff --git a/target/classes/net/t2code/lib/Spigot/system/UpdateChecker.class b/target/classes/net/t2code/lib/Spigot/system/UpdateChecker.class new file mode 100644 index 0000000..d7443de Binary files /dev/null and b/target/classes/net/t2code/lib/Spigot/system/UpdateChecker.class differ diff --git a/target/classes/net/t2code/lib/Util.class b/target/classes/net/t2code/lib/Util.class index 608c3e5..77ac46e 100644 Binary files a/target/classes/net/t2code/lib/Util.class and b/target/classes/net/t2code/lib/Util.class differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index 32bf696..a3db8b0 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 9.0_Snapshot_1 +version: 9.0 main: net.t2code.lib.Spigot.system.Main api-version: 1.13 prefix: T2CodeLib