From b2d168835a872deb376316188f790e0771769540 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sat, 31 Jul 2021 21:00:07 -0400 Subject: [PATCH] Fix message remover and hex colors in placeholders. --- .../chat/command/chat/VentureChatGui.java | 9 +- .../Aust1n46/chat/listeners/ChatListener.java | 4 +- .../Aust1n46/chat/utilities/Format.java | 2 +- src/main/resources/commands.yml | 151 ------------------ 4 files changed, 8 insertions(+), 158 deletions(-) delete mode 100644 src/main/resources/commands.yml diff --git a/src/main/java/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/src/main/java/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index db9cdd5..e38cfea 100644 --- a/src/main/java/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/src/main/java/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -88,15 +89,15 @@ public class VentureChatGui implements VentureCommand { } ItemMeta closeMeta = close.getItemMeta(); - closeMeta.setDisplayName("�oClose GUI"); + closeMeta.setDisplayName(ChatColor.RED + "" + ChatColor.ITALIC + "Close GUI"); close.setItemMeta(closeMeta); SkullMeta skullMeta = (SkullMeta) skull.getItemMeta(); skullMeta.setOwner(target.getName()); - skullMeta.setDisplayName("�b" + target.getName()); + skullMeta.setDisplayName(ChatColor.AQUA + target.getName()); List skullLore = new ArrayList(); - skullLore.add("�7Channel: " + channel.getColor() + channel.getName()); - skullLore.add("�7Hash: " + channel.getColor() + hash); + skullLore.add(ChatColor.GRAY + "Channel: " + channel.getColor() + channel.getName()); + skullLore.add(ChatColor.GRAY + "Hash: " + channel.getColor() + hash); skullMeta.setLore(skullLore); skull.setItemMeta(skullMeta); skull.setDurability((short) 3); diff --git a/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java b/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java index 5ad8c7a..0f137cf 100644 --- a/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -482,8 +482,8 @@ public class ChatListener implements Listener { } String globalJSON = Format.convertToJson(mcp, format, chat); - format = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), Format.FormatStringAll(format)); - String message = (format + chat).replaceAll("(\ufffd([a-z0-9]))", ""); // UTF-8 encoding issues. + format = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), Format.FormatStringAll(format))); + String message = (format + chat).replaceAll("(\u00A7([a-z0-9]))", ""); // UTF-8 encoding issues. int hash = message.hashCode(); //Create VentureChatEvent diff --git a/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java b/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java index b68b45a..3c976fa 100644 --- a/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java +++ b/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java @@ -108,7 +108,7 @@ public class Format { indexStart = matcher.start(); indexEnd = matcher.end(); placeholder = remaining.substring(indexStart, indexEnd); - formattedPlaceholder = PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), placeholder); + formattedPlaceholder = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), placeholder)); temp += convertToJsonColors(lastCode + remaining.substring(0, indexStart)) + ","; lastCode = getLastCode(lastCode + remaining.substring(0, indexStart)); String action = ""; diff --git a/src/main/resources/commands.yml b/src/main/resources/commands.yml deleted file mode 100644 index ac675ca..0000000 --- a/src/main/resources/commands.yml +++ /dev/null @@ -1,151 +0,0 @@ -mute: - usage: /mute [playername] [channel] - aliases: [mp] - -unmute: - usage: /unmute [playername] [channel] - aliases: [ump] - -tell: - usage: /tell [playername] [msg] - aliases: [] - -ignore: - usage: /ignore [playername] or /ignore ? for more information - aliases: [] - -whisper: - usage: /whisper [playername] [msg] - aliases: [w] - -channel: - usage: /channel [channelname] - aliases: [ch] - -leave: - usage: /leave [channelname] - aliases: [lev] - -join: - usage: /join [channelname] - aliases: [] - -chlist: - usage: /chlist - aliases: [chl] - -chwho: - usage: /chwho [channelname] - aliases: [chw] - -setchannel: - usage: /setchannel [playername] [channel] - aliases: [sc] - -kickchannel: - usage: /kickchannel [playername] [channel] - aliases: [kc] - -message: - usage: /message [playername] [msg] - aliases: [msg,pm] - -muteall: - usage: /muteall [playername] - aliases: [mpa] - -unmuteall: - usage: /unmuteall [playername] - aliases: [umpa] - -kickchannelall: - usage: /kickchannelall [playername] - aliases: [kca] - -setchannelall: - usage: /setchannelall [playername] - aliases: [sca] - -force: - usage: /force [playername] [message] - aliases: [for] - -forceall: - usage: /forceall [message] - aliases: [fora] - -listen: - usage: /listen [channel] - aliases: [lis] - -chatreload: - usage: /chatreload - aliases: [cr] - -afk: - usage: /afk - aliases: [] - -reply: - usage: /reply [msg] - aliases: [r] - -spy: - usage: /spy - aliases: [] - -commandspy: - usage: /commandspy - aliases: [comspy] - -chatinfo: - usage: /chatinfo - aliases: [ci] - -channelinfo: - usage: /channelinfo - aliases: [chi] - -mineversechat: - usage: /mineversechat - aliases: [mc] - -me: - usage: /me - aliases: [] - -filter: - usage: /filter - aliases: [fil] - -broadcast: - usage: /broadcast [msg] - aliases: [bc] - -commandblock: - usage: /commandblock [player] [command] - aliases: [cb] - -nick: - usage: /nick {player} [nickname] - aliases: [] - -party: - usage: /party help - aliases: [p,chatparty,cp] - -edit: - usage: /edit help - aliases: [] - -clearchat: - usage: /clearchat - aliases: [cc] - -notifications: - usage: /notifications - aliases: [notify] - -mail: - usage: /mail help - aliases: [] \ No newline at end of file