diff --git a/pom.xml b/pom.xml index a8998f8..8298a3b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 13.4_DEV-3 + 13.4_SNAPSHOT-1 jar T2CodeLib @@ -158,6 +158,12 @@ 4.1.2 compile + + net.kyori + adventure-platform-bungeecord + 4.1.2 + compile + org.projectlombok diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBminiMessage.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBminiMessage.java new file mode 100644 index 0000000..19398ed --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBminiMessage.java @@ -0,0 +1,30 @@ +package net.t2code.t2codelib.BUNGEE.api.messages; + + +import net.kyori.adventure.platform.bungeecord.BungeeAudiences; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.md_5.bungee.api.CommandSender; +import net.md_5.bungee.api.connection.ProxiedPlayer; +import net.t2code.t2codelib.BUNGEE.system.T2CodeBMain; +import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace; + +public class T2CBminiMessage { + private static final BungeeAudiences bungeeAudiences = T2CodeBMain.getAdventure(); + + public static void sendSenderMiniMessage(String msg, CommandSender sender) { + bungeeAudiences.sender(sender).sendMessage(replace(msg)); + } + + public static void sendConsoleMiniMessage(String msg) { + bungeeAudiences.console().sendMessage(replace(msg)); + } + + public static void sendPlayerMiniMessage(String msg, ProxiedPlayer player) { + bungeeAudiences.player(player).sendMessage(replace(msg)); + } + + protected static Component replace(String text) { + return MiniMessage.miniMessage().deserialize(T2Creplace.convertColorCode(text)); + } +} diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBsend.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBsend.java index e909438..a43c87d 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBsend.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBsend.java @@ -5,16 +5,21 @@ import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.Title; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Plugin; +import net.t2code.t2codelib.BUNGEE.system.T2CodeBMain; import java.util.logging.Level; public class T2CBsend { public static void console(String msg) { - ProxyServer.getInstance().getConsole().sendMessage(msg); + if (T2CodeBMain.getMmIsLoad()) { + T2CBminiMessage.sendConsoleMiniMessage(msg); + } else ProxyServer.getInstance().getConsole().sendMessage(msg); } public static void player(ProxiedPlayer player, String msg) { - player.sendMessage(msg); + if (T2CodeBMain.getMmIsLoad()) { + T2CBminiMessage.sendPlayerMiniMessage(msg, player); + } else player.sendMessage(msg); } public static void title(ProxiedPlayer player, Title msg) { @@ -22,7 +27,9 @@ public class T2CBsend { } public static void sender(CommandSender sender, String msg) { - sender.sendMessage(msg); + if (T2CodeBMain.getMmIsLoad()) { + T2CBminiMessage.sendSenderMiniMessage(msg, sender); + } else sender.sendMessage(msg); } public static void debug(Plugin plugin, String msg) { @@ -31,15 +38,15 @@ public class T2CBsend { public static void debug(Plugin plugin, String msg, Integer stage) { // if (!new File(Main.getPath(), "config.yml").exists()) return; - if (stage == null) { - //todo if (plugin.getConfig().getBoolean("Plugin.Debug")){ - // ProxyServer.getInstance().getConsole().sendMessage(plugin.getDescription().getName() + " §5DEBUG: §6" + msg); - // } - return; - } - // todo if (plugin.getConfig().getInt("Plugin.Debug") >= stage) { - // ProxyServer.getInstance().getConsole().sendMessage(plugin.getDescription().getName() + " §5DEBUG: §6" + msg); - // } + // if (stage == null) { + // if (plugin.getConfig().getBoolean("Plugin.Debug")) { + // ProxyServer.getInstance().getConsole().sendMessage(plugin.getDescription().getName() + " §5DEBUG: §6" + msg); + // } + // return; + //} + //if (plugin.getConfig().getInt("Plugin.Debug") >= stage) { + // ProxyServer.getInstance().getConsole().sendMessage(plugin.getDescription().getName() + " §5DEBUG: §6" + msg); + //} } public static void debugmsg(Plugin plugin, String msg) { diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBtemplate.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBtemplate.java index cc47a10..09ca8dc 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBtemplate.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBtemplate.java @@ -3,6 +3,7 @@ package net.t2code.t2codelib.BUNGEE.api.messages; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.plugin.Plugin; import net.t2code.t2codelib.BUNGEE.api.update.T2CBupdateAPI; +import net.t2code.t2codelib.T2CupdateWebData; public class T2CBtemplate { @@ -39,14 +40,14 @@ public class T2CBtemplate { } public static void sendInfo(CommandSender sender, Plugin plugin, String prefix, String spigot, String discord, String autor) { - String publicVersion = T2CBupdateAPI.bungeePluginVersins.get(plugin.getDescription().getName()).webData.getVersion(); + T2CupdateWebData webData = T2CBupdateAPI.bungeePluginVersins.get(plugin.getDescription().getName()).webData; String pluginVersion = plugin.getDescription().getVersion(); T2CBsend.sender(sender, prefix + "§4======= " + prefix + " §4======="); T2CBsend.sender(sender, prefix + " §2Autor: §6" + autor); - if (publicVersion.equalsIgnoreCase(pluginVersion)) { + if (webData.getVersion().equalsIgnoreCase(pluginVersion)) { T2CBsend.sender(sender, prefix + " §2Version: §6" + pluginVersion); } else { - T2CBupdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion, sender); + T2CBupdateAPI.sendUpdateMsg(prefix, discord, webData, plugin, sender); } T2CBsend.sender(sender, prefix + " §2Spigot: §6" + spigot); T2CBsend.sender(sender, prefix + " §2Discord: §6" + discord); diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java index 9088a95..8a1156c 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java @@ -5,10 +5,14 @@ import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend; +import net.t2code.t2codelib.BUNGEE.system.config.T2CBlibConfig; +import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; +import net.t2code.t2codelib.UpdateType; import org.json.JSONArray; import org.json.JSONObject; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; @@ -22,52 +26,63 @@ import java.util.function.Consumer; public class T2CBupdateAPI { public static HashMap bungeePluginVersins = new HashMap<>(); - public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String foundVersion, String update_version) { - T2CBsend.console("§4=========== " + Prefix + " §4==========="); - T2CBsend.console("§6A new version was found!"); - T2CBsend.console("§6Your version: §c" + foundVersion + " §7- §6Current version: §a" + update_version); - T2CBsend.console("§6You can download it here: §e" + Spigot); - T2CBsend.console("§6You can find more information on Discord: §e" + Discord); - T2CBsend.console("§4=========== " + Prefix + " §4==========="); - } + public static void sendUpdateMsg(String prefix, String discord, T2CupdateWebData webData, Plugin plugin, CommandSender sender) { + String publicVersion = webData.getVersion(); + String pluginVersion = plugin.getDescription().getVersion(); + String value; + if (webData.isPreRelease()) { + value = UpdateType.PRERELEASE.text; + if (publicVersion.toLowerCase().contains("dev")) { + value = UpdateType.DEVELOPMENT.text; + } + if (publicVersion.toLowerCase().contains("beta")) { + value = UpdateType.BETA.text; + } + if (publicVersion.toLowerCase().contains("snapshot")) { + value = UpdateType.SNAPSHOT.text; + } + } else value = UpdateType.STABLE.text; + String h = "
╔══════════════" + prefix + "══════════════"; + String s1 = "
A new [value] version was found!".replace("[value]", value); + String s2 = "
Your version: " + pluginVersion + " - Current version: " + webData.getVersion() + ""; + String s3 = "
You can download it here: " + webData.getUpdateUrl() + ""; + String s4 = "
You can find more information on Discord: " + discord + ""; + String f = "
╚══════════════" + prefix + "══════════════"; + String text = h + s1 + s2 + s3 + s4 + f; + if (sender == null) { + T2CBsend.console(text); + } else T2CBsend.sender(sender, text); - public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String foundVersion, String update_version, CommandSender sender) { - T2CBsend.sender(sender, "§4=========== " + Prefix + " §4==========="); - T2CBsend.sender(sender, "§6A new version was found!"); - T2CBsend.sender(sender, "§6Your version: §c" + foundVersion + " §7- §6Current version: §a" + update_version); - T2CBsend.sender(sender, "§6You can download it here: §e" + Spigot); - T2CBsend.sender(sender, "§6You can find more information on Discord: §e" + Discord); - T2CBsend.sender(sender, "§4=========== " + Prefix + " §4==========="); } private static Boolean noUpdate = true; private static String pluginVersion; - public static void onUpdateCheckTimer(Plugin plugin, String Prefix, String Spigot, String Discord, Integer SpigotID, String url) { + public static void onUpdateCheckTimer(Plugin plugin, String prefix, String discord, Integer spigotID, String url) { ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() { public void run() { - (new T2CBupdateAPI(plugin, SpigotID)).getVersion((update_version) -> { + (new T2CBupdateAPI(plugin, spigotID)).getVersion((webData) -> { pluginVersion = plugin.getDescription().getVersion(); T2CupdateObject update = new T2CupdateObject( plugin.getDescription().getName(), plugin.getDescription().getVersion(), - update_version, + webData, false, - !plugin.getDescription().getVersion().equals(update_version.getVersion()) + !plugin.getDescription().getVersion().equals(webData.getVersion()) ); bungeePluginVersins.put(plugin.getDescription().getName(), update); - if (!pluginVersion.replace("_Bungee", "").equalsIgnoreCase(update_version.getVersion())) { - sendUpdateMsg(Prefix, Spigot, Discord, pluginVersion, update_version.getVersion()); + if (!pluginVersion.replace("_Bungee", "").equalsIgnoreCase(webData.getVersion())) { + sendUpdateMsg(prefix, discord, webData, plugin, null); noUpdate = true; } else { if (noUpdate) { - T2CBsend.console(Prefix + " §2No update found."); + T2CBsend.console(prefix + " §2No update found."); noUpdate = false; } } - }, pluginVersion, SpigotID, url); + }, pluginVersion, spigotID, url); } - }, 0, 20 * 60 * 60L, TimeUnit.SECONDS); + }, 0, T2CBlibConfig.getUpdateTimer() * 60 * 20L, TimeUnit.SECONDS); } private Plugin plugin; diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CBload.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CBload.java index d5243b7..f3398e7 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CBload.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CBload.java @@ -33,7 +33,7 @@ public class T2CBload { throw new RuntimeException(e); } - T2CBupdateAPI.onUpdateCheckTimer(plugin, prefix, spigot, discord, spigotID,url); + T2CBupdateAPI.onUpdateCheckTimer(plugin, prefix, discord, spigotID,url); //API plugin.getProxy().registerChannel("t2c:bcmd"); @@ -48,7 +48,7 @@ public class T2CBload { plugin.getProxy().registerChannel("t2c:aresp"); plugin.getProxy().getPluginManager().registerListener(plugin, new T2CapiAutoResponse()); } - if (T2CBlibConfig.getApiAutoResponse()) { + if (T2CBlibConfig.getApiOpSecurity()) { plugin.getProxy().registerChannel("t2c:t2c:opsec"); plugin.getProxy().getPluginManager().registerListener(plugin, new T2CapiOpSecurity()); } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CodeBMain.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CodeBMain.java index f044239..db5cd3e 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CodeBMain.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CodeBMain.java @@ -1,5 +1,7 @@ package net.t2code.t2codelib.BUNGEE.system; +import lombok.NonNull; +import net.kyori.adventure.platform.bungeecord.BungeeAudiences; import net.md_5.bungee.api.plugin.Plugin; import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend; import net.t2code.t2codelib.Util; @@ -16,6 +18,16 @@ public class T2CodeBMain extends Plugin { private static String orgVersion; private static String autor; + private static Boolean mmIsLoad = true; + private static BungeeAudiences adventure; + + public static BungeeAudiences getAdventure() { + if(adventure == null) { + throw new IllegalStateException("Cannot retrieve audience provider while plugin is not enabled"); + } + return adventure; + } + @Override public void onEnable() { @@ -23,6 +35,11 @@ public class T2CodeBMain extends Plugin { plugin = this; orgVersion = plugin.getDescription().getVersion(); autor = plugin.getDescription().getAuthor(); + try { + adventure = BungeeAudiences.create(this); + } catch (Exception e){ + mmIsLoad = false; + } T2CBload.onLoad(plugin, Util.getPrefix(), autor, orgVersion, Util.getSpigot(), Util.getDiscord(), Util.getSpigotID(), Util.getBstatsID(),Util.getGit()); String[] fv = orgVersion.split("_"); plugin.getDescription().setVersion(fv[0]); @@ -32,6 +49,12 @@ public class T2CodeBMain extends Plugin { @Override public void onDisable() { // Plugin shutdown logic + if (mmIsLoad){ + if(adventure != null) { + adventure.close(); + adventure = null; + } + } T2CBsend.console(Util.getPrefix() + "§4============================= " + Util.getPrefix() + " §4============================="); T2CBsend.console(Util.getPrefix() + " §2Autor: §6" + String.valueOf(plugin.getDescription().getAuthor()).replace("[", "").replace("]", "")); T2CBsend.console(Util.getPrefix() + " §2Version: §6" + version); @@ -40,4 +63,7 @@ public class T2CodeBMain extends Plugin { T2CBsend.console(Util.getPrefix() + " §4Plugin successfully disabled."); T2CBsend.console(Util.getPrefix() + "§4============================= " + Util.getPrefix() + " §4============================="); } + public static Boolean getMmIsLoad() { + return mmIsLoad; + } } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java index c5f2bbe..88ba548 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java @@ -21,6 +21,8 @@ public class T2CBlibConfig { config.createNewFile(); } Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config); + T2CBconfig.set("UpdateCheck.TimerInMin", 60, configuration); + T2CBconfig.set("API.CommandGUI.Enable", false, configuration); T2CBconfig.set("API.AutoResponse.Enable", false, configuration); T2CBconfig.set("API.OPSecurity.Enable", false, configuration); @@ -33,15 +35,22 @@ public class T2CBlibConfig { File config = new File(T2CodeBMain.getPlugin().getDataFolder(), "config.yml"); Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config); + updateTimer = configuration.getInt("UpdateCheck.TimerInMin"); + apiCommandGUIEnable = configuration.getBoolean("API.CommandGUI.Enable"); apiAutoResponse = configuration.getBoolean("API.AutoResponse.Enable"); apiOpSecurity = configuration.getBoolean("API.OPSecurity.Enable"); } + private static Integer updateTimer; private static Boolean apiCommandGUIEnable; private static Boolean apiAutoResponse; private static Boolean apiOpSecurity; + public static Integer getUpdateTimer() { + return updateTimer; + } + public static Boolean getApiCommandGUIEnable() { return apiCommandGUIEnable; } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java index 9971720..7dbbd17 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java @@ -18,16 +18,16 @@ public class T2ChoverModule { t2cmodule(msg, player); return; } - T2CminiMessage.miniMessage(msg, player); + T2CminiMessage.sendPlayerMiniMessage(msg, player); } public static void moduleSender(String msg, CommandSender sender) { - T2CminiMessage.miniMessage(msg, sender); + T2CminiMessage.sendSenderMiniMessage(msg, sender); } public static void moduleConsole(String msg) { - if (T2CodeLibMain.getNmIsLoad()) { - T2CminiMessage.sendMiniMessage(msg); + if (T2CodeLibMain.getMmIsLoad()) { + T2CminiMessage.sendConsoleMiniMessage(msg); return; } Bukkit.getConsoleSender().sendMessage(msg); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java index b54dc38..12d8940 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java @@ -10,15 +10,15 @@ import org.bukkit.entity.Player; public class T2CminiMessage { private static final BukkitAudiences bukkitAudiences = T2CodeLibMain.getPlugin().getAdventure(); - public static void miniMessage(String msg, CommandSender sender) { + public static void sendSenderMiniMessage(String msg, CommandSender sender) { bukkitAudiences.sender(sender).sendMessage(replace(msg)); } - public static void sendMiniMessage(String msg) { + public static void sendConsoleMiniMessage(String msg) { bukkitAudiences.console().sendMessage(replace(msg)); } - public static void miniMessage(String msg, Player player) { + public static void sendPlayerMiniMessage(String msg, Player player) { bukkitAudiences.player(player).sendMessage(replace(msg)); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java index d3d9cf0..17995c8 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java @@ -1,6 +1,7 @@ package net.t2code.t2codelib.SPIGOT.api.messages; import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; +import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -24,31 +25,33 @@ public class T2Ctemplate { T2Csend.console(prefix + " | | / /| | "); T2Csend.console(prefix + " | | / /_| |____ "); T2Csend.console(prefix + " |_| |____|\\_____|"); - T2Csend.console(prefix + " §4 §e------------------"); - T2Csend.console(prefix + " §4 §e| §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); - T2Csend.console(prefix + " §4 §e| §2Version: §6" + version); - T2Csend.console(prefix + " §4 §e| §2Spigot: §6" + spigot); - T2Csend.console(prefix + " §4 §e| §2Discord: §6" + discord); + T2Csend.console(prefix + " §4 §e╔══════════════════════════"); + T2Csend.console(prefix + " §4 §e║ §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); + T2Csend.console(prefix + " §4 §e║ §2Version: §6" + version); + T2Csend.console(prefix + " §4 §e║ §2Spigot: §6" + spigot); + T2Csend.console(prefix + " §4 §e║ §2Discord: §6" + discord); if (isPremium != null) { if (isPremium) { - T2Csend.console(prefix + " §4 §e| §6Premium: §2true"); - } else T2Csend.console(prefix + " §4 §e| §6Premium: §4false"); + T2Csend.console(prefix + " §4 §e║ §6Premium: §2true"); + } else T2Csend.console(prefix + " §4 §e║ §6Premium: §4false"); if (isVerify != null) { if (isVerify) { - T2Csend.console(prefix + " §4 §e| §6Verify: §2true"); - } else T2Csend.console(prefix + " §4 §e| §6Verify: §4false"); - } else T2Csend.console(prefix + " §4 §e| §6Verify: §4false"); + T2Csend.console(prefix + " §4 §e║ §6Verify: §2true"); + } else T2Csend.console(prefix + " §4 §e║ §6Verify: §4false"); + } else T2Csend.console(prefix + " §4 §e║ §6Verify: §4false"); } - T2Csend.console(prefix + " §4 §e-------------------"); + T2Csend.console(prefix + " §4 §e╚══════════════════════════"); if (version.toLowerCase().contains("dev") || version.toLowerCase().contains("snapshot") || version.toLowerCase().contains("beta")) { T2Csend.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! Some features may not be working as expected. Please report all" + " bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!"); - T2Csend.console(prefix + " §4 §e-------------------"); - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); + onLoadSeparateStroke(prefix); + if (!SelectLibConfig.getT2cTestDevelopment()){ + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java index 06af3e1..430e1e9 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java @@ -2,11 +2,10 @@ package net.t2code.t2codelib.SPIGOT.api.update; import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.SPIGOT.system.UpdateType; +import net.t2code.t2codelib.UpdateType; import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; @@ -94,16 +93,17 @@ public class T2CupdateAPI { value = UpdateType.SNAPSHOT.text; } } else value = UpdateType.STABLE.text; - String h = "§4=========== " + prefix + " §4==========="; - String s1 = "§6A new [value] version was found!§r".replace("[value]", value); - String s2 = "§6Your version: §c" + pluginVersion + " §7- §6Current version: §a" + webData.getVersion(); - String s3 = "§6You can download it here: §e" + webData.getUpdateUrl(); - String s4 = "§6You can find more information on Discord: §e" + discord; - String text = "
" + h + "
" + s1 + "
" + s2 + "
" + s3 + "
" + s4 + "
" + h; + String h = "
╔══════════════" + prefix + "══════════════"; + String s1 = "
A new [value] version was found!".replace("[value]", value); + String s2 = "
Your version: " + pluginVersion + " - Current version: " + webData.getVersion() + ""; + String s3 = "
You can download it here: " + webData.getUpdateUrl() + ""; + String s4 = "
You can find more information on Discord: " + discord + ""; + String f = "
╚══════════════" + prefix + "══════════════"; + String text = h + s1 + s2 + s3 + s4 + f; T2Csend.console(text); } - public static String updateInfo(CommandSender sender, String[] args, Boolean player) { + public static String updateInfo(String[] args, Boolean player) { T2CupdateObject object; try { object = T2CupdateAPI.pluginVersions.get(args[1]); @@ -140,12 +140,11 @@ public class T2CupdateAPI { String updateInfoString = "
[value]:"; String updateTitleString = "
Title: " + updateTitle + ""; String updateVersionString = "
Version: " + updateVersion + ""; - String updateAtString = "
Update at: " + updateAt + ""; - String updateTypeString = "
Update type: " + updateType + ""; + String updateAtString = "
Published on: " + updateAt + ""; + String updateTypeString = "
Version type: " + updateType + ""; String updateButton; if (player) { - // updateButton = "
" + updateUpdate + "'>Download"; updateButton = "
" + updateUpdate + "'>Download | Update Description"; } else updateButton = "
Download: " + updateUpdate + ""; @@ -170,7 +169,6 @@ public class T2CupdateAPI { return text; } - public static void onUpdateCheck(Plugin plugin, String prefix, int spigotID, String discord) { new BukkitRunnable() { @Override @@ -184,7 +182,7 @@ public class T2CupdateAPI { false, !plugin.getDescription().getVersion().equals(update_version) ); pluginVersions.put(plugin.getName(), update); - if (!pluginVersions.get(plugin.getName()).updateAvailable) { + if (pluginVersions.get(plugin.getName()).updateAvailable) { if (!update.load) { new BukkitRunnable() { @Override @@ -222,7 +220,7 @@ public class T2CupdateAPI { !plugin.getDescription().getVersion().equals(webData.getVersion()) ); pluginVersions.put(plugin.getName(), update); - if (!pluginVersions.get(plugin.getName()).updateAvailable) { + if (pluginVersions.get(plugin.getName()).updateAvailable) { if (!update.load) { new BukkitRunnable() { @Override diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java index 95b6be7..28c6baf 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java @@ -18,6 +18,7 @@ import net.t2code.t2codelib.SPIGOT.system.config.languages.LanguagesCreate; import net.t2code.t2codelib.SPIGOT.system.config.languages.SelectLibMsg; import net.t2code.t2codelib.Util; import org.bukkit.Bukkit; +import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; @@ -32,7 +33,7 @@ public final class T2CodeLibMain extends JavaPlugin { private static List autor; private static String version; - private static Boolean nmIsLoad = true; + private static Boolean mmIsLoad = true; private static Boolean load = false; @Override @@ -41,7 +42,11 @@ public final class T2CodeLibMain extends JavaPlugin { plugin = this; autor = plugin.getDescription().getAuthors(); version = plugin.getDescription().getVersion(); - adventure = BukkitAudiences.create(this); + try { + adventure = BukkitAudiences.create(this); + } catch (Exception e) { + mmIsLoad = false; + } long long_ = T2Ctemplate.onLoadHeader(Util.getPrefix(), autor, version, Util.getSpigot(), Util.getDiscord()); String prefix = Util.getPrefix(); @@ -58,10 +63,12 @@ public final class T2CodeLibMain extends JavaPlugin { T2Csend.warning(plugin, "The 1.20.* is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net"); T2Csend.console(prefix); T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!"); - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); + if (!SelectLibConfig.getT2cTestDevelopment()) { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } } } T2Csend.console(prefix + " §3Server run on: §6" + T2CmcVersion.getMcVersion() + " / " + T2CmcVersion.getNms()); @@ -100,6 +107,7 @@ public final class T2CodeLibMain extends JavaPlugin { ReportLogStorage.load(); Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin); + checkIsBungee(); T2Ctemplate.onLoadFooter(prefix, long_); load = true; } @@ -117,7 +125,7 @@ public final class T2CodeLibMain extends JavaPlugin { Vault.vaultDisable(); T2Ctemplate.onDisable(Util.getPrefix(), autor, version, Util.getSpigot(), Util.getDiscord()); - if (nmIsLoad) { + if (mmIsLoad) { if (this.adventure != null) { this.adventure.close(); this.adventure = null; @@ -167,7 +175,20 @@ public final class T2CodeLibMain extends JavaPlugin { return adventure; } - public static Boolean getNmIsLoad() { - return nmIsLoad; + private static void checkIsBungee() { + File config = new File("spigot.yml"); + YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); + + isBungee = yamlConfiguration.getBoolean("settings.bungeecord"); + } + + private static Boolean isBungee; + + public static Boolean getIsBungee() { + return isBungee; + } + + public static Boolean getMmIsLoad() { + return mmIsLoad; } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Commands.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Commands.java index 6b7f4b9..87e168c 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Commands.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Commands.java @@ -52,6 +52,6 @@ public class Commands { } public static void updateInfo(CommandSender sender, String[] args) { - T2Csend.sender(sender, T2CupdateAPI.updateInfo(sender, args, sender instanceof Player)); + T2Csend.sender(sender, T2CupdateAPI.updateInfo(args, sender instanceof Player)); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CreateReportLog.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CreateReportLog.java index 127a13b..aa44837 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CreateReportLog.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CreateReportLog.java @@ -17,10 +17,12 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.json.JSONObject; + import java.io.*; import java.net.HttpURLConnection; import java.net.URL; @@ -45,13 +47,15 @@ public class CreateReportLog { try { pWriter = new PrintWriter(new FileWriter(file.getPath())); String timeStamp = new SimpleDateFormat("HH:mm:ss dd.MM.yyyy").format(Calendar.getInstance().getTime()); - pWriter.println("Created on: " + timeStamp); + pWriter.println("Created on: " + timeStamp + " - from: " + sender.getName()); pWriter.println(); pWriter.println("Server Bukkit version: " + T2CmcVersion.getBukkitVersion()); pWriter.println("Server run on: " + T2CmcVersion.getMcVersion()); pWriter.println("Server NMS: " + T2CmcVersion.getNms()); - pWriter.println(); pWriter.println("Online Mode: " + Bukkit.getOnlineMode()); + pWriter.println("Bungee Mode: " + T2CodeLibMain.getIsBungee()); + pWriter.println("Server Port: " + Bukkit.getServer().getPort()); + pWriter.println(); pWriter.println("Worlds: " + Bukkit.getWorlds()); pWriter.println("OP-Player:"); for (OfflinePlayer player : Bukkit.getOperators()) { @@ -92,7 +96,6 @@ public class CreateReportLog { pWriter.println("T2C-LuckyBox isV: " + LuckyBoxAPI.isV()); pWriter.println(); } - pWriter.println(); pWriter.println("OfflinePlayers: "); for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { pWriter.println(" - " + player.getName() + " - " + player.getUniqueId()); @@ -102,7 +105,7 @@ public class CreateReportLog { pWriter.println("Plugins: "); for (Plugin pl : Bukkit.getPluginManager().getPlugins()) { pWriter.println(" - " + pl.getName() + " - " + pl.getDescription().getVersion() + " - Enabled: " + pl.isEnabled() + " - Autors: " - + pl.getDescription().getAuthors()+" - SoftDepend: " + pl.getDescription().getSoftDepend() + " - Depend: " + pl.getDescription().getDepend() + + pl.getDescription().getAuthors() + " - SoftDepend: " + pl.getDescription().getSoftDepend() + " - Depend: " + pl.getDescription().getDepend() + " LoadBefore: " + pl.getDescription().getLoadBefore() + " - Website: " + pl.getDescription().getWebsite()); } } catch (IOException ioe) { @@ -154,11 +157,11 @@ public class CreateReportLog { "Download the debug file'>here. Please enter the following key " + "in the ticket: Copy to clipboard'>[key]" + "
Do not share the download URL with anyone!
" + - "You can delte yor Debug-File by clicking me.").replace("[key]",fileID).replace("[url]",downloadURL)); + "You can delte yor Debug-File by clicking me.").replace("[key]", fileID).replace("[url]", downloadURL)); } T2Csend.console(Util.getPrefix() + (" §6A DebugLog zip has been created. You can download it here: [url].\n§6Please enter the following key in the ticket:" + " §e[key].\n§4Do not share the download URL with anyone!\nYou can delte yor Debug-File with the following command: /t2code debug deleteReportLog [key].") - .replace("[key]",fileID).replace("[url]",downloadURL)); + .replace("[key]", fileID).replace("[url]", downloadURL)); ReportLogStorage.add(fileID); } @@ -231,11 +234,11 @@ public class CreateReportLog { HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); int response = con.getResponseCode(); - if(response == 200){ + if (response == 200) { ReportLogStorage.remove(arg); - T2Csend.sender(sender,"Deleted report: " + arg); - }else { - T2Csend.sender(sender,"Error while deleting report: " + arg); + T2Csend.sender(sender, "Deleted report: " + arg); + } else { + T2Csend.sender(sender, "Error while deleting report: " + arg); } con.disconnect(); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/SelectLibConfig.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/SelectLibConfig.java index f1bb07b..93b9ad0 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/SelectLibConfig.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/SelectLibConfig.java @@ -8,7 +8,7 @@ import java.io.File; public class SelectLibConfig { private static Boolean UpdateCheckOnJoin; - private static Boolean t2cTestDevelopment; + private static Boolean t2cTestDevelopment = false; private static Integer UpdateCheckTimeInterval; private static Boolean Debug; private static String language; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/UpdateType.java b/src/main/java/net/t2code/t2codelib/UpdateType.java similarity index 88% rename from src/main/java/net/t2code/t2codelib/SPIGOT/system/UpdateType.java rename to src/main/java/net/t2code/t2codelib/UpdateType.java index 27e4f96..b7b897e 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/UpdateType.java +++ b/src/main/java/net/t2code/t2codelib/UpdateType.java @@ -1,4 +1,4 @@ -package net.t2code.t2codelib.SPIGOT.system; +package net.t2code.t2codelib; public enum UpdateType { PRERELEASE("Pre-Release"), diff --git a/src/main/java/net/t2code/t2codelib/Util.java b/src/main/java/net/t2code/t2codelib/Util.java index 661e1a9..0470258 100644 --- a/src/main/java/net/t2code/t2codelib/Util.java +++ b/src/main/java/net/t2code/t2codelib/Util.java @@ -35,7 +35,7 @@ public class Util { public static List getT2cPlugins() { return Arrays.asList( - //"T2CodeLib", + "T2CodeLib", "T2C-LuckyBox", "WonderBagShop", "CommandGUI",