From 79e67a34bc10954ee70d8171065dbb6ed49408e9 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 30 May 2019 20:00:08 -0400 Subject: [PATCH] Revert "cooking plugin: rename session to cooking session" This reverts commit e40b1a7b10e0378e948f56deec43b2fbce9ba04f. --- .../plugins/cooking/CookingOverlay.java | 4 +-- .../client/plugins/cooking/CookingPlugin.java | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) 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 a5af5309d9..7e25f3ad31 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.Duration; import java.time.Instant; +import java.time.Duration; 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.getCookingSession(); + CookingSession session = plugin.getSession(); 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 bbcb8ddf02..7766438a73 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 cookingOverlay; + private CookingOverlay overlay; @Inject private OverlayManager overlayManager; @Getter(AccessLevel.PACKAGE) - private CookingSession cookingSession; + private CookingSession session; @Provides CookingConfig getConfig(ConfigManager configManager) @@ -71,31 +71,31 @@ public class CookingPlugin extends Plugin @Override protected void startUp() throws Exception { - cookingSession = null; - overlayManager.add(cookingOverlay); + session = null; + overlayManager.add(overlay); } @Override protected void shutDown() throws Exception { - overlayManager.remove(cookingOverlay); - cookingSession = null; + overlayManager.remove(overlay); + session = null; } @Subscribe public void onGameTick(GameTick gameTick) { - if (cookingSession == null || config.statTimeout() == 0) + if (session == null || config.statTimeout() == 0) { return; } Duration statTimeout = Duration.ofMinutes(config.statTimeout()); - Duration sinceCut = Duration.between(cookingSession.getLastCookingAction(), Instant.now()); + Duration sinceCut = Duration.between(session.getLastCookingAction(), Instant.now()); if (sinceCut.compareTo(statTimeout) >= 0) { - cookingSession = null; + session = null; } } @@ -116,24 +116,24 @@ public class CookingPlugin extends Plugin || message.startsWith("You cook") || message.startsWith("You squeeze the grapes into the jug")) { - if (cookingSession == null) + if (session == null) { - cookingSession = new CookingSession(); + session = new CookingSession(); } - cookingSession.updateLastCookingAction(); - cookingSession.increaseCookAmount(); + session.updateLastCookingAction(); + session.increaseCookAmount(); } else if (message.startsWith("You accidentally burn")) { - if (cookingSession == null) + if (session == null) { - cookingSession = new CookingSession(); + session = new CookingSession(); } - cookingSession.updateLastCookingAction(); - cookingSession.increaseBurnAmount(); + session.updateLastCookingAction(); + session.increaseBurnAmount(); } } }