Skip to content

Commit

Permalink
Finish support for greeting/farewall text on area markers
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikeprimm
mikeprimm committed May 25, 2020
1 parent 14f55bd commit 5e15187
Show file tree
Hide file tree
Showing 17 changed files with 298 additions and 9 deletions.
51 changes: 44 additions & 7 deletions DynmapCore/src/main/java/org/dynmap/MapManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,20 @@ public class MapManager {
private boolean tpspausefullrenders = false;
private boolean tpspausezoomout = false;

// User enter/exit processing
private static final int DEFAULT_ENTEREXIT_PERIOD = 1000; // 1 second
private static final int DEFAULT_TITLE_FADEIN = 10; // 10 ticks = 1/2 second
private static final int DEFAULT_TITLE_STAY = 70; // 70 ticks = 3 1/2 second
private static final int DEFAULT_TITLE_FADEOUT = 20; // 20 ticks = 1 second
private static final boolean DEFAULT_ENTEREXIT_USETITLE = true;
private int enterexitperiod = DEFAULT_ENTEREXIT_PERIOD; // Enter/exit processing period
private int titleFadeIn = DEFAULT_TITLE_FADEIN;
private int titleStay = DEFAULT_TITLE_STAY;
private int titleFadeOut = DEFAULT_TITLE_FADEOUT;
private boolean enterexitUseTitle = DEFAULT_ENTEREXIT_USETITLE;

private HashMap<UUID, HashSet<EnterExitMarker>> entersetstate = new HashMap<UUID, HashSet<EnterExitMarker>>();

private boolean did_start = false;

private int zoomout_period = DEFAULT_ZOOMOUT_PERIOD; /* Zoom-out tile processing period, in seconds */
Expand Down Expand Up @@ -934,8 +948,20 @@ public void run() {
scheduleDelayedJob(this, 1000); /* Once per second */
}
}

private HashMap<UUID, HashSet<EnterExitMarker>> entersetstate = new HashMap<UUID, HashSet<EnterExitMarker>>();

private void sendPlayerEnterExit(DynmapPlayer player, EnterExitText txt) {
core.getServer().scheduleServerTask(new Runnable() {
public void run() {
if (enterexitUseTitle) {
player.sendTitleText(txt.title, txt.subtitle, titleFadeIn, titleStay, titleFadeOut);
}
else {
if (txt.title != null) player.sendMessage(txt.title);
if (txt.subtitle != null) player.sendMessage(txt.subtitle);
}
}
}, 0);
}

private class DoUserMoveProcessing implements Runnable {
public void run() {
Expand All @@ -954,23 +980,24 @@ public void run() {
for (EnterExitMarker m : newset) {
EnterExitText txt = m.getGreetingText();
if ((txt != null) && ((oldset == null) || (oldset.contains(m) == false))) {
Log.info(String.format("User %s enter: %s - %s", player.getName(), txt.title, txt.subtitle));
sendPlayerEnterExit(player, txt);
}
}
// See which we just left
if (oldset != null) {
for (EnterExitMarker m : oldset) {
EnterExitText txt = m.getFarewellText();
if ((txt != null) && (newset.contains(m) == false)) {
Log.info(String.format("User %s exit: %s - %s", player.getName(), txt.title, txt.subtitle));
sendPlayerEnterExit(player, txt);
}
}
}
newstate.put(puuid, newset);
}
entersetstate = newstate; // Replace old with new

scheduleDelayedJob(this, 1000); /* Once per second */
if (enterexitperiod > 0) {
scheduleDelayedJob(this, enterexitperiod);
}
}
}

