diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java index 26c5d8b877..497907cd26 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java @@ -24,6 +24,14 @@ */ package net.runelite.client.plugins.woodcutting; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.Point; +import java.time.Duration; +import java.time.Instant; +import java.util.stream.IntStream; +import javax.inject.Inject; import static net.runelite.api.AnimationID.WOODCUTTING_ADAMANT; import static net.runelite.api.AnimationID.WOODCUTTING_BLACK; import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE; @@ -33,16 +41,9 @@ import static net.runelite.api.AnimationID.WOODCUTTING_IRON; import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; import static net.runelite.api.AnimationID.WOODCUTTING_RUNE; import static net.runelite.api.AnimationID.WOODCUTTING_STEEL; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.Point; -import java.time.Duration; -import java.time.Instant; -import java.util.stream.IntStream; -import javax.annotation.Nullable; -import javax.inject.Inject; import net.runelite.api.Client; +import net.runelite.api.Skill; +import net.runelite.client.plugins.xptracker.XpTrackerService; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; @@ -59,15 +60,17 @@ class WoodcuttingOverlay extends Overlay private final Client client; private final WoodcuttingPlugin plugin; private final WoodcuttingConfig config; + private final XpTrackerService xpTrackerService; private final PanelComponent panelComponent = new PanelComponent(); @Inject - public WoodcuttingOverlay(@Nullable Client client, WoodcuttingPlugin plugin, WoodcuttingConfig config) + public WoodcuttingOverlay(Client client, WoodcuttingPlugin plugin, WoodcuttingConfig config, XpTrackerService xpTrackerService) { setPosition(OverlayPosition.TOP_LEFT); this.client = client; this.plugin = plugin; this.config = config; + this.xpTrackerService = xpTrackerService; } @Override @@ -101,6 +104,23 @@ class WoodcuttingOverlay extends Overlay panelComponent.setTitleColor(Color.RED); } + int actions = xpTrackerService.getActions(Skill.WOODCUTTING); + if (actions > 0) + { + panelComponent.getLines().add(new PanelComponent.Line( + "Logs cut:", + Integer.toString(actions) + )); + + if (actions > 2) + { + panelComponent.getLines().add(new PanelComponent.Line( + "Logs/hr:", + Integer.toString(xpTrackerService.getActionsHr(Skill.WOODCUTTING)) + )); + } + } + return panelComponent.render(graphics, parent); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java index 4da5c38737..08a59269df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java @@ -32,12 +32,15 @@ import net.runelite.api.events.ChatMessage; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.xptracker.XpTrackerPlugin; import net.runelite.client.ui.overlay.Overlay; @PluginDescriptor( name = "Woodcutting" ) +@PluginDependency(XpTrackerPlugin.class) public class WoodcuttingPlugin extends Plugin { @Inject