Merge pull request #2841 from paulstraw/feature/worldborderlabel

Add `worldborderlabel` configuration.txt setting

DynmapCore/src/main/java/org/dynmap/MarkersComponent.java

@@ -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);

forge-1.10.2/src/main/resources/configuration.txt

@@ -127,6 +127,7 @@ components:
     spawnbedformat: "%name%'s bed"
     # (optional) Show world border (vanilla 1.8+)
     showworldborder: true
+    worldborderlabel: "Border"
     
   - class: org.dynmap.ClientComponent
     type: chat

forge-1.11.2/src/main/resources/configuration.txt

@@ -127,6 +127,7 @@ components:
     spawnbedformat: "%name%'s bed"
     # (optional) Show world border (vanilla 1.8+)
     showworldborder: true
+    worldborderlabel: "Border"
     
   - class: org.dynmap.ClientComponent
     type: chat

forge-1.12.2/src/main/resources/configuration.txt

@@ -127,6 +127,7 @@ components:
     spawnbedformat: "%name%'s bed"
     # (optional) Show world border (vanilla 1.8+)
     showworldborder: true
+    worldborderlabel: "Border"
     
   - class: org.dynmap.ClientComponent
     type: chat

forge-1.13.2/src/main/resources/configuration.txt

@@ -127,6 +127,7 @@ components:
     spawnbedformat: "%name%'s bed"
     # (optional) Show world border (vanilla 1.8+)
     showworldborder: true
+    worldborderlabel: "Border"
     
   - class: org.dynmap.ClientComponent
     type: chat

forge-1.8.9/src/main/resources/configuration.txt

@@ -127,6 +127,7 @@ components:
     spawnbedformat: "%name%'s bed"
     # (optional) Show world border (vanilla 1.8+)
     showworldborder: true
+    worldborderlabel: "Border"
     
   - class: org.dynmap.ClientComponent
     type: chat

forge-1.9.4/src/main/resources/configuration.txt

@@ -127,6 +127,7 @@ components:
     spawnbedformat: "%name%'s bed"
     # (optional) Show world border (vanilla 1.8+)
     showworldborder: true
+    worldborderlabel: "Border"
     
   - class: org.dynmap.ClientComponent
     type: chat

spigot/src/main/resources/configuration.txt

@@ -128,6 +128,7 @@ components:
     spawnbedformat: "%name%'s bed"
     # (optional) show world border (vanilla 1.8+)
     showworldborder: true
+    worldborderlabel: "Border"
     
   - class: org.dynmap.ClientComponent
     type: chat