From 10773f6a5e88d628cd741648326878bfa99f1461 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 14 Aug 2020 15:13:58 -0400 Subject: [PATCH] mining plugin: rename MiningOverlay to MiningRocksOverlay Co-authored-by: jzomerlei --- .../net/runelite/client/plugins/mining/MiningPlugin.java | 6 +++--- .../mining/{MiningOverlay.java => MiningRocksOverlay.java} | 4 ++-- .../main/java/net/runelite/client/plugins/mining/Rock.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename runelite-client/src/main/java/net/runelite/client/plugins/mining/{MiningOverlay.java => MiningRocksOverlay.java} (98%) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index 5c79687f6c..32ea411b9b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -71,7 +71,7 @@ public class MiningPlugin extends Plugin private OverlayManager overlayManager; @Inject - private MiningOverlay overlay; + private MiningRocksOverlay rocksOverlay; @Getter(AccessLevel.PACKAGE) private final List respawns = new ArrayList<>(); @@ -80,13 +80,13 @@ public class MiningPlugin extends Plugin @Override protected void startUp() { - overlayManager.add(overlay); + overlayManager.add(rocksOverlay); } @Override protected void shutDown() throws Exception { - overlayManager.remove(overlay); + overlayManager.remove(rocksOverlay); respawns.clear(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningRocksOverlay.java similarity index 98% rename from runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java rename to runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningRocksOverlay.java index 86d3be1ef8..8fffd13002 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningRocksOverlay.java @@ -39,7 +39,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; -class MiningOverlay extends Overlay +class MiningRocksOverlay extends Overlay { // Range of Motherlode vein respawn time - not 100% confirmed but based on observation static final int ORE_VEIN_MAX_RESPAWN_TIME = 277; // Game ticks @@ -61,7 +61,7 @@ class MiningOverlay extends Overlay private final MiningPlugin plugin; @Inject - private MiningOverlay(Client client, MiningPlugin plugin) + private MiningRocksOverlay(Client client, MiningPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java index b7a1398ef2..1ee5ccf736 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java @@ -72,7 +72,7 @@ enum Rock return region == MINING_GUILD ? Duration.of(100, GAME_TICKS) : super.respawnTime; } }, - LOVAKITE(Duration.of(MiningOverlay.LOVAKITE_ORE_MAX_RESPAWN_TIME, GAME_TICKS), 0, ROCKS_28596, ROCKS_28597), + LOVAKITE(Duration.of(MiningRocksOverlay.LOVAKITE_ORE_MAX_RESPAWN_TIME, GAME_TICKS), 0, ROCKS_28596, ROCKS_28597), ADAMANTITE(Duration.of(400, GAME_TICKS), 0, ROCKS_11374, ROCKS_11375, ROCKS_36208) { @Override @@ -89,7 +89,7 @@ enum Rock return region == MINING_GUILD ? Duration.of(600, GAME_TICKS) : super.respawnTime; } }, - ORE_VEIN(Duration.of(MiningOverlay.ORE_VEIN_MAX_RESPAWN_TIME, GAME_TICKS), 150), + ORE_VEIN(Duration.of(MiningRocksOverlay.ORE_VEIN_MAX_RESPAWN_TIME, GAME_TICKS), 150), AMETHYST(Duration.of(125, GAME_TICKS), 120), ASH_VEIN(Duration.of(50, GAME_TICKS), 0, ASH_PILE), GEM_ROCK(Duration.of(100, GAME_TICKS), 0, ROCKS_11380, ROCKS_11381), @@ -97,7 +97,7 @@ enum Rock EFH_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33255), TE_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33256), BASALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33257), - DAEYALT_ESSENCE(Duration.of(MiningOverlay.DAEYALT_MAX_RESPAWN_TIME, GAME_TICKS), 0, DAEYALT_ESSENCE_39095); + DAEYALT_ESSENCE(Duration.of(MiningRocksOverlay.DAEYALT_MAX_RESPAWN_TIME, GAME_TICKS), 0, DAEYALT_ESSENCE_39095); private static final int WILDERNESS_RESOURCE_AREA = 12605; private static final int MISCELLANIA = 10044;