From 17c2313b05fb2eeb29715bb759a8829f42bfeaab Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 20 May 2019 03:16:31 +0200 Subject: [PATCH] BATools: Remove antidrag, remove useless colors --- .../client/plugins/batools/BAToolsConfig.java | 20 ------------------- .../plugins/batools/BAToolsOverlay.java | 12 ++--------- .../client/plugins/batools/BAToolsPlugin.java | 18 +++++------------ 3 files changed, 7 insertions(+), 43 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsConfig.java index 961eda4030..b2d7a8aeba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsConfig.java @@ -81,26 +81,6 @@ public interface BAToolsConfig extends Config return false; } - @ConfigItem( - keyName = "antiDrag", - name = "Anti Drag", - description = "asd" - ) - default boolean antiDrag() - { - return false; - } - - @ConfigItem( - keyName = "antiDragDelay", - name = "Anti Drag Delay", - description = "asd" - ) - default int antiDragDelay() - { - return 5; - } - @ConfigItem( keyName = "eggBoi", name = "Collector helper", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsOverlay.java index c3b4b7e5b5..3fcf59ba34 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsOverlay.java @@ -25,6 +25,8 @@ package net.runelite.client.plugins.batools; import java.awt.Color; +import static java.awt.Color.GREEN; +import static java.awt.Color.RED; import java.awt.Dimension; import java.awt.Graphics2D; import java.time.Duration; @@ -40,16 +42,6 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class BAToolsOverlay extends Overlay { - private static final Color RED = new Color(221, 44, 0); - private static final Color GREEN = new Color(0, 200, 83); - private static final Color ORANGE = new Color(255, 109, 0); - private static final Color YELLOW = new Color(255, 214, 0); - private static final Color CYAN = new Color(0, 184, 212); - private static final Color BLUE = new Color(41, 98, 255); - private static final Color DEEP_PURPLE = new Color(98, 0, 234); - private static final Color PURPLE = new Color(170, 0, 255); - private static final Color GRAY = new Color(158, 158, 158); - private final BAToolsConfig config; private BAToolsPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java index 53059d47fa..1c44373b0b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java @@ -140,7 +140,6 @@ public class BAToolsPlugin extends Plugin implements KeyListener wave_start = Instant.now(); lastInteracted = null; foodPressed.clear(); - client.setInventoryDragDelay(config.antiDragDelay()); keyManager.registerKeyListener(this); } @@ -152,7 +151,6 @@ public class BAToolsPlugin extends Plugin implements KeyListener inGameBit = 0; lastInteracted = null; overlayManager.remove(overlay); - client.setInventoryDragDelay(5); keyManager.unregisterKeyListener(this); shiftDown = false; } @@ -173,11 +171,6 @@ public class BAToolsPlugin extends Plugin implements KeyListener @Subscribe public void onGameTick(GameTick event) { - if (config.antiDrag()) - { - client.setInventoryDragDelay(config.antiDragDelay()); - } - Widget callWidget = getWidget(); if (callWidget != null) @@ -304,7 +297,9 @@ public class BAToolsPlugin extends Plugin implements KeyListener if (inGameBit != inGame) { - if (inGameBit == 1) + inGameBit = inGame; + + if (inGameBit == 0) { pastCall = 0; removeCounter(); @@ -315,8 +310,6 @@ public class BAToolsPlugin extends Plugin implements KeyListener addCounter(); } } - - inGameBit = inGame; } @Subscribe @@ -660,12 +653,11 @@ public class BAToolsPlugin extends Plugin implements KeyListener } } - @Subscribe public void onConfigChanged(ConfigChanged event) { - if (config.antiDrag()) + if (counter != null && !config.defTimer()) { - client.setInventoryDragDelay(config.antiDragDelay()); + removeCounter(); } }