From ad6f0d1b62ace1b0ffb2cd51dbf4704a1100942b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Teichmann?= <bte@freenet.de>
Date: Mon, 8 Apr 2013 09:47:29 +0200
Subject: [PATCH] added config option to change the format for prefixchat

---
 .../MultiverseCoreConfiguration.java          | 19 +++++++++++++++++++
 .../api/MultiverseCoreConfig.java             | 12 ++++++++++++
 .../commands/VersionCommand.java              |  1 +
 .../listeners/MVChatListener.java             | 11 +++++++++--
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java
index c6865109..4ffadbb7 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java
@@ -42,6 +42,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Property
     private volatile boolean prefixchat;
     @Property
+    private volatile String prefixchatformat;
+    @Property
     private volatile boolean useasyncchat;
     @Property
     private volatile boolean teleportintercept;
@@ -85,6 +87,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         enforceaccess = false;
         useasyncchat = true;
         prefixchat = true;
+        prefixchatformat = "[%world%]%chat%";
         teleportintercept = true;
         firstspawnoverride = true;
         displaypermerrors = true;
@@ -143,6 +146,22 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     public void setPrefixChat(boolean prefixChat) {
         this.prefixchat = prefixChat;
     }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getPrefixChatFormat() {
+        return this.prefixchatformat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPrefixChatFormat(String prefixChatFormat) {
+        this.prefixchatformat = prefixChatFormat;
+    }
 
     /**
      * {@inheritDoc}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java
index 24875b5d..bb49048f 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java
@@ -121,6 +121,18 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      * @return prefixChat.
      */
     boolean getPrefixChat();
+    
+    /**
+     * Sets prefixChatFormat.
+     * @param prefixChatFormat The new value.
+     */
+    void setPrefixChatFormat(String prefixChatFormat);
+
+    /**
+     * Gets prefixChatFormat.
+     * @return prefixChatFormat.
+     */
+    String getPrefixChatFormat();
 
     /**
      * Sets enforceAccess.
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
index f4624f9c..3583d3c1 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
@@ -66,6 +66,7 @@ public class VersionCommand extends MultiverseCommand {
         buffer.append("[Multiverse-Core]  messagecooldown: ").append(plugin.getMessaging().getCooldown()).append('\n');
         buffer.append("[Multiverse-Core]  teleportcooldown: ").append(plugin.getMVConfig().getTeleportCooldown()).append('\n');
         buffer.append("[Multiverse-Core]  worldnameprefix: ").append(plugin.getMVConfig().getPrefixChat()).append('\n');
+        buffer.append("[Multiverse-Core]  worldnameprefixFormat: ").append(plugin.getMVConfig().getPrefixChatFormat()).append('\n');
         buffer.append("[Multiverse-Core]  enforceaccess: ").append(plugin.getMVConfig().getEnforceAccess()).append('\n');
         buffer.append("[Multiverse-Core]  displaypermerrors: ").append(plugin.getMVConfig().getDisplayPermErrors()).append('\n');
         buffer.append("[Multiverse-Core]  teleportintercept: ").append(plugin.getMVConfig().getTeleportIntercept()).append('\n');
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java
index 9fcd8c70..aaa05ab5 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java
@@ -3,6 +3,8 @@ package com.onarandombox.MultiverseCore.listeners;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+
+import org.bukkit.ChatColor;
 import org.bukkit.event.Listener;
 
 /**
@@ -45,8 +47,13 @@ public abstract class MVChatListener implements Listener {
                 return;
             }
             prefix = mvworld.getColoredWorldString();
-            String format = event.getFormat();
-            event.setFormat("[" + prefix + "]" + format);
+            String chat = event.getFormat();
+            
+            String prefixChatFormat = plugin.getMVConfig().getPrefixChatFormat();
+            prefixChatFormat = prefixChatFormat.replace("%world%", prefix).replace("%chat%", chat);
+            prefixChatFormat = ChatColor.translateAlternateColorCodes('&', prefixChatFormat);
+            
+            event.setFormat(prefixChatFormat);
         }
     }
 }