Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-25 03:35:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #182 from flames/master

Browse Source 
added configurable suffix for webchat
This commit is contained in:
Arthur Mayer 2011-05-31 14:54:32 -07:00
commit 773ce4e3f0
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.txt
View File

@ -104,6 +104,8 @@ showplayerfacesinmenu: true
joinmessage: "%playername% joined" joinmessage: "%playername% joined"
quitmessage: "%playername% quit" quitmessage: "%playername% quit"
spammessage: "You may only chat once every %interval% seconds." spammessage: "You may only chat once every %interval% seconds."
webprefix: "¤2[WEB] "
websuffix: "¤f"
defaultzoom: 0 defaultzoom: 0
defaultworld: world defaultworld: world

1
src/main/java/org/dynmap/ClientConfigurationComponent.java
View File

@ -19,6 +19,7 @@ public class ClientConfigurationComponent extends Component {
s(t, "joinmessage", c.getString("joinmessage", "%playername% joined")); s(t, "joinmessage", c.getString("joinmessage", "%playername% joined"));
s(t, "quitmessage", c.getString("quitmessage", "%playername% quit")); s(t, "quitmessage", c.getString("quitmessage", "%playername% quit"));
s(t, "spammessage", c.getString("spammessage", "You may only chat once every %interval% seconds.")); 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, "defaultzoom", c.getInteger("defaultzoom", 0));
s(t, "sidebaropened", c.getBoolean("sidebaropened", false)); s(t, "sidebaropened", c.getBoolean("sidebaropened", false));

2
src/main/java/org/dynmap/InternalClientUpdateComponent.java
View File

@ -44,7 +44,7 @@ public class InternalClientUpdateComponent extends ClientUpdateComponent {
protected void webChat(String name, String message) { protected void webChat(String name, String message) {
// TODO: Change null to something meaningful. // TODO: Change null to something meaningful.
plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null)); plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null));
Log.info("[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); ChatEvent event = new ChatEvent("web", name, message);
plugin.events.trigger("webchat", event); plugin.events.trigger("webchat", event);
} }

2
src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
View File

@ -158,7 +158,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
protected void webChat(String name, String message) { protected void webChat(String name, String message) {
// TODO: Change null to something meaningful. // TODO: Change null to something meaningful.
plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null)); plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null));
Log.info("[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); ChatEvent event = new ChatEvent("web", name, message);
plugin.events.trigger("webchat", event); plugin.events.trigger("webchat", event);
} }

2
src/main/java/org/dynmap/SimpleWebChatComponent.java
View File

@ -16,7 +16,7 @@ public class SimpleWebChatComponent extends Component {
plugin.events.addListener("webchat", new Event.Listener<ChatEvent>() { plugin.events.addListener("webchat", new Event.Listener<ChatEvent>() {
@Override @Override
public void triggered(ChatEvent t) { public void triggered(ChatEvent t) {
plugin.getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message); plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "¤2[WEB] ") + t.name + ": " + plugin.configuration.getString("websuffix", "¤f") + t.message);
} }
}); });

2
src/main/java/org/dynmap/herochat/HeroWebChatComponent.java
View File

@ -24,7 +24,7 @@ public class HeroWebChatComponent extends Component {
public void triggered(ChatEvent t) { public void triggered(ChatEvent t) {
/* Let HeroChat take a look - only broadcast to players if it doesn't handle it */ /* Let HeroChat take a look - only broadcast to players if it doesn't handle it */
if (!handler.sendWebMessageToHeroChat(t.name, t.message)) { if (!handler.sendWebMessageToHeroChat(t.name, t.message)) {
plugin.getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message); plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "¤2[WEB] ") + t.name + ": " + plugin.configuration.getString("websuffix", "¤f") + t.message);
} }
} }
}); });