diff --git a/src/main/java/xyz/etztech/minecraftmanager/MCMUtil.java b/src/main/java/xyz/etztech/minecraftmanager/MCMUtil.java index 8945201..e04d7ec 100644 --- a/src/main/java/xyz/etztech/minecraftmanager/MCMUtil.java +++ b/src/main/java/xyz/etztech/minecraftmanager/MCMUtil.java @@ -45,9 +45,19 @@ public class MCMUtil { } public static void staffMessage(String message) { - staffMessage(message, null); + log(staffLog, message); + HoverEvent hover = new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Staff Chat").create()); + TextComponent text = new TextComponent(message); + text.setHoverEvent(hover); + for (Player player : Bukkit.getServer().getOnlinePlayers()) { + if (player.hasPermission("minecraftmanager.staff")) { + player.spigot().sendMessage(text); + } + } + Bukkit.getConsoleSender().sendMessage(message); } + @Deprecated public static void staffMessage(String message, String hoverCommand) { log(staffLog, message); HoverEvent hover = new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Staff Chat").create()); @@ -71,7 +81,7 @@ public class MCMUtil { player.spigot().sendMessage(message); } } - Bukkit.getConsoleSender().sendMessage(message.getText()); + Bukkit.getConsoleSender().spigot().sendMessage(message); } public static void globalMessage(String message) { diff --git a/src/main/java/xyz/etztech/minecraftmanager/objects/MinecraftManagerThread.java b/src/main/java/xyz/etztech/minecraftmanager/objects/MinecraftManagerThread.java index 0da2bfa..7ffc148 100644 --- a/src/main/java/xyz/etztech/minecraftmanager/objects/MinecraftManagerThread.java +++ b/src/main/java/xyz/etztech/minecraftmanager/objects/MinecraftManagerThread.java @@ -1,13 +1,13 @@ package xyz.etztech.minecraftmanager.objects; +import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitScheduler; import xyz.etztech.minecraftmanager.MCMUtil; import xyz.etztech.minecraftmanager.MinecraftManager; @@ -89,13 +89,16 @@ public class MinecraftManagerThread extends Thread { } public static void application(String username, String id) { - String message = ChatColor.GREEN + "New application #" + id + " from " + username; - MCMUtil.staffMessage(message, "/app info " + id); + ComponentBuilder builder = new ComponentBuilder("New application #" + id + " from " + username) + .color(ChatColor.GREEN) + .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/app info " + id)); + TextComponent message = new TextComponent(builder.create()); + MCMUtil.staffMessage(message); } public static void ticket(String username, String id, String link) { ComponentBuilder builder = new ComponentBuilder("New ticket #" + id + " from " + username + ". Click for more info.") - .color(net.md_5.bungee.api.ChatColor.GREEN) + .color(ChatColor.GREEN) .event(new ClickEvent(ClickEvent.Action.OPEN_URL, link)); TextComponent message = new TextComponent(builder.create()); MCMUtil.staffMessage(message); @@ -134,7 +137,10 @@ public class MinecraftManagerThread extends Thread { } // Message to staff - MCMUtil.staffMessage(ChatColor.GREEN + username + " was " + (accepted ? "accepted" : "denied") + "."); + ComponentBuilder builder = new ComponentBuilder(username + " was " + (accepted ? "accepted" : "denied") + ".") + .color(ChatColor.GREEN); + TextComponent staffMessage = new TextComponent(builder.create()); + MCMUtil.staffMessage(staffMessage); } private static void runTask(final String command, final String username) { @@ -156,7 +162,12 @@ public class MinecraftManagerThread extends Thread { private void staffChat(ArrayList args) { String name = args.get(0); args.remove(0); - MCMUtil.staffMessage(ChatColor.GOLD + "[MCM] " + name + " > " + ChatColor.GREEN + StringUtils.join(args, " ")); + ComponentBuilder builder = new ComponentBuilder("[MCM] " + name + " > ") + .color(ChatColor.GOLD) + .append(StringUtils.join(args, " "), ComponentBuilder.FormatRetention.NONE) + .color(ChatColor.GREEN); + TextComponent message = new TextComponent(builder.create()); + MCMUtil.staffMessage(message); } }