From 834cc3e39ca18123911baea7559cc0f3bc0fbe7d Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Fri, 29 May 2020 15:59:11 +0100 Subject: [PATCH 1/3] login screen: reset fire state when disabling the plugin --- .../client/plugins/loginscreen/LoginScreenPlugin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java index b407669045..b1b4303434 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java @@ -96,7 +96,11 @@ public class LoginScreenPlugin extends Plugin implements KeyListener } keyManager.unregisterKeyListener(this); - clientThread.invoke(this::restoreLoginScreen); + clientThread.invoke(() -> + { + restoreLoginScreen(); + client.setShouldRenderLoginScreenFire(true); + }); } @Provides From 05a717824f44f99ed9d8680a3fe4937d451cc94f Mon Sep 17 00:00:00 2001 From: Brandon Austin <39202105+Rustyspewns@users.noreply.github.com> Date: Tue, 2 Jun 2020 23:44:56 -0700 Subject: [PATCH 2/3] metronome: Reset plugin state on shutDown (#11667) This prevents the tick counter from "rolling over" when toggling the plugin, ensuring it starts its counter from 0 every time. --- .../runelite/client/plugins/metronome/MetronomePlugin.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 0c63dd2033..85a502955a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -58,6 +58,13 @@ public class MetronomePlugin extends Plugin return configManager.getConfig(MetronomePluginConfiguration.class); } + @Override + protected void shutDown() + { + tickCounter = 0; + shouldTock = false; + } + @Subscribe public void onGameTick(GameTick tick) { From a803ba567bb91460f9475a0785f9ac3d29fb7780 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 3 Jun 2020 13:29:31 -0400 Subject: [PATCH 3/3] ge: include slot id --- .../main/java/net/runelite/http/api/ge/GrandExchangeTrade.java | 1 + .../net/runelite/http/service/ge/GrandExchangeController.java | 1 + .../src/main/java/net/runelite/http/service/ge/Trade.java | 1 + .../client/plugins/grandexchange/GrandExchangePlugin.java | 3 +++ 4 files changed, 6 insertions(+) diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java index e5dfe923d4..3d123ecc2b 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java @@ -38,5 +38,6 @@ public class GrandExchangeTrade private int total; private int spent; private int offer; + private int slot; private WorldType worldType; } diff --git a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java index 6d4d8fd6ef..77d82e08dd 100644 --- a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java +++ b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java @@ -95,6 +95,7 @@ public class GrandExchangeController trade.setTotal(grandExchangeTrade.getTotal()); trade.setSpent(grandExchangeTrade.getSpent()); trade.setOffer(grandExchangeTrade.getOffer()); + trade.setSlot(grandExchangeTrade.getSlot()); trade.setTime((int) (System.currentTimeMillis() / 1000L)); trade.setMachineId(request.getHeader(RuneLiteAPI.RUNELITE_MACHINEID)); trade.setUserId(userId); diff --git a/http-service/src/main/java/net/runelite/http/service/ge/Trade.java b/http-service/src/main/java/net/runelite/http/service/ge/Trade.java index ff2d7be0cd..6fcb812ab7 100644 --- a/http-service/src/main/java/net/runelite/http/service/ge/Trade.java +++ b/http-service/src/main/java/net/runelite/http/service/ge/Trade.java @@ -38,6 +38,7 @@ class Trade private int total; private int spent; private int offer; + private int slot; private int time; private String machineId; private Integer userId; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 5cddd9df7f..3e67baa648 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -416,6 +416,7 @@ public class GrandExchangePlugin extends Plugin grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setSpent(0); grandExchangeTrade.setOffer(offer.getPrice()); + grandExchangeTrade.setSlot(slot); grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setLogin(loginBurstGeUpdates); @@ -446,6 +447,7 @@ public class GrandExchangePlugin extends Plugin grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setSpent(offer.getSpent()); grandExchangeTrade.setOffer(offer.getPrice()); + grandExchangeTrade.setSlot(slot); grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setLogin(loginBurstGeUpdates); @@ -468,6 +470,7 @@ public class GrandExchangePlugin extends Plugin grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setSpent(dspent); grandExchangeTrade.setOffer(offer.getPrice()); + grandExchangeTrade.setSlot(slot); grandExchangeTrade.setWorldType(getGeWorldType()); grandExchangeTrade.setLogin(loginBurstGeUpdates);