From cd02926fb0c79f9e699a652f5d5d0e16357f4f37 Mon Sep 17 00:00:00 2001 From: Arthur Mayer Date: Tue, 31 May 2011 23:10:16 +0200 Subject: [PATCH 1/2] made webchat prefix to configurable --- configuration.txt | 1 + src/main/java/org/dynmap/ClientConfigurationComponent.java | 1 + src/main/java/org/dynmap/InternalClientUpdateComponent.java | 2 +- src/main/java/org/dynmap/JsonFileClientUpdateComponent.java | 2 +- src/main/java/org/dynmap/SimpleWebChatComponent.java | 2 +- src/main/java/org/dynmap/herochat/HeroWebChatComponent.java | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configuration.txt b/configuration.txt index 5689a57d..b34c59cd 100644 --- a/configuration.txt +++ b/configuration.txt @@ -104,6 +104,7 @@ showplayerfacesinmenu: true joinmessage: "%playername% joined" quitmessage: "%playername% quit" spammessage: "You may only chat once every %interval% seconds." +webprefix: "[WEB] " defaultzoom: 0 defaultworld: world diff --git a/src/main/java/org/dynmap/ClientConfigurationComponent.java b/src/main/java/org/dynmap/ClientConfigurationComponent.java index cf9356cc..d39f5488 100644 --- a/src/main/java/org/dynmap/ClientConfigurationComponent.java +++ b/src/main/java/org/dynmap/ClientConfigurationComponent.java @@ -19,6 +19,7 @@ public class ClientConfigurationComponent extends Component { s(t, "joinmessage", c.getString("joinmessage", "%playername% joined")); s(t, "quitmessage", c.getString("quitmessage", "%playername% quit")); s(t, "spammessage", c.getString("spammessage", "You may only chat once every %interval% seconds.")); + s(t, "webprefix", c.getString("webprefix", "[WEB] ")); s(t, "defaultzoom", c.getInteger("defaultzoom", 0)); s(t, "sidebaropened", c.getBoolean("sidebaropened", false)); diff --git a/src/main/java/org/dynmap/InternalClientUpdateComponent.java b/src/main/java/org/dynmap/InternalClientUpdateComponent.java index b15953ec..69ad61f7 100644 --- a/src/main/java/org/dynmap/InternalClientUpdateComponent.java +++ b/src/main/java/org/dynmap/InternalClientUpdateComponent.java @@ -44,7 +44,7 @@ public class InternalClientUpdateComponent extends ClientUpdateComponent { protected void webChat(String name, String message) { // TODO: Change null to something meaningful. plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null)); - Log.info("[WEB]" + name + ": " + message); + Log.info(plugin.configuration.getString("webprefix", "[WEB] ") + name + ": " + message); ChatEvent event = new ChatEvent("web", name, message); plugin.events.trigger("webchat", event); } diff --git a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java index 6e5f9fe6..83142d7e 100644 --- a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java +++ b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java @@ -158,7 +158,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent { protected void webChat(String name, String message) { // TODO: Change null to something meaningful. plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null)); - Log.info("[WEB]" + name + ": " + message); + Log.info(plugin.configuration.getString("webprefix", "[WEB] ") + name + ": " + message); ChatEvent event = new ChatEvent("web", name, message); plugin.events.trigger("webchat", event); } diff --git a/src/main/java/org/dynmap/SimpleWebChatComponent.java b/src/main/java/org/dynmap/SimpleWebChatComponent.java index 2ea177d3..e8d9f711 100644 --- a/src/main/java/org/dynmap/SimpleWebChatComponent.java +++ b/src/main/java/org/dynmap/SimpleWebChatComponent.java @@ -16,7 +16,7 @@ public class SimpleWebChatComponent extends Component { plugin.events.addListener("webchat", new Event.Listener() { @Override public void triggered(ChatEvent t) { - plugin.getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message); + plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "[WEB] ") + t.name + ": " + t.message); } }); diff --git a/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java b/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java index ee53c8b2..621830e3 100644 --- a/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java +++ b/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java @@ -24,7 +24,7 @@ public class HeroWebChatComponent extends Component { public void triggered(ChatEvent t) { /* Let HeroChat take a look - only broadcast to players if it doesn't handle it */ if (!handler.sendWebMessageToHeroChat(t.name, t.message)) { - plugin.getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message); + plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "[WEB] ") + t.name + ": " + t.message); } } }); From af51d8b7e0d7057174a98c7961c5203e4b5ed897 Mon Sep 17 00:00:00 2001 From: Arthur Mayer Date: Tue, 31 May 2011 23:30:02 +0200 Subject: [PATCH 2/2] added configurable suffix for webchat --- configuration.txt | 3 ++- src/main/java/org/dynmap/InternalClientUpdateComponent.java | 2 +- src/main/java/org/dynmap/JsonFileClientUpdateComponent.java | 2 +- src/main/java/org/dynmap/SimpleWebChatComponent.java | 2 +- src/main/java/org/dynmap/herochat/HeroWebChatComponent.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configuration.txt b/configuration.txt index b34c59cd..d17bf3ad 100644 --- a/configuration.txt +++ b/configuration.txt @@ -104,7 +104,8 @@ showplayerfacesinmenu: true joinmessage: "%playername% joined" quitmessage: "%playername% quit" spammessage: "You may only chat once every %interval% seconds." -webprefix: "[WEB] " +webprefix: "¤2[WEB] " +websuffix: "¤f" defaultzoom: 0 defaultworld: world diff --git a/src/main/java/org/dynmap/InternalClientUpdateComponent.java b/src/main/java/org/dynmap/InternalClientUpdateComponent.java index 69ad61f7..19b552ba 100644 --- a/src/main/java/org/dynmap/InternalClientUpdateComponent.java +++ b/src/main/java/org/dynmap/InternalClientUpdateComponent.java @@ -44,7 +44,7 @@ public class InternalClientUpdateComponent extends ClientUpdateComponent { protected void webChat(String name, String message) { // TODO: Change null to something meaningful. plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null)); - Log.info(plugin.configuration.getString("webprefix", "[WEB] ") + name + ": " + message); + Log.info(plugin.configuration.getString("webprefix", "¤2[WEB] ") + name + ": " + plugin.configuration.getString("websuffix", "¤f") + message); ChatEvent event = new ChatEvent("web", name, message); plugin.events.trigger("webchat", event); } diff --git a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java index 83142d7e..f39f457b 100644 --- a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java +++ b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java @@ -158,7 +158,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent { protected void webChat(String name, String message) { // TODO: Change null to something meaningful. plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null)); - Log.info(plugin.configuration.getString("webprefix", "[WEB] ") + name + ": " + message); + Log.info(plugin.configuration.getString("webprefix", "¤2[WEB] ") + name + ": " + plugin.configuration.getString("websuffix", "¤f") + message); ChatEvent event = new ChatEvent("web", name, message); plugin.events.trigger("webchat", event); } diff --git a/src/main/java/org/dynmap/SimpleWebChatComponent.java b/src/main/java/org/dynmap/SimpleWebChatComponent.java index e8d9f711..6510664a 100644 --- a/src/main/java/org/dynmap/SimpleWebChatComponent.java +++ b/src/main/java/org/dynmap/SimpleWebChatComponent.java @@ -16,7 +16,7 @@ public class SimpleWebChatComponent extends Component { plugin.events.addListener("webchat", new Event.Listener() { @Override public void triggered(ChatEvent t) { - plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "[WEB] ") + t.name + ": " + t.message); + plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "¤2[WEB] ") + t.name + ": " + plugin.configuration.getString("websuffix", "¤f") + t.message); } }); diff --git a/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java b/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java index 621830e3..5bf10a07 100644 --- a/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java +++ b/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java @@ -24,7 +24,7 @@ public class HeroWebChatComponent extends Component { public void triggered(ChatEvent t) { /* Let HeroChat take a look - only broadcast to players if it doesn't handle it */ if (!handler.sendWebMessageToHeroChat(t.name, t.message)) { - plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "[WEB] ") + t.name + ": " + t.message); + plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "¤2[WEB] ") + t.name + ": " + plugin.configuration.getString("websuffix", "¤f") + t.message); } } });