diff --git a/pom.xml b/pom.xml index e9b9e49..73a6cfd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 16.7_dev-11 + 16.7_dev-13 @@ -29,6 +29,7 @@ 11 11 + @@ -244,14 +245,6 @@ provided - - - org.json - json - 20220924 - compile - - org.apache.httpcomponents @@ -262,7 +255,7 @@ org.json json - 20230227 + 20231013 compile diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/bungeePlayers/T2CBbungeePlayers.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/bungeePlayers/T2CB_BungeePlayers.java similarity index 59% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/bungeePlayers/T2CBbungeePlayers.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/bungeePlayers/T2CB_BungeePlayers.java index bdca0ba..4f3f5b6 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/bungeePlayers/T2CBbungeePlayers.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/bungeePlayers/T2CB_BungeePlayers.java @@ -8,26 +8,27 @@ import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; -import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend; -import net.t2code.t2codelib.BUNGEE.system.T2CodeBMain; -import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2CbungeePlayersEnum; +import net.t2code.t2codelib.BUNGEE.api.messages.T2CB_Send; +import net.t2code.t2codelib.BUNGEE.system.T2CB_Main; +import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2C_BngeePlayersEnum; +import net.t2code.t2codelib.Util; import java.io.*; import java.util.logging.Logger; -public class T2CBbungeePlayers implements Listener { +public class T2CB_BungeePlayers implements Listener { @EventHandler public void onJoin(PostLoginEvent e) { - sendToSpigotPlayer(e.getPlayer().getName(), T2CbungeePlayersEnum.JOIN, ""); + sendToSpigotPlayer(e.getPlayer().getName(), T2C_BngeePlayersEnum.JOIN, ""); } @EventHandler public void onDisconnect(PlayerDisconnectEvent e) { - sendToSpigotPlayer(e.getPlayer().getName(), T2CbungeePlayersEnum.QUIT, ""); + sendToSpigotPlayer(e.getPlayer().getName(), T2C_BngeePlayersEnum.QUIT, ""); } - public static void sendToSpigotPlayer(String name, T2CbungeePlayersEnum value, String uuid) { + public static void sendToSpigotPlayer(String name, T2C_BngeePlayersEnum value, String uuid) { switch (value) { case JOIN: case QUIT: @@ -38,12 +39,12 @@ public class T2CBbungeePlayers implements Listener { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { input.append(player.getName()).append(";"); } - sendToSpigotPlayerExecute(input.toString(), T2CbungeePlayersEnum.GIVEALL, uuid); + sendToSpigotPlayerExecute(input.toString(), T2C_BngeePlayersEnum.GIVEALL, uuid); break; } } - private static void sendToSpigotPlayerExecute(String name, T2CbungeePlayersEnum value, String uuid) { + private static void sendToSpigotPlayerExecute(String name, T2C_BngeePlayersEnum value, String uuid) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); DataOutputStream output = new DataOutputStream(stream); try { @@ -53,12 +54,12 @@ public class T2CBbungeePlayers implements Listener { } catch (IOException e) { Logger.getLogger(e.getMessage()); } - T2CBsend.debug(T2CodeBMain.getPlugin(), "PluginMessage received channel: t2c:bonlp"); - T2CBsend.debug(T2CodeBMain.getPlugin(), "PluginMessage received subChannel: " + value.name()); - T2CBsend.debug(T2CodeBMain.getPlugin(), "PluginMessage received input: " + name); - T2CBsend.debug(T2CodeBMain.getPlugin(), "PluginMessage received input2/uuid: " + uuid); + T2CB_Send.debug(T2CB_Main.getPlugin(), "PluginMessage received channel: "+ Util.getPluginChannel_ProxyOnlinePlayers()); + T2CB_Send.debug(T2CB_Main.getPlugin(), "PluginMessage received subChannel: " + value.name()); + T2CB_Send.debug(T2CB_Main.getPlugin(), "PluginMessage received input: " + name); + T2CB_Send.debug(T2CB_Main.getPlugin(), "PluginMessage received input2/uuid: " + uuid); ProxyServer.getInstance().getServers().values().stream().forEach((server) -> { - server.sendData("t2c:bonlp", stream.toByteArray()); + server.sendData(Util.getPluginChannel_ProxyOnlinePlayers(), stream.toByteArray()); }); } @@ -66,29 +67,29 @@ public class T2CBbungeePlayers implements Listener { ByteArrayOutputStream stream = new ByteArrayOutputStream(); DataOutputStream output = new DataOutputStream(stream); try { - output.writeUTF(T2CbungeePlayersEnum.CLEAR.name()); + output.writeUTF(T2C_BngeePlayersEnum.CLEAR.name()); output.writeUTF(""); output.writeUTF(""); } catch (IOException e) { Logger.getLogger(e.getMessage()); } ProxyServer.getInstance().getServers().values().stream().forEach((server) -> { - server.sendData("t2c:bonlp", stream.toByteArray()); + server.sendData(Util.getPluginChannel_ProxyOnlinePlayers(), stream.toByteArray()); }); } @EventHandler public void onPluginMessage(PluginMessageEvent event) { - if (event.getTag().equalsIgnoreCase("t2c:bonlp")) { + if (event.getTag().equalsIgnoreCase(Util.getPluginChannel_ProxyOnlinePlayers())) { DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); event.setCancelled(true); try { - T2CbungeePlayersEnum subChannel = T2CbungeePlayersEnum.valueOf(stream.readUTF()); + T2C_BngeePlayersEnum subChannel = T2C_BngeePlayersEnum.valueOf(stream.readUTF()); String input = stream.readUTF(); - T2CBsend.debug(T2CodeBMain.getPlugin(), "PluginMessage received channel: " + event.getTag()); - T2CBsend.debug(T2CodeBMain.getPlugin(), "PluginMessage received subChannel: " + subChannel.name()); - T2CBsend.debug(T2CodeBMain.getPlugin(), "PluginMessage received input/uuid: " + input); + T2CB_Send.debug(T2CB_Main.getPlugin(), "PluginMessage received channel: " + event.getTag()); + T2CB_Send.debug(T2CB_Main.getPlugin(), "PluginMessage received subChannel: " + subChannel.name()); + T2CB_Send.debug(T2CB_Main.getPlugin(), "PluginMessage received input/uuid: " + input); sendToSpigotPlayer("", subChannel, input); } catch (IOException e) { diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CBcmd.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CB_Cmd.java similarity index 95% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CBcmd.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CB_Cmd.java index 23139f0..ec4c9d7 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CBcmd.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CB_Cmd.java @@ -3,7 +3,7 @@ package net.t2code.t2codelib.BUNGEE.api.commands; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; -public class T2CBcmd { +public class T2CB_Cmd { public static void Console(String cmd){ ProxyServer.getInstance().getPluginManager().dispatchCommand(ProxyServer.getInstance().getConsole(), cmd); } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CBtab.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CB_Tab.java similarity index 98% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CBtab.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CB_Tab.java index 593620e..bf52530 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CBtab.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/commands/T2CB_Tab.java @@ -6,10 +6,9 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; -public class T2CBtab { +public class T2CB_Tab { public static void tab(List matches, CommandSender sender, int arg, String[] args, String perm, Boolean onlinePlayer) { diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBminiMessage.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_MiniMessage.java similarity index 71% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBminiMessage.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_MiniMessage.java index 19398ed..3e336b7 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBminiMessage.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_MiniMessage.java @@ -6,11 +6,11 @@ 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; +import net.t2code.t2codelib.BUNGEE.system.T2CB_Main; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Replace; -public class T2CBminiMessage { - private static final BungeeAudiences bungeeAudiences = T2CodeBMain.getAdventure(); +public class T2CB_MiniMessage { + private static final BungeeAudiences bungeeAudiences = T2CB_Main.getAdventure(); public static void sendSenderMiniMessage(String msg, CommandSender sender) { bungeeAudiences.sender(sender).sendMessage(replace(msg)); @@ -25,6 +25,6 @@ public class T2CBminiMessage { } protected static Component replace(String text) { - return MiniMessage.miniMessage().deserialize(T2Creplace.convertColorCode(text)); + return MiniMessage.miniMessage().deserialize(T2C_Replace.convertColorCode(text)); } } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBreplace.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Replace.java similarity index 97% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBreplace.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Replace.java index bc5b7c9..bf73053 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBreplace.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Replace.java @@ -3,7 +3,7 @@ package net.t2code.t2codelib.BUNGEE.api.messages; import java.util.ArrayList; import java.util.List; -public class T2CBreplace { +public class T2CB_Replace { public static String replace(String prefix, String Text) { return Text.replace("[prefix]", prefix).replace("&", "§").replace("[ue]", "ü") diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBsend.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Send.java similarity index 81% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBsend.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Send.java index f497c1e..f086a05 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBsend.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Send.java @@ -5,20 +5,20 @@ 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 net.t2code.t2codelib.BUNGEE.system.T2CB_Main; import java.util.logging.Level; -public class T2CBsend { +public class T2CB_Send { public static void console(String msg) { - if (T2CodeBMain.getMmIsLoad() && T2CodeBMain.getMmIsLoad()) { - T2CBminiMessage.sendConsoleMiniMessage(msg); + if (T2CB_Main.getMmIsLoad() && T2CB_Main.getMmIsLoad()) { + T2CB_MiniMessage.sendConsoleMiniMessage(msg); } else ProxyServer.getInstance().getConsole().sendMessage(msg); } public static void player(ProxiedPlayer player, String msg) { - if (T2CodeBMain.getMmIsLoad()&& T2CodeBMain.getMmIsLoad()) { - T2CBminiMessage.sendPlayerMiniMessage(msg, player); + if (T2CB_Main.getMmIsLoad()&& T2CB_Main.getMmIsLoad()) { + T2CB_MiniMessage.sendPlayerMiniMessage(msg, player); } else player.sendMessage(msg); } @@ -27,8 +27,8 @@ public class T2CBsend { } public static void sender(CommandSender sender, String msg) { - if (T2CodeBMain.getMmIsLoad()&& T2CodeBMain.getMmIsLoad()) { - T2CBminiMessage.sendSenderMiniMessage(msg, sender); + if (T2CB_Main.getMmIsLoad()&& T2CB_Main.getMmIsLoad()) { + T2CB_MiniMessage.sendSenderMiniMessage(msg, sender); } else sender.sendMessage(msg); } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Template.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Template.java new file mode 100644 index 0000000..c6024ac --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CB_Template.java @@ -0,0 +1,56 @@ +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.T2CB_UpdateAPI; +import net.t2code.t2codelib.T2CupdateWebData; + +public class T2CB_Template { + + + public static Long onLoadHeader(String prefix, String autor, String version, String spigot, String discord) { + Long long_ = Long.valueOf(System.currentTimeMillis()); + T2CB_Send.console(prefix + "§4============================= " + prefix + " §4============================="); + T2CB_Send.console(prefix + " §2Autor: §6" + autor.replace("[", "").replace("]", "")); + T2CB_Send.console(prefix + " §2Version: §6" + version); + T2CB_Send.console(prefix + " §2Spigot: §6" + spigot); + T2CB_Send.console(prefix + " §2Discord: §6" + discord); + T2CB_Send.console(prefix + " §8-------------------------------"); + return long_; + } + + public static void onLoadSeparateStroke(String prefix) { + T2CB_Send.console(prefix + " §8-------------------------------"); + } + + public static void onLoadFooter(String prefix, Long long_) { + T2CB_Send.console(prefix + " §8-------------------------------"); + T2CB_Send.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + T2CB_Send.console(prefix + "§4============================= " + prefix + " §4============================="); + } + + public static void onDisable(String prefix, String autor, String version, String spigot, String discord) { + T2CB_Send.console(prefix + "§4============================= " + prefix + " §4============================="); + T2CB_Send.console(prefix + " §2Autor: §6" + autor.replace("[", "").replace("]", "")); + T2CB_Send.console(prefix + " §2Version: §6" + version); + T2CB_Send.console(prefix + " §2Spigot: §6" + spigot); + T2CB_Send.console(prefix + " §2Discord: §6" + discord); + T2CB_Send.console(prefix + " §4Plugin successfully disabled."); + T2CB_Send.console(prefix + "§4============================= " + prefix + " §4============================="); + } + + public static void sendInfo(CommandSender sender, Plugin plugin, String prefix, String spigot, String discord, String autor) { + T2CupdateWebData webData = T2CB_UpdateAPI.bungeePluginVersins.get(plugin.getDescription().getName()).webData; + String pluginVersion = plugin.getDescription().getVersion(); + T2CB_Send.sender(sender, prefix + "§4======= " + prefix + " §4======="); + T2CB_Send.sender(sender, prefix + " §2Autor: §6" + autor); + if (webData.getVersion().equalsIgnoreCase(pluginVersion)) { + T2CB_Send.sender(sender, prefix + " §2Version: §6" + pluginVersion); + } else { + T2CB_UpdateAPI.sendUpdateMsg(prefix, discord, webData, plugin, sender); + } + T2CB_Send.sender(sender, prefix + " §2Spigot: §6" + spigot); + T2CB_Send.sender(sender, prefix + " §2Discord: §6" + discord); + T2CB_Send.sender(sender, prefix + "§4======= " + prefix + " §4======="); + } +} 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 deleted file mode 100644 index 09ca8dc..0000000 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/messages/T2CBtemplate.java +++ /dev/null @@ -1,56 +0,0 @@ -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 { - - - public static Long onLoadHeader(String prefix, String autor, String version, String spigot, String discord) { - Long long_ = Long.valueOf(System.currentTimeMillis()); - T2CBsend.console(prefix + "§4============================= " + prefix + " §4============================="); - T2CBsend.console(prefix + " §2Autor: §6" + autor.replace("[", "").replace("]", "")); - T2CBsend.console(prefix + " §2Version: §6" + version); - T2CBsend.console(prefix + " §2Spigot: §6" + spigot); - T2CBsend.console(prefix + " §2Discord: §6" + discord); - T2CBsend.console(prefix + " §8-------------------------------"); - return long_; - } - - public static void onLoadSeparateStroke(String prefix) { - T2CBsend.console(prefix + " §8-------------------------------"); - } - - public static void onLoadFooter(String prefix, Long long_) { - T2CBsend.console(prefix + " §8-------------------------------"); - T2CBsend.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - T2CBsend.console(prefix + "§4============================= " + prefix + " §4============================="); - } - - public static void onDisable(String prefix, String autor, String version, String spigot, String discord) { - T2CBsend.console(prefix + "§4============================= " + prefix + " §4============================="); - T2CBsend.console(prefix + " §2Autor: §6" + autor.replace("[", "").replace("]", "")); - T2CBsend.console(prefix + " §2Version: §6" + version); - T2CBsend.console(prefix + " §2Spigot: §6" + spigot); - T2CBsend.console(prefix + " §2Discord: §6" + discord); - T2CBsend.console(prefix + " §4Plugin successfully disabled."); - T2CBsend.console(prefix + "§4============================= " + prefix + " §4============================="); - } - - public static void sendInfo(CommandSender sender, Plugin plugin, String prefix, String spigot, String discord, String autor) { - 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 (webData.getVersion().equalsIgnoreCase(pluginVersion)) { - T2CBsend.sender(sender, prefix + " §2Version: §6" + pluginVersion); - } else { - T2CBupdateAPI.sendUpdateMsg(prefix, discord, webData, plugin, sender); - } - T2CBsend.sender(sender, prefix + " §2Spigot: §6" + spigot); - T2CBsend.sender(sender, prefix + " §2Discord: §6" + discord); - T2CBsend.sender(sender, prefix + "§4======= " + prefix + " §4======="); - } -} diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/T2CB_PluginMessageProxyCommand.java similarity index 89% rename from src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/T2CB_PluginMessageProxyCommand.java index 2b7970e..3a9891d 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/T2CB_PluginMessageProxyCommand.java @@ -1,4 +1,4 @@ -package net.t2code.t2codelib.BUNGEE.system.pluginMessaging; +package net.t2code.t2codelib.BUNGEE.api.pluginMessaging; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; @@ -6,16 +6,15 @@ import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; import net.t2code.t2codelib.Util; -import org.junit.Ignore; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -public class T2CplmsgBcmd implements Listener { +public class T2CB_PluginMessageProxyCommand implements Listener { @EventHandler public void onPluginmessage(PluginMessageEvent event) { - if (event.getTag().equalsIgnoreCase("t2c:bcmd")) { + if (event.getTag().equalsIgnoreCase(Util.getPluginChannel_ProxyCommand())) { event.setCancelled(true); DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); try { diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/autoResponse/T2CapiAutoResponse.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/autoResponse/T2CB_API_AutoResponse.java similarity index 82% rename from src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/autoResponse/T2CapiAutoResponse.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/autoResponse/T2CB_API_AutoResponse.java index 50e46ec..583d4df 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/autoResponse/T2CapiAutoResponse.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/autoResponse/T2CB_API_AutoResponse.java @@ -1,21 +1,22 @@ -package net.t2code.t2codelib.BUNGEE.system.pluginMessaging.autoResponse; +package net.t2code.t2codelib.BUNGEE.api.pluginMessaging.autoResponse; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; -import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend; +import net.t2code.t2codelib.BUNGEE.api.messages.T2CB_Send; +import net.t2code.t2codelib.Util; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -public class T2CapiAutoResponse implements Listener { +public class T2CB_API_AutoResponse implements Listener { @EventHandler public void onPluginmessage(PluginMessageEvent event) { - if (event.getTag().equalsIgnoreCase("t2c:aresp")) { + if (event.getTag().equalsIgnoreCase(Util.getPluginChannel_AutoResponse())) { DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); event.setCancelled(true); try { @@ -29,7 +30,7 @@ public class T2CapiAutoResponse implements Listener { break; case "ALLPMSG": for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - T2CBsend.player(player, input); + T2CB_Send.player(player, input); } break; default: diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/commandgui/T2CapiCGUI.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/commandgui/T2CB_API_CGUI.java similarity index 83% rename from src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/commandgui/T2CapiCGUI.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/commandgui/T2CB_API_CGUI.java index 5ac9829..0ece168 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/commandgui/T2CapiCGUI.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/commandgui/T2CB_API_CGUI.java @@ -1,4 +1,4 @@ -package net.t2code.t2codelib.BUNGEE.system.pluginMessaging.commandgui; +package net.t2code.t2codelib.BUNGEE.api.pluginMessaging.commandgui; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; @@ -6,11 +6,12 @@ import net.md_5.bungee.api.event.PlayerDisconnectEvent; import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; +import net.t2code.t2codelib.Util; import java.io.*; import java.util.logging.Logger; -public class T2CapiCGUI implements Listener { +public class T2CB_API_CGUI implements Listener { @EventHandler public void onJoin(PostLoginEvent e) { @@ -38,7 +39,7 @@ public class T2CapiCGUI implements Listener { Logger.getLogger(e.getMessage()); } ProxyServer.getInstance().getServers().values().stream().forEach((server) -> { - server.sendData("t2c:cguiopl", stream.toByteArray()); + server.sendData(Util.getPluginChannel_CGUIOnlinePlayers(), stream.toByteArray()); }); } @@ -52,7 +53,7 @@ public class T2CapiCGUI implements Listener { Logger.getLogger(e.getMessage()); } ProxyServer.getInstance().getServers().values().stream().forEach((server) -> { - server.sendData("t2c:cguiopl", stream.toByteArray()); + server.sendData(Util.getPluginChannel_CGUIOnlinePlayers(), stream.toByteArray()); }); } } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/opSecurity/T2CapiOpSecurity.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/opSecurity/T2CB_API_OpSecurity.java similarity index 81% rename from src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/opSecurity/T2CapiOpSecurity.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/opSecurity/T2CB_API_OpSecurity.java index c30b657..fbe59d4 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/opSecurity/T2CapiOpSecurity.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/pluginMessaging/opSecurity/T2CB_API_OpSecurity.java @@ -1,18 +1,19 @@ -package net.t2code.t2codelib.BUNGEE.system.pluginMessaging.opSecurity; +package net.t2code.t2codelib.BUNGEE.api.pluginMessaging.opSecurity; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; +import net.t2code.t2codelib.Util; import java.io.*; import java.util.logging.Logger; -public class T2CapiOpSecurity implements Listener { +public class T2CB_API_OpSecurity implements Listener { @EventHandler public void onPluginmessage(PluginMessageEvent event) { - if (event.getTag().equalsIgnoreCase("t2c:opsec")) { + if (event.getTag().equalsIgnoreCase(Util.getPluginChannel_OPSecurity())) { event.setCancelled(true); DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); try { @@ -39,7 +40,7 @@ public class T2CapiOpSecurity implements Listener { Logger.getLogger(e.getMessage()); } ProxyServer.getInstance().getServers().values().stream().forEach((server) -> { - server.sendData("t2c:opsec", stream.toByteArray()); + server.sendData(Util.getPluginChannel_OPSecurity(), stream.toByteArray()); }); } } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/plugins/T2CBpluginCheck.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/plugins/T2CB_PluginCheck.java similarity index 93% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/plugins/T2CBpluginCheck.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/plugins/T2CB_PluginCheck.java index 6e9c3f6..d092d51 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/plugins/T2CBpluginCheck.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/plugins/T2CB_PluginCheck.java @@ -2,11 +2,11 @@ package net.t2code.t2codelib.BUNGEE.api.plugins; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; -import net.t2code.t2codelib.BUNGEE.system.T2CodeBMain; +import net.t2code.t2codelib.BUNGEE.system.T2CB_Main; import java.util.logging.Level; -public class T2CBpluginCheck { +public class T2CB_PluginCheck { public static Boolean pluginCheck(String pluginName){ return (ProxyServer.getInstance().getPluginManager().getPlugin(pluginName) != null); } @@ -70,7 +70,7 @@ public class T2CBpluginCheck { plugin.getLogger().log(Level.SEVERE, "Plugin can not be loaded!"); ProxyServer.getInstance().getConsole().sendMessage(prefix + " §e" + pl + " §4could not be found. Please download it here: " + "§6https://spigotmc.org/resources/" + pl + "." + spigotID + " §4to be able to use this plugin."); - T2CodeBMain.getPlugin().getProxy().getPluginManager().getPlugin(plugin.getDescription().getName()).onDisable(); + T2CB_Main.getPlugin().getProxy().getPluginManager().getPlugin(plugin.getDescription().getName()).onDisable(); return true; } else return false; } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CB_UpdateAPI.java similarity index 85% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CB_UpdateAPI.java index 8bdc4df..2f5b27a 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CB_UpdateAPI.java @@ -3,8 +3,8 @@ package net.t2code.t2codelib.BUNGEE.api.update; 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.BUNGEE.api.messages.T2CB_Send; +import net.t2code.t2codelib.BUNGEE.system.config.T2CB_LibConfig; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; import net.t2code.t2codelib.UpdateType; @@ -12,7 +12,7 @@ import net.t2code.t2codelib.UpdateType; import java.util.HashMap; import java.util.concurrent.TimeUnit; -public class T2CBupdateAPI { +public class T2CB_UpdateAPI { public static HashMap bungeePluginVersins = new HashMap<>(); public static void sendUpdateMsg(String prefix, String discord, T2CupdateWebData webData, Plugin plugin, CommandSender sender) { @@ -39,8 +39,8 @@ public class T2CBupdateAPI { String f = "
╚══════════════" + prefix + "══════════════"; String text = h + s1 + s2 + s3 + s4 + f; if (sender == null) { - T2CBsend.console(text); - } else T2CBsend.sender(sender, text); + T2CB_Send.console(text); + } else T2CB_Send.sender(sender, text); } @@ -48,12 +48,12 @@ public class T2CBupdateAPI { private static String pluginVersion; public static void onUpdateCheckTimer(Plugin plugin, String prefix, String discord, Integer spigotID, String url) { - if ((int) T2CBlibConfig.VALUES.updateTimer.getValue() < 1) { - T2CBlibConfig.VALUES.updateTimer.setValue(1); + if ((int) T2CB_LibConfig.VALUES.updateTimer.getValue() < 1) { + T2CB_LibConfig.VALUES.updateTimer.setValue(1); } ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() { public void run() { - (new T2CBupdateCheckerGit(plugin)).getVersion((webData) -> { + (new T2CB_UpdateCheckerGit(plugin)).getVersion((webData) -> { pluginVersion = plugin.getDescription().getVersion(); T2CupdateObject update = new T2CupdateObject( plugin.getDescription().getName(), @@ -69,12 +69,12 @@ public class T2CBupdateAPI { noUpdate = true; } else { if (noUpdate) { - T2CBsend.console(prefix + " §2No update found."); + T2CB_Send.console(prefix + " §2No update found."); noUpdate = false; } } }, pluginVersion, spigotID, url); } - }, 0, (int) T2CBlibConfig.VALUES.updateTimer.getValue() * 60 * 20L, TimeUnit.SECONDS); + }, 0, (int) T2CB_LibConfig.VALUES.updateTimer.getValue() * 60 * 20L, TimeUnit.SECONDS); } } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateCheckerGit.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CB_UpdateCheckerGit.java similarity index 87% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateCheckerGit.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CB_UpdateCheckerGit.java index 8f74777..f0fffea 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateCheckerGit.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CB_UpdateCheckerGit.java @@ -2,7 +2,7 @@ package net.t2code.t2codelib.BUNGEE.api.update; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; -import net.t2code.t2codelib.BUNGEE.system.config.T2CBlibConfig; +import net.t2code.t2codelib.BUNGEE.system.config.T2CB_LibConfig; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; import org.json.JSONArray; @@ -16,18 +16,18 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.function.Consumer; -public class T2CBupdateCheckerGit { +public class T2CB_UpdateCheckerGit { private Plugin plugin; - public T2CBupdateCheckerGit(Plugin plugin) { + public T2CB_UpdateCheckerGit(Plugin plugin) { this.plugin = plugin; } public void getVersion(Consumer consumer, String pluginVersion, Integer spigotID, String gitKey) { String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1"; - if (!(boolean)T2CBlibConfig.VALUES.seePreReleaseUpdates.getValue() ) { + if (!(boolean) T2CB_LibConfig.VALUES.seePreReleaseUpdates.getValue() ) { RepoURL = RepoURL + "&pre-release=false"; } String finalRepoURL = RepoURL; @@ -79,8 +79,8 @@ public class T2CBupdateCheckerGit { consumer.accept(webData); } catch (Exception var10) { Boolean load = false; - if (T2CBupdateAPI.bungeePluginVersins.containsKey(plugin.getDescription().getName())) { - load = T2CBupdateAPI.bungeePluginVersins.get(plugin.getDescription().getName()).load; + if (T2CB_UpdateAPI.bungeePluginVersins.containsKey(plugin.getDescription().getName())) { + load = T2CB_UpdateAPI.bungeePluginVersins.get(plugin.getDescription().getName()).load; } T2CupdateObject update = new T2CupdateObject( plugin.getDescription().getName(), @@ -90,7 +90,7 @@ public class T2CBupdateCheckerGit { false, true ); - T2CBupdateAPI.bungeePluginVersins.put(plugin.getDescription().getName(), update); + T2CB_UpdateAPI.bungeePluginVersins.put(plugin.getDescription().getName(), update); this.plugin.getLogger().severe("§4 Cannot look for updates: " + var10.getMessage()); } }); diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CBconfig.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CB_Config.java similarity index 89% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CBconfig.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CB_Config.java index a116f11..637f9ef 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CBconfig.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CB_Config.java @@ -1,12 +1,12 @@ package net.t2code.t2codelib.BUNGEE.api.yaml; import net.md_5.bungee.config.Configuration; -import net.t2code.t2codelib.BUNGEE.api.messages.T2CBreplace; +import net.t2code.t2codelib.BUNGEE.api.messages.T2CB_Replace; import java.util.ArrayList; import java.util.List; -public class T2CBconfig { +public class T2CB_Config { public static void set(String path, String value, Configuration configuration) { if (!configuration.contains(path)) { configuration.set(path, value); @@ -43,7 +43,7 @@ public class T2CBconfig { public static String select(String prefix, String path, Configuration configuration) { - return T2CBreplace.replace(prefix, configuration.getString(path)); + return T2CB_Replace.replace(prefix, configuration.getString(path)); } @@ -69,7 +69,7 @@ public class T2CBconfig { List output = new ArrayList<>(); List input = configuration.getStringList(path); for (String st : input) { - output.add(T2CBreplace.replace(prefix, st)); + output.add(T2CB_Replace.replace(prefix, st)); } return output; } @@ -78,7 +78,7 @@ public class T2CBconfig { List output = new ArrayList<>(); List input = configuration.getStringList(path); for (String st : input) { - output.add(T2CBreplace.replace(prefix, st)); + output.add(T2CB_Replace.replace(prefix, st)); } value = output; } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CBconfigWriter.java b/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CB_ConfigWriter.java similarity index 99% rename from src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CBconfigWriter.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CB_ConfigWriter.java index fad56cb..081f35c 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CBconfigWriter.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/api/yaml/T2CB_ConfigWriter.java @@ -15,7 +15,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public class T2CBconfigWriter { +public class T2CB_ConfigWriter { private static Configuration config; diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CB_Main.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CB_Main.java new file mode 100644 index 0000000..6b98516 --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CB_Main.java @@ -0,0 +1,115 @@ +package net.t2code.t2codelib.BUNGEE.system; + +import lombok.Getter; +import net.kyori.adventure.platform.bungeecord.BungeeAudiences; +import net.md_5.bungee.api.plugin.Plugin; +import net.t2code.t2codelib.BUNGEE.api.messages.T2CB_Send; +import net.t2code.t2codelib.BUNGEE.api.bungeePlayers.T2CB_BungeePlayers; +import net.t2code.t2codelib.BUNGEE.api.pluginMessaging.T2CB_PluginMessageProxyCommand; +import net.t2code.t2codelib.BUNGEE.api.pluginMessaging.autoResponse.T2CB_API_AutoResponse; +import net.t2code.t2codelib.BUNGEE.api.pluginMessaging.commandgui.T2CB_API_CGUI; +import net.t2code.t2codelib.BUNGEE.api.pluginMessaging.opSecurity.T2CB_API_OpSecurity; +import net.t2code.t2codelib.BUNGEE.api.update.T2CB_UpdateAPI; +import net.t2code.t2codelib.BUNGEE.system.bstats.T2CB_Metrics; +import net.t2code.t2codelib.BUNGEE.system.config.T2CB_LibConfig; +import net.t2code.t2codelib.Util; + +public class T2CB_Main extends Plugin { + + @Getter + private static Plugin plugin; + + private static String version; + 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() { + // Plugin startup logic + plugin = this; + orgVersion = plugin.getDescription().getVersion(); + autor = plugin.getDescription().getAuthor(); + try { + adventure = BungeeAudiences.create(this); + T2CB_Send.info(this, "Adventure load!"); + } catch (Exception e) { + T2CB_Send.error(this, "Adventure can not be load!"); + mmIsLoad = false; + } + onLoad(Util.getPrefix(), autor, orgVersion, Util.getSpigot(), Util.getDiscord(), Util.getSpigotID(), Util.getBstatsID(), Util.getGit()); + version = plugin.getDescription().getVersion(); + } + + @Override + public void onDisable() { + // Plugin shutdown logic + T2CB_BungeePlayers.sendToSpigotDeleteAll(); + if (mmIsLoad) { + if (adventure != null) { + adventure.close(); + adventure = null; + } + } + T2CB_Send.console(Util.getPrefix() + "§4============================= " + Util.getPrefix() + " §4============================="); + T2CB_Send.console(Util.getPrefix() + " §2Autor: §6" + String.valueOf(plugin.getDescription().getAuthor()).replace("[", "").replace("]", "")); + T2CB_Send.console(Util.getPrefix() + " §2Version: §6" + version); + T2CB_Send.console(Util.getPrefix() + " §2Spigot: §6" + Util.getSpigot()); + T2CB_Send.console(Util.getPrefix() + " §2Discord: §6" + Util.getDiscord()); + T2CB_Send.console(Util.getPrefix() + " §4Plugin successfully disabled."); + T2CB_Send.console(Util.getPrefix() + "§4============================= " + Util.getPrefix() + " §4============================="); + } + + public static Boolean getMmIsLoad() { + return mmIsLoad; + } + + public static void onLoad(String prefix, String autor, String version, String spigot, String discord, Integer spigotID, Integer bstatsID, String url) { + long long_ = System.currentTimeMillis(); + T2CB_Send.console(prefix + "§4============================= " + prefix + " §4============================="); + T2CB_Send.console(prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); + T2CB_Send.console(prefix + " §2Version: §6" + version); + T2CB_Send.console(prefix + " §2Spigot: §6" + spigot); + T2CB_Send.console(prefix + " §2Discord: §6" + discord); + + T2CB_Metrics.bStats(plugin, bstatsID); + T2CB_LibConfig.set(); + + T2CB_UpdateAPI.onUpdateCheckTimer(plugin, prefix, discord, spigotID, url); + + //API + plugin.getProxy().registerChannel(Util.getPluginChannel_ProxyCommand()); + plugin.getProxy().getPluginManager().registerListener(plugin, new T2CB_PluginMessageProxyCommand()); + + plugin.getProxy().registerChannel(Util.getPluginChannel_ProxyOnlinePlayers()); + plugin.getProxy().getPluginManager().registerListener(plugin, new T2CB_BungeePlayers()); + T2CB_BungeePlayers.sendToSpigotDeleteAll(); + + if ((boolean) T2CB_LibConfig.VALUES.apiCommandGUIEnable.getValue()) { + plugin.getProxy().registerChannel(Util.getPluginChannel_CGUIOnlinePlayers()); + plugin.getProxy().getPluginManager().registerListener(plugin, new T2CB_API_CGUI()); + T2CB_API_CGUI.sendToSpigotDeleteAll(); + } + if ((boolean) T2CB_LibConfig.VALUES.apiAutoResponse.getValue()) { + plugin.getProxy().registerChannel(Util.getPluginChannel_AutoResponse()); + plugin.getProxy().getPluginManager().registerListener(plugin, new T2CB_API_AutoResponse()); + } + if ((boolean) T2CB_LibConfig.VALUES.apiOpSecurity.getValue()) { + plugin.getProxy().registerChannel(Util.getPluginChannel_OPSecurity()); + plugin.getProxy().getPluginManager().registerListener(plugin, new T2CB_API_OpSecurity()); + } + + T2CB_Send.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + T2CB_Send.console(prefix + "§4============================= " + prefix + " §4============================="); + } +} diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CBload.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CBload.java deleted file mode 100644 index 64f7dec..0000000 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CBload.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.t2code.t2codelib.BUNGEE.system; - -import net.md_5.bungee.api.plugin.Plugin; -import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend; -import net.t2code.t2codelib.BUNGEE.api.update.T2CBupdateAPI; -import net.t2code.t2codelib.BUNGEE.system.bstats.T2CBmetrics; -import net.t2code.t2codelib.BUNGEE.api.bungeePlayers.T2CBbungeePlayers; -import net.t2code.t2codelib.BUNGEE.system.config.T2CBlibConfig; -import net.t2code.t2codelib.BUNGEE.system.pluginMessaging.T2CplmsgBcmd; -import net.t2code.t2codelib.BUNGEE.system.pluginMessaging.autoResponse.T2CapiAutoResponse; -import net.t2code.t2codelib.BUNGEE.system.pluginMessaging.commandgui.T2CapiCGUI; -import net.t2code.t2codelib.BUNGEE.system.pluginMessaging.opSecurity.T2CapiOpSecurity; - -public class T2CBload { - public static void onLoad(Plugin plugin, String prefix, String autor, String version, String spigot, String discord, Integer spigotID, Integer bstatsID, String url) { - long long_ = System.currentTimeMillis(); - T2CBsend.console(prefix + "§4============================= " + prefix + " §4============================="); - T2CBsend.console(prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); - T2CBsend.console(prefix + " §2Version: §6" + version); - T2CBsend.console(prefix + " §2Spigot: §6" + spigot); - T2CBsend.console(prefix + " §2Discord: §6" + discord); - - T2CBmetrics.bStats(plugin, bstatsID); - T2CBlibConfig.set(); - - T2CBupdateAPI.onUpdateCheckTimer(plugin, prefix, discord, spigotID, url); - - //API - plugin.getProxy().registerChannel("t2c:bcmd"); - plugin.getProxy().getPluginManager().registerListener(plugin, new T2CplmsgBcmd()); - - plugin.getProxy().registerChannel("t2c:bonlp"); - plugin.getProxy().getPluginManager().registerListener(plugin, new T2CBbungeePlayers()); - T2CBbungeePlayers.sendToSpigotDeleteAll(); - - if ((boolean) T2CBlibConfig.VALUES.apiCommandGUIEnable.getValue()) { - plugin.getProxy().registerChannel("t2c:cguiopl"); - plugin.getProxy().getPluginManager().registerListener(plugin, new T2CapiCGUI()); - T2CapiCGUI.sendToSpigotDeleteAll(); - } - if ( (boolean)T2CBlibConfig.VALUES.apiAutoResponse.getValue() ) { - plugin.getProxy().registerChannel("t2c:aresp"); - plugin.getProxy().getPluginManager().registerListener(plugin, new T2CapiAutoResponse()); - } - if ((boolean)T2CBlibConfig.VALUES.apiOpSecurity.getValue()) { - plugin.getProxy().registerChannel("t2c:t2c:opsec"); - plugin.getProxy().getPluginManager().registerListener(plugin, new T2CapiOpSecurity()); - } - - - T2CBsend.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); - T2CBsend.console(prefix + "§4============================= " + prefix + " §4============================="); - } -} diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CodeBMain.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CodeBMain.java deleted file mode 100644 index 18386da..0000000 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/T2CodeBMain.java +++ /dev/null @@ -1,70 +0,0 @@ -package net.t2code.t2codelib.BUNGEE.system; - -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.BUNGEE.api.bungeePlayers.T2CBbungeePlayers; -import net.t2code.t2codelib.Util; - -public class T2CodeBMain extends Plugin { - - private static Plugin plugin; - - public static Plugin getPlugin() { - return plugin; - } - - private static String version; - 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() { - // Plugin startup logic - plugin = this; - orgVersion = plugin.getDescription().getVersion(); - autor = plugin.getDescription().getAuthor(); - try { - adventure = BungeeAudiences.create(this); - T2CBsend.info(this,"Adventure load!"); - } catch (Exception e){ - T2CBsend.error(this,"Adventure can not be load!"); - mmIsLoad = false; - } - T2CBload.onLoad(plugin, Util.getPrefix(), autor, orgVersion, Util.getSpigot(), Util.getDiscord(), Util.getSpigotID(), Util.getBstatsID(),Util.getGit()); - version = plugin.getDescription().getVersion(); - } - - @Override - public void onDisable() { - // Plugin shutdown logic - T2CBbungeePlayers.sendToSpigotDeleteAll(); - 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); - T2CBsend.console(Util.getPrefix() + " §2Spigot: §6" + Util.getSpigot()); - T2CBsend.console(Util.getPrefix() + " §2Discord: §6" + Util.getDiscord()); - 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/bstats/T2CBmetrics.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/bstats/T2CB_Metrics.java similarity index 99% rename from src/main/java/net/t2code/t2codelib/BUNGEE/system/bstats/T2CBmetrics.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/system/bstats/T2CB_Metrics.java index 9e781d0..7d14233 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/bstats/T2CBmetrics.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/bstats/T2CB_Metrics.java @@ -21,11 +21,11 @@ import java.util.logging.Level; import java.util.stream.Collectors; import java.util.zip.GZIPOutputStream; -public class T2CBmetrics { +public class T2CB_Metrics { public static void bStats(Plugin plugin, int bstatsID) { int pluginId = bstatsID; // <-- Replace with the id of your plugin! - T2CBmetrics metrics = new T2CBmetrics(plugin, pluginId); + T2CB_Metrics metrics = new T2CB_Metrics(plugin, pluginId); } private final Plugin plugin; @@ -49,7 +49,7 @@ public class T2CBmetrics { * @param serviceId The id of the service. It can be found at What is my plugin id? */ - public T2CBmetrics(Plugin plugin, int serviceId) { + public T2CB_Metrics(Plugin plugin, int serviceId) { this.plugin = plugin; try { loadConfig(); diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/ConvertT2CBlibConfig.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/ConvertT2CBlibConfig.java index d66b52b..38df341 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/ConvertT2CBlibConfig.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/ConvertT2CBlibConfig.java @@ -1,7 +1,7 @@ package net.t2code.t2codelib.BUNGEE.system.config; import net.md_5.bungee.config.ConfigurationProvider; -import net.t2code.t2codelib.BUNGEE.system.T2CodeBMain; +import net.t2code.t2codelib.BUNGEE.system.T2CB_Main; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.YamlConfiguration; import net.t2code.t2codelib.T2CconfigItem; @@ -14,17 +14,17 @@ public class ConvertT2CBlibConfig { public static Configuration configuration; public static void convert() throws IOException { - File config = new File(T2CodeBMain.getPlugin().getDataFolder(), "config.yml"); + File config = new File(T2CB_Main.getPlugin().getDataFolder(), "config.yml"); configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config); if (!config.exists()) return; if (configuration.contains("plugin.updateCheck.onJoin")) return; - set("UpdateCheck.TimerInMin",T2CBlibConfig.VALUES.updateTimer); - set("UpdateCheck.SeePreReleaseUpdates",T2CBlibConfig.VALUES.seePreReleaseUpdates); - set("API.CommandGUI.Enable",T2CBlibConfig.VALUES.apiCommandGUIEnable); - set("API.AutoResponse.Enable",T2CBlibConfig.VALUES.apiAutoResponse); - set("API.OPSecurity.Enable",T2CBlibConfig.VALUES.apiOpSecurity); + set("UpdateCheck.TimerInMin", T2CB_LibConfig.VALUES.updateTimer); + set("UpdateCheck.SeePreReleaseUpdates", T2CB_LibConfig.VALUES.seePreReleaseUpdates); + set("API.CommandGUI.Enable", T2CB_LibConfig.VALUES.apiCommandGUIEnable); + set("API.AutoResponse.Enable", T2CB_LibConfig.VALUES.apiAutoResponse); + set("API.OPSecurity.Enable", T2CB_LibConfig.VALUES.apiOpSecurity); config.delete(); } diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CB_LibConfig.java similarity index 91% rename from src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java rename to src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CB_LibConfig.java index c385194..d4cdf9f 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CB_LibConfig.java @@ -1,7 +1,7 @@ package net.t2code.t2codelib.BUNGEE.system.config; -import net.t2code.t2codelib.BUNGEE.api.yaml.T2CBconfigWriter; -import net.t2code.t2codelib.BUNGEE.system.T2CodeBMain; +import net.t2code.t2codelib.BUNGEE.api.yaml.T2CB_ConfigWriter; +import net.t2code.t2codelib.BUNGEE.system.T2CB_Main; import net.t2code.t2codelib.T2CconfigItem; import net.t2code.t2codelib.T2CLanguageEnum; import net.t2code.t2codelib.Util; @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; -public class T2CBlibConfig { +public class T2CB_LibConfig { public enum VALUES implements T2CconfigItem { updateTimer("updateCheck.timerInMin", 60, true, @@ -86,7 +86,7 @@ public class T2CBlibConfig { } catch (IOException e) { throw new RuntimeException(e); } - T2CBconfigWriter.createConfig(new File(T2CodeBMain.getPlugin().getDataFolder(), "config.yml"), VALUES.values(), Util.getConfigLogo()); + T2CB_ConfigWriter.createConfig(new File(T2CB_Main.getPlugin().getDataFolder(), "config.yml"), VALUES.values(), Util.getConfigLogo()); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2CbungeePlayersEnum.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2C_BngeePlayersEnum.java similarity index 74% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2CbungeePlayersEnum.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2C_BngeePlayersEnum.java index d769e53..4e50324 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2CbungeePlayersEnum.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2C_BngeePlayersEnum.java @@ -1,6 +1,6 @@ package net.t2code.t2codelib.SPIGOT.api.bungeePlayers; -public enum T2CbungeePlayersEnum { +public enum T2C_BngeePlayersEnum { JOIN, QUIT, GIVEALL, diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2CbungeePlayers.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2C_BungeePlayers.java similarity index 53% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2CbungeePlayers.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2C_BungeePlayers.java index 23122b5..169373f 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2CbungeePlayers.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/bungeePlayers/T2C_BungeePlayers.java @@ -1,36 +1,37 @@ package net.t2code.t2codelib.SPIGOT.api.bungeePlayers; import lombok.Getter; -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; +import net.t2code.t2codelib.SPIGOT.api.debug.T2C_Debug; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.Util; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; +import org.jetbrains.annotations.NotNull; import java.io.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class T2CbungeePlayers implements PluginMessageListener { +public class T2C_BungeePlayers implements PluginMessageListener { @Getter private static List bungeePlayers = new ArrayList<>(); @Override - public void onPluginMessageReceived(String channel, Player player, byte[] message) { + public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte[] message) { DataInputStream stream = new DataInputStream(new ByteArrayInputStream(message)); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "stream: " + stream.toString()); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "stream: " + stream.toString()); try { - T2CbungeePlayersEnum subChannel = T2CbungeePlayersEnum.valueOf(stream.readUTF()); + T2C_BngeePlayersEnum subChannel = T2C_BngeePlayersEnum.valueOf(stream.readUTF()); String input = stream.readUTF(); String uuid = stream.readUTF(); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received channel: " + channel); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received subChannel: " + subChannel.name()); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received input: " + input); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received input2/uuid: " + uuid); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received channel: " + channel); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received subChannel: " + subChannel.name()); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received input: " + input); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received input2/uuid: " + uuid); switch (subChannel) { case JOIN: bungeePlayers.add(input); @@ -39,7 +40,7 @@ public class T2CbungeePlayers implements PluginMessageListener { bungeePlayers.remove(input); break; case GIVEALL: - if (!T2CLibConfig.VALUES.serverUUID.getValue().equals(uuid)) { + if (!T2C_LibConfig.VALUES.serverUUID.getValue().equals(uuid)) { return; } bungeePlayers.clear(); @@ -51,7 +52,7 @@ public class T2CbungeePlayers implements PluginMessageListener { break; } } catch (IOException e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); } } @@ -68,17 +69,17 @@ public class T2CbungeePlayers implements PluginMessageListener { ByteArrayOutputStream stream = new ByteArrayOutputStream(); DataOutputStream output = new DataOutputStream(stream); try { - output.writeUTF(T2CbungeePlayersEnum.GIVEALL.name()); - output.writeUTF(T2CLibConfig.VALUES.serverUUID.getValue().toString()); + output.writeUTF(T2C_BngeePlayersEnum.GIVEALL.name()); + output.writeUTF(T2C_LibConfig.VALUES.serverUUID.getValue().toString()); } catch (IOException e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); } for (Player player : Bukkit.getOnlinePlayers()) { - player.sendPluginMessage(T2CodeLibMain.getPlugin(), "t2c:bonlp", stream.toByteArray()); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received channel: t2c:bonlp"); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage send subChannel: " + T2CbungeePlayersEnum.GIVEALL.name()); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage send output/uuid: " + T2CLibConfig.VALUES.serverUUID.getValue().toString()); + player.sendPluginMessage(T2CodeLibMain.getPlugin(), Util.getPluginChannel_ProxyOnlinePlayers(), stream.toByteArray()); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received channel: " + Util.getPluginChannel_ProxyOnlinePlayers()); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage send subChannel: " + T2C_BngeePlayersEnum.GIVEALL.name()); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage send output/uuid: " + T2C_LibConfig.VALUES.serverUUID.getValue().toString()); return; } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2C_Cmd.java similarity index 77% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2C_Cmd.java index 2680673..8bb4893 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2C_Cmd.java @@ -1,17 +1,14 @@ package net.t2code.t2codelib.SPIGOT.api.commands; -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.system.T2CbungeeCommandSenderReciver; +import net.t2code.t2codelib.SPIGOT.system.BungeeCommandSenderReceiver; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Unmodifiable; -import java.rmi.MarshalledObject; import java.util.Map; -public class T2Ccmd { +public class T2C_Cmd { public static void console(String cmdInput) { Map.Entry map = delay(cmdInput); int delay = map.getValue(); @@ -20,7 +17,7 @@ public class T2Ccmd { @Override public void run() { if (cmd.contains("!onBungee")) { - T2CbungeeCommandSenderReciver.sendToBungee(null, cmd.replace("!onBungee", ""), true); + BungeeCommandSenderReceiver.sendToBungee(null, cmd.replace("!onBungee", ""), true); } else Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), cmd); } }, delay); @@ -35,11 +32,11 @@ public class T2Ccmd { public void run() { if (cmd.contains("!asConsole")) { if (cmd.contains("!onBungee")) { - T2CbungeeCommandSenderReciver.sendToBungee(player, cmd.replace("!asConsole", "").replace("!onBungee", ""), true); + BungeeCommandSenderReceiver.sendToBungee(player, cmd.replace("!asConsole", "").replace("!onBungee", ""), true); } else console(cmd.replace("!asConsole", "")); } else { if (cmd.contains("!onBungee")) { - T2CbungeeCommandSenderReciver.sendToBungee(player, cmd.replace("!onBungee", ""), false); + BungeeCommandSenderReceiver.sendToBungee(player, cmd.replace("!onBungee", ""), false); } else player.chat("/" + cmd); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ctab.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2C_Tab.java similarity index 99% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ctab.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2C_Tab.java index 79a2882..cddd300 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ctab.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2C_Tab.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -public class T2Ctab { +public class T2C_Tab { public static void tab(List matches, CommandSender sender, int arg, String[] args, String perm, Boolean onlinePlayer) { if (args.length != arg + 1) return; for (Player player1 : Bukkit.getOnlinePlayers()) { diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/debug/T2Cdebug.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/debug/T2C_Debug.java similarity index 87% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/debug/T2Cdebug.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/debug/T2C_Debug.java index 19b8158..58b60f2 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/debug/T2Cdebug.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/debug/T2C_Debug.java @@ -1,12 +1,12 @@ package net.t2code.t2codelib.SPIGOT.api.debug; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import java.util.UUID; -public class T2Cdebug { +public class T2C_Debug { public static void debug(Plugin plugin, String msg) { debug(plugin, msg, null); } @@ -15,19 +15,19 @@ public class T2Cdebug { // if (!new File(Main.getPath(), "config.yml").exists()) return; if (stage == null) { if (plugin.getConfig().getBoolean("Plugin.Debug") || plugin.getConfig().getBoolean("plugin.debug") || plugin.getConfig().getBoolean("Debug") || plugin.getConfig().getBoolean("debug")){ - T2Csend.info(plugin, ""); + T2C_Send.info(plugin, ""); Bukkit.getConsoleSender().sendMessage(plugin.getDescription().getPrefix() + " §5DEBUG: §6" + msg); } return; } if (plugin.getConfig().getInt("Plugin.Debug") >= stage || plugin.getConfig().getInt("plugin.debug") >= stage || plugin.getConfig().getInt("Debug") >= stage || plugin.getConfig().getInt("debug") >= stage) { - T2Csend.info(plugin, ""); + T2C_Send.info(plugin, ""); Bukkit.getConsoleSender().sendMessage(plugin.getDescription().getPrefix() + " §5DEBUG: §6" + msg); } } public static void debugmsg(Plugin plugin, String msg) { - T2Csend.warning(plugin, ""); + T2C_Send.warning(plugin, ""); Bukkit.getConsoleSender().sendMessage("§e[" + plugin.getDescription().getPrefix() + "] §5DEBUG-MSG: §6" + msg); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/dev/T2CdevelopmentTool.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/dev/T2C_DevelopmentTool.java similarity index 87% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/dev/T2CdevelopmentTool.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/dev/T2C_DevelopmentTool.java index 3eb50bc..36eb8b6 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/dev/T2CdevelopmentTool.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/dev/T2C_DevelopmentTool.java @@ -1,6 +1,6 @@ package net.t2code.t2codelib.SPIGOT.api.dev; -public class T2CdevelopmentTool { +public class T2C_DevelopmentTool { public static String removeLastChar(String s, int amount) { return (s == null || s.length() == 0) ? null diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/eco/T2Ceco.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/eco/T2C_Eco.java similarity index 87% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/eco/T2Ceco.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/eco/T2C_Eco.java index 03d2261..c261c14 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/eco/T2Ceco.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/eco/T2C_Eco.java @@ -1,8 +1,8 @@ package net.t2code.t2codelib.SPIGOT.api.eco; import com.bencodez.votingplugin.VotingPluginMain; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.plugins.T2C_PluginCheck; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import net.t2code.t2codelib.SPIGOT.system.config.languages.T2CLibLanguages; @@ -11,7 +11,7 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -public class T2Ceco { +public class T2C_Eco { public static boolean moneyRemove(String prefix, Player player, Double price) { if (vault(prefix, player)) { return T2CodeLibMain.getEco().withdrawPlayer(player, price).transactionSuccess(); @@ -29,7 +29,7 @@ public class T2Ceco { private static boolean vault(String prefix, Player player) { if (T2CodeLibMain.getEco() == null) { if (Bukkit.getPluginManager().getPlugin("Vault") == null) { - T2Csend.console(prefix + " §e║ "+ "§4\n" + prefix + " §e║ " + "§4Vault could not be found! §9Please download it here: " + + T2C_Send.console(prefix + " §e║ "+ "§4\n" + prefix + " §e║ " + "§4Vault could not be found! §9Please download it here: " + "§6https://www.spigotmc.org/resources/vault.34315/§4\n" + prefix + " §e║ "); } player.sendMessage(prefix + "\n" + T2CLibLanguages.VALUES.vaultNotSetUp.getValue().toString() + "\n" + prefix); @@ -85,8 +85,8 @@ public class T2Ceco { } private static boolean votePlugin(String prefix, Player player) { - if (T2CpluginCheck.votingPlugin()) return true; - T2Csend.console(prefix + " §e║ " + "§4\n" + prefix + " §e║ " + "§4VotingPlugin could not be found! §9Please download it here: " + + if (T2C_PluginCheck.votingPlugin()) return true; + T2C_Send.console(prefix + " §e║ " + "§4\n" + prefix + " §e║ " + "§4VotingPlugin could not be found! §9Please download it here: " + "§6https://www.spigotmc.org/resources/votingplugin.15358/§4\n" + prefix + " §e║ "); player.sendMessage(prefix + "\n" + T2CLibLanguages.VALUES.votingPluginNotSetUp.getValue().toString() + "\n" + prefix); return false; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2C_ItemBuilder.java similarity index 84% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2C_ItemBuilder.java index d073d15..9170ffe 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2C_ItemBuilder.java @@ -2,7 +2,9 @@ package net.t2code.t2codelib.SPIGOT.api.items; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_McVersion; +import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.inventory.Inventory; @@ -22,8 +24,8 @@ import org.json.JSONObject; import java.util.List; import java.util.UUID; -public class T2CitemBuilder { - public static final boolean getLegacy = T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12(); +public class T2C_ItemBuilder { + public static final boolean getLegacy = T2C_McVersion.isMc1_8() || T2C_McVersion.isMc1_9() || T2C_McVersion.isMc1_10() || T2C_McVersion.isMc1_11() || T2C_McVersion.isMc1_12(); public static void fillItem(boolean enable, String item, Integer lines, Inventory inventory) { if (!enable) return; @@ -45,7 +47,7 @@ public class T2CitemBuilder { inventory.setItem(i, glass); } } catch (Exception e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); } } @@ -76,13 +78,13 @@ public class T2CitemBuilder { } public static ItemStack base64(String base64Value) { - if (!T2CmcVersion.minMc1_20() || T2CmcVersion.isNms1_20_R1()|| T2CmcVersion.isNms1_20_R2()|| T2CmcVersion.isNms1_20_R3()) { + if (!T2C_McVersion.minMc1_20() || T2C_McVersion.isNms1_20_R1()|| T2C_McVersion.isNms1_20_R2()|| T2C_McVersion.isNms1_20_R3()) { return base64Old(base64Value); } else return base64New(base64Value); } private static ItemStack base64Old(String base64Value) { - ItemStack itemStack = new ItemStack(T2CitemVersion.getHead()); + ItemStack itemStack = new ItemStack(T2C_ItemVersion.getHead()); SkullMeta itemMeta = (SkullMeta) itemStack.getItemMeta(); GameProfile profile = new GameProfile(UUID.randomUUID(), ""); @@ -93,7 +95,7 @@ public class T2CitemBuilder { profileField.setAccessible(true); profileField.set(itemMeta, profile); } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); } itemStack.setItemMeta(itemMeta); @@ -101,7 +103,7 @@ public class T2CitemBuilder { } private static ItemStack base64New(String base64Value) { - ItemStack itemStack = new ItemStack(T2CitemVersion.getHead()); + ItemStack itemStack = new ItemStack(T2C_ItemVersion.getHead()); SkullMeta itemMeta = (SkullMeta) itemStack.getItemMeta(); PlayerProfile profile = Bukkit.createPlayerProfile(UUID.randomUUID()); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemVersion.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2C_ItemVersion.java similarity index 89% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemVersion.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2C_ItemVersion.java index 0fa2c62..b0ebb10 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemVersion.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2C_ItemVersion.java @@ -1,11 +1,11 @@ package net.t2code.t2codelib.SPIGOT.api.items; import lombok.Getter; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_McVersion; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -public class T2CitemVersion { +public class T2C_ItemVersion { @Getter private static Material Head; @Getter @@ -28,7 +28,7 @@ public class T2CitemVersion { private static ItemStack BlackStainedGlassPane; public static void scan() { - if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) { + if (T2C_McVersion.isMc1_8() || T2C_McVersion.isMc1_9() || T2C_McVersion.isMc1_10() || T2C_McVersion.isMc1_11() || T2C_McVersion.isMc1_12()) { Head = Material.valueOf("SKULL_ITEM"); YellowWool = new ItemStack(Material.valueOf("WOOL"), 1, (short) 4); OrangeWool = new ItemStack(Material.valueOf("WOOL"), 1, (short) 1); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_GernerateFrame.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_GernerateFrame.java new file mode 100644 index 0000000..0456aab --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_GernerateFrame.java @@ -0,0 +1,145 @@ +// This class was created by JaTiTV. + +package net.t2code.t2codelib.SPIGOT.api.messages; + +public class T2C_GernerateFrame { + + protected static final String BOTTOM_BORDER = "╚═══════════════════════════════════════════════════════════════════════════╝"; + private static final int FIXED_WIDTH = BOTTOM_BORDER.length() - 2; // Länge ohne die Randzeichen + + private static final String COLOR_CODE = "§e"; + private static final String BORDER_CHAR = "═"; + private static final String TOP_LEFT = "╔"; + private static final String TOP_RIGHT = "╗"; + private static final String BOTTOM_LEFT = "╚"; + private static final String BOTTOM_RIGHT = "╝"; + private static final String SIDE_BORDER = "║"; + + public static String setCenterAligned(String prefix, String text) { + // Entfernen von Farbcodes aus der Berechnungslänge + String textWithoutColor = removeColorCodes(text); + int textLengthWithoutColor = textWithoutColor.length(); + int totalPaddingSize = FIXED_WIDTH - textLengthWithoutColor; + + // Sicherstellen, dass das Padding nicht negativ wird + if (totalPaddingSize < 0) totalPaddingSize = 0; + + // Berechnung des Abstands vor und nach dem Text + int paddingLeft = totalPaddingSize / 2; + int paddingRight = totalPaddingSize - paddingLeft; + // Formatierung der Zeile: Text zentrieren + String formattedValue = "§e║" + " ".repeat(paddingLeft) + text + " ".repeat(paddingRight) + "§e║"; + //T2Csend.console(prefix + " " + formattedValue); + return prefix + " " + formattedValue; + } + + + public static String setLeftAligned(String prefix, String text) { + // Entfernen von Farbcodes aus der Berechnungslänge + String textWithoutColor = removeColorCodes(text); + int textLengthWithoutColor = textWithoutColor.length(); + int totalPaddingSize = FIXED_WIDTH - textLengthWithoutColor; + + // Sicherstellen, dass das Padding nicht negativ wird + if (totalPaddingSize < 0) totalPaddingSize = 0; + + // Berechnung des Abstands nach dem Text und vor dem Rand + int paddingRight = totalPaddingSize; // Alles Padding geht nach rechts + + // Formatierung der Zeile: Text am Anfang und dynamischer Abstand zum Ende + String formattedValue = "§e║ " + text + " ".repeat((paddingRight - 1)) + "║"; + System.out.println(formattedValue); + T2C_Send.console(prefix + " " + formattedValue); + return prefix + " " + formattedValue; + } + + + // Methode für mehrere Zeilen Text mit dynamischem Rahmen + public static String sendFrameLeft(String prefix, String... lines) { + // Entfernen von Farbcodes und Berechnung der maximalen Länge + int maxLength = 0; + for (String line : lines) { + String lineWithoutColor = removeColorCodes(line); + maxLength = Math.max(maxLength, lineWithoutColor.length()); + } + + // Berechnung der Rahmenbreite + int frameWidth = maxLength + 2; // +2 für die Ränder '║' + String topBorder = COLOR_CODE + TOP_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + TOP_RIGHT; + String bottomBorder = COLOR_CODE + BOTTOM_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + BOTTOM_RIGHT; + + // Gehe durch jede Zeile und formatiere sie + StringBuilder builder = new StringBuilder(); + // Ausgabe der oberen Linie + builder.append("
").append(prefix).append(" ").append(topBorder).append("
"); + for (String line : lines) { + // Entfernen von Farbcodes aus der Berechnungslänge + String lineWithoutColor = removeColorCodes(line); + int lineLengthWithoutColor = lineWithoutColor.length(); + int totalPaddingSize = frameWidth - lineLengthWithoutColor; // -2 für die Ränder '║' + + // Sicherstellen, dass das Padding nicht negativ wird + if (totalPaddingSize < 0) totalPaddingSize = 0; + + // Berechnung des Abstands nach dem Text und vor dem Rand + int paddingLeft = 0; // Kein zusätzlicher Abstand vor dem Text + int paddingRight = totalPaddingSize; // Alles Padding geht nach rechts + + // Formatierung der Zeile: Text am Anfang und dynamischer Abstand zum Ende + String formattedValue = COLOR_CODE + SIDE_BORDER + line + " ".repeat(paddingRight) + COLOR_CODE + SIDE_BORDER; + builder.append(prefix).append(" ").append(formattedValue).append("
"); + } + // Ausgabe der unteren Linie + builder.append(prefix).append(" ").append(bottomBorder); + // T2Csend.console(builder.toString()); + return builder.toString(); + } + + public static String sendFrameCenter(String prefix, String... lines) { + // Entfernen von Farbcodes und Berechnung der maximalen Länge + int maxLength = 0; + for (String line : lines) { + String lineWithoutColor = removeColorCodes(line); + maxLength = Math.max(maxLength, lineWithoutColor.length()); + } + + // Berechnung der Rahmenbreite + int frameWidth = maxLength + 2; // +2 für die Ränder '║' + String topBorder = COLOR_CODE + TOP_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + TOP_RIGHT; + String bottomBorder = COLOR_CODE + BOTTOM_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + BOTTOM_RIGHT; + + // Gehe durch jede Zeile und formatiere sie + StringBuilder builder = new StringBuilder(); + + // Ausgabe der oberen Linie + builder.append("
").append(prefix).append(" ").append(topBorder).append("
"); + for (String line : lines) { + // Entfernen von Farbcodes aus der Berechnungslänge + String lineWithoutColor = removeColorCodes(line); + int lineLengthWithoutColor = lineWithoutColor.length(); + int totalPaddingSize = frameWidth - lineLengthWithoutColor; // -2 für die Ränder '║' + + // Sicherstellen, dass das Padding nicht negativ wird + if (totalPaddingSize < 0) totalPaddingSize = 0; + + // Berechnung des Abstands vor und nach dem Text + int paddingLeft = totalPaddingSize / 2; + int paddingRight = totalPaddingSize - paddingLeft; + + // Formatierung der Zeile: Text zentrieren + String formattedValue = COLOR_CODE + SIDE_BORDER + " ".repeat(paddingLeft) + line + " ".repeat(paddingRight) + COLOR_CODE + SIDE_BORDER; + builder.append(prefix).append(" ").append(formattedValue).append("
"); + } + // Ausgabe der unteren Linie + builder.append(prefix).append(" ").append(bottomBorder); + // T2Csend.console(builder.toString()); + return builder.toString(); + } + + // Methode zum Entfernen von Farbcodes und MiniMessage-Farbcodes aus dem Text, außer
+ private static String removeColorCodes(String text) { + // Regex für alle Farbcodes und MiniMessage-Codes außer
+ String miniMessageRegex = "<(?!br)(color:#([A-Fa-f0-9]{6})|[a-zA-Z_]+)(:[a-zA-Z0-9_]+)?>|"; + return text.replaceAll("§[a-f0-9k-oK-O]", "").replaceAll(miniMessageRegex, ""); + } +} diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_HoverModule.java similarity index 87% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_HoverModule.java index 7dbbd17..0b85ba8 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_HoverModule.java @@ -6,7 +6,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class T2ChoverModule { +public class T2C_HoverModule { public static void modulePlayer(String text, String hover, String action, String actionValue, Player player) { modulePlayer((text != null ? text : "null") + "/*/" + (hover != null ? hover : "null") + "/*/" + (action != null ? action : "null") @@ -18,16 +18,16 @@ public class T2ChoverModule { t2cmodule(msg, player); return; } - T2CminiMessage.sendPlayerMiniMessage(msg, player); + T2C_MiniMessage.sendPlayerMiniMessage(msg, player); } public static void moduleSender(String msg, CommandSender sender) { - T2CminiMessage.sendSenderMiniMessage(msg, sender); + T2C_MiniMessage.sendSenderMiniMessage(msg, sender); } public static void moduleConsole(String msg) { if (T2CodeLibMain.getMmIsLoad()) { - T2CminiMessage.sendConsoleMiniMessage(msg); + T2C_MiniMessage.sendConsoleMiniMessage(msg); return; } Bukkit.getConsoleSender().sendMessage(msg); @@ -45,7 +45,7 @@ public class T2ChoverModule { if (i > 2) action = split[2]; if (i > 3) actionValue = split[3]; - T2CtextBuilder textBuilder = new T2CtextBuilder(text); + T2C_TextBuilder textBuilder = new T2C_TextBuilder(text); if (hover != null && !hover.equals("null")) { textBuilder.addHover(hover); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_MiniMessage.java similarity index 78% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_MiniMessage.java index a6b5166..c74c44b 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_MiniMessage.java @@ -7,14 +7,14 @@ import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class T2CminiMessage { +public class T2C_MiniMessage { private static final BukkitAudiences bukkitAudiences = T2CodeLibMain.getPlugin().getAdventure(); public static void sendSenderMiniMessage(String msg, CommandSender sender) { String string = ""; if (sender instanceof Player) { Player player = (Player) sender; - string =T2Creplace.replace("",player,msg); + string = T2C_Replace.replace("",player,msg); } else string = msg; bukkitAudiences.sender(sender).sendMessage(replace(string)); } @@ -24,10 +24,10 @@ public class T2CminiMessage { } public static void sendPlayerMiniMessage(String msg, Player player) { - bukkitAudiences.player(player).sendMessage(replace(T2Creplace.replace("", player, msg))); + bukkitAudiences.player(player).sendMessage(replace(T2C_Replace.replace("", player, msg))); } protected static Component replace(String text) { - return MiniMessage.miniMessage().deserialize(T2Creplace.convertColorCode(text)); + return MiniMessage.miniMessage().deserialize(T2C_Replace.convertColorCode(text)); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Replace.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Replace.java new file mode 100644 index 0000000..1f40863 --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Replace.java @@ -0,0 +1,117 @@ +package net.t2code.t2codelib.SPIGOT.api.messages; + +import me.clip.placeholderapi.PlaceholderAPI; +import net.t2code.t2codelib.SPIGOT.api.plugins.T2C_PluginCheck; +import org.bukkit.entity.Player; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class T2C_Replace { + + + private static final Map REPLACEMENTS = Map.of( + "[ue]", "ü", "[UE]", "Ü", + "[oe]", "ö", "[OE]", "Ö", + "[ae]", "ä", "[AE]", "Ä", + "[nl]", "\n" + ); + + public static String replace(String prefix, String text) { + return replacePlaceholders(replaceLegacyColor(text), prefix, null, null); + } + + public static String replace(String prefix, Player player, String text) { + return replacePlaceholders(replaceLegacyColor(text), prefix, player, null); + } + + public static Object replaceObject(String prefix, Object object) { + return replaceObjectPlaceholders(object, prefix, null, null); + } + + public static Object replaceObject(String prefix, Player player, Object object) { + return replaceObjectPlaceholders(object, prefix, player, null); + } + + public static List replace(String prefix, List texts) { + return replacePlaceholdersInList(texts, prefix, null, null); + } + + public static List replace(String prefix, Player player, List texts) { + return replacePlaceholdersInList(texts, prefix, player, null); + } + + public static List replacePrice(String prefix, List texts, String price) { + return replacePlaceholdersInList(texts, prefix, null, price); + } + + public static List replacePrice(String prefix, Player player, List texts, String price) { + return replacePlaceholdersInList(texts, prefix, player, price); + } + + public static String replacePrice(String prefix, String text, String price) { + return replacePlaceholders(replaceLegacyColor(text), prefix, null, price); + } + + public static String replacePrice(String prefix, Player player, String text, String price) { + return replacePlaceholders(replaceLegacyColor(text), prefix, player, price); + } + + public static String removeColorCode(String value) { + return value.replaceAll("&[0-9a-fk-or]", ""); + } + + public static String replaceLegacyColor(String text) { + return text.replaceAll("&([0-9a-fk-or])", "§$1"); + } + + public static String convertColorCode(String text) { + return text.replaceAll("&([0-9a-fk-or])", "<$1>").replaceAll("§([0-9a-fk-or])", "<$1>"); + } + + public static Object replace(Object object, String placeholder, String replacement) { + if (object instanceof String) { + return ((String) object).replace(placeholder, replacement); + } else if (object instanceof List) { + List list = (List) object; + List output = new ArrayList<>(); + for (String item : list) { + output.add(item.replace(placeholder, replacement)); + } + return output; + } + return object; + } + + private static String replacePlaceholders(String text, String prefix, Player player, String price) { + text = text.replace("[prefix]", prefix); + for (Map.Entry entry : REPLACEMENTS.entrySet()) { + text = text.replace(entry.getKey(), entry.getValue()); + } + if (price != null) { + text = text.replace("[price]", price); + } + if (player != null && T2C_PluginCheck.papi()) { + text = PlaceholderAPI.setPlaceholders(player, text); + } + return text; + } + + private static List replacePlaceholdersInList(List texts, String prefix, Player player, String price) { + List output = new ArrayList<>(); + for (String text : texts) { + output.add(replacePlaceholders(replaceLegacyColor(text), prefix, player, price)); + } + return output; + } + + private static Object replaceObjectPlaceholders(Object object, String prefix, Player player, String price) { + if (object instanceof String) { + return replacePlaceholders(replaceLegacyColor((String) object), prefix, player, price); + } else if (object instanceof List) { + return replacePlaceholdersInList((List) object, prefix, player, price); + } + return object; + } +} diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Send.java similarity index 53% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Send.java index ceda1a1..82371b7 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Send.java @@ -1,7 +1,6 @@ package net.t2code.t2codelib.SPIGOT.api.messages; -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import org.bukkit.Bukkit; +import net.t2code.t2codelib.SPIGOT.api.debug.T2C_Debug; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -10,35 +9,63 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; -public class T2Csend { +public class T2C_Send { + + public static String sendStartTextCenter(String prefix, String text, boolean isReload) { + if (isReload) { + return prefix + " " + text; + } + return T2C_GernerateFrame.setCenterAligned(prefix,text); + } + + public static String sendStartTextLeft(String prefix, String text, boolean isReload) { + if (isReload) { + return prefix + " " + text; + + } + return T2C_GernerateFrame.setLeftAligned(prefix, text); + } + + public static String sendFrameCenter(String prefix, String... lines){ + return T2C_GernerateFrame.sendFrameCenter(prefix, lines); + } + + public static String sendFrameLeft(String prefix, String... lines){ + return T2C_GernerateFrame.sendFrameLeft(prefix, lines); + } + + public static void sendException(Exception e, Logger logger){ + logger.log(Level.SEVERE,"Interrupted exception occurred", e); + } public static void console(String msg) { if (msg == null || msg.contains("[empty]")) return; - T2ChoverModule.moduleConsole(msg); + T2C_HoverModule.moduleConsole(msg); } public static void player(Player player, String msg) { if (msg == null || msg.contains("[empty]")) return; - T2ChoverModule.modulePlayer(msg, player); + T2C_HoverModule.modulePlayer(msg, player); } public static void sender(CommandSender sender, String msg) { if (msg == null || msg.contains("[empty]")) return; - T2ChoverModule.moduleSender(msg, sender); + T2C_HoverModule.moduleSender(msg, sender); } public static void console(Object object) { for (String msg : list(object)){ if (msg == null || msg.contains("[empty]")) continue; - T2ChoverModule.moduleConsole(msg); + T2C_HoverModule.moduleConsole(msg); } } public static void player(Player player, Object object) { for (String msg : list(object)){ if (msg == null || msg.contains("[empty]")) continue; - T2ChoverModule.modulePlayer(msg, player); + T2C_HoverModule.modulePlayer(msg, player); } } @@ -46,7 +73,7 @@ public class T2Csend { public static void sender(CommandSender sender, Object object) { for (String msg : list(object)){ if (msg == null || msg.contains("[empty]")) return; - T2ChoverModule.moduleSender(msg, sender); + T2C_HoverModule.moduleSender(msg, sender); } } @@ -59,29 +86,31 @@ public class T2Csend { } /** - * @Deprecated Use: T2Cdebug.debug(Plugin plugin, String msg) or T2Cdebug.debug(Plugin plugin, String msg, Integer stage) + * @deprecated This method will be removed soon, as the debug messages have been moved to a separate class. + * Please use the new method {@link T2C_Debug#debug(Plugin, String)} or {@link T2C_Debug#debug(Plugin, String, Integer)} */ - @Deprecated + @Deprecated(since = "16.7", forRemoval = true) public static void debug(Plugin plugin, String msg) { debug(plugin, msg, null); } /** - * @Deprecated Use: T2Cdebug.debug(Plugin plugin, String msg) or T2Cdebug.debug(Plugin plugin, String msg, Integer stage) + * @deprecated This method will be removed soon, as the debug messages have been moved to a separate class. + * Please use the new method {@link T2C_Debug#debug(Plugin, String)} or {@link T2C_Debug#debug(Plugin, String, Integer)} */ - @Deprecated + @Deprecated(since = "16.7", forRemoval = true) public static void debug(Plugin plugin, String msg, Integer stage) { // if (!new File(Main.getPath(), "config.yml").exists()) return; - T2Cdebug.debug(plugin, msg, stage); + T2C_Debug.debug(plugin, msg, stage); } /** - * - * Use: T2Cdebug.debugmsg(plugin, msg) + * @deprecated This method will be removed soon, as the debug messages have been moved to a separate class. + * Please use the new method {@link T2C_Debug#debugmsg(Plugin, String)} */ - @Deprecated + @Deprecated(since = "16.7", forRemoval = true) public static void debugmsg(Plugin plugin, String msg) { - T2Cdebug.debugmsg(plugin, msg); + T2C_Debug.debugmsg(plugin, msg); } public static void info(Plugin plugin, String msg) { diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Template.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Template.java new file mode 100644 index 0000000..6309320 --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_Template.java @@ -0,0 +1,135 @@ +package net.t2code.t2codelib.SPIGOT.api.messages; + +import net.t2code.t2codelib.SPIGOT.api.update.T2C_UpdateAPI; +import net.t2code.t2codelib.T2CupdateWebData; +import net.t2code.t2codelib.Util; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public class T2C_Template { + + + public static Long onLoadHeader(String prefix, List autor, String version, String spigot, String discord) { + return onLoadHeader(prefix, autor, version, spigot, discord, null, null); + } + + public static Long onLoadHeader(String prefix, List autor, String version, String spigot, String discord, Boolean isPremium, Boolean isVerify) { + Long long_ = System.currentTimeMillis(); + + for (String s : Util.getLoadLogo()) { + T2C_Send.console(prefix + " §e" + s); + } + T2C_Send.sendStartTextCenter(prefix, "§2Author §6" + String.valueOf(autor).replace("[", "").replace("]", ""), false); + T2C_Send.sendStartTextCenter(prefix, "§2Version: §6" + version, false); + T2C_Send.sendStartTextCenter(prefix, "§2Spigot: §6" + spigot, false); + T2C_Send.sendStartTextCenter(prefix, "§2Discord: §6" + discord, false); + if (isPremium != null) { + if (isPremium) { + T2C_Send.sendStartTextCenter(prefix, "§6Premium: §2true", false); + } else T2C_Send.sendStartTextCenter(prefix, "§6Premium: §4false", false); + if (isVerify != null) { + if (isVerify) { + T2C_Send.sendStartTextCenter(prefix, "§6Verify: §2true", false); + } else T2C_Send.sendStartTextCenter(prefix, "§6Verify: §4false", false); + } else T2C_Send.sendStartTextCenter(prefix, "§6Verify: §4false", false); + } + + onLoadSeparateStroke(prefix); + if (version.toLowerCase().contains("dev") || version.toLowerCase().contains("snapshot") || version.toLowerCase().contains("beta")) { + T2C_Send.sendStartTextCenter(prefix, "", false); + T2C_Send.sendStartTextCenter(prefix, "", false); + T2C_Send.sendStartTextCenter(prefix, "§eYou are running §4" + version + " §eof §4" + prefix + "§e!", false); + T2C_Send.sendStartTextCenter(prefix, "§eSome features may not be working as expected.", false); + T2C_Send.sendStartTextCenter(prefix, "§ePlease report all bugs here: http://dc.t2code.net", false); + T2C_Send.sendStartTextCenter(prefix, "§4UpdateChecker & bStats may be disabled!", false); + T2C_Send.sendStartTextCenter(prefix, "", false); + T2C_Send.sendStartTextCenter(prefix, "", false); + onLoadSeparateStroke(prefix); + + try { + Thread.sleep(2000); + } catch (Exception ignored) { + } + + } + + return long_; + } + + public static void onLoadSeparateStroke(String prefix) { + T2C_Send.console(prefix + " §e╠═══════════════════════════════════════════════════════════════════════════╣"); + } + + public static void onLoadFooter(String prefix, Long long_) { + onLoadSeparateStroke(prefix); + T2C_Send.sendStartTextCenter(prefix, "§2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", false); + T2C_Send.console(prefix + " §e" + T2C_GernerateFrame.BOTTOM_BORDER); + } + + public static void onDisable(String prefix, Plugin plugin) { + T2C_Send.sendFrameCenter(prefix, " §2Version: §6" + plugin.getDescription().getVersion(), "§2Autors: §6" + String.valueOf(plugin.getDescription().getAuthors()).replace("[", "").replace("]", ""), " §4Plugin successfully disabled. "); + } + + public static void sendInfo(CommandSender sender, Plugin plugin, int spigotID, String discord, Boolean premiumVerified, String text) { + String pluginVersion = plugin.getDescription().getVersion(); + String publicVersion = ""; + boolean update; + String stNVersion; + T2CupdateWebData webData; + try { + webData = T2C_UpdateAPI.pluginVersions.get(plugin.getName()).webData; + } catch (Exception ex) { + webData = null; + } + + if (webData != null) { + publicVersion = T2C_UpdateAPI.pluginVersions.get(plugin.getName()).webData.getVersion(); + update = !publicVersion.equalsIgnoreCase(pluginVersion); + + } else { + update = false; + } + + boolean player = sender instanceof Player; + String stPlugin = "║ Plugin: [pl]".replace("[pl]", plugin.getName()); + String stVersion = "║ Version: [ver]".replace("[ver]", pluginVersion); + String stAutor = "║ Autor(s): [autor]".replace("[autor]", plugin.getDescription().getAuthors().toString()); + + String stUpdate = "║ New version available: [up]".replace("[up]", webData != null ? update ? + "YES" : "no" : "It could not be checked for updates!"); + stNVersion = update ? "
║ Newest Version: [newVersion]".replace("[newVersion]", player ? "Click for the update information'>" + publicVersion + "" : publicVersion) : ""; + String stLink = getString(spigotID, discord, player); + String pr = premiumVerified != null ? "
║ Premium verified: [pr]".replace("[pr]", + premiumVerified ? "YES" : "NO") : ""; + + String stMSG = text == null || text.isEmpty() ? "" : "
║ " + text; + T2C_Send.sender(sender, "
╔════════════════════════════════" + + "
" + stPlugin + + "
" + stVersion + + stMSG + + "
" + stAutor + + "
" + stUpdate + + stNVersion + + "
" + stLink + + pr + + "
╚════════════════════════════════"); + } + + private static @NotNull String getString(int spigotID, String discord, boolean player) { + String stLinkPlayer = "║ Go to the Spigot page'>Spigot " + .replace("[slink]", "https://www.spigotmc.org/resources/" + spigotID) + + "- Go to the T2Code Support Discord'>Discord" + .replace("[dlink]", discord); + String stLinkConsole = "║ Spigot: https://www.spigotmc.org/resources/" + spigotID + "" + + "
║ Discord: " + discord + ""; + return player ? stLinkPlayer : stLinkConsole; + } + + public static void sendInfo(CommandSender sender, Plugin plugin, int spigotID, String discord, String text) { + sendInfo(sender, plugin, spigotID, discord, null, text); + } +} \ No newline at end of file diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CtextBuilder.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_TextBuilder.java similarity index 84% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CtextBuilder.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_TextBuilder.java index 7bf1457..a6f00b6 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CtextBuilder.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2C_TextBuilder.java @@ -5,23 +5,23 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -public class T2CtextBuilder { +public class T2C_TextBuilder { private final String text; private String hover; private String click; private ClickEvent.Action action; - public T2CtextBuilder(String text) { + public T2C_TextBuilder(String text) { this.text = text; } - public T2CtextBuilder addHover(String hover) { + public T2C_TextBuilder addHover(String hover) { this.hover = hover; return this; } - public T2CtextBuilder addClickEvent(ClickEvent.Action clickEventAction, String value) { + public T2C_TextBuilder addClickEvent(ClickEvent.Action clickEventAction, String value) { this.action = clickEventAction; this.click = value; return this; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Creplace.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Creplace.java deleted file mode 100644 index c41935c..0000000 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Creplace.java +++ /dev/null @@ -1,230 +0,0 @@ -package net.t2code.t2codelib.SPIGOT.api.messages; - -import me.clip.placeholderapi.PlaceholderAPI; -import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck; -import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class T2Creplace { - - public static String replace(String prefix, String Text) { - - return replaceLegacyColor(Text).replace("[prefix]", prefix).replace("[ue]", "ü") - .replace("[UE]", "Ü").replace("[oe]", "ö").replace("[OE]", "Ö") - .replace("[ae]", "ä").replace("[AE]", "Ä").replace("[nl]", "\n"); - } - - public static String replace(String prefix, Player player, String Text) { - String input = Text.replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n"); - if (T2CpluginCheck.papi()) { - return replaceLegacyColor(PlaceholderAPI.setPlaceholders(player, input)); - } else { - return replaceLegacyColor(input); - } - - } - - public static Object replaceObject(String prefix, Object object) { - if (object instanceof String) { - object = replaceLegacyColor((String) object).replace("[prefix]", prefix).replace("[ue]", "ü") - .replace("[UE]", "Ü").replace("[oe]", "ö").replace("[OE]", "Ö") - .replace("[ae]", "ä").replace("[AE]", "Ä").replace("[nl]", "\n"); - } - - if ((object instanceof List) || (object instanceof ArrayList)) { - List in = (List) object; - List output = new ArrayList<>(); - for (String input : in) { - output.add(replaceLegacyColor(input).replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n")); - } - object = output; - } - return object; - } - - public static Object replaceObject(String prefix, Player player, Object object) { - if (object instanceof String) { - - if (T2CpluginCheck.papi()) { - object = PlaceholderAPI.setPlaceholders(player, replaceLegacyColor((String) object).replace("[prefix]", prefix).replace("[ue]", "ü") - .replace("[UE]", "Ü").replace("[oe]", "ö").replace("[OE]", "Ö") - .replace("[ae]", "ä").replace("[AE]", "Ä").replace("[nl]", "\n")); - } else { - object = replaceLegacyColor((String) object).replace("[prefix]", prefix).replace("[ue]", "ü") - .replace("[UE]", "Ü").replace("[oe]", "ö").replace("[OE]", "Ö") - .replace("[ae]", "ä").replace("[AE]", "Ä").replace("[nl]", "\n"); - } - - } - if (object instanceof List) { - List in = (List) object; - List output = new ArrayList<>(); - for (String input : in) { - if (T2CpluginCheck.papi()) { - output.add(PlaceholderAPI.setPlaceholders(player, replaceLegacyColor(input).replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n"))); - } else { - output.add(replaceLegacyColor(input).replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n")); - } - } - object = output; - } - return object; - } - - public static List replace(String prefix, List Text) { - List output = new ArrayList<>(); - for (String input : Text) { - output.add(replaceLegacyColor(input).replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n")); - } - return output; - } - - public static List replace(String prefix, Player player, List Text) { - List output = new ArrayList<>(); - if (player == null) { - return Collections.singletonList("player is null"); - } - if (Text == null) { - return Collections.singletonList("Text is null"); - } - for (String input : Text) { - if (T2CpluginCheck.papi()) { - output.add(PlaceholderAPI.setPlaceholders(player, replaceLegacyColor(input).replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n"))); - } else { - output.add(replaceLegacyColor(input).replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n")); - } - - } - return output; - } - - public static List replacePrice(String prefix, List Text, String price) { - List rp = new ArrayList<>(); - for (String s : Text) { - rp.add(replaceLegacyColor(s).replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[nl]", "\n").replace("[price]", String.valueOf(price))); - } - return rp; - } - - public static String removeColorCode(String value) { - return value.replace("&0", "").replace("&1", "").replace("&2", "").replace("&3", "") - .replace("&4", "").replace("&5", "").replace("&6", "").replace("&7", "") - .replace("&8", "").replace("&9", "").replace("&a", "").replace("&b", "") - .replace("&c", "").replace("&d", "").replace("&e", "").replace("&f", "") - .replace("&k", "").replace("&l", "").replace("&m", "").replace("&n", "") - .replace("&o", "").replace("&r", ""); - } - - public static List replacePrice(String prefix, Player player, List Text, String price) { - List rp = new ArrayList<>(); - for (String s : Text) { - String input = s.replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä").replace("[nl]", "\n") - .replace("[price]", String.valueOf(price)); - if (T2CpluginCheck.papi()) { - rp.add(replaceLegacyColor(PlaceholderAPI.setPlaceholders(player, input))); - } else { - rp.add(replaceLegacyColor(input)); - } - } - return rp; - } - - public static String replacePrice(String prefix, String Text, String price) { - return replaceLegacyColor(Text).replace("[prefix]", prefix) - .replace("&o", "§o").replace("&r", "§r").replace("[ue]", "ü") - .replace("[UE]", "Ü").replace("[oe]", "ö").replace("[OE]", "Ö") - .replace("[ae]", "ä").replace("[AE]", "Ä").replace("[price]", String.valueOf(price)) - .replace("[nl]", "\n"); - } - - public static String replacePrice(String prefix, Player player, String Text, String price) { - String input = Text.replace("[prefix]", prefix) - .replace("[ue]", "ü").replace("[UE]", "Ü").replace("[oe]", "ö") - .replace("[OE]", "Ö").replace("[ae]", "ä").replace("[AE]", "Ä") - .replace("[price]", String.valueOf(price)).replace("[nl]", "\n"); - if (T2CpluginCheck.papi()) { - return replaceLegacyColor(PlaceholderAPI.setPlaceholders(player, input)); - } else { - return replaceLegacyColor(input); - } - - } - - public static String replaceLegacyColor(String text) { - return text.replace("&0", "§0").replace("&1", "§1").replace("&2", "§2").replace("&3", "§3") - .replace("&4", "§4").replace("&5", "§5").replace("&6", "§6").replace("&7", "§7") - .replace("&8", "§8").replace("&9", "§9").replace("&a", "§a").replace("&b", "§b") - .replace("&c", "§c").replace("&d", "§d").replace("&e", "§e").replace("&f", "§f") - .replace("&k", "§k").replace("&l", "§l").replace("&m", "§m").replace("&n", "§n") - .replace("&o", "§o").replace("&r", "§r"); - } - - public static String convertColorCode(String text) { - return text.replace("&0", "").replace("§0", "") - .replace("&1", "").replace("§1", "") - .replace("&2", "").replace("§2", "") - .replace("&3", "").replace("§3", "") - .replace("&4", "").replace("§4", "") - .replace("&5", "").replace("§5", "") - .replace("&6", "").replace("§6", "") - .replace("&7", "").replace("§7", "") - .replace("&8", "").replace("§8", "") - .replace("&9", "").replace("§9", "") - .replace("&a", "").replace("§a", "") - .replace("&b", "").replace("§b", "") - .replace("&c", "").replace("§c", "") - .replace("&d", "").replace("§d", "") - .replace("&e", "").replace("§e", "") - .replace("&f", "").replace("§f", "") - .replace("&k", "").replace("§k", "") - .replace("&l", "").replace("§l", "") - .replace("&m", "").replace("§m", "") - .replace("&n", "").replace("§n", "") - .replace("&o", "").replace("§o", "") - .replace("&r", "").replace("§r", ""); - } - - public static Object replace(Object object, String placeholder, String replacement) { - if (object instanceof String) { - object = ((String) object).replace(placeholder, replacement); - } - if ((object instanceof List) || (object instanceof ArrayList)) { - List in = (List) object; - List output = new ArrayList<>(); - for (String input : in) { - output.add(input.replace(placeholder, replacement)); - } - object = output; - } - return object; - } -} 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 deleted file mode 100644 index 6933195..0000000 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java +++ /dev/null @@ -1,325 +0,0 @@ -package net.t2code.t2codelib.SPIGOT.api.messages; - -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; -import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.T2CupdateWebData; -import net.t2code.t2codelib.Util; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; - -import java.util.List; - -public class T2Ctemplate { - - - public static Long onLoadHeader( String prefix, List autor, String version, String spigot, String discord) { - return onLoadHeader( prefix, autor, version, spigot, discord, null, null); - } - - public static Long onLoadHeader(String prefix, List autor, String version, String spigot, String discord, Boolean isPremium, Boolean isVerify) { - Long long_ = System.currentTimeMillis(); - - /** - T2Csend.console(prefix + " _______ ___ _____ "); - T2Csend.console(prefix + " |__ __|__ \\ / ____|"); - T2Csend.console(prefix + " | | ) | | "); - T2Csend.console(prefix + " | | / /| | "); - T2Csend.console(prefix + " | | / /_| |____ "); - T2Csend.console(prefix + " |_| |____|\\_____|"); - */ - - - for (String s : Util.getLoadLogo()) { - T2Csend.console(prefix + " §e" + s); - } - setCenterAligned(prefix, "§2Author §6" + String.valueOf(autor).replace("[", "").replace("]", ""), true); - setCenterAligned(prefix, "§2Version: §6" + version, true); - setCenterAligned(prefix, "§2Spigot: §6" + spigot, true); - setCenterAligned(prefix, "§2Discord: §6" + discord, true); - if (isPremium != null) { - if (isPremium) { - setCenterAligned(prefix, "§6Premium: §2true", true); - } else setCenterAligned(prefix, "§6Premium: §4false", true); - if (isVerify != null) { - if (isVerify) { - setCenterAligned(prefix, "§6Verify: §2true", true); - } else setCenterAligned(prefix, "§6Verify: §4false", true); - } else setCenterAligned(prefix, "§6Verify: §4false", true); - } - - onLoadSeparateStroke(prefix); - if (version.toLowerCase().contains("dev") || version.toLowerCase().contains("snapshot") || version.toLowerCase().contains("beta")) { - setCenterAligned(prefix, "", true); - setCenterAligned(prefix, "", true); - setCenterAligned(prefix, "§eYou are running §4" + version + " §eof §4" + prefix + "§e!", true); - setCenterAligned(prefix, "§eSome features may not be working as expected.", true); - setCenterAligned(prefix, "§ePlease report all bugs here: http://dc.t2code.net", true); - setCenterAligned(prefix, "§4UpdateChecker & bStats may be disabled!", true); - setCenterAligned(prefix, "", true); - setCenterAligned(prefix, "", true); - onLoadSeparateStroke(prefix); - - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - } - - return long_; - } - - public static Long onLoadHeader(String prefix) { - Long long_ = System.currentTimeMillis(); - T2Csend.console(prefix + "§4===================== " + prefix + " §4====================="); - return long_; - } - - public static void onLoadSeparateStroke(String prefix) { - T2Csend.console(prefix + " §e╠═══════════════════════════════════════════════════════════════════════════╣"); - } - - - public static void onLoadFooter(String prefix, Long long_, String v) { - onLoadFooter(prefix, long_); - } - - - public static void onLoadFooter(String prefix, Long long_) { - onLoadSeparateStroke(prefix); - setCenterAligned(prefix, "§2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); - T2Csend.console(prefix + " §e" + BOTTOM_BORDER); - } - - public static void onDisable(String prefix, Plugin plugin) { - sendFrameCenter(prefix, " §2Version: §6" + plugin.getDescription().getVersion(), "§2Autors: §6" + String.valueOf(plugin.getDescription().getAuthors()).replace("[", "").replace("]", ""), " §4Plugin successfully disabled. "); - - } - - public static void sendInfo(CommandSender sender, Plugin plugin, int spigotID, String discord, Boolean premiumVerified, String text) { - String pluginVersion = plugin.getDescription().getVersion(); - String publicVersion = ""; - boolean update; - String stNVersion; - T2CupdateWebData webData; - try { - webData = T2CupdateAPI.pluginVersions.get(plugin.getName()).webData; - } catch (Exception ex) { - webData = null; - } - - if (webData != null) { - publicVersion = T2CupdateAPI.pluginVersions.get(plugin.getName()).webData.getVersion(); - update = !publicVersion.equalsIgnoreCase(pluginVersion); - - } else { - update = false; - } - - boolean player = sender instanceof Player; - String stPlugin = "║ Plugin: [pl]".replace("[pl]", plugin.getName()); - String stVersion = "║ Version: [ver]".replace("[ver]", pluginVersion); - String stAutor = "║ Autor(s): [autor]".replace("[autor]", plugin.getDescription().getAuthors().toString()); - - String stUpdate = "║ New version available: [up]".replace("[up]", webData != null ? update ? - "YES" : "no" : "It could not be checked for updates!"); - stNVersion = update ? "
║ Newest Version: [nver]".replace("[nver]", player ? "Click for the update information'>" + publicVersion + "" : publicVersion) : ""; - String stLinkPlayer = "║ Go to the Spigot page'>Spigot " - .replace("[slink]", "https://www.spigotmc.org/resources/" + spigotID) - + "- Go to the T2Code Support Discord'>Discord" - .replace("[dlink]", discord); - String stLinkConsole = "║ Spigot: https://www.spigotmc.org/resources/" + spigotID + "" - + "
║ Discord: " + discord + ""; - String stLink = player ? stLinkPlayer : stLinkConsole; - String pr = premiumVerified != null ? "
║ Premium verified: [pr]".replace("[pr]", - premiumVerified ? "YES" : "NO") : ""; - - String stMSG = text == null || text.equals("") ? "" : "
║ " + text; - T2Csend.sender(sender, "
╔════════════════════════════════" - + "
" + stPlugin - + "
" + stVersion - + stMSG - + "
" + stAutor - + "
" + stUpdate - + stNVersion - + "
" + stLink - + pr - + "
╚════════════════════════════════"); - } - - public static void sendInfo(CommandSender sender, Plugin plugin, int spigotID, String discord, String text) { - sendInfo(sender, plugin, spigotID, discord, null, text); - } - - - // Frame in Console - - - //todo Frame Builder als replace String Builder um es überall nutzen zu können - - protected static final String BOTTOM_BORDER = "╚═══════════════════════════════════════════════════════════════════════════╝"; - protected static final int FIXED_WIDTH = BOTTOM_BORDER.length() - 2; // Länge ohne die Randzeichen - - - public static void setCenterAligned(String prefix, String text, boolean setStartFrame) { - if (!setStartFrame) { - T2Csend.console(prefix + " " + text); - return; - } - // Entfernen von Farbcodes aus der Berechnungslänge - String textWithoutColor = removeColorCodes(text); - int textLengthWithoutColor = textWithoutColor.length(); - int totalPaddingSize = FIXED_WIDTH - textLengthWithoutColor; - - // Sicherstellen, dass das Padding nicht negativ wird - if (totalPaddingSize < 0) totalPaddingSize = 0; - - // Berechnung des Abstands vor und nach dem Text - int paddingLeft = totalPaddingSize / 2; - int paddingRight = totalPaddingSize - paddingLeft; - // Formatierung der Zeile: Text zentrieren - String formattedValue = "§e║" + " ".repeat(paddingLeft) + text + " ".repeat(paddingRight) + "§e║"; - T2Csend.console(prefix + " " + formattedValue); - } - - - public static void setLeftAligned(String prefix, String text, boolean setStartFrame) { - T2Csend.error(T2CodeLibMain.getPlugin(), text); - if (!setStartFrame) { - T2Csend.console(prefix + " " + text); - return; - } - // Entfernen von Farbcodes aus der Berechnungslänge - String textWithoutColor = removeColorCodes(text); - int textLengthWithoutColor = textWithoutColor.length(); - int totalPaddingSize = FIXED_WIDTH - textLengthWithoutColor; - - // Sicherstellen, dass das Padding nicht negativ wird - if (totalPaddingSize < 0) totalPaddingSize = 0; - - // Berechnung des Abstands nach dem Text und vor dem Rand - int paddingLeft = 0; // Kein zusätzlicher Abstand vor dem Text - int paddingRight = totalPaddingSize; // Alles Padding geht nach rechts - - // Formatierung der Zeile: Text am Anfang und dynamischer Abstand zum Ende - String formattedValue = "§e║" + text + " ".repeat(paddingRight) + "║"; - T2Csend.console(prefix + " " + formattedValue); - - } - - - // Methode für mehrere Zeilen Text mit dynamischem Rahmen - public static void sendFrameLeft(String prefix, String... lines) { - - String COLOR_CODE = "§e"; - String BORDER_CHAR = "═"; - String TOP_LEFT = "╔"; - String TOP_RIGHT = "╗"; - String BOTTOM_LEFT = "╚"; - String BOTTOM_RIGHT = "╝"; - String SIDE_BORDER = "║"; - - // Entfernen von Farbcodes und Berechnung der maximalen Länge - int maxLength = 0; - for (String line : lines) { - String lineWithoutColor = removeColorCodes(line); - maxLength = Math.max(maxLength, lineWithoutColor.length()); - } - - // Berechnung der Rahmenbreite - int frameWidth = maxLength + 2; // +2 für die Ränder '║' - String topBorder = COLOR_CODE + TOP_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + TOP_RIGHT; - String bottomBorder = COLOR_CODE + BOTTOM_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + BOTTOM_RIGHT; - - - - // Gehe durch jede Zeile und formatiere sie - StringBuilder builder = new StringBuilder(); - - // Ausgabe der oberen Linie - builder.append("
").append(prefix).append(" ").append(topBorder).append("
"); - for (String line : lines) { - // Entfernen von Farbcodes aus der Berechnungslänge - String lineWithoutColor = removeColorCodes(line); - int lineLengthWithoutColor = lineWithoutColor.length(); - int totalPaddingSize = frameWidth - lineLengthWithoutColor; // -2 für die Ränder '║' - - // Sicherstellen, dass das Padding nicht negativ wird - if (totalPaddingSize < 0) totalPaddingSize = 0; - - // Berechnung des Abstands nach dem Text und vor dem Rand - int paddingLeft = 0; // Kein zusätzlicher Abstand vor dem Text - int paddingRight = totalPaddingSize; // Alles Padding geht nach rechts - - // Formatierung der Zeile: Text am Anfang und dynamischer Abstand zum Ende - String formattedValue = COLOR_CODE + SIDE_BORDER + line + " ".repeat(paddingRight) + COLOR_CODE + SIDE_BORDER; - builder.append(prefix).append(" ").append(formattedValue).append("
"); - } - // Ausgabe der unteren Linie - builder.append(prefix).append(" ").append(bottomBorder); - T2Csend.console(builder.toString()); - } - - public static void sendFrameCenter(String prefix, String... lines) { - - String COLOR_CODE = "§e"; - String BORDER_CHAR = "═"; - String TOP_LEFT = "╔"; - String TOP_RIGHT = "╗"; - String BOTTOM_LEFT = "╚"; - String BOTTOM_RIGHT = "╝"; - String SIDE_BORDER = "║"; - // Entfernen von Farbcodes und Berechnung der maximalen Länge - int maxLength = 0; - for (String line : lines) { - String lineWithoutColor = removeColorCodes(line); - maxLength = Math.max(maxLength, lineWithoutColor.length()); - } - - // Berechnung der Rahmenbreite - int frameWidth = maxLength + 2; // +2 für die Ränder '║' - String topBorder = COLOR_CODE + TOP_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + TOP_RIGHT; - String bottomBorder = COLOR_CODE + BOTTOM_LEFT + BORDER_CHAR.repeat(frameWidth) + COLOR_CODE + BOTTOM_RIGHT; - - - // Gehe durch jede Zeile und formatiere sie - StringBuilder builder = new StringBuilder(); - - // Ausgabe der oberen Linie - - builder.append("
").append(prefix).append(" ").append(topBorder).append("
"); - for (String line : lines) { - // Entfernen von Farbcodes aus der Berechnungslänge - String lineWithoutColor = removeColorCodes(line); - int lineLengthWithoutColor = lineWithoutColor.length(); - int totalPaddingSize = frameWidth - lineLengthWithoutColor; // -2 für die Ränder '║' - - // Sicherstellen, dass das Padding nicht negativ wird - if (totalPaddingSize < 0) totalPaddingSize = 0; - - // Berechnung des Abstands vor und nach dem Text - int paddingLeft = totalPaddingSize / 2; - int paddingRight = totalPaddingSize - paddingLeft; - - // Formatierung der Zeile: Text zentrieren - String formattedValue = COLOR_CODE + SIDE_BORDER + " ".repeat(paddingLeft) + line + " ".repeat(paddingRight) + COLOR_CODE + SIDE_BORDER; - builder.append(prefix).append(" ").append(formattedValue).append("
"); - - } - // Ausgabe der unteren Linie - builder.append(prefix).append(" ").append(bottomBorder); - T2Csend.console(builder.toString()); - - } - - // Methode zum Entfernen von Farbcodes und MiniMessage-Farbcodes aus dem Text, außer
- private static String removeColorCodes(String text) { - // Regex für alle Farbcodes und MiniMessage-Codes außer
- String miniMessageRegex = "<(?!br)(color:#([A-Fa-f0-9]{6})|[a-zA-Z_]+)(:[a-zA-Z0-9_]+)?>|"; - return text.replaceAll("§[a-f0-9k-oK-O]", "").replaceAll(miniMessageRegex, ""); - } - -} \ No newline at end of file diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_McVersion.java similarity index 97% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_McVersion.java index 7abd124..66090ed 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_McVersion.java @@ -1,18 +1,16 @@ package net.t2code.t2codelib.SPIGOT.api.minecraftVersion; -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import org.bukkit.Bukkit; -public class T2CmcVersion { +public class T2C_McVersion { public static void onCheck() { mcVersion = Bukkit.getServer().getVersion(); bukkitVersion = Bukkit.getServer().getBukkitVersion(); - T2CnmsVersions.init(); - nms = String.valueOf(T2CnmsVersions.getT2CnmsEnum()); + T2C_NmsVersions.init(); + nms = String.valueOf(T2C_NmsVersions.getT2CnmsEnum()); // T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "mcVersion: " + mcVersion); // T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "bukkitVersion: " + bukkitVersion); // T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "nms: " + nms); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsEnum.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_NmsEnum.java similarity index 94% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsEnum.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_NmsEnum.java index fa97c67..366a842 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsEnum.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_NmsEnum.java @@ -1,6 +1,6 @@ package net.t2code.t2codelib.SPIGOT.api.minecraftVersion; -public enum T2CnmsEnum { +public enum T2C_NmsEnum { not_support, v1_8_R1, v1_8_R2, diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_NmsVersions.java similarity index 65% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_NmsVersions.java index 0bb0133..8a323b2 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CnmsVersions.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2C_NmsVersions.java @@ -1,73 +1,71 @@ package net.t2code.t2codelib.SPIGOT.api.minecraftVersion; import lombok.Getter; -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -public class T2CnmsVersions { +public class T2C_NmsVersions { public static Class minecraftServerClass; @Getter - private static T2CnmsEnum t2CnmsEnum; + private static T2C_NmsEnum t2CnmsEnum; public static void init() { - String mc = T2CmcVersion.getMcVersion(); + String mc = T2C_McVersion.getMcVersion(); if (mc.contains("(MC: 1.8)") || mc.contains("(MC: 1.8.1)")) { - t2CnmsEnum = T2CnmsEnum.v1_8_R1; + t2CnmsEnum = T2C_NmsEnum.v1_8_R1; } else if (mc.contains("(MC: 1.8.3)")) { - t2CnmsEnum = T2CnmsEnum.v1_8_R2; + t2CnmsEnum = T2C_NmsEnum.v1_8_R2; } else if (mc.contains("(MC: 1.8.4)") || mc.contains("(MC: 1.8.5)") || mc.contains("(MC: 1.8.6)") || mc.contains("(MC: 1.8.7)") || mc.contains("(MC: 1.8.8)")) { - t2CnmsEnum = T2CnmsEnum.v1_8_R3; + t2CnmsEnum = T2C_NmsEnum.v1_8_R3; } else if (mc.contains("(MC: 1.9)") || mc.contains("(MC: 1.9.2)")) { - t2CnmsEnum = T2CnmsEnum.v1_9_R1; + t2CnmsEnum = T2C_NmsEnum.v1_9_R1; } else if (mc.contains("(MC: 1.9.3)") || mc.contains("(MC: 1.9.4)")) { - t2CnmsEnum = T2CnmsEnum.v1_9_R2; + t2CnmsEnum = T2C_NmsEnum.v1_9_R2; } else if (mc.contains("(MC: 1.10")) { - t2CnmsEnum = T2CnmsEnum.v1_10_R1; + t2CnmsEnum = T2C_NmsEnum.v1_10_R1; } else if (mc.contains("(MC: 1.11")) { - t2CnmsEnum = T2CnmsEnum.v1_11_R1; + t2CnmsEnum = T2C_NmsEnum.v1_11_R1; } else if (mc.contains("(MC: 1.12")) { - t2CnmsEnum = T2CnmsEnum.v1_12_R1; + t2CnmsEnum = T2C_NmsEnum.v1_12_R1; } else if (mc.contains("(MC: 1.13)")) { - t2CnmsEnum = T2CnmsEnum.v1_13_R1; + t2CnmsEnum = T2C_NmsEnum.v1_13_R1; } else if (mc.contains("(MC: 1.13.1)") || mc.contains("(MC: 1.13.2)")) { - t2CnmsEnum = T2CnmsEnum.v1_13_R2; + t2CnmsEnum = T2C_NmsEnum.v1_13_R2; } else if (mc.contains("(MC: 1.14")) { - t2CnmsEnum = T2CnmsEnum.v1_14_R1; + t2CnmsEnum = T2C_NmsEnum.v1_14_R1; } else if (mc.contains("(MC: 1.15")) { - t2CnmsEnum = T2CnmsEnum.v1_15_R1; + t2CnmsEnum = T2C_NmsEnum.v1_15_R1; } else if (mc.contains("(MC: 1.16)") || mc.contains("(MC: 1.16.1)")) { - t2CnmsEnum = T2CnmsEnum.v1_16_R1; + t2CnmsEnum = T2C_NmsEnum.v1_16_R1; } else if (mc.contains("(MC: 1.16.2)") || mc.contains("(MC: 1.16.3)")) { - t2CnmsEnum = T2CnmsEnum.v1_16_R2; + t2CnmsEnum = T2C_NmsEnum.v1_16_R2; } else if (mc.contains("(MC: 1.16.4)") || mc.contains("(MC: 1.16.5)")) { - t2CnmsEnum = T2CnmsEnum.v1_16_R3; + t2CnmsEnum = T2C_NmsEnum.v1_16_R3; } else if (mc.contains("(MC: 1.17")) { - t2CnmsEnum = T2CnmsEnum.v1_17_R1; + t2CnmsEnum = T2C_NmsEnum.v1_17_R1; } else if (mc.contains("(MC: 1.18)") || mc.contains("(MC: 1.18.1)")) { - t2CnmsEnum = T2CnmsEnum.v1_18_R1; + t2CnmsEnum = T2C_NmsEnum.v1_18_R1; } else if (mc.contains("(MC: 1.18.2)")) { - t2CnmsEnum = T2CnmsEnum.v1_18_R2; + t2CnmsEnum = T2C_NmsEnum.v1_18_R2; } else if (mc.contains("(MC: 1.19)") || mc.contains("(MC: 1.19.1)") || mc.contains("(MC: 1.19.2)")) { - t2CnmsEnum = T2CnmsEnum.v1_19_R1; + t2CnmsEnum = T2C_NmsEnum.v1_19_R1; } else if (mc.contains("(MC: 1.19.3)")) { - t2CnmsEnum = T2CnmsEnum.v1_19_R2; + t2CnmsEnum = T2C_NmsEnum.v1_19_R2; } else if (mc.contains("(MC: 1.19.4)")) { - t2CnmsEnum = T2CnmsEnum.v1_19_R3; + t2CnmsEnum = T2C_NmsEnum.v1_19_R3; } else if (mc.contains("(MC: 1.20)") || mc.contains("(MC: 1.20.1)")) { - t2CnmsEnum = T2CnmsEnum.v1_20_R1; + t2CnmsEnum = T2C_NmsEnum.v1_20_R1; } else if (mc.contains("(MC: 1.20.2)")) { - t2CnmsEnum = T2CnmsEnum.v1_20_R2; + t2CnmsEnum = T2C_NmsEnum.v1_20_R2; } else if (mc.contains("(MC: 1.20.3)") || mc.contains("(MC: 1.20.4)")) { - t2CnmsEnum = T2CnmsEnum.v1_20_R3; + t2CnmsEnum = T2C_NmsEnum.v1_20_R3; } else if (mc.contains("(MC: 1.20.6)")) { - t2CnmsEnum = T2CnmsEnum.v1_20_R4; + t2CnmsEnum = T2C_NmsEnum.v1_20_R4; } else if (mc.contains("(MC: 1.21)")) { - t2CnmsEnum = T2CnmsEnum.v1_21_R1; - } else t2CnmsEnum = T2CnmsEnum.not_support; + t2CnmsEnum = T2C_NmsEnum.v1_21_R1; + } else t2CnmsEnum = T2C_NmsEnum.not_support; } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/player/T2CnameHistory.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/player/T2C_NameHistory.java similarity index 99% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/player/T2CnameHistory.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/player/T2C_NameHistory.java index 4238abb..56b21f6 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/player/T2CnameHistory.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/player/T2C_NameHistory.java @@ -14,7 +14,7 @@ import java.util.Date; import java.util.UUID; import java.util.stream.Collectors; -public class T2CnameHistory { +public class T2C_NameHistory { public static class NameLookup { /** diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2CpluginCheck.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2C_PluginCheck.java similarity index 99% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2CpluginCheck.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2C_PluginCheck.java index 58cdef1..8815f81 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2CpluginCheck.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2C_PluginCheck.java @@ -6,7 +6,7 @@ import org.bukkit.plugin.Plugin; import java.util.logging.Level; -public class T2CpluginCheck { +public class T2C_PluginCheck { public static Boolean pluginCheck(String pluginName){ return Bukkit.getPluginManager().getPlugin(pluginName) != null; } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2CpluginManager.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2C_PluginManager.java similarity index 98% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2CpluginManager.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2C_PluginManager.java index 0cfad7a..37a9849 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2CpluginManager.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/plugins/T2C_PluginManager.java @@ -6,7 +6,7 @@ import org.bukkit.plugin.Plugin; import java.util.Objects; -public class T2CpluginManager { +public class T2C_PluginManager { public static void restart(String plugin) { if (Bukkit.getPluginManager().getPlugin(plugin) == null) return; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/register/T2Cregister.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/register/T2C_Register.java similarity index 98% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/register/T2Cregister.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/register/T2C_Register.java index 159b2d2..f61bbd4 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/register/T2Cregister.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/register/T2C_Register.java @@ -6,7 +6,7 @@ import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.Plugin; -public class T2Cregister { +public class T2C_Register { public static void listener(Listener listener, Plugin plugin) { Bukkit.getServer().getPluginManager().registerEvents(listener, plugin); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/sound/T2Csound.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/sound/T2C_Sound.java similarity index 74% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/sound/T2Csound.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/sound/T2C_Sound.java index 0befe7a..850146e 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/sound/T2Csound.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/sound/T2C_Sound.java @@ -2,13 +2,13 @@ package net.t2code.t2codelib.SPIGOT.api.sound; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_McVersion; import net.t2code.t2codelib.SPIGOT.system.config.languages.T2CLibLanguages; import org.bukkit.Sound; import org.bukkit.entity.Player; -public class T2Csound { +public class T2C_Sound { public static void playSound(Player player, String sound, int v, int v1) { playSound(player, Sound.valueOf(sound), v, v1); } @@ -20,9 +20,9 @@ public class T2Csound { public static Sound checkSound(String sound1_8, String sound1_9, String sound1_13, String selectSoundFromConfig, String prefix) { String SOUND; - if (T2CmcVersion.isMc1_8()) { + if (T2C_McVersion.isMc1_8()) { SOUND = sound1_8; - } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) { + } else if (T2C_McVersion.isMc1_9() || T2C_McVersion.isMc1_10() || T2C_McVersion.isMc1_11() || T2C_McVersion.isMc1_12()) { SOUND = sound1_9; } else SOUND = sound1_13; @@ -32,7 +32,7 @@ public class T2Csound { public static Sound checkSound(String sound1_8, String sound1_13, String selectSoundFromConfig, String prefix) { String SOUND; - if (T2CmcVersion.isMc1_8()) { + if (T2C_McVersion.isMc1_8()) { SOUND = sound1_8; } else SOUND = sound1_13; @@ -44,7 +44,7 @@ public class T2Csound { try { return Sound.valueOf(selectSoundFromConfig); } catch (Exception e) { - T2Csend.console("§4\n§4\n§4\n" + T2CLibLanguages.VALUES.soundNotFound.getValue().toString().replace("[prefix]", prefix) + T2C_Send.console("§4\n§4\n§4\n" + T2CLibLanguages.VALUES.soundNotFound.getValue().toString().replace("[prefix]", prefix) .replace("[sound]", "§8Buy: §6" + selectSoundFromConfig) + "§4\n§4\n§4\n"); return Sound.valueOf(sound); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2C_UpdateAPI.java similarity index 91% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2C_UpdateAPI.java index 34e45f6..a671bb2 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2C_UpdateAPI.java @@ -1,9 +1,8 @@ package net.t2code.t2codelib.SPIGOT.api.update; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.UpdateType; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; @@ -16,7 +15,7 @@ import org.bukkit.scheduler.BukkitRunnable; import java.util.HashMap; -public class T2CupdateAPI { +public class T2C_UpdateAPI { public static HashMap pluginVersions = new HashMap<>(); public static void join(Plugin plugin, String prefix, String perm, Player player, Integer spigotID, String discord) { @@ -86,7 +85,7 @@ public class T2CupdateAPI { } } else updateStatusVersion = UpdateType.STABLE.text; - T2Csend.player(player, st.replace("[prefix]", prefix).replace("[value]", updateStatusVersion).replace("[link]", webData.getUpdateUrl()) + T2C_Send.player(player, st.replace("[prefix]", prefix).replace("[value]", updateStatusVersion).replace("[link]", webData.getUpdateUrl()) .replace("[plv]", pluginVersion).replace("[puv]", publicVersion).replace("[dc]", discord)); } @@ -111,13 +110,13 @@ public class T2CupdateAPI { String s3 = " You can download it here: " + webData.getUpdateUrl() + ""; String s4 = " You can find more information on Discord: " + discord + ""; - T2Ctemplate.sendFrameCenter(prefix,s1,s2,s3,s4); + T2C_Send.sendFrameCenter(prefix,s1,s2,s3,s4); } public static String updateInfo(String[] args, Boolean player) { T2CupdateObject object; try { - object = T2CupdateAPI.pluginVersions.get(args[1]); + object = T2C_UpdateAPI.pluginVersions.get(args[1]); } catch (Exception e) { return Util.getPrefix() + " The plugin " + args[1] + " is not registered in the update checker of T2Code!"; } @@ -126,8 +125,8 @@ public class T2CupdateAPI { if (webData == null) { return Util.getPrefix() + " It could not be checked for updates with the plugin " + args[1] + "!"; } - String pluginName = T2CupdateAPI.pluginVersions.get(args[1]).pluginName; - String pluginVersion = T2CupdateAPI.pluginVersions.get(args[1]).pluginVersion; + String pluginName = T2C_UpdateAPI.pluginVersions.get(args[1]).pluginName; + String pluginVersion = T2C_UpdateAPI.pluginVersions.get(args[1]).pluginVersion; String updateTitle = webData.getUpdateTitle(); String updateVersion = webData.getVersion(); @@ -185,7 +184,7 @@ public class T2CupdateAPI { } public static void onUpdateCheck(Plugin plugin, String prefix, String gitKey, Integer spigotID, String discord, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) { - if ((boolean) T2CLibConfig.VALUES.updateCheckFullDisable.getValue()) return; - new T2CupdateCheckerGit((JavaPlugin) plugin, prefix, gitKey, spigotID, discord, updateCheckOnJoin, seePreReleaseUpdates, timeInterval); + if ((boolean) T2C_LibConfig.VALUES.updateCheckFullDisable.getValue()) return; + new T2C_UpdateCheckerGit((JavaPlugin) plugin, prefix, gitKey, spigotID, discord, updateCheckOnJoin, seePreReleaseUpdates, timeInterval); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateCheckerGit.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2C_UpdateCheckerGit.java similarity index 78% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateCheckerGit.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2C_UpdateCheckerGit.java index 0a62fe7..d4defb3 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateCheckerGit.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2C_UpdateCheckerGit.java @@ -1,8 +1,8 @@ package net.t2code.t2codelib.SPIGOT.api.update; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; import org.bukkit.Bukkit; @@ -18,12 +18,12 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.function.Consumer; -public class T2CupdateCheckerGit { +public class T2C_UpdateCheckerGit { private final JavaPlugin plugin; private T2CupdateObject t2CupdateObject; - public T2CupdateCheckerGit(JavaPlugin plugin, String prefix, String gitKey, Integer spigotID, String discord, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) { + public T2C_UpdateCheckerGit(JavaPlugin plugin, String prefix, String gitKey, Integer spigotID, String discord, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) { this.plugin = plugin; String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1"; @@ -40,7 +40,7 @@ public class T2CupdateCheckerGit { Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() { @Override public void run() { - if ((boolean) T2CLibConfig.VALUES.updateCheckFullDisable.getValue()) return; + if ((boolean) T2C_LibConfig.VALUES.updateCheckFullDisable.getValue()) return; getVersion((webData) -> { T2CupdateObject update = new T2CupdateObject( plugin.getName(), @@ -51,24 +51,24 @@ public class T2CupdateCheckerGit { updateCheckOnJoin ); - T2CupdateAPI.pluginVersions.put(plugin.getName(), update); - if (T2CupdateAPI.pluginVersions.get(plugin.getName()) == null) { - T2Csend.debugmsg(T2CodeLibMain.getPlugin(), "'" + plugin.getName() + "' UpdateAPI T2CupdateAPI.pluginVersions.get(plugin.getName()) == null"); + T2C_UpdateAPI.pluginVersions.put(plugin.getName(), update); + if (T2C_UpdateAPI.pluginVersions.get(plugin.getName()) == null) { + T2C_Send.debugmsg(T2CodeLibMain.getPlugin(), "'" + plugin.getName() + "' UpdateAPI T2CupdateAPI.pluginVersions.get(plugin.getName()) == null"); return; } - if (T2CupdateAPI.pluginVersions.get(plugin.getName()).updateAvailable) { + if (T2C_UpdateAPI.pluginVersions.get(plugin.getName()).updateAvailable) { if (!update.load) { new BukkitRunnable() { @Override public void run() { update.load = true; - T2CupdateAPI.sendUpdateMsg(prefix, discord, webData, plugin); + T2C_UpdateAPI.sendUpdateMsg(prefix, discord, webData, plugin); } }.runTaskLaterAsynchronously(plugin, 600L); - } else T2CupdateAPI.sendUpdateMsg(prefix, discord, webData, plugin); + } else T2C_UpdateAPI.sendUpdateMsg(prefix, discord, webData, plugin); } else { if (!update.load) { - T2Csend.console(prefix + " §e║ " + "§2No update found."); + T2C_Send.console(prefix + " §e║ " + "§2No update found."); update.load = true; } } @@ -132,8 +132,8 @@ public class T2CupdateCheckerGit { consumer.accept(webData); } catch (Exception exception) { Boolean load = false; - if (T2CupdateAPI.pluginVersions.containsKey(plugin.getName())) { - load = T2CupdateAPI.pluginVersions.get(plugin.getName()).load; + if (T2C_UpdateAPI.pluginVersions.containsKey(plugin.getName())) { + load = T2C_UpdateAPI.pluginVersions.get(plugin.getName()).load; } T2CupdateObject update = new T2CupdateObject( plugin.getName(), @@ -143,9 +143,9 @@ public class T2CupdateCheckerGit { false, updateCheckOnJoin ); - T2CupdateAPI.pluginVersions.put(plugin.getName(), update); + T2C_UpdateAPI.pluginVersions.put(plugin.getName(), update); - T2Csend.error(this.plugin, "§4 Cannot look for updates: " + exception.getMessage()); + T2C_Send.error(this.plugin, "§4 Cannot look for updates: " + exception.getMessage()); exception.printStackTrace(); } }); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CLibConfig.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CLibConfig.java deleted file mode 100644 index b5523b3..0000000 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CLibConfig.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.t2code.t2codelib.SPIGOT.api.yaml; - -public class T2CLibConfig { - - /** - * @deprecated since version 16.7, use the method from the return! - */ - @Deprecated(since = "16.7", forRemoval = true) - public static Boolean getUpdateCheckOnJoin() { - return (boolean) net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig.VALUES.updateCheckOnJoin.getValue(); - } - - /** - * @deprecated since version 16.7, use the method from the return! - */ - @Deprecated(since = "16.7", forRemoval = true) - public static Integer getUpdateCheckTimeInterval() { - return (Integer) net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig.VALUES.updateCheckTimeInterval.getValue(); - } - - /** - * @deprecated since version 16.7, use the method from the return! - */ - @Deprecated(since = "16.7", forRemoval = true) - public static Boolean getSeePreReleaseUpdates() { - return (boolean) net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig.VALUES.seePreReleaseUpdates.getValue(); - } - - /** - * @deprecated since version 16.7, use the method from the return! - */ - @Deprecated(since = "16.7", forRemoval = true) - public static Boolean getDebug() { - return (boolean) net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig.VALUES.debug.getValue(); - } - - /** - * @deprecated since version 16.7, use the method from the return! - */ - @Deprecated(since = "16.7", forRemoval = true) - public static String getLanguage() { - return (String) net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig.VALUES.language.getValue(); - } - - /** - * @deprecated since version 16.7, use the method from the return! - */ - @Deprecated(since = "16.7", forRemoval = true) - public static Boolean getBungee() { - return (boolean) net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig.VALUES.proxy.getValue(); - } - - /** - * @deprecated since version 16.7, use the method from the return! - */ - @Deprecated(since = "16.7", forRemoval = true) - public static Boolean getInventoriesCloseByServerStop() { - return (boolean) net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig.VALUES.inventoriesCloseByServerStop.getValue(); - } -} diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_Config.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_Config.java new file mode 100644 index 0000000..50d81a4 --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_Config.java @@ -0,0 +1,304 @@ +package net.t2code.t2codelib.SPIGOT.api.yaml; + +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Replace; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_McVersion; +import net.t2code.t2codelib.SPIGOT.api.sound.T2C_Sound; +import net.t2code.t2codelib.T2CconfigItem; +import org.bukkit.Sound; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.inventory.ItemStack; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class T2C_Config { + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, String value, YamlConfiguration YamlConfiguration) { + if (!YamlConfiguration.contains(path)) { + YamlConfiguration.set(path, value); + } + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, Object value, YamlConfiguration YamlConfiguration) { + if (!YamlConfiguration.contains(path)) { + YamlConfiguration.set(path, value); + } + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, YamlConfiguration YamlConfiguration) { + YamlConfiguration.set(path, null); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, Integer value, YamlConfiguration YamlConfiguration) { + if (!YamlConfiguration.contains(path)) { + YamlConfiguration.set(path, value); + } + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, Double value, YamlConfiguration YamlConfiguration) { + if (!YamlConfiguration.contains(path)) { + YamlConfiguration.set(path, value); + } + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, Boolean value, YamlConfiguration YamlConfiguration) { + if (!YamlConfiguration.contains(path)) { + YamlConfiguration.set(path, value); + } + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, List value, YamlConfiguration YamlConfiguration) { + if (!YamlConfiguration.contains(path)) { + YamlConfiguration.set(path, value); + } + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void set(String path, ItemStack value, YamlConfiguration YamlConfiguration) { + if (!YamlConfiguration.contains(path)) { + YamlConfiguration.set(path, value); + } + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void setSound(String soundName, String sound1_8, String sound1_9, String sound1_13, YamlConfiguration yamlConfiguration) { + set("Sound." + soundName + ".Enable", true, yamlConfiguration); + String sound; + if (T2C_McVersion.isMc1_8()) { + sound = sound1_8.toString(); + } else if (T2C_McVersion.isMc1_9() || T2C_McVersion.isMc1_10() || T2C_McVersion.isMc1_11() || T2C_McVersion.isMc1_12()) { + sound = sound1_9.toString(); + } else sound = sound1_13.toString(); + set("Sound." + soundName + ".Sound", sound, yamlConfiguration); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void setSound(String soundName, String sound1_8, String sound1_13, YamlConfiguration yamlConfiguration) { + set("Sound." + soundName + ".Enable", true, yamlConfiguration); + String sound; + if (T2C_McVersion.isMc1_8()) { + sound = sound1_8.toString(); + } else sound = sound1_13.toString(); + set("Sound." + soundName + ".Sound", sound, yamlConfiguration); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void setSound(String soundName, String sound, YamlConfiguration yamlConfiguration) { + set("Sound." + soundName + ".Enable", true, yamlConfiguration); + set("Sound." + soundName + ".Sound", sound.toString(), yamlConfiguration); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static boolean selectSoundEnable(String soundName, YamlConfiguration yamlConfiguration) { + return selectBoolean("Sound." + soundName + ".Enable", yamlConfiguration); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static String selectSound(String prefix, String soundName, YamlConfiguration yamlConfiguration) { + return select(prefix, "Sound." + soundName + ".Sound", yamlConfiguration); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static Sound checkSound(String sound1_8, String sound1_9, String sound1_13, String selectSoundFromConfig, String prefix) { + return T2C_Sound.checkSound(sound1_8, sound1_9, sound1_13, selectSoundFromConfig, prefix); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static Sound checkSound(String sound1_8, String sound1_13, String selectSoundFromConfig, String prefix) { + return T2C_Sound.checkSound(sound1_8, sound1_13, selectSoundFromConfig, prefix); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static Sound checkSound(String sound, String selectSoundFromConfig, String prefix) { + return T2C_Sound.checkSound(sound, selectSoundFromConfig, prefix); + + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static String select(String prefix, String path, YamlConfiguration yamlConfiguration) { + return T2C_Replace.replace(prefix, yamlConfiguration.getString(path)); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static Object selectObject(String prefix, String path, YamlConfiguration yamlConfiguration) { + return T2C_Replace.replaceObject(prefix, yamlConfiguration.get(path)); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static Integer selectInt(String path, YamlConfiguration yamlConfiguration) { + return (yamlConfiguration.getInt(path)); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static Boolean selectBoolean(String path, YamlConfiguration yamlConfiguration) { + return (yamlConfiguration.getBoolean(path)); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static Double selectDouble(String path, YamlConfiguration yamlConfiguration) { + return (yamlConfiguration.getDouble(path)); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static List selectList(String path, YamlConfiguration yamlConfiguration) { + return (yamlConfiguration.getStringList(path)); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static ItemStack selectItemStack(String path, YamlConfiguration yamlConfiguration) { + return (yamlConfiguration.getItemStack(path)); + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static List selectList(String prefix, String path, YamlConfiguration yamlConfiguration) { + List output = new ArrayList<>(); + List input = yamlConfiguration.getStringList(path); + for (String st : input) { + output.add(T2C_Replace.replace(prefix, st)); + } + return output; + } + + /** + * @deprecated since version 16.7 + * This method will be removed soon! + * Please use the new {@link T2C_ConfigWriter#createConfig(File, T2CconfigItem[], String...)}. + */ + @Deprecated(since = "16.7", forRemoval = true) + public static void select(String prefix, List value, String path, YamlConfiguration yamlConfiguration) { + List output = new ArrayList<>(); + List input = yamlConfiguration.getStringList(path); + for (String st : input) { + output.add(T2C_Replace.replace(prefix, st)); + } + value = output; + } +} diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CconfigWriter.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_ConfigWriter.java similarity index 86% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CconfigWriter.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_ConfigWriter.java index f8d04f9..9530eca 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CconfigWriter.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_ConfigWriter.java @@ -2,6 +2,8 @@ package net.t2code.t2codelib.SPIGOT.api.yaml; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import net.t2code.t2codelib.T2CLanguageEnum; import net.t2code.t2codelib.T2CconfigItem; import org.bukkit.configuration.file.FileConfiguration; @@ -13,7 +15,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public class T2CconfigWriter { +public class T2C_ConfigWriter { private static FileConfiguration config; @@ -24,7 +26,7 @@ public class T2CconfigWriter { try { configFile.createNewFile(); } catch (IOException e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); return; } } else exist = true; @@ -52,7 +54,7 @@ public class T2CconfigWriter { // Copy default values if they are missing config.options().copyDefaults(true); - T2CymlWriter.saveConfigWithComments(configFile, config, comments, header); + T2C_YmlWriter.saveConfigWithComments(configFile, config, comments, header); readConfig(config, values); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CconfigWriterLanguage.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_LanguageWriter.java similarity index 65% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CconfigWriterLanguage.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_LanguageWriter.java index 78790b0..628e0bc 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CconfigWriterLanguage.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_LanguageWriter.java @@ -2,7 +2,8 @@ package net.t2code.t2codelib.SPIGOT.api.yaml; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import net.t2code.t2codelib.T2CLanguageEnum; import net.t2code.t2codelib.T2CconfigItemLanguages; import org.bukkit.configuration.file.FileConfiguration; @@ -12,19 +13,19 @@ import java.io.File; import java.io.IOException; import java.util.*; -public class T2CconfigWriterLanguage { +public class T2C_LanguageWriter { private static FileConfiguration config; - public static void createConfig(String prefix,File path, T2CconfigItemLanguages[] values, String loadConfig,boolean pluginStart, String... header) { + public static void createConfig(String prefix, File path, T2CconfigItemLanguages[] values, String loadConfig, boolean isReload, String... header) { File f = new File(path + "/languages/"); f.mkdirs(); File[] fileArray = f.listFiles(); - if(fileArray.length == 0){ + if (fileArray.length == 0) { List zw = new ArrayList<>(); - for(T2CLanguageEnum lan : T2CLanguageEnum.values()){ - if(values[0].getLanguage().containsKey(lan)){ + for (T2CLanguageEnum lan : T2CLanguageEnum.values()) { + if (values[0].getLanguage().containsKey(lan)) { zw.add(new File(path + "/languages/" + lan.name() + ".yml")); } } @@ -43,7 +44,7 @@ public class T2CconfigWriterLanguage { try { langFile.createNewFile(); } catch (IOException e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); return; } } @@ -60,23 +61,23 @@ public class T2CconfigWriterLanguage { comments.put(item.getPath(), commandList); } } - T2CymlWriter.saveConfigWithComments(langFile, config, comments, header); + T2C_YmlWriter.saveConfigWithComments(langFile, config, comments, header); } } - readConfig(prefix,path,values, loadConfig, pluginStart); + readConfig(prefix, path, values, loadConfig, isReload); } - private static void readConfig(String prefix, File path, T2CconfigItemLanguages[] values, String loadConfig, boolean pluginStart) { + private static void readConfig(String prefix, File path, T2CconfigItemLanguages[] values, String loadConfig, boolean isReload) { String selectMSG; File msg; msg = new File(path, "languages/" + loadConfig + ".yml"); if (!msg.isFile()) { - T2Ctemplate.setCenterAligned(prefix, "", pluginStart); - T2Ctemplate.setCenterAligned(prefix, "§4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", pluginStart); - T2Ctemplate.setCenterAligned(prefix, "§4The selected §c" + loadConfig + " §4language file was not found.", pluginStart); - T2Ctemplate.setCenterAligned(prefix, "§6The default language §e" + T2CLanguageEnum.english.name() + " §6is used!", pluginStart); - T2Ctemplate.setCenterAligned(prefix, "§4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", pluginStart); - T2Ctemplate.setCenterAligned(prefix, "", pluginStart); + T2C_Send.sendStartTextCenter(prefix, "", isReload); + T2C_Send.sendStartTextCenter(prefix, "§4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", isReload); + T2C_Send.sendStartTextCenter(prefix, "§4The selected §c" + loadConfig + " §4language file was not found.", isReload); + T2C_Send.sendStartTextCenter(prefix, "§6The default language §e" + T2CLanguageEnum.english.name() + " §6is used!", isReload); + T2C_Send.sendStartTextCenter(prefix, "§4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", isReload); + T2C_Send.sendStartTextCenter(prefix, "", isReload); msg = new File(path, "languages/" + T2CLanguageEnum.english.name() + ".yml"); selectMSG = T2CLanguageEnum.english.name(); } else selectMSG = loadConfig; @@ -84,6 +85,6 @@ public class T2CconfigWriterLanguage { for (T2CconfigItemLanguages value : values) { value.setValue(yml.get(value.getPath())); } - T2Ctemplate.setCenterAligned(prefix, "§2Language successfully selected to: §6" + selectMSG, pluginStart); + T2C_Send.sendStartTextCenter(prefix, "§2Language successfully selected to: §6" + selectMSG, isReload); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CymlWriter.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_YmlWriter.java similarity index 99% rename from src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CymlWriter.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_YmlWriter.java index 502a7f1..2093bb0 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2CymlWriter.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2C_YmlWriter.java @@ -11,7 +11,7 @@ import java.nio.file.Files; import java.util.List; import java.util.Map; -public class T2CymlWriter { +public class T2C_YmlWriter { protected static void saveConfigWithComments(File file, FileConfiguration config, Map> comments, String... headers) { try { StringBuilder configContent = new StringBuilder(); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2Cconfig.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2Cconfig.java deleted file mode 100644 index ec5c0af..0000000 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/yaml/T2Cconfig.java +++ /dev/null @@ -1,227 +0,0 @@ -package net.t2code.t2codelib.SPIGOT.api.yaml; - -import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; -import net.t2code.t2codelib.SPIGOT.api.sound.T2Csound; -import org.bukkit.Sound; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.inventory.ItemStack; - -import java.util.ArrayList; -import java.util.List; - -public class T2Cconfig { - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, String value, YamlConfiguration YamlConfiguration) { - if (!YamlConfiguration.contains(path)) { - YamlConfiguration.set(path, value); - } - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, Object value, YamlConfiguration YamlConfiguration) { - if (!YamlConfiguration.contains(path)) { - YamlConfiguration.set(path, value); - } - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, YamlConfiguration YamlConfiguration) { - YamlConfiguration.set(path, null); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, Integer value, YamlConfiguration YamlConfiguration) { - if (!YamlConfiguration.contains(path)) { - YamlConfiguration.set(path, value); - } - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, Double value, YamlConfiguration YamlConfiguration) { - if (!YamlConfiguration.contains(path)) { - YamlConfiguration.set(path, value); - } - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, Boolean value, YamlConfiguration YamlConfiguration) { - if (!YamlConfiguration.contains(path)) { - YamlConfiguration.set(path, value); - } - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, List value, YamlConfiguration YamlConfiguration) { - if (!YamlConfiguration.contains(path)) { - YamlConfiguration.set(path, value); - } - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void set(String path, ItemStack value, YamlConfiguration YamlConfiguration) { - if (!YamlConfiguration.contains(path)) { - YamlConfiguration.set(path, value); - } - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void setSound(String soundName, String sound1_8, String sound1_9, String sound1_13, YamlConfiguration yamlConfiguration) { - set("Sound." + soundName + ".Enable", true, yamlConfiguration); - String sound; - if (T2CmcVersion.isMc1_8()) { - sound = sound1_8.toString(); - } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) { - sound = sound1_9.toString(); - } else sound = sound1_13.toString(); - set("Sound." + soundName + ".Sound", sound, yamlConfiguration); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void setSound(String soundName, String sound1_8, String sound1_13, YamlConfiguration yamlConfiguration) { - set("Sound." + soundName + ".Enable", true, yamlConfiguration); - String sound; - if (T2CmcVersion.isMc1_8()) { - sound = sound1_8.toString(); - } else sound = sound1_13.toString(); - set("Sound." + soundName + ".Sound", sound, yamlConfiguration); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void setSound(String soundName, String sound, YamlConfiguration yamlConfiguration) { - set("Sound." + soundName + ".Enable", true, yamlConfiguration); - set("Sound." + soundName + ".Sound", sound.toString(), yamlConfiguration); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static boolean selectSoundEnable(String soundName, YamlConfiguration yamlConfiguration) { - return selectBoolean("Sound." + soundName + ".Enable", yamlConfiguration); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static String selectSound(String prefix, String soundName, YamlConfiguration yamlConfiguration) { - return select(prefix, "Sound." + soundName + ".Sound", yamlConfiguration); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static Sound checkSound(String sound1_8, String sound1_9, String sound1_13, String selectSoundFromConfig, String prefix) { - return T2Csound.checkSound(sound1_8, sound1_9, sound1_13, selectSoundFromConfig, prefix); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static Sound checkSound(String sound1_8, String sound1_13, String selectSoundFromConfig, String prefix) { - return T2Csound.checkSound(sound1_8, sound1_13, selectSoundFromConfig, prefix); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static Sound checkSound(String sound, String selectSoundFromConfig, String prefix) { - return T2Csound.checkSound(sound, selectSoundFromConfig, prefix); - - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static String select(String prefix, String path, YamlConfiguration yamlConfiguration) { - return T2Creplace.replace(prefix, yamlConfiguration.getString(path)); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static Object selectObject(String prefix, String path, YamlConfiguration yamlConfiguration) { - return T2Creplace.replaceObject(prefix, yamlConfiguration.get(path)); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static Integer selectInt(String path, YamlConfiguration yamlConfiguration) { - return (yamlConfiguration.getInt(path)); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static Boolean selectBoolean(String path, YamlConfiguration yamlConfiguration) { - return (yamlConfiguration.getBoolean(path)); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static Double selectDouble(String path, YamlConfiguration yamlConfiguration) { - return (yamlConfiguration.getDouble(path)); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static List selectList(String path, YamlConfiguration yamlConfiguration) { - return (yamlConfiguration.getStringList(path)); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static ItemStack selectItemStack(String path, YamlConfiguration yamlConfiguration) { - return (yamlConfiguration.getItemStack(path)); - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static List selectList(String prefix, String path, YamlConfiguration yamlConfiguration) { - List output = new ArrayList<>(); - List input = yamlConfiguration.getStringList(path); - for (String st : input) { - output.add(T2Creplace.replace(prefix, st)); - } - return output; - } - - /** - * @deprecated since version 16.7, please use the new T2CconfigWriter. - */ - public static void select(String prefix, List value, String path, YamlConfiguration yamlConfiguration) { - List output = new ArrayList<>(); - List input = yamlConfiguration.getStringList(path); - for (String st : input) { - output.add(T2Creplace.replace(prefix, st)); - } - value = output; - } -} diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/BungeeCommandSenderReceiver.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/BungeeCommandSenderReceiver.java new file mode 100644 index 0000000..b1e72bf --- /dev/null +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/BungeeCommandSenderReceiver.java @@ -0,0 +1,48 @@ +package net.t2code.t2codelib.SPIGOT.system; + +import net.t2code.t2codelib.SPIGOT.api.debug.T2C_Debug; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; +import net.t2code.t2codelib.Util; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Arrays; + +public class BungeeCommandSenderReceiver { + + public static void sendToBungee(CommandSender sender, String information, Boolean console) { + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + DataOutputStream output = new DataOutputStream(stream); + try { + if (console) { + output.writeUTF("T2Code-Console"); + } else { + if (sender instanceof Player) { + output.writeUTF(sender.getName()); + } else { + output.writeUTF("T2Code-Console"); + } + } + output.writeUTF(information); + output.writeUTF(String.valueOf(T2C_LibConfig.VALUES.serverUUID.getValue())); + } catch (IOException e) { + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); + } + if (sender instanceof Player) { + Player player = (Player) sender; + player.sendPluginMessage(T2CodeLibMain.getPlugin(), Util.getPluginChannel_ProxyCommand(), stream.toByteArray()); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received T2CbungeeCommandSenderReciver: "+Util.getPluginChannel_ProxyCommand()+" - " + Arrays.toString(stream.toByteArray()) + " Player: " + player.getName()); + } else { + for (Player player : Bukkit.getOnlinePlayers()) { + player.sendPluginMessage(T2CodeLibMain.getPlugin(), Util.getPluginChannel_ProxyCommand(), stream.toByteArray()); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received T2CbungeeCommandSenderReciver: "+Util.getPluginChannel_ProxyCommand()+" - " + Arrays.toString(stream.toByteArray()) + " Player: " + player.getName()); + return; + } + } + } +} diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/JoinEvent.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/JoinEvent.java index e037ca8..f82b89b 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/JoinEvent.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/JoinEvent.java @@ -2,7 +2,7 @@ package net.t2code.t2codelib.SPIGOT.system; -import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; +import net.t2code.t2codelib.SPIGOT.api.update.T2C_UpdateAPI; import net.t2code.t2codelib.Util; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -12,6 +12,6 @@ public class JoinEvent implements Listener { @EventHandler public void onJoinEvent(PlayerLoginEvent event) { - T2CupdateAPI.join(T2CodeLibMain.getPlugin(), Util.getPrefix(),"t2code.lib.updatemsg",event.getPlayer(),Util.getSpigotID(),Util.getDiscord()); + T2C_UpdateAPI.join(T2CodeLibMain.getPlugin(), Util.getPrefix(),"t2code.lib.updatemsg",event.getPlayer(),Util.getSpigotID(),Util.getDiscord()); } } \ No newline at end of file diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CbungeeCommandSenderReciver.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CbungeeCommandSenderReciver.java deleted file mode 100644 index 4638176..0000000 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CbungeeCommandSenderReciver.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.t2code.t2codelib.SPIGOT.system; - -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; -import net.t2code.t2codelib.Util; -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Arrays; - -public class T2CbungeeCommandSenderReciver { - - public static void sendToBungee(CommandSender sender, String information, Boolean console) { - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - DataOutputStream output = new DataOutputStream(stream); - try { - if (console) { - output.writeUTF("T2Code-Console"); - } else { - if (sender instanceof Player) { - output.writeUTF(sender.getName()); - } else { - output.writeUTF("T2Code-Console"); - } - } - output.writeUTF(information); - output.writeUTF(String.valueOf(T2CLibConfig.VALUES.serverUUID.getValue())); - } catch (IOException e) { - e.printStackTrace(); - } - if (sender instanceof Player) { - Player player = (Player) sender; - player.sendPluginMessage(T2CodeLibMain.getPlugin(), "t2c:bcmd", stream.toByteArray()); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received T2CbungeeCommandSenderReciver: t2c:bcmd - " + Arrays.toString(stream.toByteArray()) + " Player: " + player.getName()); - } else { - - for (Player player : Bukkit.getOnlinePlayers()) { - player.sendPluginMessage(T2CodeLibMain.getPlugin(), "t2c:bcmd", stream.toByteArray()); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage received T2CbungeeCommandSenderReciver: t2c:bcmd - " + Arrays.toString(stream.toByteArray()) + " Player: " + player.getName()); - return; - } - //todo - } - } -} 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 db12809..82ccf8d 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java @@ -4,21 +4,21 @@ import lombok.Getter; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; -import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2CbungeePlayers; -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.api.items.T2CitemVersion; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CnmsEnum; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CnmsVersions; -import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck; -import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; +import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2C_BungeePlayers; +import net.t2code.t2codelib.SPIGOT.api.debug.T2C_Debug; +import net.t2code.t2codelib.SPIGOT.api.items.T2C_ItemVersion; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Template; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_McVersion; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_NmsEnum; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_NmsVersions; +import net.t2code.t2codelib.SPIGOT.api.plugins.T2C_PluginCheck; +import net.t2code.t2codelib.SPIGOT.api.update.T2C_UpdateAPI; import net.t2code.t2codelib.SPIGOT.system.bstats.Metrics; import net.t2code.t2codelib.SPIGOT.system.cmd.CmdExecuter; import net.t2code.t2codelib.SPIGOT.system.cmd.Development; import net.t2code.t2codelib.SPIGOT.system.cmd.ReportLogStorage; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.SPIGOT.system.config.languages.T2CLibLanguages; import net.t2code.t2codelib.T2CplatformDetector; import net.t2code.t2codelib.Util; @@ -26,9 +26,11 @@ import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.List; +import java.util.logging.Logger; public final class T2CodeLibMain extends JavaPlugin { @Getter @@ -50,6 +52,7 @@ public final class T2CodeLibMain extends JavaPlugin { @Getter private static T2CplatformDetector.PlatformType plattform; + @Override public void onEnable() { // Plugin startup logic @@ -64,7 +67,11 @@ public final class T2CodeLibMain extends JavaPlugin { mmIsLoad = false; } plattform = T2CplatformDetector.detectPlatform(); - long long_ = T2Ctemplate.onLoadHeader(Util.getPrefix(), autor, version, Util.getSpigot(), Util.getDiscord()); + load(); + } + + private void load() { + long long_ = T2C_Template.onLoadHeader(Util.getPrefix(), autor, version, Util.getSpigot(), Util.getDiscord()); checkIsBungee(); String prefix = Util.getPrefix(); @@ -72,115 +79,114 @@ public final class T2CodeLibMain extends JavaPlugin { try { Vault.loadVault(); } catch (InterruptedException e) { - e.printStackTrace(); + T2C_Send.sendException(e, getLogger()); } - T2CmcVersion.onCheck(); + T2C_McVersion.onCheck(); - if (T2CnmsVersions.getT2CnmsEnum() == T2CnmsEnum.not_support) { - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "The " + T2CmcVersion.getMcVersion() + " is a very fresh / new version.", true); - T2Ctemplate.setCenterAligned(prefix, "The plugin may not yet be supported on this server!", true); - T2Ctemplate.setCenterAligned(prefix, "If there are any bugs in our plugins,", true); - T2Ctemplate.setCenterAligned(prefix, "please report them to us via our Discord: http://dc.t2code.net", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "", true); + if (T2C_NmsVersions.getT2CnmsEnum() == T2C_NmsEnum.not_support) { + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "The " + T2C_McVersion.getMcVersion() + " is a very fresh / new version.", true); + T2C_Send.sendStartTextCenter(prefix, "The plugin may not yet be supported on this server!", true); + T2C_Send.sendStartTextCenter(prefix, "If there are any bugs in our plugins,", true); + T2C_Send.sendStartTextCenter(prefix, "please report them to us via our Discord: http://dc.t2code.net", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "", true); try { Thread.sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InterruptedException ignored) { } } - if (T2CmcVersion.isMc1_22()) { - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "The 1.22 is a very fresh / new version.", true); - T2Ctemplate.setCenterAligned(prefix, "If there are any bugs in our plugins,", true); - T2Ctemplate.setCenterAligned(prefix, "please report them to us via our Discord: http://dc.t2code.net", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); - T2Ctemplate.setCenterAligned(prefix, "", true); - T2Ctemplate.setCenterAligned(prefix, "", true); + if (T2C_McVersion.isMc1_22()) { + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "The 1.22 is a very fresh / new version.", true); + T2C_Send.sendStartTextCenter(prefix, "If there are any bugs in our plugins,", true); + T2C_Send.sendStartTextCenter(prefix, "please report them to us via our Discord: http://dc.t2code.net", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "§4!!!!!!!!!!!!!!!!!!!!", true); + T2C_Send.sendStartTextCenter(prefix, "", true); + T2C_Send.sendStartTextCenter(prefix, "", true); try { Thread.sleep(2000); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InterruptedException ignored) { + } } - T2Ctemplate.onLoadSeparateStroke(prefix); - T2Ctemplate.setCenterAligned(prefix, "§2Server run on:", true); - T2Ctemplate.setCenterAligned(prefix, "§3NMS: §6" + T2CmcVersion.getNms(), true); - T2Ctemplate.setCenterAligned(prefix, "§3Platform: §6" + plattform.name(), true); - T2Ctemplate.setCenterAligned(prefix, "§3Bukkit Version: §6" + T2CmcVersion.getBukkitVersion(), true); - T2Ctemplate.setCenterAligned(prefix, "§3Server Version: §6" + T2CmcVersion.getMcVersion(), true); + T2C_Template.onLoadSeparateStroke(prefix); + T2C_Send.sendStartTextCenter(prefix, "§2Server run on:", true); + T2C_Send.sendStartTextCenter(prefix, "§3NMS: §6" + T2C_McVersion.getNms(), true); + T2C_Send.sendStartTextCenter(prefix, "§3Platform: §6" + plattform.name(), true); + T2C_Send.sendStartTextCenter(prefix, "§3Bukkit Version: §6" + T2C_McVersion.getBukkitVersion(), true); + T2C_Send.sendStartTextCenter(prefix, "§3Server Version: §6" + T2C_McVersion.getMcVersion(), true); - T2Ctemplate.onLoadSeparateStroke(prefix); + T2C_Template.onLoadSeparateStroke(prefix); if (eco != null) { String st = eco.getName(); if (eco.getName().equals("CMIEconomy")) st = "CMI"; if (Bukkit.getPluginManager().getPlugin(st) != null) { - T2Ctemplate.setCenterAligned(prefix, "§3Economy: §6" + eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion() + " §7- §e" + + T2C_Send.sendStartTextCenter(prefix, "§3Economy: §6" + eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } else - T2Ctemplate.setCenterAligned(prefix, "§3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(prefix, "§3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } else - T2Ctemplate.setCenterAligned(prefix, "§3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(prefix, "§3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); if (perm != null) { if (Bukkit.getPluginManager().getPlugin(perm.getName()) != null) { - T2Ctemplate.setCenterAligned(prefix, "§3Permission plugin: §6" + perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(perm.getName()).getDescription().getVersion() + T2C_Send.sendStartTextCenter(prefix, "§3Permission plugin: §6" + perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(perm.getName()).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } else - T2Ctemplate.setCenterAligned(prefix, "§3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(prefix, "§3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } else - T2Ctemplate.setCenterAligned(prefix, "§3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(prefix, "§3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); - if (T2CpluginCheck.papi()) { - T2Ctemplate.setCenterAligned(prefix, "§3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + if (T2C_PluginCheck.papi()) { + T2C_Send.sendStartTextCenter(prefix, "§3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } - T2Ctemplate.setCenterAligned(prefix, "§3Kyori MiniMessage Support: " + (getMmIsLoad() ? "§2load" : "§4not load") + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(prefix, "§3Kyori MiniMessage Support: " + (getMmIsLoad() ? "§2load" : "§4not load") + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); plugin.getCommand("t2code").setExecutor(new CmdExecuter()); - T2Ctemplate.onLoadSeparateStroke(prefix); - T2CLibConfig.set(true); + T2C_Template.onLoadSeparateStroke(prefix); + T2C_LibConfig.set(false); - T2CitemVersion.scan(); - T2CLibLanguages.set(true); + T2C_ItemVersion.scan(); + T2CLibLanguages.set(false); - T2Ctemplate.onLoadSeparateStroke(prefix); - T2Ctemplate.setCenterAligned(prefix, "§3Use Proxy: §6" + (boolean) T2CLibConfig.VALUES.proxy.getValue(), true); - T2Ctemplate.setCenterAligned(prefix, "§3serverUUID: §6" + T2CLibConfig.VALUES.serverUUID.getValue(), true); + T2C_Template.onLoadSeparateStroke(prefix); + T2C_Send.sendStartTextCenter(prefix, "§3Use Proxy: §6" + (boolean) T2C_LibConfig.VALUES.proxy.getValue(), true); + T2C_Send.sendStartTextCenter(prefix, "§3serverUUID: §6" + T2C_LibConfig.VALUES.serverUUID.getValue(), true); - T2CupdateAPI.onUpdateCheck(plugin, prefix, Util.getGit(), Util.getSpigotID(), Util.getDiscord(), - (boolean) T2CLibConfig.VALUES.updateCheckOnJoin.getValue(), - (boolean) T2CLibConfig.VALUES.seePreReleaseUpdates.getValue(), - (int) T2CLibConfig.VALUES.updateCheckTimeInterval.getValue()); + T2C_UpdateAPI.onUpdateCheck(plugin, prefix, Util.getGit(), Util.getSpigotID(), Util.getDiscord(), + (boolean) T2C_LibConfig.VALUES.updateCheckOnJoin.getValue(), + (boolean) T2C_LibConfig.VALUES.seePreReleaseUpdates.getValue(), + (int) T2C_LibConfig.VALUES.updateCheckTimeInterval.getValue()); Metrics.Bstats(plugin, Util.getBstatsID()); - if ((boolean) T2CLibConfig.VALUES.proxy.getValue()) { - Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "t2c:bcmd"); - T2Cdebug.debug(plugin, "registerIncomingPluginChannel §et2c:bcmd"); + if ((boolean) T2C_LibConfig.VALUES.proxy.getValue()) { + Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, Util.getPluginChannel_ProxyCommand()); + T2C_Debug.debug(plugin, "registerIncomingPluginChannel §e" + Util.getPluginChannel_ProxyCommand()); - Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "t2c:bonlp"); - if (!Bukkit.getMessenger().isIncomingChannelRegistered(plugin, "t2c:bonlp")) { - T2Cdebug.debug(plugin, "registerIncomingPluginChannel §et2c:bonlp"); - Bukkit.getMessenger().registerIncomingPluginChannel(plugin, "t2c:bonlp", new T2CbungeePlayers()); - T2CbungeePlayers.callAllBungeePlayers(); + Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, Util.getPluginChannel_ProxyOnlinePlayers()); + if (!Bukkit.getMessenger().isIncomingChannelRegistered(plugin, Util.getPluginChannel_ProxyOnlinePlayers())) { + T2C_Debug.debug(plugin, "registerIncomingPluginChannel §e" + Util.getPluginChannel_ProxyOnlinePlayers()); + Bukkit.getMessenger().registerIncomingPluginChannel(plugin, Util.getPluginChannel_ProxyOnlinePlayers(), new T2C_BungeePlayers()); + T2C_BungeePlayers.callAllBungeePlayers(); } } ReportLogStorage.load(); Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin); Bukkit.getServer().getPluginManager().registerEvents(new Development(), plugin); - T2Ctemplate.onLoadFooter(prefix, long_); + T2C_Template.onLoadFooter(prefix, long_); load = true; } @@ -189,14 +195,14 @@ public final class T2CodeLibMain extends JavaPlugin { // Plugin shutdown logic if (!load) return; ReportLogStorage.save(); - if ((boolean) T2CLibConfig.VALUES.inventoriesCloseByServerStop.getValue()) { + if ((boolean) T2C_LibConfig.VALUES.inventoriesCloseByServerStop.getValue()) { for (Player player : Bukkit.getOnlinePlayers()) { player.closeInventory(); } } Vault.vaultDisable(); - T2Ctemplate.onDisable(Util.getPrefix(), this); + T2C_Template.onDisable(Util.getPrefix(), this); if (mmIsLoad) { if (this.adventure != null) { this.adventure.close(); diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/Vault.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/Vault.java index 9429d02..afef238 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/Vault.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/Vault.java @@ -2,7 +2,7 @@ package net.t2code.t2codelib.SPIGOT.system; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; import net.t2code.t2codelib.Util; import org.bukkit.plugin.RegisteredServiceProvider; @@ -23,14 +23,14 @@ public class Vault { if (T2CodeLibMain.getEco() != null) { connected = true; - T2Ctemplate.setCenterAligned(Util.getPrefix(), " §2Vault / Economy successfully connected!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(Util.getPrefix(), " §2Vault / Economy successfully connected!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } else { connected = false; - T2Ctemplate.setCenterAligned(Util.getPrefix(), " §4Economy could not be connected / found! [1]" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(Util.getPrefix(), " §4Economy could not be connected / found! [1]" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } } else { connected = false; - T2Ctemplate.setCenterAligned(Util.getPrefix(), " §4Economy could not be connected / found! [2]" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(Util.getPrefix(), " §4Economy could not be connected / found! [2]" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } RegisteredServiceProvider perm = T2CodeLibMain.getPlugin().getServer().getServicesManager().getRegistration(Permission.class); if (perm != null) { @@ -39,13 +39,13 @@ public class Vault { } else { vaultEnable = false; connected = false; - T2Ctemplate.setCenterAligned(Util.getPrefix()," §4Vault could not be connected! [3]" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); + T2C_Send.sendStartTextCenter(Util.getPrefix()," §4Vault could not be connected! [3]" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", true); } } public static void vaultDisable() { if (!connected) return; connected = false; - T2Ctemplate.setCenterAligned(Util.getPrefix(), " §4Vault / Economy successfully deactivated.", true); + T2C_Send.sendStartTextCenter(Util.getPrefix(), " §4Vault / Economy successfully deactivated.", true); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/bstats/Metrics.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/bstats/Metrics.java index 146c1c0..12fac0a 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/bstats/Metrics.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/bstats/Metrics.java @@ -2,7 +2,7 @@ package net.t2code.t2codelib.SPIGOT.system.bstats; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; @@ -31,7 +31,7 @@ public class Metrics { public static void Bstats(Plugin plugin, int bstatsID) { int pluginId = bstatsID; // <-- Replace with the id of your plugin! Metrics metrics = new Metrics((JavaPlugin) plugin, pluginId); - metrics.addCustomChart(new SimplePie("updatecheckonjoin", () -> String.valueOf(T2CLibConfig.VALUES.updateCheckOnJoin.getValue()))); + metrics.addCustomChart(new SimplePie("updatecheckonjoin", () -> String.valueOf(T2C_LibConfig.VALUES.updateCheckOnJoin.getValue()))); } private final Plugin plugin; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CmdExecuter.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CmdExecuter.java index 97abdb7..1921f85 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CmdExecuter.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CmdExecuter.java @@ -1,11 +1,11 @@ package net.t2code.t2codelib.SPIGOT.system.cmd; -import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; -import net.t2code.t2codelib.SPIGOT.system.T2CbungeeCommandSenderReciver; +import net.t2code.t2codelib.SPIGOT.api.debug.T2C_Debug; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.update.T2C_UpdateAPI; +import net.t2code.t2codelib.SPIGOT.system.BungeeCommandSenderReceiver; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.SPIGOT.system.config.languages.T2CLibLanguages; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.Util; @@ -26,7 +26,7 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (args.length == 0) { if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } Commands.info(sender); @@ -39,21 +39,21 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { case "version": case "ver": if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } Commands.info(sender); return false; case "permtoggle": if (!sender.hasPermission("t2code.permtoggle.use")) { - T2Csend.sender(sender, "§4No Permission §8t2code.permtoggle.use"); + T2C_Send.sender(sender, "§4No Permission §8t2code.permtoggle.use"); return false; } Commands.permtoggle(sender, args); return false; case "updateinfo": if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } Commands.updateInfo(sender, args); @@ -67,38 +67,38 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { // return false; case "reloadconfig": if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } - T2CLibConfig.set(false); - T2CLibLanguages.set(false); - T2Csend.sender(sender, Util.getPrefix() + " §2Config successfully reloaded"); + T2C_LibConfig.set(true); + T2CLibLanguages.set(true); + T2C_Send.sender(sender, Util.getPrefix() + " §2Config successfully reloaded"); return false; case "debug": if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } Commands.debug(sender, args); return false; case "test": if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } Commands.test(sender, args); return false; case "serverid": if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } - T2Csend.sender(sender, ("[prefix] T2C ServerID: copy'>" + - "[id]").replace("[prefix]", Util.getPrefix()).replace("[id]", String.valueOf(T2CLibConfig.VALUES.serverUUID.getValue()))); + T2C_Send.sender(sender, ("[prefix] T2C ServerID: copy'>" + + "[id]").replace("[prefix]", Util.getPrefix()).replace("[id]", String.valueOf(T2C_LibConfig.VALUES.serverUUID.getValue()))); return false; case "bcmd": if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } String cmd = ""; @@ -106,16 +106,16 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { cmd = cmd + s + " "; } cmd = cmd.replace("bcmd ", ""); - T2CbungeeCommandSenderReciver.sendToBungee(null, cmd, true); - T2Cdebug.debug(T2CodeLibMain.getPlugin(), "PluginMessage BCMD: " + cmd); + BungeeCommandSenderReceiver.sendToBungee(null, cmd, true); + T2C_Debug.debug(T2CodeLibMain.getPlugin(), "PluginMessage BCMD: " + cmd); return false; default: if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + T2C_Send.sender(sender, "§4No Permission §8t2code.admin"); return false; } - T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog"); + T2C_Send.sender(sender, "§4Use: §7/t2code debug createReportLog"); return false; } } @@ -161,7 +161,7 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { if (args.length == 2 && args[0].equalsIgnoreCase("updateinfo")) { if (sender.hasPermission("t2code.admin")) { if (hasPermission(p, arg1.get("updateinfo"))) { - for (Map.Entry pl : T2CupdateAPI.pluginVersions.entrySet()) { + for (Map.Entry pl : T2C_UpdateAPI.pluginVersions.entrySet()) { if (passend(pl.getValue().pluginName, args[1])) list.add(pl.getValue().pluginName); } } 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 35ad827..fd7c401 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 @@ -1,11 +1,11 @@ package net.t2code.t2codelib.SPIGOT.system.cmd; -import net.t2code.t2codelib.SPIGOT.api.commands.T2Ccmd; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; -import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; +import net.t2code.t2codelib.SPIGOT.api.commands.T2C_Cmd; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Template; +import net.t2code.t2codelib.SPIGOT.api.update.T2C_UpdateAPI; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.Util; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -15,16 +15,16 @@ import java.io.IOException; public class Commands { protected static void info(CommandSender sender) { - T2Ctemplate.sendInfo(sender, T2CodeLibMain.getPlugin(), Util.getSpigotID(), Util.getDiscord(), null, Util.getInfoText()); + T2C_Template.sendInfo(sender, T2CodeLibMain.getPlugin(), Util.getSpigotID(), Util.getDiscord(), null, Util.getInfoText()); } protected static void test(CommandSender sender, String[] args) { - T2Csend.sender(sender, Util.getPrefix() + " &4Currently there is no development test command"); + T2C_Send.sender(sender, Util.getPrefix() + " &4Currently there is no development test command"); } protected static void debug(CommandSender sender, String[] args) { if (args.length < 2) { - T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog"); + T2C_Send.sender(sender, "§4Use: §7/t2code debug createReportLog"); return; } switch (args[1].toLowerCase()) { @@ -32,11 +32,11 @@ public class Commands { switch (args.length) { case 2: if (sender instanceof Player) { - T2Csend.sender(sender, "The debug zip file is automatically uploaded to T2Code's servers
and automatically deleted " + + T2C_Send.sender(sender, "The debug zip file is automatically uploaded to T2Code's servers
and automatically deleted " + "after 14 days!
The file can also be deleted manually by you via command!
Confirm the" + " upload'>upload | " + "Do not upload'>keep the file on your server"); - } else T2Csend.sender(sender, "The debug zip file is automatically uploaded to T2Code's servers" + + } else T2C_Send.sender(sender, "The debug zip file is automatically uploaded to T2Code's servers" + "
and automatically deleted after 14 days!" + "
The file can also be deleted manually by you via command!" + "
Confirm the upload with the command:" + @@ -52,20 +52,20 @@ public class Commands { try { CreateReportLog.create(sender, upload); } catch (IOException e) { - T2Csend.sender(sender, Util.getPrefix() + " An error occurred while creating a report log! Please look in the console!"); + T2C_Send.sender(sender, Util.getPrefix() + " An error occurred while creating a report log! Please look in the console!"); throw new RuntimeException(e); } } }); break; default: - T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog"); + T2C_Send.sender(sender, "§4Use: §7/t2code debug createReportLog"); return; } break; case "deletereportlog": if (args.length != 3) { - T2Csend.sender(sender, "§4Use: §7/t2code debug deleteReportLog [id]"); + T2C_Send.sender(sender, "§4Use: §7/t2code debug deleteReportLog [id]"); return; } try { @@ -75,29 +75,29 @@ public class Commands { } break; default: - T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog/deleteReportLog"); + T2C_Send.sender(sender, "§4Use: §7/t2code debug createReportLog/deleteReportLog"); break; } } protected static void updateInfo(CommandSender sender, String[] args) { - T2Csend.sender(sender, T2CupdateAPI.updateInfo(args, sender instanceof Player)); + T2C_Send.sender(sender, T2C_UpdateAPI.updateInfo(args, sender instanceof Player)); } public static void permtoggle(CommandSender sender, String[] args) { Player player = (Player) Bukkit.getOfflinePlayer(args[1]); if (player == null) { - T2Csend.sender(sender, "§4Player §6" + args[1] + " §4not exist!"); + T2C_Send.sender(sender, "§4Player §6" + args[1] + " §4not exist!"); return; } String permission = args[2]; if (player.hasPermission(permission)) { - T2Ccmd.console(String.valueOf(T2CLibConfig.VALUES.commandPermToggleCommand.getValue()).replace("[player]",player.getName()).replace("%player_name%",player.getName()).replace("[perm]",permission).replace("[value]", "false")); - T2Csend.sender(sender, "§2Permission §8'§6" + permission + "§8' §2was set to §6false §2for the player §6" + player.getName() + "§2."); + T2C_Cmd.console(String.valueOf(T2C_LibConfig.VALUES.commandPermToggleCommand.getValue()).replace("[player]",player.getName()).replace("%player_name%",player.getName()).replace("[perm]",permission).replace("[value]", "false")); + T2C_Send.sender(sender, "§2Permission §8'§6" + permission + "§8' §2was set to §6false §2for the player §6" + player.getName() + "§2."); } else { - T2Ccmd.console(String.valueOf(T2CLibConfig.VALUES.commandPermToggleCommand.getValue()).replace("[player]",player.getName()).replace("%player_name%",player.getName()).replace("[perm]",permission).replace("[value]", "true")); - T2Csend.sender(sender, "§2Permission §8'§6" + permission + "§8' §2was set to §6true §2for the player §6" + player.getName() + "§2."); + T2C_Cmd.console(String.valueOf(T2C_LibConfig.VALUES.commandPermToggleCommand.getValue()).replace("[player]",player.getName()).replace("%player_name%",player.getName()).replace("[perm]",permission).replace("[value]", "true")); + T2C_Send.sender(sender, "§2Permission §8'§6" + permission + "§8' §2was set to §6true §2for the player §6" + player.getName() + "§2."); } 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 44c4d05..310a37d 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 @@ -1,9 +1,9 @@ package net.t2code.t2codelib.SPIGOT.system.cmd; import net.t2code.luckyBox.api.LuckyBoxAPI; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; -import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_McVersion; +import net.t2code.t2codelib.SPIGOT.api.plugins.T2C_PluginCheck; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import net.t2code.t2codelib.SPIGOT.system.Vault; import net.t2code.t2codelib.Util; @@ -17,7 +17,6 @@ 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; @@ -38,7 +37,7 @@ import java.util.zip.ZipOutputStream; public class CreateReportLog { protected static void create(CommandSender sender, Boolean confirmUpload) throws IOException { - T2Csend.sender(sender, Util.getPrefix() + " §6A DebugLog is created..."); + T2C_Send.sender(sender, Util.getPrefix() + " §6A DebugLog is created..."); String timeStampFile = new SimpleDateFormat("HH_mm_ss-dd_MM_yyyy").format(Calendar.getInstance().getTime()); File directory = new File(T2CodeLibMain.getPath() + "/DebugLogs"); @@ -57,9 +56,9 @@ public class CreateReportLog { String timeStamp = new SimpleDateFormat("HH:mm:ss dd.MM.yyyy").format(Calendar.getInstance().getTime()); 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("Server Bukkit version: " + T2C_McVersion.getBukkitVersion()); + pWriter.println("Server run on: " + T2C_McVersion.getMcVersion()); + pWriter.println("Server NMS: " + T2C_McVersion.getNms()); pWriter.println("Online Mode: " + Bukkit.getOnlineMode()); pWriter.println("Bungee Mode: " + T2CodeLibMain.getIsBungee()); pWriter.println("Server Port: " + Bukkit.getServer().getPort()); @@ -95,7 +94,7 @@ public class CreateReportLog { pWriter.println(); pWriter.println("T2CodeLib: " + T2CodeLibMain.getPlugin().getDescription().getVersion()); pWriter.println(); - if (T2CpluginCheck.luckyBox()) { + if (T2C_PluginCheck.luckyBox()) { pWriter.println("T2C-PremiumPlugins: "); pWriter.println("T2C-LuckyBox UID: " + LuckyBoxAPI.getUID()); pWriter.println("T2C-LuckyBox RID: " + LuckyBoxAPI.getRID()); @@ -133,8 +132,8 @@ public class CreateReportLog { " - Website: " + pl.getDescription().getWebsite()); } - } catch (IOException ioe) { - ioe.printStackTrace(); + } catch (IOException e) { + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); } finally { if (pWriter != null) { pWriter.flush(); @@ -160,7 +159,7 @@ public class CreateReportLog { zip.closeEntry(); zip.close(); } catch (IOException e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); } file.delete(); File zipFile = new File(zipPath); @@ -170,9 +169,9 @@ public class CreateReportLog { zipFile.delete(); directoryTemp.delete(); if (sender instanceof Player) { - T2Csend.sender(sender, Util.getPrefix() + " §6A DebugLog zip has been created. you can find it on in the files on your server under the path: §e" + directory + "/" + zipFile.getName()); + T2C_Send.sender(sender, Util.getPrefix() + " §6A DebugLog zip has been created. you can find it on in the files on your server under the path: §e" + directory + "/" + zipFile.getName()); } - T2Csend.console(Util.getPrefix() + " §6A DebugLog zip has been created. you can find it on in the files on your server under the path: §e" + directory + "/" + zipFile.getName()); + T2C_Send.console(Util.getPrefix() + " §6A DebugLog zip has been created. you can find it on in the files on your server under the path: §e" + directory + "/" + zipFile.getName()); return; } @@ -194,7 +193,7 @@ public class CreateReportLog { zipFile.delete(); directoryTemp.delete(); if (sender instanceof Player) { - T2Csend.sender(sender, ("[prefix] A DebugLog zip has been created." + + T2C_Send.sender(sender, ("[prefix] A DebugLog zip has been created." + "
[prefix] You can download it Download the debug file'>here." + "
[prefix] Please enter the following key in the ticket: Copy to clipboard'>[key]" + "
[prefix] Do not share the download URL with anyone!" + @@ -202,7 +201,7 @@ public class CreateReportLog { "
[prefix] (If you do not delete the debug file, it will be deleted automatically after 14 days!)") .replace("[key]", fileID).replace("[url]", downloadURL).replace("[prefix]", Util.getPrefix())); } - T2Csend.console(Util.getPrefix() + (" A DebugLog zip has been created. You can download it here: [url]" + + T2C_Send.console(Util.getPrefix() + (" A DebugLog zip has been created. You can download it here: [url]" + "
Please enter the following key in the ticket: [key]." + "
Do not share the download URL with anyone!" + "
(If you do not delete the debug file, it will be deleted automatically after 14 days!)" + @@ -212,7 +211,7 @@ public class CreateReportLog { } private static void pluginToDebug(String pluginName, ZipOutputStream zip) throws IOException { - if (T2CpluginCheck.pluginCheck(pluginName)) { + if (T2C_PluginCheck.pluginCheck(pluginName)) { Plugin plugin = Bukkit.getPluginManager().getPlugin(pluginName); File plConfigs = new File(plugin.getDataFolder().getPath()); if (plConfigs.exists()) { @@ -296,9 +295,9 @@ public class CreateReportLog { int response = con.getResponseCode(); if (response == 200) { ReportLogStorage.remove(arg); - T2Csend.sender(sender, "Deleted report: " + arg); + T2C_Send.sender(sender, "Deleted report: " + arg); } else { - T2Csend.sender(sender, "Error while deleting report: " + arg); + T2C_Send.sender(sender, "Error while deleting report: " + arg); } con.disconnect(); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Development.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Development.java index 2981175..16ca089 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Development.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Development.java @@ -1,8 +1,8 @@ package net.t2code.t2codelib.SPIGOT.system.cmd; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; -import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2C_McVersion; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.Util; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import static net.t2code.t2codelib.SPIGOT.api.dev.T2CdevelopmentTool.removeLastChar; +import static net.t2code.t2codelib.SPIGOT.api.dev.T2C_DevelopmentTool.removeLastChar; public class Development implements Listener { @EventHandler @@ -27,8 +27,8 @@ public class Development implements Listener { if (!args[0].equals("_t2code_")) { return; } - if (!(boolean) T2CLibConfig.VALUES.developerTool.getValue()) { - T2Csend.player(e.getPlayer(), Util.getPrefix() + " The Development Tool is disabled."); + if (!(boolean) T2C_LibConfig.VALUES.developerTool.getValue()) { + T2C_Send.player(e.getPlayer(), Util.getPrefix() + " The Development Tool is disabled."); } e.setCancelled(true); t2cPls(e.getPlayer()); @@ -36,7 +36,7 @@ public class Development implements Listener { protected static void t2cPls(Player player) { String msg = "T2Code Development
" - + T2CmcVersion.getMcVersion() + "
(" + Bukkit.getPluginManager().getPlugins().length + ") "; + + T2C_McVersion.getMcVersion() + "
(" + Bukkit.getPluginManager().getPlugins().length + ") "; ArrayList plugins = new ArrayList<>(); Collections.addAll(plugins, Bukkit.getPluginManager().getPlugins()); plugins.sort(Comparator.comparing(Plugin::getName)); @@ -63,7 +63,7 @@ public class Development implements Listener { msg = msg + "" + plSt + ", "; } else msg = msg + "" + plSt + ", "; } - T2Csend.player(player, removeLastChar(msg, 2)); + T2C_Send.player(player, removeLastChar(msg, 2)); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/ReportLogStorage.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/ReportLogStorage.java index 55df04a..7659249 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/ReportLogStorage.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/ReportLogStorage.java @@ -1,5 +1,6 @@ package net.t2code.t2codelib.SPIGOT.system.cmd; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import org.bukkit.configuration.file.YamlConfiguration; @@ -31,7 +32,7 @@ public class ReportLogStorage { try { yamlConfiguration.save(config); } catch (IOException e) { - e.printStackTrace(); + T2C_Send.sendException(e, T2CodeLibMain.getPlugin().getLogger()); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java index 0766f3b..bf962b5 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConvertT2ClibConfig.java @@ -18,16 +18,16 @@ public class ConvertT2ClibConfig { if (!config.exists()) return; if (yamlConfiguration.contains("plugin.updateCheck.onJoin")) return; - set("Plugin.UpdateCheck.OnJoin",T2CLibConfig.VALUES.updateCheckOnJoin); - set("Plugin.UpdateCheck.TimeInterval",T2CLibConfig.VALUES.updateCheckTimeInterval); - set("Plugin.UpdateCheck.SeePreReleaseUpdates",T2CLibConfig.VALUES.seePreReleaseUpdates); - set("Plugin.UpdateCheck.AllPlugins.FullDisable",T2CLibConfig.VALUES.updateCheckFullDisable); - set("Plugin.Debug",T2CLibConfig.VALUES.debug); - set("Plugin.language",T2CLibConfig.VALUES.language); - set("Plugin.Not recommended to disable.developerTool",T2CLibConfig.VALUES.developerTool); - set("BungeeCord.Enable",T2CLibConfig.VALUES.proxy); - set("Player.Inventories.CloseByServerStop",T2CLibConfig.VALUES.inventoriesCloseByServerStop); - set("Command.PermToggle.PermissionSetCommand",T2CLibConfig.VALUES.updateCheckOnJoin); + set("Plugin.UpdateCheck.OnJoin", T2C_LibConfig.VALUES.updateCheckOnJoin); + set("Plugin.UpdateCheck.TimeInterval", T2C_LibConfig.VALUES.updateCheckTimeInterval); + set("Plugin.UpdateCheck.SeePreReleaseUpdates", T2C_LibConfig.VALUES.seePreReleaseUpdates); + set("Plugin.UpdateCheck.AllPlugins.FullDisable", T2C_LibConfig.VALUES.updateCheckFullDisable); + set("Plugin.Debug", T2C_LibConfig.VALUES.debug); + set("Plugin.language", T2C_LibConfig.VALUES.language); + set("Plugin.Not recommended to disable.developerTool", T2C_LibConfig.VALUES.developerTool); + set("BungeeCord.Enable", T2C_LibConfig.VALUES.proxy); + set("Player.Inventories.CloseByServerStop", T2C_LibConfig.VALUES.inventoriesCloseByServerStop); + set("Command.PermToggle.PermissionSetCommand", T2C_LibConfig.VALUES.updateCheckOnJoin); config.delete(); } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2CLibConfig.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2C_LibConfig.java similarity index 95% rename from src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2CLibConfig.java rename to src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2C_LibConfig.java index 87b363f..9b7b849 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2CLibConfig.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/T2C_LibConfig.java @@ -1,7 +1,7 @@ package net.t2code.t2codelib.SPIGOT.system.config.config; -import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; -import net.t2code.t2codelib.SPIGOT.api.yaml.T2CconfigWriter; +import net.t2code.t2codelib.SPIGOT.api.messages.T2C_Send; +import net.t2code.t2codelib.SPIGOT.api.yaml.T2C_ConfigWriter; import net.t2code.t2codelib.T2CLanguageEnum; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import net.t2code.t2codelib.T2CconfigItem; @@ -10,7 +10,7 @@ import net.t2code.t2codelib.Util; import java.io.File; import java.util.*; -public class T2CLibConfig { +public class T2C_LibConfig { public enum VALUES implements T2CconfigItem { @@ -146,12 +146,12 @@ public class T2CLibConfig { } } - public static void set(boolean pluginStart) { + public static void set(boolean isReload) { long long_ = System.currentTimeMillis(); ConvertT2ClibConfig.convert(); - T2CconfigWriter.createConfig(new File(T2CodeLibMain.getPath(), "config.yml"), VALUES.values(), Util.getConfigLogo()); + T2C_ConfigWriter.createConfig(new File(T2CodeLibMain.getPath(), "config.yml"), VALUES.values(), Util.getConfigLogo()); - T2Ctemplate.setCenterAligned(Util.getPrefix(), "§2config.yml were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", pluginStart); + T2C_Send.sendStartTextCenter(Util.getPrefix(), "§2config.yml were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms", isReload); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/languages/T2CLibLanguages.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/languages/T2CLibLanguages.java index 3ab19dd..eac82a7 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/languages/T2CLibLanguages.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/config/languages/T2CLibLanguages.java @@ -6,9 +6,9 @@ package net.t2code.t2codelib.SPIGOT.system.config.languages; import lombok.NonNull; import net.t2code.t2codelib.T2CLanguageEnum; import net.t2code.t2codelib.T2CconfigItemLanguages; -import net.t2code.t2codelib.SPIGOT.api.yaml.T2CconfigWriterLanguage; +import net.t2code.t2codelib.SPIGOT.api.yaml.T2C_LanguageWriter; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; -import net.t2code.t2codelib.SPIGOT.system.config.config.T2CLibConfig; +import net.t2code.t2codelib.SPIGOT.system.config.config.T2C_LibConfig; import net.t2code.t2codelib.Util; import java.util.*; @@ -101,8 +101,8 @@ public class T2CLibLanguages { } } - public static void set(boolean pluginStart) { - T2CconfigWriterLanguage.createConfig(Util.getPrefix(), T2CodeLibMain.getPath(), VALUES.values(), T2CLibConfig.VALUES.language.getValue().toString(), pluginStart, Util.getConfigLogo()); + public static void set(boolean isReload) { + T2C_LanguageWriter.createConfig(Util.getPrefix(), T2CodeLibMain.getPath(), VALUES.values(), T2C_LibConfig.VALUES.language.getValue().toString(), isReload, Util.getConfigLogo()); } } \ No newline at end of file diff --git a/src/main/java/net/t2code/t2codelib/Util.java b/src/main/java/net/t2code/t2codelib/Util.java index cf071fc..dfdb401 100644 --- a/src/main/java/net/t2code/t2codelib/Util.java +++ b/src/main/java/net/t2code/t2codelib/Util.java @@ -109,9 +109,16 @@ public class Util { "╠═══════════════════════════════════════════════════════════════════════════╣" }; - private static String[] loadLogos = new String[]{ - "╔════════════════════════════════════╗", - // "║ Version: "+version+" ║", - "╚════════════════════════════════════╝" - }; + @Getter + private static final String pluginChannel_ProxyOnlinePlayers = "t2c:bonlp"; + @Getter + private static final String pluginChannel_ProxyCommand = "t2c:bcmd"; + @Getter + private static final String pluginChannel_CGUIOnlinePlayers = "t2c:cguiopl"; + @Getter + private static final String pluginChannel_AutoResponse = "t2c:aresp"; + @Getter + private static final String pluginChannel_OPSecurity = "t2c:opsec"; + @Getter + private static final String pluginSubChannel_Console = "T2Cconsole"; } diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/commands/T2CVcmd.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/commands/T2CV_Cmd.java similarity index 79% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/commands/T2CVcmd.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/commands/T2CV_Cmd.java index 543de72..e7959cc 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/commands/T2CVcmd.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/commands/T2CV_Cmd.java @@ -6,13 +6,13 @@ import com.velocitypowered.api.command.CommandManager; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.ConsoleCommandSource; import com.velocitypowered.api.proxy.ProxyServer; -import net.t2code.t2codelib.VELOCITY.system.T2CodeVMain; +import net.t2code.t2codelib.VELOCITY.system.T2CV_Main; import org.slf4j.Logger; -public class T2CVcmd { +public class T2CV_Cmd { - private static final ProxyServer server = T2CodeVMain.getServer(); - private static final Logger logger = T2CodeVMain.getLogger(); + private static final ProxyServer server = T2CV_Main.getServer(); + private static final Logger logger = T2CV_Main.getLogger(); public static void Console(String cmd) { // Get the console command source diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CVsend.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CV_Send.java similarity index 94% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CVsend.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CV_Send.java index c4136fa..2293ff2 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CVsend.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/messages/T2CV_Send.java @@ -4,7 +4,7 @@ import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.Component; import net.kyori.adventure.title.Title; -import net.t2code.t2codelib.VELOCITY.system.config.T2CVlibConfig; +import net.t2code.t2codelib.VELOCITY.system.config.T2CV_LibConfig; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -12,7 +12,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; -public class T2CVsend { +public class T2CV_Send { public static void console(Logger logger, String msg) { if (msg == null || msg.contains("[empty]")) return; @@ -67,7 +67,7 @@ public class T2CVsend { } public static void debug(Logger logger, String msg) { - if (!(boolean)T2CVlibConfig.VALUES.debug.getValue()) return; + if (!(boolean) T2CV_LibConfig.VALUES.debug.getValue()) return; logger.warn(msg); } diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/T2CVplmsgCmd.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/T2CV_PluginMessageProxyCommand.java similarity index 77% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/T2CVplmsgCmd.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/T2CV_PluginMessageProxyCommand.java index 928689e..c5e27ae 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/T2CVplmsgCmd.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/T2CV_PluginMessageProxyCommand.java @@ -9,25 +9,25 @@ import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import net.t2code.t2codelib.Util; -import net.t2code.t2codelib.VELOCITY.api.commands.T2CVcmd; -import net.t2code.t2codelib.VELOCITY.system.T2CodeVMain; +import net.t2code.t2codelib.VELOCITY.api.commands.T2CV_Cmd; +import net.t2code.t2codelib.VELOCITY.system.T2CV_Main; import org.slf4j.Logger; -public class T2CVplmsgCmd { +public class T2CV_PluginMessageProxyCommand { private final ProxyServer server; private final Logger logger; - public T2CVplmsgCmd(ProxyServer server, Logger logger) { + public T2CV_PluginMessageProxyCommand(ProxyServer server, Logger logger) { this.server = server; this.logger = logger; - server.getChannelRegistrar().register(T2CodeVMain.bcmd); + server.getChannelRegistrar().register(T2CV_Main.bcmd); } @Subscribe public void onPluginMessageFromPlayer(PluginMessageEvent event) { - if (event.getIdentifier() != T2CodeVMain.bcmd) { + if (event.getIdentifier() != T2CV_Main.bcmd) { return; } ByteArrayDataInput stream = ByteStreams.newDataInput(event.getData()); @@ -42,12 +42,12 @@ public class T2CVplmsgCmd { if (channel.equals("T2Code-Console")) { logger.info("{} [{}] T2C BCMD Command Console: {}", Util.getVPrefix(), serverID, input); - T2CVcmd.Console(input); + T2CV_Cmd.Console(input); } else { Player player = server.getPlayer(channel).orElse(null); if (player != null) { logger.info("{} [{}] T2C BCMD Command {}: {}", Util.getVPrefix(), serverID, player, input); - T2CVcmd.Player(player, input); + T2CV_Cmd.Player(player, input); } } event.setResult(PluginMessageEvent.ForwardResult.handled()); diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/autoResponse/T2CVapiAutoResponse.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/autoResponse/T2CV_API_AutoResponse.java similarity index 73% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/autoResponse/T2CVapiAutoResponse.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/autoResponse/T2CV_API_AutoResponse.java index d7548ba..e15bc54 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/autoResponse/T2CVapiAutoResponse.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/autoResponse/T2CV_API_AutoResponse.java @@ -6,28 +6,28 @@ import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import net.t2code.t2codelib.VELOCITY.api.commands.T2CVcmd; -import net.t2code.t2codelib.VELOCITY.api.messages.T2CVsend; -import net.t2code.t2codelib.VELOCITY.system.T2CodeVMain; +import net.t2code.t2codelib.VELOCITY.api.commands.T2CV_Cmd; +import net.t2code.t2codelib.VELOCITY.api.messages.T2CV_Send; +import net.t2code.t2codelib.VELOCITY.system.T2CV_Main; import org.slf4j.Logger; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -public class T2CVapiAutoResponse { +public class T2CV_API_AutoResponse { private final ProxyServer server; private final Logger logger; - public T2CVapiAutoResponse(ProxyServer server, Logger logger) { + public T2CV_API_AutoResponse(ProxyServer server, Logger logger) { this.server = server; this.logger = logger; - server.getChannelRegistrar().register(T2CodeVMain.aresp); + server.getChannelRegistrar().register(T2CV_Main.aresp); } @Subscribe public void onPluginmessage(PluginMessageEvent event) { - if (event.getIdentifier() != T2CodeVMain.aresp) { + if (event.getIdentifier() != T2CV_Main.aresp) { return; } DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); @@ -39,18 +39,18 @@ public class T2CVapiAutoResponse { switch (channel) { case "ConC": logger.info("Command Console: {}", input); - T2CVcmd.Console(input); + T2CV_Cmd.Console(input); break; case "ALLPMSG": for (Player player : server.getAllPlayers()) { - T2CVsend.player(player, input); + T2CV_Send.player(player, input); } break; default: Player player = server.getPlayer(channel).orElse(null); if (player != null) { logger.info("Command Console: {}", input); - T2CVcmd.Player(player, input); + T2CV_Cmd.Player(player, input); } break; } diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/commandgui/T2CVapiCGUI.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/commandgui/T2CV_API_CGUI.java similarity index 83% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/commandgui/T2CVapiCGUI.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/commandgui/T2CV_API_CGUI.java index b0cc059..1cd92ba 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/commandgui/T2CVapiCGUI.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/commandgui/T2CV_API_CGUI.java @@ -8,22 +8,22 @@ import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; -import net.t2code.t2codelib.VELOCITY.system.T2CodeVMain; +import net.t2code.t2codelib.VELOCITY.system.T2CV_Main; import org.slf4j.Logger; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; -public class T2CVapiCGUI { +public class T2CV_API_CGUI { private static ProxyServer server; private static Logger logger; - public T2CVapiCGUI(ProxyServer server, Logger logger) { - T2CVapiCGUI.server = server; - T2CVapiCGUI.logger = logger; - server.getChannelRegistrar().register(T2CodeVMain.cguiopl); + public T2CV_API_CGUI(ProxyServer server, Logger logger) { + T2CV_API_CGUI.server = server; + T2CV_API_CGUI.logger = logger; + server.getChannelRegistrar().register(T2CV_Main.cguiopl); } @@ -54,7 +54,7 @@ public class T2CVapiCGUI { } byte[] data = stream.toByteArray(); for (RegisteredServer server : server.getAllServers()) { - server.sendPluginMessage(T2CodeVMain.cguiopl, data); + server.sendPluginMessage(T2CV_Main.cguiopl, data); } } @@ -69,7 +69,7 @@ public class T2CVapiCGUI { } byte[] data = stream.toByteArray(); for (RegisteredServer server : server.getAllServers()) { - server.sendPluginMessage(T2CodeVMain.cguiopl, data); + server.sendPluginMessage(T2CV_Main.cguiopl, data); } } } \ No newline at end of file diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/opSecurity/T2CVapiOpSecurity.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/opSecurity/T2CV_API_OpSecurity.java similarity index 77% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/opSecurity/T2CVapiOpSecurity.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/opSecurity/T2CV_API_OpSecurity.java index 0f494ea..70e09bc 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/opSecurity/T2CVapiOpSecurity.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/pluginMessaging/opSecurity/T2CV_API_OpSecurity.java @@ -6,24 +6,24 @@ import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; -import net.t2code.t2codelib.VELOCITY.system.T2CodeVMain; +import net.t2code.t2codelib.VELOCITY.system.T2CV_Main; import org.slf4j.Logger; import java.io.*; -public class T2CVapiOpSecurity { +public class T2CV_API_OpSecurity { private static ProxyServer server ; private static Logger logger ; - public T2CVapiOpSecurity(ProxyServer server, Logger logger) { - T2CVapiOpSecurity.server = server; - T2CVapiOpSecurity.logger = logger; - server.getChannelRegistrar().register(T2CodeVMain.opsec); + public T2CV_API_OpSecurity(ProxyServer server, Logger logger) { + T2CV_API_OpSecurity.server = server; + T2CV_API_OpSecurity.logger = logger; + server.getChannelRegistrar().register(T2CV_Main.opsec); } @Subscribe public void onPluginmessage(PluginMessageEvent event) { - if (event.getIdentifier() != T2CodeVMain.opsec) { + if (event.getIdentifier() != T2CV_Main.opsec) { return; } @@ -52,7 +52,7 @@ public class T2CVapiOpSecurity { logger.error(e.getMessage()); } for (RegisteredServer server : server.getAllServers()) { - server.sendPluginMessage(T2CodeVMain.opsec, stream.toByteArray()); + server.sendPluginMessage(T2CV_Main.opsec, stream.toByteArray()); } } } \ No newline at end of file diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/proxyPlayers/T2CVPlayers.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/proxyPlayers/T2CV_Players.java similarity index 61% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/proxyPlayers/T2CVPlayers.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/proxyPlayers/T2CV_Players.java index 5faae36..b5ef452 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/proxyPlayers/T2CVPlayers.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/proxyPlayers/T2CV_Players.java @@ -11,30 +11,31 @@ import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; -import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2CbungeePlayersEnum; -import net.t2code.t2codelib.VELOCITY.api.messages.T2CVsend; -import net.t2code.t2codelib.VELOCITY.system.T2CodeVMain; +import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2C_BngeePlayersEnum; +import net.t2code.t2codelib.Util; +import net.t2code.t2codelib.VELOCITY.api.messages.T2CV_Send; +import net.t2code.t2codelib.VELOCITY.system.T2CV_Main; import org.slf4j.Logger; import java.io.*; -public class T2CVPlayers { +public class T2CV_Players { - public static ProxyServer server = T2CodeVMain.getServer(); - public static Logger logger = T2CodeVMain.getLogger(); + public static ProxyServer server = T2CV_Main.getServer(); + public static Logger logger = T2CV_Main.getLogger(); @Subscribe public void onJoin(PostLoginEvent e) { - sendToSpigotPlayer(e.getPlayer().getUsername(), T2CbungeePlayersEnum.JOIN, ""); + sendToSpigotPlayer(e.getPlayer().getUsername(), T2C_BngeePlayersEnum.JOIN, ""); } @Subscribe public void onDisconnect(DisconnectEvent e) { - sendToSpigotPlayer(e.getPlayer().getUsername(), T2CbungeePlayersEnum.QUIT, ""); + sendToSpigotPlayer(e.getPlayer().getUsername(), T2C_BngeePlayersEnum.QUIT, ""); } - public void sendToSpigotPlayer(String name, T2CbungeePlayersEnum value, String uuid) { + public void sendToSpigotPlayer(String name, T2C_BngeePlayersEnum value, String uuid) { switch (value) { case JOIN: case QUIT: @@ -45,12 +46,12 @@ public class T2CVPlayers { for (Player player : server.getAllPlayers()) { input.append(player.getUsername()).append(";"); } - sendToSpigotPlayerExecute(input.toString(), T2CbungeePlayersEnum.GIVEALL, uuid); + sendToSpigotPlayerExecute(input.toString(), T2C_BngeePlayersEnum.GIVEALL, uuid); break; } } - private void sendToSpigotPlayerExecute(String name, T2CbungeePlayersEnum value, String uuid) { + private void sendToSpigotPlayerExecute(String name, T2C_BngeePlayersEnum value, String uuid) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); DataOutputStream output = new DataOutputStream(stream); try { @@ -60,13 +61,13 @@ public class T2CVPlayers { } catch (IOException e) { logger.error (e.getMessage()); } - T2CVsend.debug(logger, "PluginMessage received channel: t2c:bonlp"); - T2CVsend.debug(logger, "PluginMessage received subChannel: " + value.name()); - T2CVsend.debug(logger, "PluginMessage received input: " + name); - T2CVsend.debug(logger, "PluginMessage received input2/uuid: " + uuid); + T2CV_Send.debug(logger, "PluginMessage received channel: "+ Util.getPluginChannel_ProxyOnlinePlayers()); + T2CV_Send.debug(logger, "PluginMessage received subChannel: " + value.name()); + T2CV_Send.debug(logger, "PluginMessage received input: " + name); + T2CV_Send.debug(logger, "PluginMessage received input2/uuid: " + uuid); byte[] data = stream.toByteArray(); for (RegisteredServer server : server.getAllServers()) { - server.sendPluginMessage(T2CodeVMain.bonlp, data); + server.sendPluginMessage(T2CV_Main.bonlp, data); } } @@ -75,7 +76,7 @@ public class T2CVPlayers { ByteArrayOutputStream stream = new ByteArrayOutputStream(); DataOutputStream output = new DataOutputStream(stream); try { - output.writeUTF(T2CbungeePlayersEnum.CLEAR.name()); + output.writeUTF(T2C_BngeePlayersEnum.CLEAR.name()); output.writeUTF(""); output.writeUTF(""); } catch (IOException e) { @@ -83,24 +84,24 @@ public class T2CVPlayers { } byte[] data = stream.toByteArray(); for (RegisteredServer server : server.getAllServers()) { - server.sendPluginMessage(T2CodeVMain.bonlp, data); + server.sendPluginMessage(T2CV_Main.bonlp, data); } } @Subscribe public void onPluginMessage(PluginMessageEvent event) { - if (event.getIdentifier() != T2CodeVMain.bonlp) { + if (event.getIdentifier() != T2CV_Main.bonlp) { return; } DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); try { - T2CbungeePlayersEnum subChannel = T2CbungeePlayersEnum.valueOf(stream.readUTF()); + T2C_BngeePlayersEnum subChannel = T2C_BngeePlayersEnum.valueOf(stream.readUTF()); String input = stream.readUTF(); - T2CVsend.debug(logger, "PluginMessage received channel: " + T2CodeVMain.bonlp); - T2CVsend.debug(logger, "PluginMessage received subChannel: " + subChannel.name()); - T2CVsend.debug(logger, "PluginMessage received input/uuid: " + input); + T2CV_Send.debug(logger, "PluginMessage received channel: " + T2CV_Main.bonlp); + T2CV_Send.debug(logger, "PluginMessage received subChannel: " + subChannel.name()); + T2CV_Send.debug(logger, "PluginMessage received input/uuid: " + input); sendToSpigotPlayer("", subChannel, input); } catch (IOException e) { diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CVupdateAPI.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CV_UpdateAPI.java similarity index 69% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CVupdateAPI.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CV_UpdateAPI.java index 2b7140d..1510715 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CVupdateAPI.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CV_UpdateAPI.java @@ -1,20 +1,19 @@ package net.t2code.t2codelib.VELOCITY.api.update; -import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.proxy.ProxyServer; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; import net.t2code.t2codelib.UpdateType; -import net.t2code.t2codelib.VELOCITY.api.messages.T2CVsend; -import net.t2code.t2codelib.VELOCITY.system.config.T2CVlibConfig; +import net.t2code.t2codelib.VELOCITY.api.messages.T2CV_Send; +import net.t2code.t2codelib.VELOCITY.system.config.T2CV_LibConfig; import org.slf4j.Logger; import java.time.Duration; import java.util.HashMap; -public class T2CVupdateAPI { +public class T2CV_UpdateAPI { public static HashMap bungeePluginVersins = new HashMap<>(); public static void sendUpdateMsg(Logger logger, String prefix, String discord, T2CupdateWebData webData, PluginContainer plugin) { @@ -33,24 +32,24 @@ public class T2CVupdateAPI { value = UpdateType.SNAPSHOT_.text; } } else value = UpdateType.STABLE_.text; - T2CVsend.console(logger, "╔══════════════" + prefix + "══════════════"); - T2CVsend.console(logger, "║ A new [value] version was found!".replace("[value]", value)); - T2CVsend.console(logger, "║ Your version: " + pluginVersion + " - Current version: " + webData.getVersion()); - T2CVsend.console(logger, "║ You can download it here: " + webData.getUpdateUrl()); - T2CVsend.console(logger, "║ You can find more information on Discord: " + discord); - T2CVsend.console(logger, "╚══════════════" + prefix + "══════════════"); + T2CV_Send.console(logger, "╔══════════════" + prefix + "══════════════"); + T2CV_Send.console(logger, "║ A new [value] version was found!".replace("[value]", value)); + T2CV_Send.console(logger, "║ Your version: " + pluginVersion + " - Current version: " + webData.getVersion()); + T2CV_Send.console(logger, "║ You can download it here: " + webData.getUpdateUrl()); + T2CV_Send.console(logger, "║ You can find more information on Discord: " + discord); + T2CV_Send.console(logger, "╚══════════════" + prefix + "══════════════"); } private static Boolean noUpdate = true; private static String pluginVersion; public static void onUpdateCheckTimer(Logger logger, PluginContainer plugin, ProxyServer server, String prefix, String discord, Integer spigotID, String url) { - if ((int) T2CVlibConfig.VALUES.updateTimer.getValue() < 1) { - T2CVlibConfig.VALUES.updateTimer.setValue(1); + if ((int) T2CV_LibConfig.VALUES.updateTimer.getValue() < 1) { + T2CV_LibConfig.VALUES.updateTimer.setValue(1); } server.getScheduler().buildTask(plugin, () -> { - (new T2CVupdateCheckerGit(plugin,logger)).getVersion((webData) -> { + (new T2CV_UpdateCheckerGit(plugin,logger)).getVersion((webData) -> { pluginVersion = plugin.getDescription().getVersion().toString(); T2CupdateObject update = new T2CupdateObject( plugin.getDescription().getName().toString(), @@ -66,12 +65,12 @@ public class T2CVupdateAPI { noUpdate = true; } else { if (noUpdate) { - T2CVsend.console(logger, " No update found."); + T2CV_Send.console(logger, " No update found."); noUpdate = false; } } }, pluginVersion, spigotID, url); - }).repeat(Duration.ofMinutes((int) T2CVlibConfig.VALUES.updateTimer.getValue())).schedule(); + }).repeat(Duration.ofMinutes((int) T2CV_LibConfig.VALUES.updateTimer.getValue())).schedule(); } } diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CVupdateCheckerGit.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CV_UpdateCheckerGit.java similarity index 86% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CVupdateCheckerGit.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CV_UpdateCheckerGit.java index 182692d..f862920 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CVupdateCheckerGit.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/update/T2CV_UpdateCheckerGit.java @@ -1,7 +1,7 @@ package net.t2code.t2codelib.VELOCITY.api.update; import com.velocitypowered.api.plugin.PluginContainer; -import net.t2code.t2codelib.BUNGEE.system.config.T2CBlibConfig; +import net.t2code.t2codelib.BUNGEE.system.config.T2CB_LibConfig; import net.t2code.t2codelib.T2CupdateObject; import net.t2code.t2codelib.T2CupdateWebData; import org.json.JSONArray; @@ -17,12 +17,12 @@ import java.util.Date; import java.util.function.Consumer; -public class T2CVupdateCheckerGit { +public class T2CV_UpdateCheckerGit { private PluginContainer plugin; private Logger logger; - public T2CVupdateCheckerGit(PluginContainer plugin, Logger logger) { + public T2CV_UpdateCheckerGit(PluginContainer plugin, Logger logger) { this.plugin = plugin; this.logger=logger; @@ -30,7 +30,7 @@ public class T2CVupdateCheckerGit { public void getVersion(Consumer consumer, String pluginVersion, Integer spigotID, String gitKey) { String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1"; - if (!(boolean)T2CBlibConfig.VALUES.seePreReleaseUpdates.getValue() ) { + if (!(boolean) T2CB_LibConfig.VALUES.seePreReleaseUpdates.getValue() ) { RepoURL = RepoURL + "&pre-release=false"; } String finalRepoURL = RepoURL; @@ -82,8 +82,8 @@ public class T2CVupdateCheckerGit { consumer.accept(webData); } catch (Exception var10) { Boolean load = false; - if (T2CVupdateAPI.bungeePluginVersins.containsKey(plugin.getDescription().getName().toString())) { - load = T2CVupdateAPI.bungeePluginVersins.get(plugin.getDescription().getName().toString()).load; + if (T2CV_UpdateAPI.bungeePluginVersins.containsKey(plugin.getDescription().getName().toString())) { + load = T2CV_UpdateAPI.bungeePluginVersins.get(plugin.getDescription().getName().toString()).load; } T2CupdateObject update = new T2CupdateObject( plugin.getDescription().getName().toString(), @@ -93,7 +93,7 @@ public class T2CVupdateCheckerGit { false, true ); - T2CVupdateAPI.bungeePluginVersins.put(plugin.getDescription().getName().toString(), update); + T2CV_UpdateAPI.bungeePluginVersins.put(plugin.getDescription().getName().toString(), update); logger.error("Cannot look for updates: {}", var10.getMessage()); } diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/api/yml/T2CVconfigWriter.java b/src/main/java/net/t2code/t2codelib/VELOCITY/api/yml/T2CV_ConfigWriter.java similarity index 99% rename from src/main/java/net/t2code/t2codelib/VELOCITY/api/yml/T2CVconfigWriter.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/api/yml/T2CV_ConfigWriter.java index 01cab2b..f0a5465 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/api/yml/T2CVconfigWriter.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/api/yml/T2CV_ConfigWriter.java @@ -13,7 +13,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public class T2CVconfigWriter { +public class T2CV_ConfigWriter { public static void createConfig(Logger logger, File configFile, T2CconfigItem[] manager, String... header) throws IOException { boolean exist = configFile.exists(); diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CodeVMain.java b/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CV_Main.java similarity index 59% rename from src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CodeVMain.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CV_Main.java index 417e13b..78e0cb4 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CodeVMain.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/system/T2CV_Main.java @@ -12,20 +12,20 @@ import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import lombok.Getter; import net.t2code.t2codelib.Util; -import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.T2CVplmsgCmd; -import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.autoResponse.T2CVapiAutoResponse; -import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.commandgui.T2CVapiCGUI; -import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.opSecurity.T2CVapiOpSecurity; -import net.t2code.t2codelib.VELOCITY.api.proxyPlayers.T2CVPlayers; -import net.t2code.t2codelib.VELOCITY.api.update.T2CVupdateAPI; -import net.t2code.t2codelib.VELOCITY.system.bstats.Metrics; -import net.t2code.t2codelib.VELOCITY.system.config.T2CVlibConfig; +import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.T2CV_PluginMessageProxyCommand; +import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.autoResponse.T2CV_API_AutoResponse; +import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.commandgui.T2CV_API_CGUI; +import net.t2code.t2codelib.VELOCITY.api.pluginMessaging.opSecurity.T2CV_API_OpSecurity; +import net.t2code.t2codelib.VELOCITY.api.proxyPlayers.T2CV_Players; +import net.t2code.t2codelib.VELOCITY.api.update.T2CV_UpdateAPI; +import net.t2code.t2codelib.VELOCITY.system.bstats.T2CV_Metrics; +import net.t2code.t2codelib.VELOCITY.system.config.T2CV_LibConfig; import org.slf4j.Logger; import java.io.IOException; import java.nio.file.Path; -public class T2CodeVMain { +public class T2CV_Main { @Getter private static ProxyServer server; @@ -38,22 +38,22 @@ public class T2CodeVMain { @Getter private static Path dataDirectory; - private final Metrics.Factory metricsFactory; + private final T2CV_Metrics.Factory metricsFactory; - public static final MinecraftChannelIdentifier bcmd = MinecraftChannelIdentifier.from("t2c:bcmd"); - public static final MinecraftChannelIdentifier bonlp = MinecraftChannelIdentifier.from("t2c:bonlp"); - public static final MinecraftChannelIdentifier cguiopl = MinecraftChannelIdentifier.from("t2c:cguiopl"); - public static final MinecraftChannelIdentifier aresp = MinecraftChannelIdentifier.from("t2c:aresp"); - public static final MinecraftChannelIdentifier opsec = MinecraftChannelIdentifier.from("t2c:opsec"); + public static final MinecraftChannelIdentifier bcmd = MinecraftChannelIdentifier.from(Util.getPluginChannel_ProxyCommand()); + public static final MinecraftChannelIdentifier bonlp = MinecraftChannelIdentifier.from(Util.getPluginChannel_ProxyOnlinePlayers()); + public static final MinecraftChannelIdentifier cguiopl = MinecraftChannelIdentifier.from(Util.getPluginChannel_CGUIOnlinePlayers()); + public static final MinecraftChannelIdentifier aresp = MinecraftChannelIdentifier.from(Util.getPluginChannel_AutoResponse()); + public static final MinecraftChannelIdentifier opsec = MinecraftChannelIdentifier.from(Util.getPluginChannel_OPSecurity()); @Inject - public T2CodeVMain(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory) { + public T2CV_Main(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, T2CV_Metrics.Factory metricsFactory) { starttime = System.currentTimeMillis(); - T2CodeVMain.server = server; - T2CodeVMain.logger = logger; - T2CodeVMain.dataDirectory = dataDirectory; + T2CV_Main.server = server; + T2CV_Main.logger = logger; + T2CV_Main.dataDirectory = dataDirectory; this.metricsFactory = metricsFactory; @@ -75,7 +75,7 @@ public class T2CodeVMain { logger.info("║ Discord: {}", Util.getDiscord()); try { - T2CVlibConfig.set(dataDirectory, logger); + T2CV_LibConfig.set(dataDirectory, logger); } catch (IOException ex) { throw new RuntimeException(ex); } @@ -85,28 +85,28 @@ public class T2CodeVMain { //API - server.getEventManager().register(this, new T2CVplmsgCmd(server, logger)); + server.getEventManager().register(this, new T2CV_PluginMessageProxyCommand(server, logger)); - server.getChannelRegistrar().register(T2CodeVMain.bonlp); - T2CVPlayers.sendToSpigotDeleteAll(); + server.getChannelRegistrar().register(T2CV_Main.bonlp); + T2CV_Players.sendToSpigotDeleteAll(); - if ((boolean) T2CVlibConfig.VALUES.apiCommandGUIEnable.getValue()) { - server.getEventManager().register(this, new T2CVapiCGUI(server, logger)); - T2CVapiCGUI.sendToSpigotDeleteAll(); + if ((boolean) T2CV_LibConfig.VALUES.apiCommandGUIEnable.getValue()) { + server.getEventManager().register(this, new T2CV_API_CGUI(server, logger)); + T2CV_API_CGUI.sendToSpigotDeleteAll(); } - if ((boolean) T2CVlibConfig.VALUES.apiAutoResponse.getValue()) { - server.getEventManager().register(this, new T2CVapiAutoResponse(server, logger)); + if ((boolean) T2CV_LibConfig.VALUES.apiAutoResponse.getValue()) { + server.getEventManager().register(this, new T2CV_API_AutoResponse(server, logger)); } - if ((boolean) T2CVlibConfig.VALUES.apiOpSecurity.getValue()) { - server.getEventManager().register(this, new T2CVapiOpSecurity(server, logger)); + if ((boolean) T2CV_LibConfig.VALUES.apiOpSecurity.getValue()) { + server.getEventManager().register(this, new T2CV_API_OpSecurity(server, logger)); } - Metrics.bStats(this, Util.getBstatsID(), metricsFactory); - T2CVupdateAPI.onUpdateCheckTimer(logger, plugin, server, Util.getVPrefix(), Util.getDiscord(), Util.getSpigotID(), Util.getGit()); + T2CV_Metrics.bStats(this, Util.getBstatsID(), metricsFactory); + T2CV_UpdateAPI.onUpdateCheckTimer(logger, plugin, server, Util.getVPrefix(), Util.getDiscord(), Util.getSpigotID(), Util.getGit()); logger.info("║"); logger.info("║ Plugin loaded successfully - {}ms", System.currentTimeMillis() - starttime); logger.info("╚════════════════════════════════════"); diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/system/bstats/Metrics.java b/src/main/java/net/t2code/t2codelib/VELOCITY/system/bstats/T2CV_Metrics.java similarity index 98% rename from src/main/java/net/t2code/t2codelib/VELOCITY/system/bstats/Metrics.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/system/bstats/T2CV_Metrics.java index c226a03..3c43782 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/system/bstats/Metrics.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/system/bstats/T2CV_Metrics.java @@ -55,15 +55,15 @@ import java.util.stream.Collectors; import java.util.zip.GZIPOutputStream; import javax.net.ssl.HttpsURLConnection; -import net.t2code.t2codelib.VELOCITY.system.T2CodeVMain; +import net.t2code.t2codelib.VELOCITY.system.T2CV_Main; import org.slf4j.Logger; -public class Metrics { +public class T2CV_Metrics { - public static void bStats(T2CodeVMain plugin, Integer bstatsID, Metrics.Factory metricsFactory) { + public static void bStats(T2CV_Main plugin, Integer bstatsID, T2CV_Metrics.Factory metricsFactory) { int pluginId = bstatsID; // <-- Replace with the id of your plugin! - Metrics metrics = metricsFactory.make(plugin, pluginId); + T2CV_Metrics metrics = metricsFactory.make(plugin, pluginId); } /** A factory to create new Metrics classes. */ @@ -94,8 +94,8 @@ public class Metrics { * @return A Metrics instance that can be used to register custom charts. *

The return value can be ignored, when you do not want to register custom charts. */ - public Metrics make(Object plugin, int serviceId) { - return new Metrics(plugin, server, logger, dataDirectory, serviceId); + public T2CV_Metrics make(Object plugin, int serviceId) { + return new T2CV_Metrics(plugin, server, logger, dataDirectory, serviceId); } } @@ -105,7 +105,7 @@ public class Metrics { private MetricsBase metricsBase; - private Metrics( + private T2CV_Metrics( Object plugin, ProxyServer server, Logger logger, Path dataDirectory, int serviceId) { pluginContainer = server diff --git a/src/main/java/net/t2code/t2codelib/VELOCITY/system/config/T2CVlibConfig.java b/src/main/java/net/t2code/t2codelib/VELOCITY/system/config/T2CV_LibConfig.java similarity index 87% rename from src/main/java/net/t2code/t2codelib/VELOCITY/system/config/T2CVlibConfig.java rename to src/main/java/net/t2code/t2codelib/VELOCITY/system/config/T2CV_LibConfig.java index 822279c..c80b2c7 100644 --- a/src/main/java/net/t2code/t2codelib/VELOCITY/system/config/T2CVlibConfig.java +++ b/src/main/java/net/t2code/t2codelib/VELOCITY/system/config/T2CV_LibConfig.java @@ -3,8 +3,8 @@ package net.t2code.t2codelib.VELOCITY.system.config; import net.t2code.t2codelib.T2CLanguageEnum; import net.t2code.t2codelib.T2CconfigItem; import net.t2code.t2codelib.Util; -import net.t2code.t2codelib.VELOCITY.api.messages.T2CVsend; -import net.t2code.t2codelib.VELOCITY.api.yml.T2CVconfigWriter; +import net.t2code.t2codelib.VELOCITY.api.messages.T2CV_Send; +import net.t2code.t2codelib.VELOCITY.api.yml.T2CV_ConfigWriter; import org.slf4j.Logger; import java.io.File; @@ -13,7 +13,7 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.List; -public class T2CVlibConfig { +public class T2CV_LibConfig { public enum VALUES implements T2CconfigItem { updateTimer("updateCheck.timerInMin", 60, true, @@ -89,7 +89,7 @@ public class T2CVlibConfig { public static void set(Path dataDirectory, Logger logger) throws IOException { long long_ = System.currentTimeMillis(); - T2CVconfigWriter.createConfig(logger, new File(dataDirectory.getParent() + "/T2CodeLib", "config.yml"), VALUES.values(), Util.getConfigLogo()); - T2CVsend.info(logger, "║ The config.yml were successfully created / updated." + " - " + (System.currentTimeMillis() - long_) + "ms"); + T2CV_ConfigWriter.createConfig(logger, new File(dataDirectory.getParent() + "/T2CodeLib", "config.yml"), VALUES.values(), Util.getConfigLogo()); + T2CV_Send.info(logger, "║ The config.yml were successfully created / updated." + " - " + (System.currentTimeMillis() - long_) + "ms"); } }