Move some more command and error messages to new language system

CuukyOfficial · Jan 1, 2025 · 92de6bb · 92de6bb
1 parent 127e01c
commit 92de6bb
Show file tree

Hide file tree

Showing 37 changed files with 105 additions and 157 deletions.
diff --git 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
@@ -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;
     }
 }
diff --git a/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java b/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java
@@ -3,22 +3,18 @@
 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;
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 			}