diff --git a/src/main/java/de/cuuky/varo/command/VaroCommandListener.java b/src/main/java/de/cuuky/varo/command/VaroCommandListener.java index 946a11a1..9ca721b3 100644 --- a/src/main/java/de/cuuky/varo/command/VaroCommandListener.java +++ b/src/main/java/de/cuuky/varo/command/VaroCommandListener.java @@ -10,8 +10,8 @@ import de.cuuky.varo.Main; import de.cuuky.varo.command.custom.CustomCommand; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; import de.cuuky.varo.player.VaroPlayer; public class VaroCommandListener implements CommandExecutor { @@ -43,7 +43,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } if (command.getPermission() != null && !sender.hasPermission(command.getPermission())) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(player, player)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/BorderCommand.java b/src/main/java/de/cuuky/varo/command/essentials/BorderCommand.java index dcb04daa..4eb47d52 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/BorderCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/BorderCommand.java @@ -9,9 +9,7 @@ import de.cuuky.varo.Main; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; import de.cuuky.varo.game.world.VaroWorldHandler; -import de.cuuky.varo.player.VaroPlayer; import de.varoplugin.cfw.version.ServerVersion; import de.varoplugin.cfw.version.VersionUtils; import io.github.almightysatan.slams.Placeholder; @@ -20,7 +18,6 @@ public class BorderCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command arg1, String arg2, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!VersionUtils.getVersion().isHigherThan(ServerVersion.ONE_7)) { Messages.COMMANDS_ERROR_WRONGVERSION.send(sender, Placeholder.constant("required-version", "1.8.8")); return false; @@ -64,11 +61,11 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String return false; } - sender.sendMessage(Main.getPrefix() + ConfigMessages.BORDER_COMMAND_SET_BORDER.getValue(vp).replace("%size%", String.valueOf(borderSize))); + Messages.COMMANDS_BORDER_SUCCESS.send(sender); if (p != null) p.playSound(p.getLocation(), XSound.BLOCK_NOTE_BLOCK_BASEDRUM.parseSound(), 1, 1); } else - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } } \ No newline at end of file diff --git a/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java b/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java index 0c3bc086..3b89e7fd 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java @@ -3,12 +3,9 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import de.cuuky.varo.Main; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; import io.github.almightysatan.slams.Placeholder; import net.md_5.bungee.api.ChatColor; @@ -16,9 +13,8 @@ public class BroadcastCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.broadcast")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/ChatClearCommand.java b/src/main/java/de/cuuky/varo/command/essentials/ChatClearCommand.java index 25cc2bef..8b2012c0 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/ChatClearCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/ChatClearCommand.java @@ -6,17 +6,14 @@ import org.bukkit.entity.Player; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; import de.varoplugin.cfw.version.VersionUtils; public class ChatClearCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.chatclear")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/CountdownCommand.java b/src/main/java/de/cuuky/varo/command/essentials/CountdownCommand.java index 223d7ff1..2ffd8bd9 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/CountdownCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/CountdownCommand.java @@ -3,14 +3,11 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; import de.cuuky.varo.Main; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; import io.github.almightysatan.slams.Placeholder; public class CountdownCommand implements CommandExecutor { @@ -24,9 +21,8 @@ public class CountdownCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.countdowm")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/DayCommand.java b/src/main/java/de/cuuky/varo/command/essentials/DayCommand.java index d52f7f0c..27e30735 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/DayCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/DayCommand.java @@ -8,16 +8,13 @@ import de.cuuky.varo.Main; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; public class DayCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.day")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/FlyCommand.java b/src/main/java/de/cuuky/varo/command/essentials/FlyCommand.java index 7e4d7fd6..85332464 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/FlyCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/FlyCommand.java @@ -7,16 +7,15 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.player.VaroPlayer; public class FlyCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.fly")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/FreezeCommand.java b/src/main/java/de/cuuky/varo/command/essentials/FreezeCommand.java index 7ac395e9..9ed058b1 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/FreezeCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/FreezeCommand.java @@ -7,7 +7,7 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.listener.helper.cancelable.CancelableType; import de.cuuky.varo.listener.helper.cancelable.VaroCancelable; import de.cuuky.varo.player.VaroPlayer; @@ -16,9 +16,8 @@ public class FreezeCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.freeze")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/GamemodeCommand.java b/src/main/java/de/cuuky/varo/command/essentials/GamemodeCommand.java index 7c569cc7..f4471ecd 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/GamemodeCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/GamemodeCommand.java @@ -7,19 +7,17 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import de.cuuky.varo.Main; +import de.cuuky.varo.config.language.Messages; import de.varoplugin.cfw.version.ServerVersion; import de.varoplugin.cfw.version.VersionUtils; -import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; public class GamemodeCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.gamemode")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/HealCommand.java b/src/main/java/de/cuuky/varo/command/essentials/HealCommand.java index 19839326..99de7425 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/HealCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/HealCommand.java @@ -7,16 +7,14 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; +import de.cuuky.varo.config.language.Messages; public class HealCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.heal")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/InfoCommand.java b/src/main/java/de/cuuky/varo/command/essentials/InfoCommand.java index 6a6d1a15..440007e2 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/InfoCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/InfoCommand.java @@ -6,20 +6,18 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.varoplugin.cfw.version.ServerSoftware; -import de.varoplugin.cfw.version.VersionUtils; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.utils.MagmaUtils; +import de.varoplugin.cfw.version.ServerSoftware; +import de.varoplugin.cfw.version.VersionUtils; public class InfoCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.info")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/InvSeeCommand.java b/src/main/java/de/cuuky/varo/command/essentials/InvSeeCommand.java index 5abe0716..9c874d87 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/InvSeeCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/InvSeeCommand.java @@ -7,16 +7,15 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; +import de.cuuky.varo.config.language.Messages; +import io.github.almightysatan.slams.Placeholder; public class InvSeeCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.invsee")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -26,12 +25,12 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } if (!(sender instanceof Player)) { - sender.sendMessage(Main.getPrefix() + "Nicht fuer die Konsole!"); + Messages.COMMANDS_ERROR_NO_CONSOLE.send(sender); return false; } if (Bukkit.getPlayerExact(args[0]) == null) { - sender.sendMessage(Main.getPrefix() + "§7" + args[0] + " §7nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/MuteCommand.java b/src/main/java/de/cuuky/varo/command/essentials/MuteCommand.java index 50cbd887..0b99e98f 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/MuteCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/MuteCommand.java @@ -7,18 +7,18 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.listener.helper.cancelable.CancelableType; import de.cuuky.varo.listener.helper.cancelable.VaroCancelable; import de.cuuky.varo.player.VaroPlayer; +import io.github.almightysatan.slams.Placeholder; public class MuteCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.mute")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -41,7 +41,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } if (Bukkit.getPlayerExact(args[0]) == null) { - sender.sendMessage(Main.getPrefix() + "§7" + args[0] + " §7nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/NightCommand.java b/src/main/java/de/cuuky/varo/command/essentials/NightCommand.java index 57a1405a..e93ff7b4 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/NightCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/NightCommand.java @@ -8,16 +8,13 @@ import de.cuuky.varo.Main; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; public class NightCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.night")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/PerformanceCommand.java b/src/main/java/de/cuuky/varo/command/essentials/PerformanceCommand.java index e2a41712..71b8722b 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/PerformanceCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/PerformanceCommand.java @@ -7,21 +7,18 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; import de.cuuky.varo.Main; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; import de.cuuky.varo.threads.LagCounter; public class PerformanceCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.performance")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/PingCommand.java b/src/main/java/de/cuuky/varo/command/essentials/PingCommand.java index 06e7fa7c..b2477d2e 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/PingCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/PingCommand.java @@ -7,7 +7,6 @@ import de.cuuky.varo.Main; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; import de.cuuky.varo.player.VaroPlayer; public class PingCommand implements CommandExecutor { @@ -24,7 +23,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String ping, String[ Messages.COMMANDS_PING.send(vp); } else if (args.length == 1) { if (!sender.hasPermission("varo.ping")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/ProtectCommand.java b/src/main/java/de/cuuky/varo/command/essentials/ProtectCommand.java index 4eaef991..958b4141 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/ProtectCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/ProtectCommand.java @@ -7,18 +7,18 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.listener.helper.cancelable.CancelableType; import de.cuuky.varo.listener.helper.cancelable.VaroCancelable; import de.cuuky.varo.player.VaroPlayer; +import io.github.almightysatan.slams.Placeholder; public class ProtectCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.protect")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -37,7 +37,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } if (Bukkit.getPlayerExact(args[0]) == null) { - sender.sendMessage(Main.getPrefix() + "§7" + args[0] + " §7nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/RainCommand.java b/src/main/java/de/cuuky/varo/command/essentials/RainCommand.java index cbf599a3..cb9fbf3b 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/RainCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/RainCommand.java @@ -8,16 +8,13 @@ import org.bukkit.entity.Player; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; public class RainCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!(sender.hasPermission("varo.rain"))) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/ReportCommand.java b/src/main/java/de/cuuky/varo/command/essentials/ReportCommand.java index 46cc2b46..b3c6fe91 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/ReportCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/ReportCommand.java @@ -1,10 +1,7 @@ package de.cuuky.varo.command.essentials; -import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.config.ConfigSetting; -import de.cuuky.varo.gui.report.ReportGUI; -import de.cuuky.varo.gui.report.ReportListGUI; -import de.cuuky.varo.player.VaroPlayer; +import java.util.HashMap; +import java.util.Map; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -12,8 +9,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.util.HashMap; -import java.util.Map; +import de.cuuky.varo.Main; +import de.cuuky.varo.configuration.configurations.config.ConfigSetting; +import de.cuuky.varo.gui.report.ReportGUI; +import de.cuuky.varo.gui.report.ReportListGUI; +import de.cuuky.varo.player.VaroPlayer; public class ReportCommand implements CommandExecutor { diff --git a/src/main/java/de/cuuky/varo/command/essentials/SetWorldspawnCommand.java b/src/main/java/de/cuuky/varo/command/essentials/SetWorldspawnCommand.java index 4fc82ca3..0ba56485 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/SetWorldspawnCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/SetWorldspawnCommand.java @@ -9,23 +9,21 @@ import de.cuuky.varo.Main; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; import de.cuuky.varo.game.world.border.VaroBorder; -import de.cuuky.varo.player.VaroPlayer; public class SetWorldspawnCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command arg1, String arg2, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!(sender instanceof Player)) { + Messages.COMMANDS_ERROR_NO_CONSOLE.send(sender); System.out.println("Nicht fuer die Konsole"); return false; } Player p = (Player) sender; if (!p.hasPermission("Varo.setup")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/SpeedCommand.java b/src/main/java/de/cuuky/varo/command/essentials/SpeedCommand.java index 50a91aa5..9552e3fd 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/SpeedCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/SpeedCommand.java @@ -7,8 +7,8 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; +import de.cuuky.varo.config.language.Messages; +import io.github.almightysatan.slams.Placeholder; public class SpeedCommand implements CommandExecutor { @@ -18,17 +18,15 @@ private float getRealMoveSpeed(final float userSpeed, final boolean isFly) { if (userSpeed < 1f) { return defaultSpeed * userSpeed; - } else { - float ratio = ((userSpeed - 1) / 9) * (maxSpeed - defaultSpeed); - return ratio + defaultSpeed; } + float ratio = ((userSpeed - 1) / 9) * (maxSpeed - defaultSpeed); + return ratio + defaultSpeed; } @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.speed")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -91,7 +89,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String Player to = Bukkit.getPlayerExact(args[1]); if (to == null) { - sender.sendMessage(Main.getPrefix() + Main.getColorCode() + args[1] + "§7 nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[1])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/SunCommand.java b/src/main/java/de/cuuky/varo/command/essentials/SunCommand.java index 53f4fab5..4a3dece5 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/SunCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/SunCommand.java @@ -8,16 +8,13 @@ import org.bukkit.entity.Player; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; public class SunCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!(sender.hasPermission("varo.sun"))) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/ThunderCommand.java b/src/main/java/de/cuuky/varo/command/essentials/ThunderCommand.java index ba20eeb9..18c7e6cd 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/ThunderCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/ThunderCommand.java @@ -8,16 +8,13 @@ import org.bukkit.entity.Player; import de.cuuky.varo.config.language.Messages; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; public class ThunderCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!(sender.hasPermission("varo.thunder"))) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/UnflyCommand.java b/src/main/java/de/cuuky/varo/command/essentials/UnflyCommand.java index 2847e69e..cb9d70cb 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/UnflyCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/UnflyCommand.java @@ -7,16 +7,16 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.player.VaroPlayer; +import io.github.almightysatan.slams.Placeholder; public class UnflyCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.unfly")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -44,7 +44,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String Player to = Bukkit.getPlayerExact(args[0]); if (to == null) { - sender.sendMessage(Main.getPrefix() + "§7" + args[0] + "§7 nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/UnfreezeCommand.java b/src/main/java/de/cuuky/varo/command/essentials/UnfreezeCommand.java index 6c65a6dd..37f5a2d8 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/UnfreezeCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/UnfreezeCommand.java @@ -7,18 +7,18 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.listener.helper.cancelable.CancelableType; import de.cuuky.varo.listener.helper.cancelable.VaroCancelable; import de.cuuky.varo.player.VaroPlayer; +import io.github.almightysatan.slams.Placeholder; public class UnfreezeCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.unfreeze")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -38,7 +38,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } if (Bukkit.getPlayerExact(args[0]) == null) { - sender.sendMessage(Main.getPrefix() + "§7" + args[0] + " §7nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/UnmuteCommand.java b/src/main/java/de/cuuky/varo/command/essentials/UnmuteCommand.java index 371e5016..9cabd81d 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/UnmuteCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/UnmuteCommand.java @@ -7,18 +7,18 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.listener.helper.cancelable.CancelableType; import de.cuuky.varo.listener.helper.cancelable.VaroCancelable; import de.cuuky.varo.player.VaroPlayer; +import io.github.almightysatan.slams.Placeholder; public class UnmuteCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.unmute")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -38,7 +38,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } if (Bukkit.getPlayerExact(args[0]) == null) { - sender.sendMessage(Main.getPrefix() + "§7" + args[0] + " §7nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/UnprotectCommand.java b/src/main/java/de/cuuky/varo/command/essentials/UnprotectCommand.java index dee85b26..f5f8ea9c 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/UnprotectCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/UnprotectCommand.java @@ -7,18 +7,18 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.listener.helper.cancelable.CancelableType; import de.cuuky.varo.listener.helper.cancelable.VaroCancelable; import de.cuuky.varo.player.VaroPlayer; +import io.github.almightysatan.slams.Placeholder; public class UnprotectCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.unprotect")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -38,7 +38,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } if (Bukkit.getPlayerExact(args[0]) == null) { - sender.sendMessage(Main.getPrefix() + "§7" + args[0] + " §7nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/UsageCommand.java b/src/main/java/de/cuuky/varo/command/essentials/UsageCommand.java index 2ba11491..70d1201b 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/UsageCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/UsageCommand.java @@ -4,20 +4,17 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.threads.LagCounter; public class UsageCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command arg1, String arg2, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.usage")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } diff --git a/src/main/java/de/cuuky/varo/command/essentials/VanishCommand.java b/src/main/java/de/cuuky/varo/command/essentials/VanishCommand.java index 45bba4ab..1ed25cba 100644 --- a/src/main/java/de/cuuky/varo/command/essentials/VanishCommand.java +++ b/src/main/java/de/cuuky/varo/command/essentials/VanishCommand.java @@ -9,9 +9,9 @@ import org.bukkit.entity.Player; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.player.VaroPlayer; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.utils.Vanish; +import io.github.almightysatan.slams.Placeholder; public class VanishCommand implements CommandExecutor { @@ -19,9 +19,8 @@ public class VanishCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null); if (!sender.hasPermission("varo.vanish")) { - sender.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(vp)); + Messages.COMMANDS_ERROR_PERMISSION.send(sender); return false; } @@ -43,7 +42,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String } else if (args.length == 1) { Player player = Bukkit.getPlayerExact(args[0]); if (player == null) { - sender.sendMessage(Main.getPrefix() + Main.getColorCode() + args[0] + " §7nicht gefunden!"); + Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender, Placeholder.constant("target", args[0])); return false; } diff --git a/src/main/java/de/cuuky/varo/command/varo/TeamRequestCommand.java b/src/main/java/de/cuuky/varo/command/varo/TeamRequestCommand.java index ca3b8981..38a28b52 100644 --- a/src/main/java/de/cuuky/varo/command/varo/TeamRequestCommand.java +++ b/src/main/java/de/cuuky/varo/command/varo/TeamRequestCommand.java @@ -7,6 +7,7 @@ import de.cuuky.varo.Main; import de.cuuky.varo.command.VaroCommand; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; import de.cuuky.varo.gui.settings.VaroColorMenu; @@ -22,7 +23,7 @@ public TeamRequestCommand() { @Override public void onCommand(CommandSender sender, VaroPlayer player, Command cmd, String label, String[] args) { if (!(sender instanceof Player)) { - System.out.println("Not for console!"); + Messages.COMMANDS_ERROR_NO_CONSOLE.send(sender); return; } @@ -39,7 +40,7 @@ public void onCommand(CommandSender sender, VaroPlayer player, Command cmd, Stri } if (!player.getPlayer().hasPermission("varo.changeTeamColor")) { - player.sendMessage(ConfigMessages.NOPERMISSION_NO_PERMISSION.getValue(player)); + Messages.COMMANDS_ERROR_PERMISSION.send(player); return; } diff --git a/src/main/java/de/cuuky/varo/config/language/Messages.java b/src/main/java/de/cuuky/varo/config/language/Messages.java index e093368f..4e4f7f35 100644 --- a/src/main/java/de/cuuky/varo/config/language/Messages.java +++ b/src/main/java/de/cuuky/varo/config/language/Messages.java @@ -134,6 +134,7 @@ public final class Messages { public static final VaroMessage COMMANDS_ERROR_WRONGVERSION = message("commands.error.wrongVersion"); public static final VaroMessage COMMANDS_ERROR_GENERIC = message("commands.error.generic"); public static final VaroMessage COMMANDS_ERROR_BLOCKED = message("commands.error.blocked"); + public static final VaroMessage COMMANDS_ERROR_PERMISSION = message("commands.error.permission"); public static final VaroMessage COMMANDS_VARO_BUGREPORT_UPDATE = message("commands.varo.bugreport.update"); public static final VaroMessage COMMANDS_VARO_BUGREPORT_COLLECTING_DATA = message("commands.varo.bugreport.collectingdata"); @@ -236,6 +237,7 @@ public final class Messages { public static final VaroMessage COMMANDS_BORDER_SIZE = message("commands.border.size"); public static final VaroMessage COMMANDS_BORDER_DISTANCE = message("commands.border.distance"); public static final VaroMessage COMMANDS_BORDER_USAGE = message("commands.border.usage"); + public static final VaroMessage COMMANDS_BORDER_SUCCESS = message("commands.border.success"); public static final VaroMessage COMMANDS_BROADCAST_FORMAT = message("commands.broadcast.format"); @@ -258,6 +260,10 @@ public final class Messages { public static final VaroMessage COMMANDS_PING = message("commands.ping"); public static final VaroMessageArray BROADCAST = array("broadcast"); + + public static final VaroMessage SPECTATOR_HEIGHT = message("spectator.height"); + + public static final VaroMessage CRAFTING_DISALLOWED = message("crafting.disallowed"); public static void load() throws MissingTranslationException, InvalidTypeException, IOException { SLAMS.load("en", JasklParser.createParser(YamlConfig.of(Resource.of(Messages.class.getClassLoader().getResource("en.yml"))))); diff --git a/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/ConfigMessages.java b/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/ConfigMessages.java index e8e8ec54..9acc8536 100644 --- a/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/ConfigMessages.java +++ b/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/ConfigMessages.java @@ -11,8 +11,6 @@ public enum ConfigMessages implements DefaultLanguage { BOTS_DISCORD_NOT_REGISTERED_DISCORD("bots.notRegisteredDiscord", "&cDu bist noch nicht mit Discord verifiziert!\n&7Nutze &c/verify %code% &7um dich auf unserem Discord zu verifizieren!\nLink zum Discord: &c%discordLink%"), BOTS_DISCORD_NO_SERVER_USER("bots.noServerUser", "&cDein Account ist nicht auf dem Discord!%nextLine%&7Joine dem Discord und versuche es erneut."), - BORDER_COMMAND_SET_BORDER("border.borderSet", "&7Die Border wurde auf %colorcode%%size% &7gesetzt!"), - COMBAT_FRIENDLY_FIRE("combat.friendlyfire", "&7Dieser Spieler ist in deinem Team!"), COMBAT_IN_FIGHT("combat.inFight", "&7Du bist nun im Kampf, logge dich &4NICHT &7aus!"), COMBAT_LOGGED_OUT("combat.loggedOut", "&c%player% &7hat den Server während eines Kampfes verlassen!"), @@ -79,10 +77,6 @@ public enum ConfigMessages implements DefaultLanguage { CHEST_SAVED_CHEST("chest.newChestSaved", "&7Eine neue Kiste wurde gesichert!"), CHEST_SAVED_FURNACE("chest.newFurnaceSaved", "&7Ein neuer Ofen wurde gesichert!"), - NOPERMISSION_NO_PERMISSION("nopermission.noPermission", "%colorcode%Dazu bist du nicht berechtigt!"), - NOPERMISSION_NOT_ALLOWED_CRAFT("nopermission.notAllowedCraft", "&7Das darfst du nicht craften, benutzen oder brauen!"), - NOPERMISSION_NO_LOWER_FLIGHT("nopermission.noLowerFlight", "&7Niedriger darfst du nicht fliegen!"), - PLACEHOLDER_NO_TOP_PLAYER("placeholder.noTopPlayer", "-"), // TODO delete this PLACEHOLDER_NO_TOP_TEAM("placeholder.noTopTeam", "-"), // TODO delete this @@ -131,8 +125,6 @@ public enum ConfigMessages implements DefaultLanguage { MODS_BLOCKED_MODLIST_SPLIT("mods.blockedModsListSplit", "&7, "), MODS_BLOCKED_MODS_BROADCAST("mods.blockedModsBroadcast", "&7Der Spieler %colorcode%%player% &7hat versucht mit folgenden blockierten Mods zu joinen: %colorcode%%mods%"), - OTHER_CONFIG("other.configReload", "&7Die %colorcode%Config &7wurde neu geladen"), - LOGGER_FILTER_INVALID_FILTER("blockLoggerFilter.invalidFilter", "&c%filterName% \"%content%\" ist nicht gültig!"), LOGGER_FILTER_SET_FILTER("blockLoggerFilter.setFilter", "&7%filterName% wurde auf %colorcode%%newContent% &7gesetzt (vorher: %oldContent%)."), LOGGER_FILTER_RESET_FILTER("blockLoggerFilter.resetFilter", "&7%filterName% wurde zurückgesetzt (vorher: %oldContent%)."), diff --git a/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/LanguageEN.java b/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/LanguageEN.java index a2d88af4..34206d07 100644 --- a/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/LanguageEN.java +++ b/src/main/java/de/cuuky/varo/configuration/configurations/language/languages/LanguageEN.java @@ -7,8 +7,6 @@ public enum LanguageEN implements LoadableMessage { BOTS_DISCORD_NOT_REGISTERED_DISCORD("bots.notRegisteredDiscord", "&cYour account is not verified!\n&7Please use &c/verify %code% &7to verify your Discord account!\nLink: &c%discordLink%"), BOTS_DISCORD_NO_SERVER_USER("bots.noServerUser", "&cYour account is not on the discord!%nextLine%&7Join the discord and try again."), - BORDER_COMMAND_SET_BORDER("border.borderSet", "&7The border was set to %colorcode%%size% &7!"), - COMBAT_FRIENDLY_FIRE("combat.friendlyfire", "&7This player is on your team!"), COMBAT_IN_FIGHT("combat.inFight", "&7You are now in combat, do &4NOT &7log &7out!"), COMBAT_LOGGED_OUT("combat.loggedOut", "&c%player% &7has left the server during a fight!"), @@ -75,10 +73,6 @@ public enum LanguageEN implements LoadableMessage { CHEST_SAVED_CHEST("chest.newChestSaved", "&7A new chest was secured!"), CHEST_SAVED_FURNACE("chest.newFurnaceSaved", "&7A new furnace was secured!"), - NOPERMISSION_NO_PERMISSION("nopermission.noPermission", "%colorcode%You are not authorized for this!"), - NOPERMISSION_NOT_ALLOWED_CRAFT("nopermission.notAllowedCraft", "&7You may not craft, use or brew that!"), - NOPERMISSION_NO_LOWER_FLIGHT("nopermission.noLowerFlight", "&7You can not fly lower!"), - PLACEHOLDER_NO_TOP_PLAYER("placeholder.noTopPlayer", "-"), PLACEHOLDER_NO_TOP_TEAM("placeholder.noTopTeam", "-"), @@ -127,8 +121,6 @@ public enum LanguageEN implements LoadableMessage { MODS_BLOCKED_MODLIST_SPLIT("mods.blockedModsListSplit", "&7, "), MODS_BLOCKED_MODS_BROADCAST("mods.blockedModsBroadcast", "%colorcode%%player% &7tried to join while having the following mods installed: %colorcode%%mods%"), - OTHER_CONFIG("other.configReload", "&7The %colorcode%Config &7was reloaded"), - LOGGER_FILTER_INVALID_FILTER("blockLoggerFilter.invalidFilter", "&c%filterName% \"%content%\" is invalid!"), LOGGER_FILTER_SET_FILTER("blockLoggerFilter.setFilter", "&7Set %filterName% to %colorcode%%newContent%&7 (before: %oldContent%)."), LOGGER_FILTER_RESET_FILTER("blockLoggerFilter.resetFilter", "&7Reset %filterName% (before: %oldContent%)."), diff --git a/src/main/java/de/cuuky/varo/listener/lists/BlockedEnchantmentsListener.java b/src/main/java/de/cuuky/varo/listener/lists/BlockedEnchantmentsListener.java index 9b20cf43..65dcbac7 100644 --- a/src/main/java/de/cuuky/varo/listener/lists/BlockedEnchantmentsListener.java +++ b/src/main/java/de/cuuky/varo/listener/lists/BlockedEnchantmentsListener.java @@ -13,7 +13,7 @@ import org.bukkit.inventory.ItemStack; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.player.VaroPlayer; public class BlockedEnchantmentsListener implements Listener { @@ -27,7 +27,7 @@ public void onEnchant(EnchantItemEvent event) { if (Main.getDataManager().getListManager().getBlockedEnchantments().isBlocked(enc, event.getEnchantsToAdd().get(enc))) { event.setCancelled(true); VaroPlayer vp = VaroPlayer.getPlayer(event.getEnchanter()); - event.getEnchanter().sendMessage(Main.getPrefix() + ConfigMessages.NOPERMISSION_NOT_ALLOWED_CRAFT.getValue(vp, vp)); + Messages.CRAFTING_DISALLOWED.send(vp); return; } } @@ -56,7 +56,7 @@ public void onInventoryClick(InventoryClickEvent event) { if (Main.getDataManager().getListManager().getBlockedEnchantments().isBlocked(enc, item.getEnchantments().get(enc))) { event.setCancelled(true); VaroPlayer vp = VaroPlayer.getPlayer((Player) event.getWhoClicked()); - vp.sendMessage(ConfigMessages.NOPERMISSION_NOT_ALLOWED_CRAFT); + Messages.CRAFTING_DISALLOWED.send(vp); return; } } diff --git a/src/main/java/de/cuuky/varo/listener/lists/BlockedItemsListener.java b/src/main/java/de/cuuky/varo/listener/lists/BlockedItemsListener.java index 0ca56bdd..af543b50 100644 --- a/src/main/java/de/cuuky/varo/listener/lists/BlockedItemsListener.java +++ b/src/main/java/de/cuuky/varo/listener/lists/BlockedItemsListener.java @@ -7,7 +7,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import de.cuuky.varo.Main; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.player.VaroPlayer; public class BlockedItemsListener implements Listener { @@ -22,7 +22,7 @@ public void onCraft(CraftItemEvent event) { event.setCancelled(true); VaroPlayer vp = VaroPlayer.getPlayer((Player) event.getWhoClicked()); - vp.sendMessage(ConfigMessages.NOPERMISSION_NOT_ALLOWED_CRAFT); + Messages.CRAFTING_DISALLOWED.send(vp); } @EventHandler @@ -35,6 +35,6 @@ public void onInteract(PlayerInteractEvent event) { event.setCancelled(true); VaroPlayer vp = VaroPlayer.getPlayer(event.getPlayer()); - vp.sendMessage(ConfigMessages.NOPERMISSION_NOT_ALLOWED_CRAFT); + Messages.CRAFTING_DISALLOWED.send(vp); } } \ No newline at end of file diff --git a/src/main/java/de/cuuky/varo/listener/spectator/SpectatorListener.java b/src/main/java/de/cuuky/varo/listener/spectator/SpectatorListener.java index 1b32d625..37f6eee5 100644 --- a/src/main/java/de/cuuky/varo/listener/spectator/SpectatorListener.java +++ b/src/main/java/de/cuuky/varo/listener/spectator/SpectatorListener.java @@ -27,9 +27,8 @@ import com.cryptomorin.xseries.XMaterial; import de.cuuky.varo.Main; +import de.cuuky.varo.config.language.Messages; import de.cuuky.varo.configuration.configurations.config.ConfigSetting; -import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages; -import de.cuuky.varo.game.GameState; import de.cuuky.varo.player.VaroPlayer; import de.cuuky.varo.player.stats.stat.PlayerState; import de.cuuky.varo.utils.Vanish; @@ -177,7 +176,7 @@ public void onPlayerMove(PlayerMoveEvent event) { tp.setY(ConfigSetting.MINIMAL_SPECTATOR_HEIGHT.getValueAsInt()); event.setTo(tp); VaroPlayer vp = VaroPlayer.getPlayer(event.getPlayer()); - vp.sendMessage(ConfigMessages.NOPERMISSION_NO_LOWER_FLIGHT, vp); + Messages.SPECTATOR_HEIGHT.send(vp); } } diff --git a/src/main/resources/en.yml b/src/main/resources/en.yml index 01911a6e..29defc1d 100644 --- a/src/main/resources/en.yml +++ b/src/main/resources/en.yml @@ -157,10 +157,11 @@ commands: notstarted: "§cThe games have not started yet!" generic: "§cAn error has occurred!" wrongVersion: "§cThis feature is not available on versions lower than §c!" - unknownplayer: "§cThe player §chas never entered the server before!" + unknownplayer: "§cUnknown player §c!" usage: "§cError! Use /varo §cfor help." noconsole: "§cYou must be a player!" blocked: "§cYou are not allowed to use this command!" + permission: "§cInsufficient permission" varo: autostart: alreadystarted: " §7has already been started!" @@ -284,6 +285,7 @@ commands: distance: "You are blocks §7away from the border." usage: "You can change the size of the border using /border [seconds]§7. The center of the border will be set to your current position." size: "The border has a size of blocks§7." + success: "The border size is now §7blocks!" weather: thunder: "Changed weather to thunderstorm§7." sun: "Weather cleared§7." @@ -297,4 +299,10 @@ commands: broadcast: - " A broadcast message" - - " Another broadcast message" \ No newline at end of file + - " Another broadcast message" + +spectator: + height: "§cYou can not fly any lower!" + +crafting: + disallowed: "§cYou are not allowed to craft, use or brew this item!"