Expand Down Expand Up @@ -1055,6 +1082,12 @@ public MapManager(DynmapCore core, ConfigurationNode configuration) {
if (tpslimit_fullrenders > 19.5) tpslimit_fullrenders = 19.5;
tpslimit_zoomout = configuration.getDouble("zoomout-min-tps", 18.0);
if (tpslimit_zoomout > 19.5) tpslimit_zoomout = 19.5;
// Load enter/exit processing settings
enterexitperiod = configuration.getInteger("enterexitperiod", DEFAULT_ENTEREXIT_PERIOD);
titleFadeIn = configuration.getInteger("titleFadeIn", DEFAULT_TITLE_FADEIN);
titleStay = configuration.getInteger("titleStay", DEFAULT_TITLE_STAY);
titleFadeOut = configuration.getInteger("titleFadeOut", DEFAULT_TITLE_FADEOUT);
enterexitUseTitle = configuration.getBoolean("enterexitUseTitle", DEFAULT_ENTEREXIT_USETITLE);
// Load the save pending job period
savependingperiod = configuration.getInteger("save-pending-period", 900);
if ((savependingperiod > 0) && (savependingperiod < 60)) savependingperiod = 60;
Expand Down Expand Up @@ -1501,7 +1534,11 @@ public void startRendering() {
scheduleDelayedJob(new DoZoomOutProcessing(), 60000);
scheduleDelayedJob(new CheckWorldTimes(), 5000);
scheduleDelayedJob(new DoTouchProcessing(), 1000);
scheduleDelayedJob(new DoUserMoveProcessing(), 1000);
// If enabled, start enter/exit processing
if (enterexitperiod > 0) {
Log.info("Starting enter/exit processing");
scheduleDelayedJob(new DoUserMoveProcessing(), enterexitperiod);
}
/* Resume pending jobs */
for(FullWorldRenderState job : active_renders.values()) {
scheduleDelayedJob(job, 5000);
Expand Down
8 changes: 8 additions & 0 deletions DynmapCore/src/main/java/org/dynmap/common/DynmapPlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,12 @@ public interface DynmapPlayer extends DynmapCommandSender {
* Return UUID, or null if not available
*/
public default UUID getUUID() { return null; }
/**
* Send title and subtitle text (called from server thread)
*/
public default void sendTitleText(String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
// Fallback if not implemented
if (title != null) this.sendMessage(title);;
if (subtitle != null) this.sendMessage(subtitle);
}
}
35 changes: 35 additions & 0 deletions DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.dynmap.markers.AreaMarker;
import org.dynmap.markers.CircleMarker;
import org.dynmap.markers.EnterExitMarker;
import org.dynmap.markers.EnterExitMarker.EnterExitText;
import org.dynmap.markers.Marker;
import org.dynmap.markers.MarkerAPI;
import org.dynmap.markers.MarkerDescription;
Expand Down Expand Up @@ -828,6 +829,7 @@ static void removePlayerSet(PlayerSetImpl pset) {

private static boolean processAreaArgs(DynmapCommandSender sender, AreaMarker marker, Map<String,String> parms) {
String val = null;
String val2 = null;
try {
double ytop = marker.getTopY();
double ybottom = marker.getBottomY();
Expand All @@ -839,6 +841,8 @@ private static boolean processAreaArgs(DynmapCommandSender sender, AreaMarker ma
boolean boost = marker.getBoostFlag();
int minzoom = marker.getMinZoom();
int maxzoom = marker.getMaxZoom();
EnterExitText greet = marker.getGreetingText();
EnterExitText farew = marker.getFarewellText();

val = parms.get(ARG_STROKECOLOR);
if(val != null)
Expand Down Expand Up @@ -886,6 +890,22 @@ private static boolean processAreaArgs(DynmapCommandSender sender, AreaMarker ma
marker.setBoostFlag(boost);
marker.setMinZoom(minzoom);
marker.setMaxZoom(maxzoom);
// Handle greeting
val = parms.get(ARG_GREETING);
val2 = parms.get(ARG_GREETINGSUB);
if ((val != null) || (val2 != null)) {
String title = (val != null) ? ((val.length() > 0) ? val : null) : ((greet != null) ? greet.title : null);
String subtitle = (val2 != null) ? ((val2.length() > 0) ? val2 : null) : ((greet != null) ? greet.subtitle : null);
marker.setGreetingText(title, subtitle);
}
// Handle farewell
val = parms.get(ARG_FAREWELL);
val2 = parms.get(ARG_FAREWELLSUB);
if ((val != null) || (val2 != null)) {
String title = (val != null) ? ((val.length() > 0) ? val : null) : ((farew != null) ? farew.title : null);
String subtitle = (val2 != null) ? ((val2.length() > 0) ? val2 : null) : ((farew != null) ? farew.subtitle : null);
marker.setFarewellText(title, subtitle);
}
} catch (NumberFormatException nfx) {
sender.sendMessage("Invalid parameter format: " + val);
return false;
Expand Down Expand Up @@ -1050,6 +1070,11 @@ private static boolean processCircleArgs(DynmapCommandSender sender, CircleMarke
private static final String ARG_WORLD = "world";
private static final String ARG_BOOST = "boost";
private static final String ARG_DESC = "desc";
private static final String ARG_GREETING = "greeting";
private static final String ARG_GREETINGSUB = "greetingsub";
private static final String ARG_FAREWELL = "farewell";
private static final String ARG_FAREWELLSUB = "farewellsub";


/* Parse argument strings : handle 'attrib:value' and quoted strings */
private static Map<String,String> parseArgs(String[] args, DynmapCommandSender snd) {
Expand Down Expand Up @@ -2196,6 +2221,16 @@ private static boolean processListArea(DynmapCore plugin, DynmapCommandSender se
}
if (m.getMaxZoom() >= 0) {
msg += ", maxzoom:" + m.getMaxZoom();
}
EnterExitText t = m.getGreetingText();
if (t != null) {
if (t.title != null) msg += ", greeting='" + t.title + "'";
if (t.subtitle != null) msg += ", greetingsub='" + t.subtitle + "'";
}
t = m.getFarewellText();
if (t != null) {
if (t.title != null) msg += ", farewell='" + t.title + "'";
if (t.subtitle != null) msg += ", farewellsub='" + t.subtitle + "'";
}
sender.sendMessage(msg);
}
Expand Down
2 changes: 1 addition & 1 deletion DynmapCoreAPI/src/main/java/org/dynmap/markers/AreaMarker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* This defines the public interface to an area marker object, for use with the MarkerAPI
*/
public interface AreaMarker extends MarkerDescription {
public interface AreaMarker extends MarkerDescription, EnterExitMarker {
/**
* Get top Y coordinate
* @return coordinate
Expand Down
7 changes: 7 additions & 0 deletions ...r-113-2/src/main/java/org/dynmap/bukkit/helper/v113_2/BukkitVersionHelperSpigot113_2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.WorldBorder;
import org.bukkit.entity.Player;
import org.dynmap.DynmapChunk;
import org.dynmap.Log;
import org.dynmap.bukkit.helper.BukkitVersionHelper;
Expand Down Expand Up @@ -189,5 +190,11 @@ public Polygon getWorldBorder(World world) {
}
return p;
}
// Send title/subtitle to user
public void sendTitleText(Player p, String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
if (p != null) {
p.sendTitle(title, subtitle, fadeInTicks, stayTicks, fadeOutTIcks);
}
}

}
7 changes: 7 additions & 0 deletions ...r-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/BukkitVersionHelperSpigot114_1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.WorldBorder;
import org.bukkit.entity.Player;
import org.dynmap.DynmapChunk;
import org.dynmap.Log;
import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
Expand Down Expand Up @@ -201,5 +202,11 @@ public Polygon getWorldBorder(World world) {
}
return p;
}
// Send title/subtitle to user
public void sendTitleText(Player p, String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
if (p != null) {
p.sendTitle(title, subtitle, fadeInTicks, stayTicks, fadeOutTIcks);
}
}

}
7 changes: 7 additions & 0 deletions ...-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/BukkitVersionHelperSpigot115.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.WorldBorder;
import org.bukkit.entity.Player;
import org.dynmap.DynmapChunk;
import org.dynmap.Log;
import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
Expand Down Expand Up @@ -201,5 +202,11 @@ public Polygon getWorldBorder(World world) {
}
return p;
}
// Send title/subtitle to user
public void sendTitleText(Player p, String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
if (p != null) {
p.sendTitle(title, subtitle, fadeInTicks, stayTicks, fadeOutTIcks);
}
}

}
11 changes: 10 additions & 1 deletion bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,13 @@ public int getBiomeBaseWaterMult(Object bb) {
}

public abstract String getStateStringByCombinedId(int blkid, int meta);
}

// Send title/subtitle to user
public void sendTitleText(Player p, String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
// Do send message for old implementations
if (p != null) {
if (title != null) p.sendMessage(title);
if (subtitle != null) p.sendMessage(subtitle);
}
}
}
21 changes: 21 additions & 0 deletions forge-1.10.2/src/main/java/org/dynmap/forge_1_10_2/DynmapPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import net.minecraft.item.Item;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketTitle;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.management.UserListBans;
import net.minecraft.server.management.UserListIPBans;
Expand Down Expand Up @@ -1341,6 +1342,26 @@ public String getSkinURL() {
public UUID getUUID() {
return uuid;
}
/**
* Send title and subtitle text (called from server thread)
*/
@Override
public void sendTitleText(String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
if (player instanceof EntityPlayerMP) {
EntityPlayerMP mp = (EntityPlayerMP) player;
SPacketTitle times = new SPacketTitle(fadeInTicks, stayTicks, fadeOutTicks);
mp.connection.sendPacket(times);
if (title != null) {
SPacketTitle titlepkt = new SPacketTitle(SPacketTitle.Type.TITLE, new TextComponentString(title));
mp.connection.sendPacket(titlepkt);
}

if (subtitle != null) {
SPacketTitle subtitlepkt = new SPacketTitle(SPacketTitle.Type.SUBTITLE, new TextComponentString(subtitle));
mp.connection.sendPacket(subtitlepkt);
}
}
}
}
/* Handler for generic console command sender */
public class ForgeCommandSender implements DynmapCommandSender
Expand Down
21 changes: 21 additions & 0 deletions forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import net.minecraft.item.Item;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketTitle;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.management.UserListBans;
import net.minecraft.server.management.UserListIPBans;
Expand Down Expand Up @@ -1351,6 +1352,26 @@ public String getSkinURL() {
public UUID getUUID() {
return uuid;
}
/**
* Send title and subtitle text (called from server thread)
*/
@Override
public void sendTitleText(String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
if (player instanceof EntityPlayerMP) {
EntityPlayerMP mp = (EntityPlayerMP) player;
SPacketTitle times = new SPacketTitle(fadeInTicks, stayTicks, fadeOutTicks);
mp.connection.sendPacket(times);
if (title != null) {
SPacketTitle titlepkt = new SPacketTitle(SPacketTitle.Type.TITLE, new TextComponentString(title));
mp.connection.sendPacket(titlepkt);
}

if (subtitle != null) {
SPacketTitle subtitlepkt = new SPacketTitle(SPacketTitle.Type.SUBTITLE, new TextComponentString(subtitle));
mp.connection.sendPacket(subtitlepkt);
}
}
}
}
/* Handler for generic console command sender */
public class ForgeCommandSender implements DynmapCommandSender
Expand Down
23 changes: 23 additions & 0 deletions forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
import net.minecraft.item.Item;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketTimeUpdate;
import net.minecraft.network.play.server.SPacketTitle;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.management.UserListBans;
import net.minecraft.server.management.UserListIPBans;
Expand Down Expand Up @@ -1356,6 +1358,27 @@ public String getSkinURL() {
public UUID getUUID() {
return uuid;
}
/**
* Send title and subtitle text (called from server thread)
*/
@Override
public void sendTitleText(String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
if (player instanceof EntityPlayerMP) {
EntityPlayerMP mp = (EntityPlayerMP) player;
SPacketTitle times = new SPacketTitle(fadeInTicks, stayTicks, fadeOutTicks);
mp.connection.sendPacket(times);
if (title != null) {
SPacketTitle titlepkt = new SPacketTitle(SPacketTitle.Type.TITLE, new TextComponentString(title));
mp.connection.sendPacket(titlepkt);
}

if (subtitle != null) {
SPacketTitle subtitlepkt = new SPacketTitle(SPacketTitle.Type.SUBTITLE, new TextComponentString(subtitle));
mp.connection.sendPacket(subtitlepkt);
}
}
}

}
/* Handler for generic console command sender */
public class ForgeCommandSender implements DynmapCommandSender
Expand Down
Loading

0 comments on commit 5e15187

Please sign in to comment.