Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved HeroChat code to HeroWebChatModule.

Browse source
This commit is contained in:
FrozenCow 2011-05-19 23:23:50 +02:00
parent b2cb15b75c
commit 987e6bcb54
7 changed files with 83 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/dynmap/ChatEvent.java Normal file
View file

@ -0,0 +1,12 @@
package org.dynmap;
public class ChatEvent {
public String source;
public String name;
public String message;
public ChatEvent(String source, String name, String message) {
this.source = source;
this.name = name;
this.message = message;
}
}

3
src/main/java/org/dynmap/ClientConfigurationComponent.java
View file

@ -19,9 +19,6 @@ public class ClientConfigurationComponent extends Component {
s(t, "allowchat", c.getBoolean("allowchat", true));
s(t, "allowwebchat", c.getBoolean("allowwebchat", true));
s(t, "webchat-interval", c.getFloat("webchat-interval", 5.0f));
s(t, "enableherochat", c.getBoolean("enableherochat", false));
s(t, "herochatwebchannel", c.getString("herochatwebchannel", "Global"));
s(t, "herochatchannels", l(c.getStrings("herochatchannels", null)));
s(t, "showplayerfacesinmenu", c.getBoolean("showplayerfacesinmenu", true));
s(t, "joinmessage", c.getString("joinmessage", "%playername% joined"));
s(t, "quitmessage", c.getString("joinmessage", "%playername% quit"));

8
src/main/java/org/dynmap/DynmapPlugin.java
View file

@ -54,7 +54,6 @@ public class DynmapPlugin extends JavaPlugin {
public ConfigurationNode configuration;
public HashSet<String> enabledTriggers = new HashSet<String>();
public PermissionProvider permissions;
public HeroChatHandler hchand;
public ComponentManager componentManager = new ComponentManager();
public Events events = new Events();
@ -106,8 +105,6 @@ public class DynmapPlugin extends JavaPlugin {
timer.scheduleAtFixedRate(new JsonTimerTask(this, configuration), jsonInterval, jsonInterval);
}
hchand = new HeroChatHandler(configuration, this, getServer());
enabledTriggers.clear();
List<String> triggers = configuration.getStrings("render-triggers", new ArrayList<String>());
if (triggers != null)
@ -415,8 +412,7 @@ public class DynmapPlugin extends JavaPlugin {
public void webChat(String name, String message) {
mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null));
Log.info("[WEB]" + name + ": " + message);
/* Let HeroChat take a look - only broadcast to players if it doesn't handle it */
if(hchand.sendWebMessageToHeroChat(name, message) == false)
getServer().broadcastMessage("[WEB]" + name + ": " + message);
ChatEvent event = new ChatEvent("web", name, message);
events.trigger("webchat", event);
}
}

15
src/main/java/org/dynmap/SimpleWebChatComponent.java Normal file
View file

@ -0,0 +1,15 @@
package org.dynmap;
public class SimpleWebChatComponent extends Component {
public SimpleWebChatComponent(final DynmapPlugin plugin, ConfigurationNode configuration) {
super(plugin, configuration);
plugin.events.addListener("webchat", new Event.Listener<ChatEvent>() {
@Override
public void triggered(ChatEvent t) {
plugin.getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message);
}
});
}
}

37
src/main/java/org/dynmap/HeroChatHandler.java → src/main/java/org/dynmap/herochat/HeroChatHandler.java
View file

@ -1,4 +1,4 @@
package org.dynmap;
package org.dynmap.herochat;
import java.lang.reflect.Method;
import java.util.Collections;
@ -11,6 +11,11 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.Plugin;
import java.lang.reflect.Field;
import org.dynmap.Client;
import org.dynmap.ConfigurationNode;
import org.dynmap.DynmapPlugin;
import org.dynmap.Log;
import org.dynmap.Client.ChatMessage;
public class HeroChatHandler {
private static final String DEF_CHANNEL = "Global";
@ -239,22 +244,20 @@ public class HeroChatHandler {
public HeroChatHandler(ConfigurationNode cfg, DynmapPlugin plugin, Server server) {
/* If we're enabling hero chat support */
if (cfg.getBoolean("enableherochat", false)) {
Log.info("HeroChat support configured");
this.plugin = plugin;
/* Now, get the monitored channel list */
hcchannels = cfg.getStrings("herochatchannels", DEF_CHANNELS);
/* And get channel to send web messages */
hcwebinputchannel = cfg.getString("herochatwebchannel", DEF_CHANNEL);
Plugin hc = server.getPluginManager().getPlugin("HeroChat");
if(hc != null) {
activateHeroChat(hc);
}
else {
/* Set up to hear when HeroChat is enabled */
server.getPluginManager().registerEvent(Event.Type.PLUGIN_ENABLE,
new OurPluginListener(), Event.Priority.Normal, plugin);
}
Log.info("HeroChat support configured");
this.plugin = plugin;
/* Now, get the monitored channel list */
hcchannels = cfg.getStrings("herochatchannels", DEF_CHANNELS);
/* And get channel to send web messages */
hcwebinputchannel = cfg.getString("herochatwebchannel", DEF_CHANNEL);
Plugin hc = server.getPluginManager().getPlugin("HeroChat");
if(hc != null) {
activateHeroChat(hc);
}
else {
/* Set up to hear when HeroChat is enabled */
server.getPluginManager().registerEvent(Event.Type.PLUGIN_ENABLE,
new OurPluginListener(), Event.Priority.Normal, plugin);
}
}

25
src/main/java/org/dynmap/herochat/HeroWebChatComponent.java Normal file
View file

@ -0,0 +1,25 @@
package org.dynmap.herochat;
import org.dynmap.ChatEvent;
import org.dynmap.Component;
import org.dynmap.ConfigurationNode;
import org.dynmap.DynmapPlugin;
import org.dynmap.Event;
public class HeroWebChatComponent extends Component {
HeroChatHandler handler;
public HeroWebChatComponent(final DynmapPlugin plugin, ConfigurationNode configuration) {
super(plugin, configuration);
handler = new HeroChatHandler(configuration, plugin, plugin.getServer());
plugin.events.addListener("webchat", new Event.Listener<ChatEvent>() {
@Override
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);
}
}
});
}
}