diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index e9d7c5012..70f32b57c 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -241,56 +241,34 @@ public class ScriptPlayer extends ScriptLivingBase PlayerData data = PlayerDataController.instance.getPlayerData(player); return data.factionData.getFactionPoints(faction); } - - /** - * @param message The message you want to send - */ + public void sendMessage(String message){ player.addChatMessage(new ChatComponentTranslation(NoppesStringUtils.formatText(message,player))); } - /** - * @param message The message you want to send - */ - public void sendMessage(String message, EnumChatFormatting color, boolean bold, boolean italic, boolean underlined) { - ChatComponentTranslation chat = new ChatComponentTranslation(NoppesStringUtils.formatText(message,player)); - ChatStyle style = new ChatStyle(); - style.setColor(color); - style.setBold(bold); - style.setItalic(italic); - style.setUnderlined(underlined); - chat.setChatStyle(style); - player.addChatMessage(chat); + public void sendMessage(String message, String color, boolean bold, boolean italic, boolean underlined) { + sendMessage(message, color, bold, italic, underlined, false, false); } + + public void sendMessage(String message, String color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined) { + EnumChatFormatting c = getColor(color); + + if (c == null) + return; - /** - * @param message The message you want to send - */ - public void sendMessage(String message, EnumChatFormatting color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined) { ChatComponentTranslation chat = new ChatComponentTranslation(NoppesStringUtils.formatText(message,player)); ChatStyle style = new ChatStyle(); - style.setColor(color); + style.setColor(c); style.setBold(bold); style.setItalic(italic); style.setObfuscated(obfuscated); style.setStrikethrough(strikethrough); style.setUnderlined(underlined); chat.setChatStyle(style); + player.addChatMessage(chat); } - public void sendMessage(String message, String color, boolean bold, boolean italic, boolean underlined) { - EnumChatFormatting c = getColor(color); - if (c == null) return; - sendMessage(message, c, bold, italic, underlined); - } - - public void sendMessage(String message, String color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined) { - EnumChatFormatting c = getColor(color); - if (c == null) return; - sendMessage(message, c, bold, italic, obfuscated, strikethrough, underlined); - } - private EnumChatFormatting getColor(String color) { switch (color) { case "black": return EnumChatFormatting.BLACK; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java b/src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java index 9ecd82d75..b03d12f7e 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java @@ -93,18 +93,12 @@ public interface IPlayer extends IEntityLivingBase int getFactionPoints(int faction); /** - * @param message The message you want to send + * @param message The message you want to send. Compatible with formatting codes, which can be found on the attached link. + * @see Minecraft formatting codes + * */ void sendMessage(String message); - void sendMessage(String message, EnumChatFormatting color, boolean bold, boolean italic, boolean underlined); - - void sendMessage(String message, EnumChatFormatting color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined); - - void sendMessage(String message, String color, boolean bold, boolean italic, boolean underlined); - - void sendMessage(String message, String color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined); - /** * @return Return gamemode. 0: Survival, 1: Creative, 2: Adventure */