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

Mark label as markup:true for UI (for alternate UIs)

Browse source
This commit is contained in:
Mike Primm 2022-01-28 19:06:28 -06:00
parent 945c8235e4
commit 8cd1e0f889
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
View file

@ -108,7 +108,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
this.z = m.getZ(); this.z = m.getZ();
this.set = m.getMarkerSet().getMarkerSetID(); this.set = m.getMarkerSet().getMarkerSetID();
this.icon = m.getMarkerIcon().getMarkerIconID(); this.icon = m.getMarkerIcon().getMarkerIconID();
this.markup = m.isLabelMarkup(); this.markup = true; // We are markup format all the time now
this.desc = Client.sanitizeHTML(m.getDescription()); this.desc = Client.sanitizeHTML(m.getDescription());
this.dim = m.getMarkerIcon().getMarkerIconSize().getSize(); this.dim = m.getMarkerIcon().getMarkerIconSize().getSize();
this.minzoom = m.getMinZoom(); this.minzoom = m.getMinZoom();
@ -171,7 +171,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
desc = Client.sanitizeHTML(m.getDescription()); desc = Client.sanitizeHTML(m.getDescription());
this.minzoom = m.getMinZoom(); this.minzoom = m.getMinZoom();
this.maxzoom = m.getMaxZoom(); this.maxzoom = m.getMaxZoom();
this.markup = m.isLabelMarkup(); this.markup = true; // We are markup format all the time now
this.set = m.getMarkerSet().getMarkerSetID(); this.set = m.getMarkerSet().getMarkerSetID();
if(deleted) if(deleted)
@ -207,10 +207,12 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
public String desc; public String desc;
public int minzoom; public int minzoom;
public int maxzoom; public int maxzoom;
public boolean markup;
public PolyLineMarkerUpdated(PolyLineMarker m, boolean deleted) { public PolyLineMarkerUpdated(PolyLineMarker m, boolean deleted) {
this.id = m.getMarkerID(); this.id = m.getMarkerID();
this.label = Client.sanitizeHTML(m.getLabel()); this.label = Client.sanitizeHTML(m.getLabel());
this.markup = true; // We are markup format all the time now
int cnt = m.getCornerCount(); int cnt = m.getCornerCount();
x = new double[cnt]; x = new double[cnt];
y = new double[cnt]; y = new double[cnt];
@ -265,6 +267,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
public String desc; public String desc;
public int minzoom; public int minzoom;
public int maxzoom; public int maxzoom;
public boolean markup;
public CircleMarkerUpdated(CircleMarker m, boolean deleted) { public CircleMarkerUpdated(CircleMarker m, boolean deleted) {
this.id = m.getMarkerID(); this.id = m.getMarkerID();
@ -274,6 +277,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
this.z = m.getCenterZ(); this.z = m.getCenterZ();
this.xr = m.getRadiusX(); this.xr = m.getRadiusX();
this.zr = m.getRadiusZ(); this.zr = m.getRadiusZ();
this.markup = true; // We are markup format all the time now
color = String.format("#%06X", m.getLineColor()); color = String.format("#%06X", m.getLineColor());
weight = m.getLineWeight(); weight = m.getLineWeight();
opacity = m.getLineOpacity(); opacity = m.getLineOpacity();