From f8e43ed71c7ae11e18d330efa62cb60e8dcc3466 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sat, 26 May 2018 02:35:28 +0200 Subject: [PATCH] Store markers based on epoch millis To create fully unique identifier, store markers based on epoch millis instead of using their name, to allow renaming. Signed-off-by: Tomas Slusny --- .../net/runelite/client/plugins/screenmarkers/ScreenMarker.java | 1 + .../client/plugins/screenmarkers/ScreenMarkerOverlay.java | 2 +- .../client/plugins/screenmarkers/ScreenMarkerPlugin.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarker.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarker.java index 624567f09e..aa164d780c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarker.java @@ -35,6 +35,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class ScreenMarker { + private long id; private String name; private int borderThickness; private Color color; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java index b0321fd29a..bcfa5a6722 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java @@ -52,7 +52,7 @@ public class ScreenMarkerOverlay extends Overlay @Override public String getName() { - return marker.getName(); + return "marker" + marker.getId(); } @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java index cc1b2803f3..009f4a7c90 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java @@ -33,6 +33,7 @@ import com.google.gson.reflect.TypeToken; import java.awt.Dimension; import java.awt.Point; import java.awt.image.BufferedImage; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -170,6 +171,7 @@ public class ScreenMarkerPlugin extends Plugin public void startCreation(Point location) { currentMarker = new ScreenMarker( + Instant.now().toEpochMilli(), DEFAULT_MARKER_NAME + " " + (screenMarkers.size() + 1), pluginPanel.getSelectedBorderThickness(), pluginPanel.getSelectedColor(),