diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java index 7e25f3ad31..a5af5309d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java @@ -29,8 +29,8 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.text.DecimalFormat; -import java.time.Instant; import java.time.Duration; +import java.time.Instant; import javax.inject.Inject; import static net.runelite.api.AnimationID.COOKING_FIRE; import static net.runelite.api.AnimationID.COOKING_RANGE; @@ -72,7 +72,7 @@ class CookingOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - CookingSession session = plugin.getSession(); + CookingSession session = plugin.getCookingSession(); if (session == null) { return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java index 7766438a73..bbcb8ddf02 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java @@ -54,13 +54,13 @@ public class CookingPlugin extends Plugin private CookingConfig config; @Inject - private CookingOverlay overlay; + private CookingOverlay cookingOverlay; @Inject private OverlayManager overlayManager; @Getter(AccessLevel.PACKAGE) - private CookingSession session; + private CookingSession cookingSession; @Provides CookingConfig getConfig(ConfigManager configManager) @@ -71,31 +71,31 @@ public class CookingPlugin extends Plugin @Override protected void startUp() throws Exception { - session = null; - overlayManager.add(overlay); + cookingSession = null; + overlayManager.add(cookingOverlay); } @Override protected void shutDown() throws Exception { - overlayManager.remove(overlay); - session = null; + overlayManager.remove(cookingOverlay); + cookingSession = null; } @Subscribe public void onGameTick(GameTick gameTick) { - if (session == null || config.statTimeout() == 0) + if (cookingSession == null || config.statTimeout() == 0) { return; } Duration statTimeout = Duration.ofMinutes(config.statTimeout()); - Duration sinceCut = Duration.between(session.getLastCookingAction(), Instant.now()); + Duration sinceCut = Duration.between(cookingSession.getLastCookingAction(), Instant.now()); if (sinceCut.compareTo(statTimeout) >= 0) { - session = null; + cookingSession = null; } } @@ -116,24 +116,24 @@ public class CookingPlugin extends Plugin || message.startsWith("You cook") || message.startsWith("You squeeze the grapes into the jug")) { - if (session == null) + if (cookingSession == null) { - session = new CookingSession(); + cookingSession = new CookingSession(); } - session.updateLastCookingAction(); - session.increaseCookAmount(); + cookingSession.updateLastCookingAction(); + cookingSession.increaseCookAmount(); } else if (message.startsWith("You accidentally burn")) { - if (session == null) + if (cookingSession == null) { - session = new CookingSession(); + cookingSession = new CookingSession(); } - session.updateLastCookingAction(); - session.increaseBurnAmount(); + cookingSession.updateLastCookingAction(); + cookingSession.increaseBurnAmount(); } } }