diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java index d4266dbf13..9952b402eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java @@ -37,7 +37,7 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.components.ProgressPie; +import net.runelite.client.ui.overlay.components.ProgressPieComponent; /** * Represents the overlay that shows timers on traps that are placed by the @@ -148,10 +148,12 @@ public class TrapOverlay extends Overlay double timeLeft = 1 - trap.getTrapTimeRelative(); - ProgressPie pie = new ProgressPie(); + ProgressPieComponent pie = new ProgressPieComponent(); pie.setFill(timeLeft > TIMER_LOW ? fill : fillTimeLow); pie.setBorderColor(timeLeft > TIMER_LOW ? border : borderTimeLow); - pie.render(graphics, loc, timeLeft); + pie.setPosition(loc); + pie.setProgress(timeLeft); + pie.render(graphics); } /** @@ -175,9 +177,11 @@ public class TrapOverlay extends Overlay } net.runelite.api.Point loc = Perspective.worldToCanvas(client, localLoc.getX(), localLoc.getY(), trap.getWorldLocation().getPlane()); - ProgressPie pie = new ProgressPie(); + ProgressPieComponent pie = new ProgressPieComponent(); pie.setFill(fill); pie.setBorderColor(border); - pie.render(graphics, loc, 1); + pie.setPosition(loc); + pie.setProgress(1); + pie.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressPie.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressPieComponent.java similarity index 91% rename from runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressPie.java rename to runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressPieComponent.java index 0c7c26c3a1..9632ebca4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressPie.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressPieComponent.java @@ -32,9 +32,10 @@ import java.awt.Stroke; import java.awt.geom.Arc2D; import lombok.Setter; import net.runelite.api.Point; +import net.runelite.client.ui.overlay.RenderableEntity; -public class ProgressPie +public class ProgressPieComponent implements RenderableEntity { @Setter private int diameter = 25; @@ -48,7 +49,14 @@ public class ProgressPie @Setter private Stroke stroke = new BasicStroke(1); - public Dimension render(Graphics2D graphics, Point position, double progress) + @Setter + private double progress; + + @Setter + private Point position; + + @Override + public Dimension render(Graphics2D graphics) { //Construct the arc Arc2D.Float arc = new Arc2D.Float(Arc2D.PIE);