diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java index 7dbbd17..9a0d774 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2ChoverModule.java @@ -8,11 +8,25 @@ import org.bukkit.entity.Player; public class T2ChoverModule { + /** + * @deprecated reason this method is deprecated
+ * The T2Code Hover Module will be removed soon,
+ * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'
+ * and the Kyori MiniMessage format! + */ + @Deprecated 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") + "/*/" + (actionValue != null ? actionValue : "null"), player); } + /** + * @deprecated reason this method is deprecated
+ * The T2Code Hover Module will be removed soon,
+ * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'
+ * and the Kyori MiniMessage format! + */ + @Deprecated public static void modulePlayer(String msg, Player player) { if (msg.contains("/*/")) { t2cmodule(msg, player); @@ -21,10 +35,24 @@ public class T2ChoverModule { T2CminiMessage.sendPlayerMiniMessage(msg, player); } + /** + * @deprecated reason this method is deprecated
+ * The T2Code Hover Module will be removed soon,
+ * please use 'T2CminiMessage.sendSenderMiniMessage(msg, sender);'
+ * and the Kyori MiniMessage format! + */ + @Deprecated public static void moduleSender(String msg, CommandSender sender) { T2CminiMessage.sendSenderMiniMessage(msg, sender); } + /** + * @deprecated reason this method is deprecated
+ * The T2Code Hover Module will be removed soon,
+ * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'
+ * and the Kyori MiniMessage format! + */ + @Deprecated public static void moduleConsole(String msg) { if (T2CodeLibMain.getMmIsLoad()) { T2CminiMessage.sendConsoleMiniMessage(msg); @@ -33,6 +61,13 @@ public class T2ChoverModule { Bukkit.getConsoleSender().sendMessage(msg); } + /** + * @deprecated reason this method is deprecated
+ * The T2Code Hover Module will be removed soon,
+ * please use 'T2CminiMessage.sendPlayerMiniMessage(msg, player);'
+ * and the Kyori MiniMessage format! + */ + @Deprecated private static void t2cmodule(String msg, Player player) { String[] split = msg.split("/\\*/"); int i = split.length; 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 index 5e0f4c3..d9e0aad 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Creplace.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Creplace.java @@ -110,16 +110,6 @@ public class T2Creplace { .replace("&c", "").replace("&d", "").replace("&e", "").replace("&f", "") .replace("&k", "").replace("&l", "").replace("&m", "").replace("&n", "") .replace("&o", "").replace("&r", ""); - // String text = value.replace("&", "§"); - // while (text.contains("§")) { - // int stelle = text.indexOf("§"); - // if (text.length() >= stelle + 2) { - // text = text.substring(0, stelle) + text.substring(stelle + 2); - // } else { - // text = text.substring(0, stelle) + text.substring(stelle + 1); - // } - // } - // return (text); } public static List replacePrice(String prefix, Player player, List Text, String price) { diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java index c0ead23..1c40be2 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java @@ -12,36 +12,62 @@ import java.util.logging.Level; public class T2Csend { /** - * Spigot + * @deprecated reason this method is deprecated
+ * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed! */ - + @Deprecated public static void console(String msg) { if (msg == null || msg.contains("[empty]")) return; T2ChoverModule.moduleConsole(msg); } + /** + * @deprecated reason this method is deprecated
+ * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed! + */ + @Deprecated public static void player(Player player, String msg) { if (msg == null || msg.contains("[empty]")) return; T2ChoverModule.modulePlayer(msg, player); } + /** + * @deprecated reason this method is deprecated
+ * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed! + */ + @Deprecated public static void sender(CommandSender sender, String msg) { if (msg == null || msg.contains("[empty]")) return; T2ChoverModule.moduleSender(msg, sender); } + /** + * @deprecated reason this method is deprecated
+ * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed! + */ + @Deprecated public static void console(Object object) { String msg = String.valueOf(object); if (msg == null || msg.contains("[empty]")) return; T2ChoverModule.moduleConsole(msg); } + /** + * @deprecated reason this method is deprecated
+ * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed! + */ + @Deprecated public static void player(Player player, Object object) { String msg = String.valueOf(object); if (msg == null || msg.contains("[empty]")) return; T2ChoverModule.modulePlayer(msg, player); } + /** + * @deprecated reason this method is deprecated
+ * Please note that these methods will be rebuilt to MiniMessage in the future and from then on the T2Code Hover Module will be removed! + */ + @Deprecated public static void sender(CommandSender sender, Object object) { String msg = String.valueOf(object); if (msg == null || msg.contains("[empty]")) return; diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java index e46a866..56c9d72 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Ctemplate.java @@ -68,21 +68,41 @@ public class T2Ctemplate { T2Csend.console(prefix + " §8-------------------------------"); } - public static void onLoadFooter(String prefix, Long long_, String version) { - onLoadSeparateStroke(prefix); - T2Csend.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); - } - public static void onLoadFooter(String prefix, Long long_) { onLoadSeparateStroke(prefix); T2Csend.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); } + /** + * @param prefix + * @param autor + * @param spigot + * @param discord + * + * @deprecated reason this method is deprecated
+ * {will be removed in next version}
+ * use {@link #onDisable(Plugin)} instead like this: + * + * + * 
+     * onDisable(getPlugin())
+     *
+ * + */ + @Deprecated public static void onDisable(String prefix, List autor, String version, String spigot, String discord) { T2Csend.console(prefix + " §2Version: §6" + version); T2Csend.console(prefix + " §4Plugin successfully disabled."); } + public static void onDisable(String prefix, Plugin plugin) { + T2Csend.console(prefix + " §4 §e╔══════════════════════════"); + T2Csend.console(prefix + " §4 §e║ §2Version: §6" + plugin.getDescription().getVersion()); + T2Csend.console(prefix + " §4 §e║ §2Autors: §6" + plugin.getDescription().getAuthors()); + T2Csend.console(prefix + " §4 §e║ §4Plugin successfully disabled."); + T2Csend.console(prefix + " §4 §e╚══════════════════════════"); + } + public static void sendInfo(CommandSender sender, Plugin plugin, int spigotID, String discord, Boolean premiumVerified, String text) { String pluginVersion = plugin.getDescription().getVersion(); String publicVersion = T2CupdateAPI.pluginVersions.get(plugin.getName()).webData.getVersion(); 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 138a3c7..e7becc8 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 @@ -25,11 +25,11 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!sender.hasPermission("t2code.admin")) { - T2Csend.sender(sender, "§4No Permission §8t2code.admin"); - return false; - } if (args.length == 0) { + if (!sender.hasPermission("t2code.admin")) { + T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + return false; + } Commands.info(sender); return false; } @@ -39,26 +39,53 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { case "pl": case "version": case "ver": + if (!sender.hasPermission("t2code.admin")) { + T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + return false; + } Commands.info(sender); return false; case "updateinfo": + if (!sender.hasPermission("t2code.admin")) { + T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + return false; + } Commands.updateInfo(sender, args); return false; case "reloadconfig": + if (!sender.hasPermission("t2code.admin")) { + T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + return false; + } SelectLibConfig.onSelect(); T2Csend.sender(sender, Util.getPrefix() + " §2Config successfully reloaded"); return false; case "debug": + if (!sender.hasPermission("t2code.admin")) { + T2Csend.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"); + return false; + } Commands.test(sender, args); return false; - case "serverid": + case "serverid":if (!sender.hasPermission("t2code.admin")) { + T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + return false; + } T2Csend.sender(sender, ("[prefix] T2C ServerID: copy'>" + "[id]").replace("[prefix]", Util.getPrefix()).replace("[id]", String.valueOf(Util.getServerUUID()))); return false; case "bcmd": + if (!sender.hasPermission("t2code.admin")) { + T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + return false; + } String cmd = ""; for (String s : args) { cmd = cmd + s + " "; @@ -69,6 +96,10 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { return false; default: + if (!sender.hasPermission("t2code.admin")) { + T2Csend.sender(sender, "§4No Permission §8t2code.admin"); + return false; + } T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog"); return false; } 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 8087682..af30b16 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 @@ -3,31 +3,33 @@ package net.t2code.t2codelib.SPIGOT.system.cmd; 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.system.T2CbungeeCommandSenderReciver; import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain; import net.t2code.t2codelib.Util; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import java.io.File; import java.io.IOException; public class Commands { - public static void info(CommandSender sender) { + protected static void info(CommandSender sender) { T2Ctemplate.sendInfo(sender, T2CodeLibMain.getPlugin(), Util.getSpigotID(), Util.getDiscord(), null, Util.getInfoText()); } - public static void test(CommandSender sender, String[] args) { - T2Csend.sender(sender,Util.getPrefix()+" &4Currently there is no development test command"); + + protected static void test(CommandSender sender, String[] args) { + T2Csend.sender(sender, Util.getPrefix() + " &4Currently there is no development test command"); } - public static void debug(CommandSender sender, String[] args) { + protected static void debug(CommandSender sender, String[] args) { if (args.length < 2) { T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog"); return; } switch (args[1].toLowerCase()) { case "createreportlog": - switch (args.length){ + 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 " + @@ -78,7 +80,7 @@ public class Commands { } } - public static void updateInfo(CommandSender sender, String[] args) { + protected static void updateInfo(CommandSender sender, String[] args) { T2Csend.sender(sender, T2CupdateAPI.updateInfo(args, sender instanceof Player)); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CreateReportLog.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CreateReportLog.java index df7ef1c..76f92a0 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 @@ -123,9 +123,14 @@ public class CreateReportLog { Collections.addAll(plugins, Bukkit.getPluginManager().getPlugins()); plugins.sort(Comparator.comparing(Plugin::getName)); for (Plugin pl : plugins) { - pWriter.println(" - " + pl.getName() + " - " + pl.getDescription().getVersion() + " - Enabled: " + pl.isEnabled() + " - Autors: " - + pl.getDescription().getAuthors() + " - SoftDepend: " + pl.getDescription().getSoftDepend() + " - Depend: " + pl.getDescription().getDepend() - + " LoadBefore: " + pl.getDescription().getLoadBefore() + " - Website: " + pl.getDescription().getWebsite()); + pWriter.println(" - " + pl.getName() + + " - " + pl.getDescription().getVersion() + + " - Enabled: " + pl.isEnabled() + + " - Autors: " + pl.getDescription().getAuthors() + + " - SoftDepend: " + pl.getDescription().getSoftDepend() + + " - Depend: " + pl.getDescription().getDepend() + + " - LoadBefore: " + pl.getDescription().getLoadBefore() + + " - Website: " + pl.getDescription().getWebsite()); } } catch (IOException ioe) { @@ -147,9 +152,9 @@ public class CreateReportLog { addFileToZip("", "logs/latest.log", zip, false); - // for (String pl : Util.getT2cPlugins()) { - // pluginToDebug(pl, zip); - // } + // for (String pl : Util.getT2cPlugins()) { + // pluginToDebug(pl, zip); + // } pluginToDebug(zip); //todo überprüfen zip.closeEntry(); @@ -223,16 +228,17 @@ public class CreateReportLog { } } } + private static void pluginToDebug(ZipOutputStream zip) throws IOException { - for (Plugin plugin : Bukkit.getPluginManager().getPlugins()){ + for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) { String plName = plugin.getDescription().getName(); - if (plName.contains("T2C-") || Util.getT2cPlugins().contains(plName)){ + if (plName.contains("T2C-") || Util.getT2cPlugins().contains(plName) || plugin.getDescription().getAuthors().contains("JaTiTV")) { File plConfigs = new File(plugin.getDataFolder().getPath()); if (plConfigs.exists()) { addFolderToZip("T2Code-Plugins", plugin.getDataFolder().getPath(), zip); } File f = new File(plugin.getClass().getProtectionDomain().getCodeSource().getLocation().getPath()); - addFileToZip("T2Code-Plugins", f.getPath(), zip, false); + addFileToZip("T2Code-Plugins", f.getPath(), zip, false); } } }