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

Merge branch 'v3.0' into postgres

Browse source
This commit is contained in:
mikeprimm 2020-04-12 19:35:03 -05:00 • committed by GitHub
commit 3b09dba95f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 57 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
DynmapCore/src/main/java/org/dynmap/DynmapCore.java
View file

@ -49,10 +49,7 @@ import org.dynmap.markers.MarkerAPI;
import org.dynmap.markers.impl.MarkerAPIImpl;
import org.dynmap.modsupport.ModSupportImpl;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.servlet.FileResourceHandler;
import org.dynmap.servlet.JettyNullLogger;
import org.dynmap.servlet.LoginServlet;
import org.dynmap.servlet.MapStorageResourceHandler;
import org.dynmap.servlet.*;
import org.dynmap.storage.MapStorage;
import org.dynmap.storage.filetree.FileTreeMapStorage;
import org.dynmap.storage.mysql.MySQLMapStorage;
@ -843,12 +840,15 @@ public class DynmapCore implements DynmapCommonAPI {
filters.add(new CustomHeaderFilter(configuration.getNode("http-response-headers")));
FilterHandler fh = new FilterHandler(router, filters);
ContextHandler contextHandler = new ContextHandler();
contextHandler.setContextPath("/");
contextHandler.setHandler(fh);
HandlerList hlist = new HandlerList();
hlist.setHandlers(new org.eclipse.jetty.server.Handler[] { new SessionHandler(), fh });
hlist.setHandlers(new org.eclipse.jetty.server.Handler[] { new SessionHandler(), contextHandler });
webServer.setHandler(hlist);
addServlet("/up/configuration", new org.dynmap.servlet.ClientConfigurationServlet(this));
addServlet("/standalone/config.js", new org.dynmap.servlet.ConfigJSServlet(this));
addServlet("/up/configuration", new ClientConfigurationServlet(this));
addServlet("/standalone/config.js", new ConfigJSServlet(this));
if(authmgr != null) {
LoginServlet login = new LoginServlet(this);
addServlet("/up/login", login);

6
DynmapCore/src/main/java/org/dynmap/MarkersComponent.java
View file

@ -25,6 +25,7 @@ public class MarkersComponent extends ClientComponent {
private MarkerSignManager signmgr;
private MarkerIcon spawnicon;
private String spawnlbl;
private String worldborderlbl;
private MarkerSet offlineset;
private MarkerIcon offlineicon;
private MarkerSet spawnbedset;
@ -57,6 +58,9 @@ public class MarkersComponent extends ClientComponent {
spawnicon = api.getMarkerIcon(MarkerIcon.WORLD);
}
}
if (showBorder) {
worldborderlbl = configuration.getString("worldborderlabel", "Border");
}
if (showSpawn || showBorder) {
/* Add listener for world loads */
WorldEventListener wel = new WorldEventListener() {
@ -280,7 +284,7 @@ public class MarkersComponent extends ClientComponent {
}
}
if (am == null) {
am = ms.createAreaMarker(borderid, "Border", false, w.getName(), x, z, false);
am = ms.createAreaMarker(borderid, worldborderlbl, false, w.getName(), x, z, false);
}
else {
am.setCornerLocations(x, z);

9
DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css
View file

@ -887,22 +887,19 @@
}
.dynmap .mapMarker .markerIcon16x16 {
margin-top: -8px;
margin-left: -8px;
transform: translate(-50%, -50%);
width: 16px;
height: 16px;
}
.dynmap .mapMarker .markerIcon8x8 {
margin-top: -4px;
margin-left: -4px;
transform: translate(-50%, -50%);
width: 8px;
height: 8px;
}
.dynmap .mapMarker .markerIcon32x32 {
margin-top: -16px;
margin-left: -16px;
transform: translate(-50%, -50%);
width: 32px;
height: 32px;
}