diff --git a/pom.xml b/pom.xml index 9d4bf70..a7a3833 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.jatitv OPSecurity - 2.4.1 + 2.4.2 jar OPSecurity diff --git a/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java b/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java index 33318a0..76d3af6 100644 --- a/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java +++ b/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java @@ -29,12 +29,14 @@ public class Commands { } if (sender.hasPermission(Permissions.help)) { SelectConfig.Help(sender); - } else sender.sendMessage(Util.getPrefix() + " §cYou do not have permission for OPSecurity!"); + } else { + sender.sendMessage(Util.getPrefix() + " §cYou do not have permission for OPSecurity! §7<" + Permissions.help + ">"); + } } public static void reload(CommandSender sender) { if (!sender.hasPermission(Permissions.reload)) { - sender.sendMessage(Util.getPrefix() + "§cYou do not have permission for OPSecurity!"); + sender.sendMessage(Util.getPrefix() + "§cYou do not have permission for OPSecurity! §7<" + Permissions.reload + ">"); return; } if (sender instanceof Player) { @@ -62,7 +64,7 @@ public class Commands { public static void info(CommandSender sender) { if (!sender.hasPermission(Permissions.info)) { - sender.sendMessage(Util.getPrefix() + "§cYou do not have permission for OPSecurity!"); + sender.sendMessage(Util.getPrefix() + "§cYou do not have permission for OPSecurity! §7<" + Permissions.info + ">"); return; } T2CodeTemplate.sendInfo(sender, Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.autor, Main.version, UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion); diff --git a/src/main/java/de/jatitv/opsecurity/config/config/ConfigConvert.java b/src/main/java/de/jatitv/opsecurity/config/config/ConfigConvert.java index 076fb72..d6be612 100644 --- a/src/main/java/de/jatitv/opsecurity/config/config/ConfigConvert.java +++ b/src/main/java/de/jatitv/opsecurity/config/config/ConfigConvert.java @@ -52,7 +52,6 @@ public class ConfigConvert { File config = new File(Main.plugin.getDataFolder().getPath(), "config.yml"); YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); - if (yamlConfiguration.get("ConfigVersion") == null) { try { if (yamlConfiguration.get("Plugin.language") != null) { @@ -107,13 +106,10 @@ public class ConfigConvert { } } - - List oldOPs = yamlConfiguration.getStringList("OP_Whitelist.Whitelist"); yamlConfiguration.set("OP_Whitelist.Whitelist", null); convertPlayer("OP_Whitelist.Whitelist", "OP_Whitelist.Whitelist.", oldOPs, yamlConfiguration); - List oldPerms = yamlConfiguration.getStringList("Permission_Whitelist.Player"); yamlConfiguration.set("Permission_Whitelist.Player", null); convertPlayer("Permission_Whitelist.Player", "Permission_Whitelist.Whitelist.", oldPerms, yamlConfiguration); @@ -122,8 +118,6 @@ public class ConfigConvert { } catch (IOException tac) { tac.printStackTrace(); } - - } } public static void convert(String oldConfig, String newConfig) { @@ -156,7 +150,6 @@ public class ConfigConvert { private static void renameLanguages() { String replace = Main.getPath().toString() + "/languages/"; - Path messagesDEold = Paths.get(Main.getPath() + "/languages/de_DE_Messages.yml"); Path messagesDE = Paths.get(Main.getPath() + "/languages/german_messages.yml"); if(Files.exists(messagesDEold) && !Files.isDirectory(messagesDEold)) { diff --git a/src/main/java/de/jatitv/opsecurity/config/config/CreateConfig.java b/src/main/java/de/jatitv/opsecurity/config/config/CreateConfig.java index 9cd97d9..f95a0e3 100644 --- a/src/main/java/de/jatitv/opsecurity/config/config/CreateConfig.java +++ b/src/main/java/de/jatitv/opsecurity/config/config/CreateConfig.java @@ -94,7 +94,6 @@ public class CreateConfig { set("Notify.Sound.Sound", Notify_Sound_1_9_to_1_12, yamlConfiguration); } else set("Notify.Sound.Sound", Notify_Sound_from_1_13, yamlConfiguration); - set("OP_Whitelist.Enable", OP_Whitelist_Enable, yamlConfiguration); set("OP_Whitelist.PlayerMustBeOnlineToOp", PlayerMustBeOnlineToOp, yamlConfiguration); if (yamlConfiguration.get("OP_Whitelist.Whitelist") == null) { @@ -102,7 +101,6 @@ public class CreateConfig { set("OP_Whitelist.Whitelist." + OP_Whitelist_P2 + ".UUID", OP_Whitelist_P2UUID, yamlConfiguration); } - set("OP_Whitelist.noOpPlayerDeop.Enable", no_OP_Player_deop, yamlConfiguration); set("OP_Whitelist.noOpPlayerDeop.PlayerSendMessage", sendPlayerDEOPmsg, yamlConfiguration); set("OP_Whitelist.noOpPlayerKick.Enable", no_OP_Player_kick, yamlConfiguration); @@ -117,7 +115,6 @@ public class CreateConfig { set("Permission_Whitelist.Whitelist." + Perm_Whitelist_P2 + ".UUID", Perm_Whitelist_P2UUID, yamlConfiguration); } - set("Permission_Whitelist.PlayerWhithPermission_kick", PlayerWhithPermission_kick, yamlConfiguration); set("Permission_Whitelist.customCommands.Enable", Perm_Command_enable, yamlConfiguration); set("Permission_Whitelist.customCommands.Commands", Perm_Command, yamlConfiguration); @@ -127,7 +124,6 @@ public class CreateConfig { //set("LuckPerms_Whitelist.Whitelist", LP_Whitelist, yamlConfiguration); - try { yamlConfiguration.save(configYML); } catch (IOException e) { diff --git a/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java b/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java index 159f3a3..f415e95 100644 --- a/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java +++ b/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java @@ -6,6 +6,7 @@ import de.jatitv.opsecurity.Util; import de.jatitv.opsecurity.objects.PlayerObject; import de.jatitv.opsecurity.system.Main; import de.jatitv.opsecurity.system.Permissions; +import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.yamlConfiguration.Config; import org.bukkit.Sound; import org.bukkit.command.CommandSender; @@ -64,12 +65,11 @@ public class SelectConfig { //help public static void Help(CommandSender sender) { - if (sender.hasPermission(Permissions.help)) { - sender.sendMessage(Util.getPrefix() + "§cYou do not have permission for OPSecurity!"); + if (!sender.hasPermission(Permissions.help)) { + sender.sendMessage(Util.getPrefix() + " §cYou do not have permission for OPSecurity! §7<" + Permissions.help + ">"); return; } - sender.sendMessage(Util.getPrefix() + " §8----- §2OP§4Security §chelp §8-----"); sender.sendMessage(Util.getPrefix()); sender.sendMessage(Util.getPrefix() + " §8'§b/opsecurity reload§8' §eReload the Plugin."); @@ -103,7 +103,6 @@ public class SelectConfig { Notify_Sound_Enable = yamlConfiguration.getBoolean("Notify.Sound.Enable"); Notify_Sound_input = yamlConfiguration.getString("Notify.Sound.Sound"); - OP_Whitelist_Enable = yamlConfiguration.getBoolean("OP_Whitelist.Enable"); PlayerMustBeOnlineToOp = yamlConfiguration.getBoolean("OP_Whitelist.PlayerMustBeOnlineToOp"); diff --git a/src/main/java/de/jatitv/opsecurity/config/languages/LanguagesCreate.java b/src/main/java/de/jatitv/opsecurity/config/languages/LanguagesCreate.java index 24e328d..1b81816 100644 --- a/src/main/java/de/jatitv/opsecurity/config/languages/LanguagesCreate.java +++ b/src/main/java/de/jatitv/opsecurity/config/languages/LanguagesCreate.java @@ -37,7 +37,6 @@ public class LanguagesCreate { set("Permission_Whitelist.consoleKick", MSG.DE_Perm_consoleKick, yamlConfigurationDE); set("Console.ExactKickReason", MSG.DE_ExactKickReason, yamlConfigurationDE); - try { yamlConfigurationDE.save(messagesDE); } catch (IOException e) { diff --git a/src/main/java/de/jatitv/opsecurity/config/languages/SelectMessages.java b/src/main/java/de/jatitv/opsecurity/config/languages/SelectMessages.java index ae09602..353b570 100644 --- a/src/main/java/de/jatitv/opsecurity/config/languages/SelectMessages.java +++ b/src/main/java/de/jatitv/opsecurity/config/languages/SelectMessages.java @@ -82,5 +82,4 @@ public class SelectMessages { private static String select(String path, YamlConfiguration yamlConfiguration) { return Replace.replace(Util.getPrefix(),yamlConfiguration.getString(path)); } - } diff --git a/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java b/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java index d66fb4f..9265a04 100644 --- a/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java +++ b/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java @@ -36,7 +36,6 @@ public class OPCommand implements Listener { break; } } - } @EventHandler diff --git a/src/main/java/de/jatitv/opsecurity/listener/PlugManCommand.java b/src/main/java/de/jatitv/opsecurity/listener/PlugManCommand.java index b392afb..1656d2b 100644 --- a/src/main/java/de/jatitv/opsecurity/listener/PlugManCommand.java +++ b/src/main/java/de/jatitv/opsecurity/listener/PlugManCommand.java @@ -15,7 +15,6 @@ public class PlugManCommand implements Listener { @EventHandler public void onOPServer(ServerCommandEvent event) { - if ((event.getCommand().toLowerCase().contains("plugman disable") && event.getCommand().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase())) || (event.getCommand().toLowerCase().contains("plugman reload") && event.getCommand().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase())) || (event.getCommand().toLowerCase().contains("plugman unload") && event.getCommand().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase())) @@ -28,7 +27,6 @@ public class PlugManCommand implements Listener { @EventHandler public void onOpPlayer(PlayerCommandPreprocessEvent event) { - if (event.getMessage().toLowerCase().startsWith("/plugman disable") && event.getMessage().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase()) || (event.getMessage().toLowerCase().startsWith("/plugman reload") && event.getMessage().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase())) || (event.getMessage().toLowerCase().startsWith("/plugman unload") && event.getMessage().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase())) diff --git a/src/main/java/de/jatitv/opsecurity/system/Load.java b/src/main/java/de/jatitv/opsecurity/system/Load.java index d3d802f..315bcbf 100644 --- a/src/main/java/de/jatitv/opsecurity/system/Load.java +++ b/src/main/java/de/jatitv/opsecurity/system/Load.java @@ -61,7 +61,6 @@ public class Load { } catch (Exception e) { e.printStackTrace(); } - try { Timer.RefreshTimer(); } catch (Exception e) { diff --git a/src/main/java/de/jatitv/opsecurity/system/Main.java b/src/main/java/de/jatitv/opsecurity/system/Main.java index db3e7c5..ec7bcb5 100644 --- a/src/main/java/de/jatitv/opsecurity/system/Main.java +++ b/src/main/java/de/jatitv/opsecurity/system/Main.java @@ -26,7 +26,6 @@ public final class Main extends JavaPlugin { public static HashMap opHashMap = new HashMap(); public static HashMap permissionHashMap = new HashMap(); - @Override public void onEnable() { // Plugin startup logic diff --git a/src/main/java/de/jatitv/opsecurity/system/NameHistory.java b/src/main/java/de/jatitv/opsecurity/system/NameHistory.java index a76a1df..5b3de24 100644 --- a/src/main/java/de/jatitv/opsecurity/system/NameHistory.java +++ b/src/main/java/de/jatitv/opsecurity/system/NameHistory.java @@ -17,7 +17,6 @@ import java.util.UUID; public class NameHistory { - /** * The URL from Mojang API that provides the JSON String in response. */ diff --git a/src/main/java/de/jatitv/opsecurity/system/Permissions.java b/src/main/java/de/jatitv/opsecurity/system/Permissions.java index c9a4350..83a6b85 100644 --- a/src/main/java/de/jatitv/opsecurity/system/Permissions.java +++ b/src/main/java/de/jatitv/opsecurity/system/Permissions.java @@ -28,6 +28,5 @@ public class Permissions { Register.permission(admin, op, reload, true, Main.plugin); Register.permission(admin, op, info, true, Main.plugin); Register.permission(admin, op, help, true, Main.plugin); - } }