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

Changed chat-mechanism a bit.

Browse source
This commit is contained in:
FrozenCow 2011-03-07 22:07:34 +01:00
parent b5f9d68127
commit d06a0ecb4b
4 changed files with 75 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configuration.txt
View file

@ -67,14 +67,16 @@ web:
# Interval the browser should poll for updates. # Interval the browser should poll for updates.
updaterate: 2000 updaterate: 2000
# showchat: modal/balloons showchatballoons: false
showchat: modal focuschatballoons: false
allowchat: true
showchatwindow: true
allowwebchat: true
messagettl: 15000 messagettl: 15000
showplayerfacesonmap: true showplayerfacesonmap: true
showplayerfacesinmenu: true showplayerfacesinmenu: true
focuschatballoons: false
joinmessage: "%playername% joined" joinmessage: "%playername% joined"
quitmessage: "%playername% quit" quitmessage: "%playername% quit"

4
src/main/java/org/dynmap/DynmapPlayerListener.java → src/main/java/org/dynmap/DynmapPlayerChatListener.java
View file

@ -4,10 +4,10 @@ import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerEvent;
import org.bukkit.event.player.PlayerListener; import org.bukkit.event.player.PlayerListener;
public class DynmapPlayerListener extends PlayerListener { public class DynmapPlayerChatListener extends PlayerListener {
DynmapPlugin plugin; DynmapPlugin plugin;
public DynmapPlayerListener(DynmapPlugin plugin) { public DynmapPlayerChatListener(DynmapPlugin plugin) {
this.plugin = plugin; this.plugin = plugin;
} }

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

@ -16,14 +16,12 @@ import java.util.logging.Logger;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.BlockDamageLevel;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.Event.Priority; import org.bukkit.event.Event.Priority;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockListener;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerEvent;
@ -131,18 +129,17 @@ public class DynmapPlugin extends JavaPlugin {
webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getServer())); webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getServer()));
webServer.handlers.put("/up/configuration", new ClientConfigurationHandler((Map<?, ?>) configuration.getProperty("web"))); webServer.handlers.put("/up/configuration", new ClientConfigurationHandler((Map<?, ?>) configuration.getProperty("web")));
boolean allowchat = configuration.getBoolean("allowchat", true); if (configuration.getNode("web").getBoolean("allowwebchat", false)) {
if (allowchat == true) {
SendMessageHandler messageHandler = new SendMessageHandler(); SendMessageHandler messageHandler = new SendMessageHandler();
messageHandler.onMessageReceived.addListener(new Listener<SendMessageHandler.Message>() { messageHandler.onMessageReceived.addListener(new Listener<SendMessageHandler.Message>() {
@Override @Override
public void triggered(Message t) { public void triggered(Message t) {
mapManager.pushUpdate(new Client.WebChatMessage(t.name, t.message)); mapManager.pushUpdate(new Client.WebChatMessage(t.name, t.message));
log.info("[WEB]" + t.name + ": " + t.message); log.info("[WEB]" + t.name + ": " + t.message);
getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message); getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message);
} }
}); });
webServer.handlers.put("/up/sendmessage", messageHandler); webServer.handlers.put("/up/sendmessage", messageHandler);
} }
try { try {
@ -188,8 +185,10 @@ public class DynmapPlugin extends JavaPlugin {
mm.touch(event.getBlock().getLocation()); mm.touch(event.getBlock().getLocation());
} }
}; };
if (isTrigger("blockplaced")) pm.registerEvent(Event.Type.BLOCK_PLACED, renderTrigger, Priority.Monitor, this); if (isTrigger("blockplaced"))
if (isTrigger("blockbreak")) pm.registerEvent(Event.Type.BLOCK_BREAK, renderTrigger, Priority.Monitor, this); pm.registerEvent(Event.Type.BLOCK_PLACED, renderTrigger, Priority.Monitor, this);
if (isTrigger("blockbreak"))
pm.registerEvent(Event.Type.BLOCK_BREAK, renderTrigger, Priority.Monitor, this);
} }
{ {
PlayerListener renderTrigger = new PlayerListener() { PlayerListener renderTrigger = new PlayerListener() {
@ -197,13 +196,16 @@ public class DynmapPlugin extends JavaPlugin {
public void onPlayerJoin(PlayerEvent event) { public void onPlayerJoin(PlayerEvent event) {
mm.touch(event.getPlayer().getLocation()); mm.touch(event.getPlayer().getLocation());
} }
@Override @Override
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
mm.touch(event.getPlayer().getLocation()); mm.touch(event.getPlayer().getLocation());
} }
}; };
if (isTrigger("playerjoin")) pm.registerEvent(Event.Type.PLAYER_JOIN, renderTrigger, Priority.Monitor, this); if (isTrigger("playerjoin"))
if (isTrigger("playermove")) pm.registerEvent(Event.Type.PLAYER_MOVE, renderTrigger, Priority.Monitor, this); pm.registerEvent(Event.Type.PLAYER_JOIN, renderTrigger, Priority.Monitor, this);
if (isTrigger("playermove"))
pm.registerEvent(Event.Type.PLAYER_MOVE, renderTrigger, Priority.Monitor, this);
} }
{ {
WorldListener renderTrigger = new WorldListener() { WorldListener renderTrigger = new WorldListener() {
@ -214,17 +216,29 @@ public class DynmapPlugin extends JavaPlugin {
mm.touch(new Location(event.getWorld(), x, 127, z)); mm.touch(new Location(event.getWorld(), x, 127, z));
} }
/*@Override /*
public void onChunkGenerated(ChunkLoadEvent event) { * @Override public void onChunkGenerated(ChunkLoadEvent event)
int x = event.getChunk().getX() * 16 + 8; * { int x = event.getChunk().getX() * 16 + 8; int z =
int z = event.getChunk().getZ() * 16 + 8; * event.getChunk().getZ() * 16 + 8; mm.touch(new
mm.touch(new Location(event.getWorld(), x, 127, z)); * Location(event.getWorld(), x, 127, z)); }
}*/ */
}; };
if (isTrigger("chunkloaded")) pm.registerEvent(Event.Type.CHUNK_LOADED, renderTrigger, Priority.Monitor, this); if (isTrigger("chunkloaded"))
pm.registerEvent(Event.Type.CHUNK_LOADED, renderTrigger, Priority.Monitor, this);
//if (isTrigger("chunkgenerated")) pm.registerEvent(Event.Type.CHUNK_GENERATED, renderTrigger, Priority.Monitor, this); //if (isTrigger("chunkgenerated")) pm.registerEvent(Event.Type.CHUNK_GENERATED, renderTrigger, Priority.Monitor, this);
} }
// To announce when players have joined/quit/chatted.
if (configuration.getNode("web").getBoolean("showchatballoons", false) || configuration.getNode("web").getBoolean("showchatwindow", false)) {
// To handle webchat.
PlayerListener playerListener = new DynmapPlayerChatListener(this);
//getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_CHAT, playerListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Monitor, this);
}
// To link configuration to real loaded worlds. // To link configuration to real loaded worlds.
WorldListener worldListener = new WorldListener() { WorldListener worldListener = new WorldListener() {
@Override @Override
@ -233,15 +247,6 @@ public class DynmapPlugin extends JavaPlugin {
} }
}; };
pm.registerEvent(Event.Type.WORLD_LOADED, worldListener, Priority.Monitor, this); pm.registerEvent(Event.Type.WORLD_LOADED, worldListener, Priority.Monitor, this);
// To handle webchat.
PlayerListener playerListener = new DynmapPlayerListener(this);
//getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_CHAT, playerListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Monitor, this);
} }
private static File combinePaths(File parent, String path) { private static File combinePaths(File parent, String path) {

58
web/map.js
View file

@ -195,14 +195,14 @@ DynMap.prototype = {
.appendTo(container); .appendTo(container);
// The chat // The chat
if (me.options.showchat === 'modal') { if (me.options.showchatwindow) {
var chat = me.chat = $('<div/>') var chat = me.chat = $('<div/>')
.addClass('chat') .addClass('chat')
.appendTo(container); .appendTo(container);
var messagelist = me.messagelist = $('<div/>') var messagelist = me.messagelist = $('<div/>')
.addClass('messagelist') .addClass('messagelist')
.appendTo(chat); .appendTo(chat);
if (me.options.allowchat === true) { if (me.options.allowwebchat) {
var chatinput = me.chatinput = $('<input/>') var chatinput = me.chatinput = $('<input/>')
.addClass('chatinput') .addClass('chatinput')
.attr({ .attr({
@ -308,30 +308,22 @@ DynMap.prototype = {
} }
$.each(update.updates, function(index, update) { $.each(update.updates, function(index, update) {
swtch(update.type, { // Only handle updates that are actually new.
tile: function() { if(!me.options.jsonfile || me.lasttimestamp <= update.timestamp) {
swtch(update.type, {
if(me.lasttimestamp <= update.timestamp || !me.options.jsonfile) tile: function() {
me.onTileUpdated(update.name); me.onTileUpdated(update.name);
}, },
chat: function() { chat: function() {
if (!me.options.showchat) {
return;
}
if(me.lasttimestamp <= update.timestamp || !me.options.jsonfile)
me.onPlayerChat(update.playerName, update.message); me.onPlayerChat(update.playerName, update.message);
}, },
webchat: function() { webchat: function() {
if (!me.options.showchat) {
return;
}
if(me.lasttimestamp <= update.timestamp || !me.options.jsonfile)
me.onPlayerChat('[WEB]' + update.playerName, update.message); me.onPlayerChat('[WEB]' + update.playerName, update.message);
} }
}, function(type) { }, function(type) {
console.log('Unknown type ', type, '!'); console.log('Unknown type ', type, '!');
}); });
}
/* remove older messages from chat*/ /* remove older messages from chat*/
//var timestamp = event.timeStamp; //var timestamp = event.timeStamp;
//var divs = $('div[rel]'); //var divs = $('div[rel]');
@ -371,11 +363,9 @@ DynMap.prototype = {
var d = new Date(); var d = new Date();
var now = d.getTime(); var now = d.getTime();
var popupIndex; var popupIndex;
for (popupIndex in this.chatPopups) for (popupIndex in this.chatPopups) {
{
var popup = this.chatPopups[popupIndex]; var popup = this.chatPopups[popupIndex];
if (now - popup.popupTime > POPUP_LIFE) if (now - popup.popupTime > POPUP_LIFE) {
{
popup.infoWindow.close(); popup.infoWindow.close();
popup.infoWindow = null; popup.infoWindow = null;
delete this.chatPopups[popupIndex]; delete this.chatPopups[popupIndex];
@ -388,9 +378,8 @@ DynMap.prototype = {
var map = me.map; var map = me.map;
var player = me.players[playerName]; var player = me.players[playerName];
var playerMarker = player && player.marker; var playerMarker = player && player.marker;
if (me.options.showchat === 'balloons') { if (me.options.showchatballoons) {
if (playerMarker) if (playerMarker) {
{
var popup = chatPopups[playerName]; var popup = chatPopups[playerName];
if (!popup) { if (!popup) {
popup = { lines: [ message ] }; popup = { lines: [ message ] };
@ -399,14 +388,12 @@ DynMap.prototype = {
} }
var MAX_LINES = 5; var MAX_LINES = 5;
if (popup.lines.length > MAX_LINES) if (popup.lines.length > MAX_LINES) {
{
popup.lines = popup.lines.slice(1); popup.lines = popup.lines.slice(1);
} }
var htmlMessage = '<div id="content"><b>' + playerName + "</b><br/><br/>"; var htmlMessage = '<div id="content"><b>' + playerName + "</b><br/><br/>";
var line; var line;
for (line in popup.lines) for (line in popup.lines) {
{
htmlMessage = htmlMessage + popup.lines[line] + "<br/>"; htmlMessage = htmlMessage + popup.lines[line] + "<br/>";
} }
htmlMessage = htmlMessage + "</div>"; htmlMessage = htmlMessage + "</div>";
@ -423,7 +410,8 @@ DynMap.prototype = {
popup.infoWindow.open(map, playerMarker); popup.infoWindow.open(map, playerMarker);
this.chatPopups[playerName] = popup; this.chatPopups[playerName] = popup;
} }
} else if (me.options.showchat === 'modal') { }
if (me.options.showchatwindow) {
var messagelist = me.messagelist; var messagelist = me.messagelist;
var messageRow = $('<div/>') var messageRow = $('<div/>')