From 5459c791e2629f68eda952f0fe99df7d11f8b1f0 Mon Sep 17 00:00:00 2001
From: Minenash <minenash@protonmail.com>
Date: Sun, 13 Jan 2019 23:09:20 -0500
Subject: Added world-specific arrow colors. Added format reset command*.

*Can not reset world-specific settings
---
 src/main/java/com/redstoner/modules/chat/Chat.cmd  |  8 +++++++-
 src/main/java/com/redstoner/modules/chat/Chat.java | 22 ++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/redstoner/modules/chat/Chat.cmd b/src/main/java/com/redstoner/modules/chat/Chat.cmd
index 339e128..d51d56b 100644
--- a/src/main/java/com/redstoner/modules/chat/Chat.cmd
+++ b/src/main/java/com/redstoner/modules/chat/Chat.cmd
@@ -87,4 +87,10 @@ command chatonly {
         help Shows that you're onlu able to chat, nothing else.;
         type player;
     }
-}
\ No newline at end of file
+}
+
+command resetchatformating {
+	run resetformating;
+	help Resets the formatting to defaults.;
+	type console;
+}
diff --git a/src/main/java/com/redstoner/modules/chat/Chat.java b/src/main/java/com/redstoner/modules/chat/Chat.java
index 5a2f8d7..9f494b3 100644
--- a/src/main/java/com/redstoner/modules/chat/Chat.java
+++ b/src/main/java/com/redstoner/modules/chat/Chat.java
@@ -40,13 +40,14 @@ public class Chat implements Module, Listener {
 	private Set<UUID> chatonly = new HashSet<>();
 
 	public Chat() {
-		defaults.put("chat", " %n %c§7→§r %m");
+		defaults.put("chat", " %n %c%w→§r %m");
 		defaults.put("me", " §7- %n %c§7⇦ %m");
 		defaults.put("action", " §7- %n %c§7⇦ %m");
-		defaults.put("say", " §7[§9%n§7]%c§7:§r %m");
-		defaults.put("shrug", " %n %c§7→§r %m ¯\\_(ツ)_/¯");
+		defaults.put("say", " §7[§9%n§7]%c%w:§r %m");
+		defaults.put("shrug", " %n %c%w→§r %m ¯\\_(ツ)_/¯");
 		defaults.put("print", "%m");
 		defaults.put("%c", "§c*");
+		defaults.put("%w-default", "§7");
 	}
 
 	@Override
@@ -58,9 +59,15 @@ public class Chat implements Module, Listener {
 		DataManager.setConfig("shrug", defaults.get("shrug"));
 		DataManager.setConfig("print", defaults.get("print"));
 		DataManager.setConfig("%c", defaults.get("%c"));
-		DataManager.setConfig("%c-hover", defaults.get("%c-hover"));
+		DataManager.setConfig("%w-default", defaults.get("§7"));
 	}
 
+	@Command(hook = "resetformating")
+	public void resetFormating(CommandSender sender) {
+		firstLoad();
+		sender.sendMessage("Chat Formats have been reset to defaults.");
+	}
+	
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onPlayerChat(AsyncPlayerChatEvent event) {
 		Player player = event.getPlayer();
@@ -208,6 +215,13 @@ public class Chat implements Module, Listener {
 		
 		formatted = !isChatOnly? formatted.replaceAll("%c", "") : formatted.replace("%c", (String) DataManager.getConfigOrDefault("%c", defaults.get("%c")));
 		
+		
+		if (sender instanceof Player)
+			formatted = formatted.replace("%w", (String) DataManager.getConfigOrDefault(((Player)sender).getWorld().getName() + ".%w",
+					                            (String) DataManager.getConfigOrDefault("%w-default", defaults.get("%w-default"))));
+		else
+			formatted = formatted.replace("%w", "");
+		
 		if (ModuleLoader.exists("Mentio")) {
 			for (Player player : Bukkit.getOnlinePlayers())
 				if (filter.sendTo(player)) {
-- 
cgit v1.2.3