From cde326e432d9b4192a77156f666dbfc1c0b42ba1 Mon Sep 17 00:00:00 2001 From: Ron Young Date: Mon, 18 Feb 2019 23:17:36 -0600 Subject: [PATCH 01/14] Bank Tags: close chat input like withdraw-x --- .../client/plugins/banktags/tabs/TabInterface.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index e0b1af23eb..923d7221c8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -564,6 +564,14 @@ public class TabInterface return; } + if (chatboxPanelManager.getCurrentInput() != null + && event.getMenuAction() != MenuAction.CANCEL + && !event.getMenuOption().equals(SCROLL_UP) + && !event.getMenuOption().equals(SCROLL_DOWN)) + { + chatboxPanelManager.close(); + } + if (event.getWidgetId() == WidgetInfo.BANK_ITEM_CONTAINER.getId() && event.getMenuAction() == MenuAction.EXAMINE_ITEM_BANK_EQ && event.getMenuOption().equalsIgnoreCase("withdraw-x")) From 676f57b76eadb6f0f7566438b3abc54b4aa0092a Mon Sep 17 00:00:00 2001 From: Ron Young Date: Tue, 9 Jul 2019 22:41:52 -0500 Subject: [PATCH 02/14] mta: fix Telekinetic solver not moving The bug happened when the Telekinetic projectile existed on the same game tick as the guardian moving. --- .../plugins/mta/telekinetic/TelekineticRoom.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index 96d7847321..cc657fd161 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -46,8 +46,6 @@ import net.runelite.api.NPC; import net.runelite.api.NpcID; import net.runelite.api.NullObjectID; import net.runelite.api.Perspective; -import net.runelite.api.Projectile; -import net.runelite.api.ProjectileID; import net.runelite.api.WallObject; import net.runelite.api.coords.Angle; import net.runelite.api.coords.Direction; @@ -178,14 +176,6 @@ public class TelekineticRoom extends MTARoom } else { - for (Projectile projectile : client.getProjectiles()) - { - if (projectile.getId() == ProjectileID.TELEKINETIC_SPELL) - { - return; - } - } - log.debug("Rebuilding moves due to guardian move"); this.moves = build(); } From 70f2be507b0d513f3fea76e8ee72d9db55e06bc0 Mon Sep 17 00:00:00 2001 From: Adam Witkowski Date: Thu, 11 Jul 2019 02:15:18 +0200 Subject: [PATCH 03/14] mlm: fix rock obstacles not being marked on load --- .../client/plugins/motherlode/MotherlodePlugin.java | 8 ++++---- .../client/plugins/motherlode/MotherlodePluginTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index 82bea5175b..a9b5bf6c5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -376,9 +376,7 @@ public class MotherlodePlugin extends Plugin // on region changes the tiles get set to null veins.clear(); rocks.clear(); - } - else if (event.getGameState() == GameState.LOGGED_IN) - { + inMlm = checkInMlm(); } else if (event.getGameState() == GameState.LOGIN_SCREEN) @@ -461,7 +459,9 @@ public class MotherlodePlugin extends Plugin private boolean checkInMlm() { - if (client.getGameState() != GameState.LOGGED_IN) + GameState gameState = client.getGameState(); + if (gameState != GameState.LOGGED_IN + && gameState != GameState.LOADING) { return false; } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java index 602a58f3b6..43b2dc75f3 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java @@ -101,7 +101,7 @@ public class MotherlodePluginTest { // set inMlm GameStateChanged gameStateChanged = new GameStateChanged(); - gameStateChanged.setGameState(GameState.LOGGED_IN); + gameStateChanged.setGameState(GameState.LOADING); motherlodePlugin.onGameStateChanged(gameStateChanged); // Initial sack count @@ -163,4 +163,4 @@ public class MotherlodePluginTest when(item.getQuantity()).thenReturn(quantity); return item; } -} \ No newline at end of file +} From 501df1e4094a82e6c104bd33db30dc6ffc1d07f9 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Wed, 10 Jul 2019 23:09:14 -0700 Subject: [PATCH 04/14] loottracker: Fix duplicate cox and tob chest loots This prevents loot entries for Chamber of Xeric and Theatre of Blood chests from being duplicated when viewed multiple times. Fixes runelite/runelite#4754 --- .../loottracker/LootTrackerPlugin.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 00f15a1616..17d709cdca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -51,6 +51,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; +import net.runelite.api.GameState; import net.runelite.api.InventoryID; import net.runelite.api.ItemComposition; import net.runelite.api.ItemContainer; @@ -60,6 +61,7 @@ import net.runelite.api.SpriteID; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.WidgetID; @@ -140,6 +142,7 @@ public class LootTrackerPlugin extends Plugin private LootTrackerPanel panel; private NavigationButton navButton; private String eventType; + private boolean chestLooted; private List ignoredItems = new ArrayList<>(); @@ -282,6 +285,16 @@ public class LootTrackerPlugin extends Plugin { clientToolbar.removeNavigation(navButton); lootTrackerClient = null; + chestLooted = false; + } + + @Subscribe + public void onGameStateChanged(final GameStateChanged event) + { + if (event.getGameState() == GameState.LOADING) + { + chestLooted = false; + } } @Subscribe @@ -329,10 +342,19 @@ public class LootTrackerPlugin extends Plugin container = client.getItemContainer(InventoryID.BARROWS_REWARD); break; case (WidgetID.CHAMBERS_OF_XERIC_REWARD_GROUP_ID): + if (chestLooted) + { + return; + } eventType = "Chambers of Xeric"; container = client.getItemContainer(InventoryID.CHAMBERS_OF_XERIC_CHEST); + chestLooted = true; break; case (WidgetID.THEATRE_OF_BLOOD_GROUP_ID): + if (chestLooted) + { + return; + } int region = WorldPoint.fromLocalInstance(client, client.getLocalPlayer().getLocalLocation()).getRegionID(); if (region != THEATRE_OF_BLOOD_REGION) { @@ -340,6 +362,7 @@ public class LootTrackerPlugin extends Plugin } eventType = "Theatre of Blood"; container = client.getItemContainer(InventoryID.THEATRE_OF_BLOOD_CHEST); + chestLooted = true; break; case (WidgetID.CLUE_SCROLL_REWARD_GROUP_ID): // event type should be set via ChatMessage for clue scrolls. From 41968c725fbe4f7956c39ee59b62ab6a5d6957c5 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 11 Jul 2019 00:33:00 -0700 Subject: [PATCH 05/14] Remove unused Slf4j annotations and imports --- .../java/net/runelite/http/service/config/ConfigService.java | 2 -- .../java/net/runelite/http/service/hiscore/HiscoreService.java | 2 -- .../java/net/runelite/http/service/worlds/WorldController.java | 2 -- .../net/runelite/http/service/config/ConfigControllerTest.java | 2 -- .../http/service/loottracker/LootTrackerControllerTest.java | 2 -- .../src/main/java/net/runelite/client/RuneLiteModule.java | 2 -- .../main/java/net/runelite/client/chat/ChatCommandManager.java | 2 -- .../src/main/java/net/runelite/client/game/SpriteManager.java | 2 -- .../net/runelite/client/game/chatbox/ChatboxTextMenuInput.java | 2 -- .../src/main/java/net/runelite/client/plugins/gpu/GLUtil.java | 2 -- .../client/plugins/grandexchange/GrandExchangeSearchPanel.java | 2 -- .../java/net/runelite/client/plugins/mining/MiningPlugin.java | 2 -- .../client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java | 2 -- .../client/plugins/objectindicators/ObjectIndicatorsPlugin.java | 2 -- .../java/net/runelite/client/plugins/party/PartyPlugin.java | 2 -- .../client/plugins/timetracking/farming/FarmingTabPanel.java | 2 -- .../runelite/client/plugins/worldhopper/WorldSwitcherPanel.java | 2 -- .../java/net/runelite/client/plugins/xptracker/XpPanel.java | 2 -- .../runelite/client/util/ExecutorServiceExceptionLogger.java | 2 -- 19 files changed, 38 deletions(-) diff --git a/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java b/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java index f18169938a..9fa47ec98c 100644 --- a/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java +++ b/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java @@ -41,7 +41,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.config.ConfigEntry; import net.runelite.http.api.config.Configuration; @@ -50,7 +49,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -@Slf4j public class ConfigService { private final Gson GSON = RuneLiteAPI.GSON; diff --git a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java index d212c142bb..cc565b4444 100644 --- a/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java +++ b/http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java @@ -31,7 +31,6 @@ import com.google.common.cache.LoadingCache; import java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreResult; @@ -39,7 +38,6 @@ import okhttp3.HttpUrl; import org.springframework.stereotype.Service; @Service -@Slf4j public class HiscoreService { private final HiscoreClient hiscoreClient = new HiscoreClient(); diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java b/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java index 51769e181c..537e252b96 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java @@ -26,7 +26,6 @@ package net.runelite.http.service.worlds; import java.io.IOException; import java.util.concurrent.TimeUnit; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.worlds.WorldResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; @@ -38,7 +37,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/worlds") -@Slf4j public class WorldController { @Autowired diff --git a/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java b/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java index b91029bec2..88657ca04c 100644 --- a/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java +++ b/http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java @@ -27,7 +27,6 @@ package net.runelite.http.service.config; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.service.account.AuthFilter; import net.runelite.http.service.account.beans.SessionEntry; import org.junit.Before; @@ -51,7 +50,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @WebMvcTest(ConfigController.class) -@Slf4j @ActiveProfiles("test") public class ConfigControllerTest { diff --git a/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java b/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java index 9151838016..3c80dd72d4 100644 --- a/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java +++ b/http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java @@ -29,7 +29,6 @@ import java.time.Instant; import java.util.Collections; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.loottracker.GameItem; import net.runelite.http.api.loottracker.LootRecord; @@ -57,7 +56,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @WebMvcTest(LootTrackerController.class) -@Slf4j @ActiveProfiles("test") public class LootTrackerControllerTest { diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index af5e7e2631..7ce80f8a1e 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -32,7 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nullable; import javax.inject.Singleton; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.hooks.Callbacks; import net.runelite.client.account.SessionManager; @@ -55,7 +54,6 @@ import okhttp3.OkHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Slf4j public class RuneLiteModule extends AbstractModule { private final ClientUpdateCheckMode updateCheckMode; diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java index b1aa9b3ac2..f930992d08 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java @@ -31,7 +31,6 @@ import java.util.function.BiConsumer; import java.util.function.BiPredicate; import javax.inject.Inject; import javax.inject.Singleton; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.ChatMessage; @@ -42,7 +41,6 @@ import net.runelite.client.events.ChatboxInput; import net.runelite.client.events.PrivateMessageInput; @Singleton -@Slf4j public class ChatCommandManager implements ChatboxInputListener { private final Map commands = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index f177377818..b2fd496d31 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -37,14 +37,12 @@ import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.SwingUtilities; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.SpritePixels; import net.runelite.client.callback.ClientThread; import net.runelite.client.util.ImageUtil; -@Slf4j @Singleton public class SpriteManager { diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java index 51e5e7dfde..94f3c10dcc 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java @@ -31,7 +31,6 @@ import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.FontID; import net.runelite.api.widgets.WidgetType; import net.runelite.api.widgets.JavaScriptCallback; @@ -41,7 +40,6 @@ import net.runelite.api.widgets.WidgetSizeMode; import net.runelite.api.widgets.WidgetTextAlignment; import net.runelite.client.input.KeyListener; -@Slf4j public class ChatboxTextMenuInput extends ChatboxInput implements KeyListener { @Data diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java index fd6094aea7..af5d5ea018 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java @@ -27,9 +27,7 @@ package net.runelite.client.plugins.gpu; import com.jogamp.opengl.GL4; import java.io.InputStream; import java.util.Scanner; -import lombok.extern.slf4j.Slf4j; -@Slf4j class GLUtil { private static final int ERR_LEN = 1024; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java index bae1c45648..5ad9032cb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java @@ -41,7 +41,6 @@ import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; import lombok.Setter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.ItemComposition; import net.runelite.client.callback.ClientThread; import net.runelite.client.game.AsyncBufferedImage; @@ -55,7 +54,6 @@ import net.runelite.http.api.item.ItemPrice; * This panel holds the search section of the Grand Exchange Plugin. * It should display a search bar and either item results or a error panel. */ -@Slf4j class GrandExchangeSearchPanel extends JPanel { private static final String ERROR_PANEL = "ERROR_PANEL"; 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 0c526222c3..a401a5ca66 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 @@ -30,7 +30,6 @@ import java.util.List; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; @@ -54,7 +53,6 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; -@Slf4j @PluginDescriptor( name = "Mining", description = "Show ore respawn timers", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index f81d1482a8..1f07645999 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -38,7 +38,6 @@ import java.util.Arrays; import java.util.List; import javax.inject.Inject; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.ItemID; @@ -62,7 +61,6 @@ import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.util.WildcardMatcher; -@Slf4j @PluginDescriptor( name = "NPC Aggression Timer", description = "Highlights the unaggressive area of NPCs nearby and timer until it becomes active", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index 05fd84d0d8..28a1ca85b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -40,7 +40,6 @@ import java.util.Set; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import static net.runelite.api.Constants.REGION_SIZE; import net.runelite.api.DecorativeObject; @@ -69,7 +68,6 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; -@Slf4j @PluginDescriptor( name = "Object Markers", description = "Enable marking of objects using the Shift key", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 2d7bddc3a6..b70057e97b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -39,7 +39,6 @@ import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import lombok.Getter; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -86,7 +85,6 @@ import net.runelite.http.api.ws.messages.party.UserSync; name = "Party", description = "Shows useful information about current party" ) -@Slf4j public class PartyPlugin extends Plugin implements KeyListener { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java index 2c262111e2..fa6852082d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTabPanel.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Set; import javax.swing.JLabel; import javax.swing.border.EmptyBorder; -import lombok.extern.slf4j.Slf4j; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.timetracking.TabContentPanel; import net.runelite.client.plugins.timetracking.TimeTrackingConfig; @@ -42,7 +41,6 @@ import net.runelite.client.plugins.timetracking.TimeablePanel; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; -@Slf4j public class FarmingTabPanel extends TabContentPanel { private final FarmingTracker farmingTracker; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java index 937a9e74d2..a531dabaf4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java @@ -39,14 +39,12 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; import lombok.AccessLevel; import lombok.Setter; -import lombok.extern.slf4j.Slf4j; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.PluginPanel; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldType; -@Slf4j class WorldSwitcherPanel extends PluginPanel { private static final Color ODD_ROW = new Color(44, 44, 44); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java index c7bf7c3876..87c272c842 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java @@ -37,7 +37,6 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.Skill; @@ -49,7 +48,6 @@ import net.runelite.client.ui.components.PluginErrorPanel; import net.runelite.client.util.LinkBrowser; import okhttp3.HttpUrl; -@Slf4j class XpPanel extends PluginPanel { private final Map infoBoxes = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java b/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java index af5f13c89f..fe8902d663 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ExecutorServiceExceptionLogger.java @@ -34,12 +34,10 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; /** * Wrapper for ${@link ScheduledExecutorService} that will log all uncaught exceptions as warning to console */ -@Slf4j @RequiredArgsConstructor public class ExecutorServiceExceptionLogger implements ScheduledExecutorService { From ea3b6ac9e8ff155ff6574258cde7aab182fc3e00 Mon Sep 17 00:00:00 2001 From: Pineapplezz Date: Thu, 11 Jul 2019 04:16:45 -0400 Subject: [PATCH 06/14] Improve Arrandar mountain pass clue description (#9331) --- .../client/plugins/cluescrolls/clues/CoordinateClue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java index ec7334ca2b..2fb7891866 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java @@ -96,7 +96,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati .put(new WorldPoint(2542, 3031, 0), "Gu'Tanoth.") .put(new WorldPoint(2581, 3030, 0), "Gu'Tanoth island, enter cave north-west of Feldip Hills (AKS).") .put(new WorldPoint(2961, 3024, 0), "Ship yard (DKP).") - .put(new WorldPoint(2339, 3311, 0), "East of Tirannwn on Arandar mountain pass.") + .put(new WorldPoint(2339, 3311, 0), "East of Prifddinas on Arandar mountain pass.") .put(new WorldPoint(3440, 3341, 0), "Nature Spirit's grotto.") .put(new WorldPoint(2763, 2974, 0), "Cairn Isle, west of Shilo Village.") .put(new WorldPoint(3138, 2969, 0), "West of Bandit Camp.") From 700658d2cf888bfbb02806e7dce80a64e81bd9b2 Mon Sep 17 00:00:00 2001 From: meshens Date: Thu, 11 Jul 2019 07:26:50 -0500 Subject: [PATCH 07/14] item identification: add support for labeling ores and gems (#9268) --- .../ItemIdentification.java | 40 ++++++++++++++++++- .../ItemIdentificationConfig.java | 20 ++++++++++ .../ItemIdentificationOverlay.java | 12 ++++++ 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java index 622ab1c04e..4ab740ffc2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java @@ -85,7 +85,41 @@ enum ItemIdentification TEAK_SAPLING(Type.SAPLING, "Teak", "TEAK", ItemID.TEAK_SAPLING, ItemID.TEAK_SEEDLING, ItemID.TEAK_SEEDLING_W), MAHOGANY_SAPLING(Type.SAPLING, "Mahog", "MAHOG", ItemID.MAHOGANY_SAPLING, ItemID.MAHOGANY_SEEDLING, ItemID.MAHOGANY_SEEDLING_W), CALQUAT_SAPLING(Type.SAPLING, "Calquat", "CALQ", ItemID.CALQUAT_SAPLING, ItemID.CALQUAT_SEEDLING, ItemID.CALQUAT_SEEDLING_W), - CELASTRUS_SAPLING(Type.SAPLING, "Celas", "CEL", ItemID.CELASTRUS_SAPLING, ItemID.CELASTRUS_SEEDLING, ItemID.CELASTRUS_SEEDLING_W); + CELASTRUS_SAPLING(Type.SAPLING, "Celas", "CEL", ItemID.CELASTRUS_SAPLING, ItemID.CELASTRUS_SEEDLING, ItemID.CELASTRUS_SEEDLING_W), + + //Ores + COPPER_ORE(Type.ORE, "Copper", "COP", ItemID.COPPER_ORE), + TIN_ORE(Type.ORE, "Tin", "TIN", ItemID.TIN_ORE), + IRON_ORE(Type.ORE, "Iron", "IRO", ItemID.IRON_ORE), + SILVER_ORE(Type.ORE, "Silver", "SIL", ItemID.SILVER_ORE), + COAL_ORE(Type.ORE, "Coal", "COA", ItemID.COAL), + GOLD_ORE(Type.ORE, "Gold", "GOL", ItemID.GOLD_ORE), + MITHRIL_ORE(Type.ORE, "Mithril", "MIT", ItemID.MITHRIL_ORE), + ADAMANTITE_ORE(Type.ORE, "Adaman", "ADA", ItemID.ADAMANTITE_ORE), + RUNITE_ORE(Type.ORE, "Runite", "RUN", ItemID.RUNITE_ORE), + + RUNE_ESSENCE(Type.ORE, "R.Ess", "R.E.", ItemID.RUNE_ESSENCE), + PURE_ESSENCE(Type.ORE, "P.Ess", "P.E.", ItemID.PURE_ESSENCE), + + PAYDIRT(Type.ORE, "Paydirt", "PAY", ItemID.PAYDIRT), + AMETHYST(Type.ORE, "Amethy", "AME", ItemID.AMETHYST), + LOVAKITE_ORE(Type.ORE, "Lovakit", "LOV", ItemID.LOVAKITE_ORE), + BLURITE_ORE(Type.ORE, "Blurite", "BLU", ItemID.BLURITE_ORE), + ELEMENTAL_ORE(Type.ORE, "Element", "ELE", ItemID.ELEMENTAL_ORE), + DAEYALT_ORE(Type.ORE, "Daeyalt", "DAE", ItemID.DAEYALT_ORE), + LUNAR_ORE(Type.ORE, "Lunar", "LUN", ItemID.LUNAR_ORE), + + //Gems + SAPPHIRE(Type.GEM, "Sapphir", "S", ItemID.UNCUT_SAPPHIRE, ItemID.SAPPHIRE), + EMERALD(Type.GEM, "Emerald", "E", ItemID.UNCUT_EMERALD, ItemID.EMERALD), + RUBY(Type.GEM, "Ruby", "R", ItemID.UNCUT_RUBY, ItemID.RUBY), + DIAMOND(Type.GEM, "Diamon", "DI", ItemID.UNCUT_DIAMOND, ItemID.DIAMOND), + OPAL(Type.GEM, "Opal", "OP", ItemID.UNCUT_OPAL, ItemID.OPAL), + JADE(Type.GEM, "Jade", "J", ItemID.UNCUT_JADE, ItemID.JADE), + RED_TOPAZ(Type.GEM, "Topaz", "T", ItemID.UNCUT_RED_TOPAZ, ItemID.RED_TOPAZ), + DRAGONSTONE(Type.GEM, "Dragon", "DR", ItemID.UNCUT_DRAGONSTONE, ItemID.DRAGONSTONE), + ONYX(Type.GEM, "Onyx", "ON", ItemID.UNCUT_ONYX, ItemID.ONYX), + ZENYTE(Type.GEM, "Zenyte", "Z", ItemID.UNCUT_ZENYTE, ItemID.ZENYTE); final Type type; final String medName; @@ -126,6 +160,8 @@ enum ItemIdentification { SEED, HERB, - SAPLING + SAPLING, + ORE, + GEM } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java index 12009a284f..f8e524b35a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationConfig.java @@ -83,4 +83,24 @@ public interface ItemIdentificationConfig extends Config { return true; } + + @ConfigItem( + keyName = "showOres", + name = "Ores", + description = "Show identification on Ores" + ) + default boolean showOres() + { + return false; + } + + @ConfigItem( + keyName = "showGems", + name = "Gems", + description = "Show identification on Gems" + ) + default boolean showGems() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java index 588a51173d..4089af6027 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java @@ -80,6 +80,18 @@ class ItemIdentificationOverlay extends WidgetItemOverlay return; } break; + case ORE: + if (!config.showOres()) + { + return; + } + break; + case GEM: + if (!config.showGems()) + { + return; + } + break; } graphics.setFont(FontManager.getRunescapeSmallFont()); From 931588371e85b6ecab0b4e7cebf2535dc54302af Mon Sep 17 00:00:00 2001 From: Decorth <38436593+Decorth@users.noreply.github.com> Date: Thu, 11 Jul 2019 13:29:14 +0100 Subject: [PATCH 08/14] Fix location of Fishing Platform elite clue stash (#9327) Closes #9325 --- .../client/plugins/cluescrolls/clues/emote/STASHUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java index 8e196c421c..bf66bcefb1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java @@ -103,7 +103,7 @@ public enum STASHUnit ENTRANCE_OF_THE_CAVE_OF_DAMIS(NullObjectID.NULL_29027, new WorldPoint(2629, 5070, 0)), WARRIORS_GUILD_BANK(NullObjectID.NULL_29028, new WorldPoint(2844, 3537, 0)), SOUTHEAST_CORNER_OF_THE_MONASTERY(NullObjectID.NULL_29029, new WorldPoint(3056, 3482, 0)), - SOUTHEAST_CORNER_OF_THE_FISHING_PLATFORM(NullObjectID.NULL_29030, new WorldPoint(2787, 3277, 1)), + SOUTHEAST_CORNER_OF_THE_FISHING_PLATFORM(NullObjectID.NULL_29030, new WorldPoint(2787, 3277, 0)), OUTSIDE_THE_SLAYER_TOWER_GARGOYLE_ROOM(NullObjectID.NULL_29031, new WorldPoint(3423, 3534, 2)), ON_TOP_OF_TROLLHEIM_MOUNTAIN(NullObjectID.NULL_29032, new WorldPoint(2886, 3676, 0)), FOUNTAIN_OF_HEROES(NullObjectID.NULL_29033, new WorldPoint(2916, 9891, 0)), From ad2cce60bf559a6cca73e31282ad827ced7ba439 Mon Sep 17 00:00:00 2001 From: Oussama Date: Thu, 11 Jul 2019 23:41:22 +0200 Subject: [PATCH 09/14] Fix typo in Loot Tracker panel (#9341) --- .../runelite/client/plugins/loottracker/LootTrackerPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java index d9729ee97c..4f583e11c8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java @@ -321,7 +321,7 @@ class LootTrackerPanel extends PluginPanel layoutPanel.add(logsContainer); // Add error pane - errorPanel.setContent("Loot trackers", "You have not received any loot yet."); + errorPanel.setContent("Loot tracker", "You have not received any loot yet."); add(errorPanel); } From 1ba77fbc2070c3463eb4814cbc61ec13a102e335 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 11 Jul 2019 21:43:13 -0700 Subject: [PATCH 10/14] hotcoldclue: Display npc location before using device Closes runelite/runelite#9219 --- .../cluescrolls/clues/HotColdClue.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 219916d240..e28ee82b9e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -62,14 +62,17 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat private static final int HOT_COLD_PANEL_WIDTH = 200; private static final HotColdClue BEGINNER_CLUE = new HotColdClue("Buried beneath the ground, who knows where it's found. Lucky for you, A man called Reldo may have a clue.", "Reldo", - "Speak to Reldo to receive a strange device."); + "Speak to Reldo to receive a strange device.", + new WorldPoint(3211, 3494, 0)); private static final HotColdClue MASTER_CLUE = new HotColdClue("Buried beneath the ground, who knows where it's found. Lucky for you, A man called Jorral may have a clue.", "Jorral", - "Speak to Jorral to receive a strange device."); + "Speak to Jorral to receive a strange device.", + new WorldPoint(2436, 3347, 0)); private final String text; private final String npc; private final String solution; + private final WorldPoint npcLocation; @Nullable private HotColdSolver hotColdSolver; private WorldPoint location; @@ -90,11 +93,12 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat return null; } - private HotColdClue(String text, String npc, String solution) + private HotColdClue(String text, String npc, String solution, WorldPoint npcLocation) { this.text = text; this.npc = npc; this.solution = solution; + this.npcLocation = npcLocation; setRequiresSpade(true); initializeSolver(); } @@ -107,7 +111,14 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat return new WorldPoint[0]; } - return hotColdSolver.getPossibleLocations().stream().map(HotColdLocation::getWorldPoint).toArray(WorldPoint[]::new); + if (hotColdSolver.getLastWorldPoint() == null) + { + return new WorldPoint[] {npcLocation}; + } + else + { + return hotColdSolver.getPossibleLocations().stream().map(HotColdLocation::getWorldPoint).toArray(WorldPoint[]::new); + } } @Override From 99e37c2f7b56747eb35e24760c2af246a7c16161 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 1 May 2019 11:24:23 -0700 Subject: [PATCH 11/14] dailytasksplugin: Add Rantz ogre arrow collection notification Closes runelite/runelite#8581 Closes runelite/runelite#8583 --- .../src/main/java/net/runelite/api/Varbits.java | 1 + .../dailytaskindicators/DailyTasksConfig.java | 11 +++++++++++ .../dailytaskindicators/DailyTasksPlugin.java | 15 +++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index ee72d85f2b..6d3f8d930a 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -375,6 +375,7 @@ public enum Varbits DAILY_RUNES_COLLECTED(4540), DAILY_SAND_COLLECTED(4549), DAILY_FLAX_STATE(4559), + DAILY_ARROWS_STATE(4563), /** * This varbit tracks how much bonemeal has been redeemed from Robin * The player gets 13 for each diary completed above and including Medium, for a maxiumum of 39 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksConfig.java index 1cf96a15f9..4ff86534be 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksConfig.java @@ -120,4 +120,15 @@ public interface DailyTasksConfig extends Config { return false; } + + @ConfigItem( + position = 9, + keyName = "showArrows", + name = "Show Claimable Ogre Arrows", + description = "Show a message when you can collect ogre arrows from Rantz." + ) + default boolean showArrows() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java index a2af9d3635..8e1757b26b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java @@ -63,6 +63,7 @@ public class DailyTasksPlugin extends Plugin private static final String SAND_MESSAGE = "You have sand waiting to be collected from Bert."; private static final int SAND_QUEST_COMPLETE = 160; private static final String FLAX_MESSAGE = "You have bowstrings waiting to be converted from flax from the Flax keeper."; + private static final String ARROWS_MESSAGE = "You have ogre arrows waiting to be collected from Rantz."; private static final String BONEMEAL_MESSAGE = "You have bonemeal and slime waiting to be collected from Robin."; private static final int BONEMEAL_PER_DIARY = 13; private static final String DYNAMITE_MESSAGE = "You have dynamite waiting to be collected from Thirus."; @@ -159,6 +160,10 @@ public class DailyTasksPlugin extends Plugin checkDynamite(dailyReset); } + if (config.showArrows()) + { + checkArrows(dailyReset); + } } } @@ -223,6 +228,16 @@ public class DailyTasksPlugin extends Plugin } } + private void checkArrows(boolean dailyReset) + { + if (client.getVar(Varbits.DIARY_WESTERN_EASY) == 1 + && (client.getVar(Varbits.DAILY_ARROWS_STATE) == 0 + || dailyReset)) + { + sendChatMessage(ARROWS_MESSAGE); + } + } + private void checkBonemeal(boolean dailyReset) { if (client.getVar(Varbits.DIARY_MORYTANIA_MEDIUM) == 1) From 23413bf0b3ccdb9c8f4cf0e0b96d086fdff54c73 Mon Sep 17 00:00:00 2001 From: Cameron Moberg Date: Sat, 21 Jul 2018 14:40:19 -0400 Subject: [PATCH 12/14] Stop screenshotPlugin from overwriting previous screenshots --- .../client/plugins/screenshot/ScreenshotPlugin.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index c586b9cd91..19b7a50962 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -648,6 +648,14 @@ public class ScreenshotPlugin extends Plugin { File screenshotFile = new File(playerFolder, fileName + ".png"); + // To make sure that screenshots don't get overwritten, check if file exists, + // and if it does create file with same name and suffix. + int i = 1; + while (screenshotFile.exists()) + { + screenshotFile = new File(playerFolder, fileName + String.format("(%d)", i++) + ".png"); + } + ImageIO.write(screenshot, "PNG", screenshotFile); if (config.uploadScreenshot()) From ce71957d491fa82a9f3cf686c895f4c594368d31 Mon Sep 17 00:00:00 2001 From: rlw0014 <38933102+rlw0014@users.noreply.github.com> Date: Fri, 12 Jul 2019 07:00:22 -0400 Subject: [PATCH 13/14] Add swap for ToB Quick-Enter to menu entry swapper (#9136) --- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 264a7b4105..db7f720e4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -532,6 +532,10 @@ public class MenuEntrySwapperPlugin extends Plugin { swap("empty", option, target, true); } + else if (config.swapQuick() && option.equals("enter")) + { + swap("quick-enter", option, target, true); + } else if (config.swapQuick() && option.equals("ring")) { swap("quick-start", option, target, true); From 06f4d620adb2ff77cec1cb4caa06cb3e60c71f6c Mon Sep 17 00:00:00 2001 From: David Date: Fri, 12 Jul 2019 13:50:27 +0100 Subject: [PATCH 14/14] Center the Inventory icon in 2005 resizable mode (#9322) --- .../runelite/client/plugins/interfacestyles/WidgetOffset.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java index 9edf17165e..ea519dbf0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java @@ -110,7 +110,7 @@ enum WidgetOffset RESIZABLE_2005_EQUIPMENT_ICON(Skin.AROUND_2005, WidgetInfo.RESIZABLE_VIEWPORT_EQUIPMENT_ICON, null, 2, null, null), RESIZABLE_2005_MUSIC_ICON(Skin.AROUND_2005, WidgetInfo.RESIZABLE_VIEWPORT_MUSIC_ICON, null, 3, null, null), - RESIZABLE_BOTTOM_2005_INVENTORY_ICON(Skin.AROUND_2005, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_ICON, null, -2, null, null), + RESIZABLE_BOTTOM_2005_INVENTORY_ICON(Skin.AROUND_2005, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_ICON, 98, 2, null, null), RESIZABLE_BOTTOM_2005_QUESTS_ICON(Skin.AROUND_2005, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_QUESTS_ICON, 67, 0, null, null), RESIZABLE_BOTTOM_2005_EQUIPMENT_ICON(Skin.AROUND_2005, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_EQUIPMENT_ICON, 132, 2, null, null),