From f84b0751136b4e6eaf9c16ec251badb302c0f0e5 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Mon, 22 Feb 2021 15:34:53 +0100 Subject: [PATCH] got rid of bungee api (yuck) --- .../togglepvp/commands/PvpToggleCommand.java | 41 +++++++------------ 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/src/main/java/eu/endermite/togglepvp/commands/PvpToggleCommand.java b/src/main/java/eu/endermite/togglepvp/commands/PvpToggleCommand.java index c72463b..c2c714d 100644 --- a/src/main/java/eu/endermite/togglepvp/commands/PvpToggleCommand.java +++ b/src/main/java/eu/endermite/togglepvp/commands/PvpToggleCommand.java @@ -3,10 +3,8 @@ import eu.endermite.togglepvp.TogglePvp; import eu.endermite.togglepvp.util.CombatTimer; import eu.endermite.togglepvp.util.PluginMessages; -import net.md_5.bungee.api.ChatMessageType; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -17,9 +15,8 @@ public static void toggle(CommandSender sender, String[] args) { Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> { if (!sender.hasPermission("togglepvp.command.toggle")) { - String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); - BaseComponent[] component = TextComponent.fromLegacyText(message); - sender.spigot().sendMessage(component); + String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission()); + sender.sendMessage(message); return; } @@ -40,16 +37,14 @@ public static void toggle(CommandSender sender, String[] args) { } else { message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled()); } - BaseComponent[] component = TextComponent.fromLegacyText(message); - player.spigot().sendMessage(ChatMessageType.CHAT, component); + player.sendMessage(message); } else { sender.sendMessage("Try /pvp toggle "); } } else if (args.length == 2) { if (!sender.hasPermission("togglepvp.command.toggle.others")) { - String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); - BaseComponent[] component = TextComponent.fromLegacyText(message); - sender.spigot().sendMessage(component); + String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission()); + sender.sendMessage(message); return; } @@ -86,9 +81,8 @@ public static void toggle(CommandSender sender, String[] args) { public static void enable(CommandSender sender, String[] args) { if (!sender.hasPermission("togglepvp.command.toggle")) { - String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); - BaseComponent[] component = TextComponent.fromLegacyText(message); - sender.spigot().sendMessage(component); + String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission()); + sender.sendMessage(message); return; } if (args.length == 1) { @@ -100,16 +94,14 @@ public static void enable(CommandSender sender, String[] args) { } TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true); String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_enabled()); - BaseComponent[] component = TextComponent.fromLegacyText(message); - player.spigot().sendMessage(ChatMessageType.CHAT, component); + player.sendMessage(message); } else { sender.sendMessage("Try /pvp enable "); } } else if (args.length == 2) { if (!sender.hasPermission("togglepvp.command.toggle.others")) { - String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); - BaseComponent[] component = TextComponent.fromLegacyText(message); - sender.spigot().sendMessage(component); + String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission()); + sender.sendMessage(message); return; } if (sender instanceof Player) { @@ -138,9 +130,8 @@ public static void enable(CommandSender sender, String[] args) { public static void disable(CommandSender sender, String[] args) { if (!sender.hasPermission("togglepvp.command.toggle")) { - String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); - BaseComponent[] component = TextComponent.fromLegacyText(message); - sender.spigot().sendMessage(component); + String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission()); + sender.sendMessage(message); return; } if (args.length == 1) { @@ -152,16 +143,14 @@ public static void disable(CommandSender sender, String[] args) { } TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), false); String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled()); - BaseComponent[] component = TextComponent.fromLegacyText(message); - player.spigot().sendMessage(ChatMessageType.CHAT, component); + player.sendMessage(message); } else { sender.sendMessage("Try /pvp disable "); } } else if (args.length == 2) { if (!sender.hasPermission("togglepvp.command.toggle.others")) { String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); - BaseComponent[] component = TextComponent.fromLegacyText(message); - sender.spigot().sendMessage(component); + sender.sendMessage(message); return; } if (sender instanceof Player) {