From e05a841262f040cca363ace7b6883422fb2141a7 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/HelpCommand.java | 1 - .../togglepvp/commands/MainCommand.java | 1 - .../togglepvp/commands/PvpToggleCommand.java | 41 +++++++------------ .../togglepvp/commands/ReloadCommand.java | 8 ++-- 4 files changed, 18 insertions(+), 33 deletions(-) diff --git a/src/main/java/eu/endermite/togglepvp/commands/HelpCommand.java b/src/main/java/eu/endermite/togglepvp/commands/HelpCommand.java index a85d82f..5fead30 100644 --- a/src/main/java/eu/endermite/togglepvp/commands/HelpCommand.java +++ b/src/main/java/eu/endermite/togglepvp/commands/HelpCommand.java @@ -4,7 +4,6 @@ import eu.endermite.togglepvp.TogglePvp; import eu.endermite.togglepvp.util.PluginMessages; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; - import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/eu/endermite/togglepvp/commands/MainCommand.java b/src/main/java/eu/endermite/togglepvp/commands/MainCommand.java index c859698..cca2e77 100644 --- a/src/main/java/eu/endermite/togglepvp/commands/MainCommand.java +++ b/src/main/java/eu/endermite/togglepvp/commands/MainCommand.java @@ -7,7 +7,6 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 @@ package eu.endermite.togglepvp.commands; 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 class PvpToggleCommand { 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 class PvpToggleCommand { } 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 class PvpToggleCommand { 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 class PvpToggleCommand { } 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 class PvpToggleCommand { 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 class PvpToggleCommand { } 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) { diff --git a/src/main/java/eu/endermite/togglepvp/commands/ReloadCommand.java b/src/main/java/eu/endermite/togglepvp/commands/ReloadCommand.java index dd0284d..88ada13 100644 --- a/src/main/java/eu/endermite/togglepvp/commands/ReloadCommand.java +++ b/src/main/java/eu/endermite/togglepvp/commands/ReloadCommand.java @@ -1,9 +1,8 @@ package eu.endermite.togglepvp.commands; import eu.endermite.togglepvp.TogglePvp; -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; public class ReloadCommand { @@ -12,9 +11,8 @@ public class ReloadCommand { Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> { if (!sender.hasPermission("togglepvp.command.reload")) { - 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; } TogglePvp.getPlugin().reloadPluginConfig(sender);