From 51fdc80542e060647dfcc929310ecfafc0ddb87c Mon Sep 17 00:00:00 2001
From: Torrie Fischer <tdfischer@hackerbots.net>
Date: Thu, 8 Jul 2021 07:49:39 -0700
Subject: [PATCH] pl3xmap: use lantern icons for region posts

---
 .../java/us/camin/regions/Pl3xMapRelay.java   |  31 +++++++++++++-----
 src/main/resources/lantern.png                | Bin 0 -> 1902 bytes
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/lantern.png

diff --git a/src/main/java/us/camin/regions/Pl3xMapRelay.java b/src/main/java/us/camin/regions/Pl3xMapRelay.java
index 83ce267..02b67e9 100644
--- a/src/main/java/us/camin/regions/Pl3xMapRelay.java
+++ b/src/main/java/us/camin/regions/Pl3xMapRelay.java
@@ -33,6 +33,10 @@ import net.pl3x.map.api.marker.Icon;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Optional;
+import java.io.File;
+import java.awt.image.BufferedImage;
+import javax.imageio.ImageIO;
+import java.io.IOException;
 
 import org.bukkit.World;
 import org.bukkit.Color;
@@ -53,6 +57,20 @@ public class Pl3xMapRelay implements Listener {
     }
 
     if (isEnabled()) {
+
+			File file = new File(m_plugin.getDataFolder(), "lantern.png");
+			if (!file.exists()) {
+        m_plugin.saveResource("lantern.png", false);
+			}
+
+      Key key = Key.of("lantern");
+      try {
+        BufferedImage image = ImageIO.read(file);
+        Pl3xMapProvider.get().iconRegistry().register(key, image);
+      } catch (IOException e) {
+        //Logger.log().log(Level.WARNING, "Failed to register signs icon", e);
+      }
+
       for(World world : m_plugin.getServer().getWorlds()) {
         Optional<MapWorld> opt = m_map.getWorldIfEnabled(world);
         opt.ifPresent((MapWorld mapWorld) -> {
@@ -95,28 +113,25 @@ public class Pl3xMapRelay implements Listener {
         int size = 32;
         String clickTooltip = "<h3>" + region.name() + "</h3>";
         clickTooltip += "<ul>";
-        Key imageKey = Key.of("sign_oak");
-        Marker marker = Marker.icon(point, imageKey, size);
 
         for(Region neighbor : geom.neighbors(region)) {
-          marker = Marker.polyline(Point.of(region.location().getX(), region.location().getZ()), Point.of(neighbor.location().getX(), neighbor.location().getZ()));
+          Marker marker = Marker.polyline(Point.of(region.location().getX(), region.location().getZ()), Point.of(neighbor.location().getX(), neighbor.location().getZ()));
           marker.markerOptions(MarkerOptions.builder()
               .hoverTooltip(region.name() + " / " + neighbor.name())
               .strokeColor(awtColor)
               .strokeOpacity(0.8));
           markers.add(marker);
-          clickTooltip += "<li>" + neighbor.name() + " - Cost: ";
+          clickTooltip += "<li style=\"display: list-item\">" + neighbor.name() + " - Cost: ";
           clickTooltip += region.getTravelCost(neighbor);
           clickTooltip += " levels</li>";
         }
         clickTooltip += "</ul>";
 
-        marker = Marker.circle(point, size);
+        Key imageKey = Key.of("lantern");
+        Marker marker = Marker.icon(point, imageKey, size);
         marker.markerOptions(MarkerOptions.builder()
             .hoverTooltip(region.name())
-            .clickTooltip(clickTooltip)
-            .strokeColor(awtColor)
-            .strokeOpacity(0.8));
+            .clickTooltip(clickTooltip));
         markers.add(marker);
       }
 
diff --git a/src/main/resources/lantern.png b/src/main/resources/lantern.png
new file mode 100644
index 0000000000000000000000000000000000000000..56c4a90299893b09e3b32d23bb1cbfeb7b7a6181
GIT binary patch
literal 1902
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

literal 0
HcmV?d00001