ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3328 from deathbeam/marker-timestamp-based

Browse Source 
Store markers based on epoch millis
This commit is contained in:
Adam
2018-05-27 15:42:52 -04:00
committed by GitHub
parent b108a54621 f8e43ed71c
commit d990167fe4
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarker.java
View File

@@ -35,6 +35,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class ScreenMarker public class ScreenMarker
{ {
private long id;
private String name; private String name;
private int borderThickness; private int borderThickness;
private Color color; private Color color;

2
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java
View File

@@ -52,7 +52,7 @@ public class ScreenMarkerOverlay extends Overlay
@Override @Override
public String getName() public String getName()
{ {
return marker.getName(); return "marker" + marker.getId();
} }
@Override @Override

2
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java
View File

@@ -33,6 +33,7 @@ import com.google.gson.reflect.TypeToken;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Point; import java.awt.Point;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -170,6 +171,7 @@ public class ScreenMarkerPlugin extends Plugin
public void startCreation(Point location) public void startCreation(Point location)
{ {
currentMarker = new ScreenMarker( currentMarker = new ScreenMarker(
Instant.now().toEpochMilli(),
DEFAULT_MARKER_NAME + " " + (screenMarkers.size() + 1), DEFAULT_MARKER_NAME + " " + (screenMarkers.size() + 1),
pluginPanel.getSelectedBorderThickness(), pluginPanel.getSelectedBorderThickness(),
pluginPanel.getSelectedColor(), pluginPanel.getSelectedColor(),