ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Clean up Anti-Drag Plugin (#798)

Browse Source 
* Clean up Anti-Drag Plugin

* Cleanup Anti-Drag Config
This commit is contained in:
Ganom
2019-06-28 15:26:15 -04:00
committed by Kyleeld
parent 8b3a70d115
commit 23f6463024
2 changed files with 74 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
View File

@@ -37,33 +37,66 @@ import net.runelite.client.config.ModifierlessKeybind;
@ConfigGroup("antiDrag")
public interface AntiDragConfig extends Config
{
@ConfigItem(
keyName = "dragDelay",
name = "Drag Delay",
description = "Configures the inventory drag delay in client ticks (20ms)",
position = 1
position = 0,
keyName = "alwaysOn",
name = "Always On",
description = "Makes the anti-drag always active and disables the hotkey toggle",
disabledBy = "keybind",
hide = "keybind"
)
default int dragDelay()
default boolean alwaysOn()
{
return Constants.GAME_TICK_LENGTH / Constants.CLIENT_TICK_LENGTH; // one game tick
return false;
}
@ConfigItem(
position = 1,
keyName = "keybind",
name = "keybind",
name = "Toggle with Keybind",
description = "Toggle anti drag on and off, rather than always on.",
disabledBy = "alwaysOn",
hide = "alwaysOn"
)
default boolean keybind()
{
return false;
}
@ConfigItem(
keyName = "key",
name = "Keybind",
description = "The keybind you want to use for antidrag",
position = 2
position = 2,
hidden = true,
unhide = "keybind"
)
default Keybind key()
{
return new ModifierlessKeybind(KeyEvent.VK_SHIFT, 0);
}
@ConfigItem(
keyName = "dragDelay",
name = "Drag Delay",
description = "Configures the inventory drag delay in client ticks (20ms)",
position = 3,
hidden = true,
unhide = "keybind"
)
default int dragDelay()
{
return Constants.GAME_TICK_LENGTH / Constants.CLIENT_TICK_LENGTH; // one game tick
}
@ConfigItem(
keyName = "reqfocus",
name = "Reset on focus loss",
description = "Disable antidrag when losing focus (like alt tabbing)",
position = 3
position = 4,
hidden = true,
unhide = "keybind"
)
default boolean reqfocus()
{
@@ -74,7 +107,9 @@ public interface AntiDragConfig extends Config
keyName = "overlay",
name = "Enable overlay",
description = "Do you really need a description?",
position = 4
position = 5,
hidden = true,
unhide = "keybind"
)
default boolean overlay()
{
@@ -87,8 +122,8 @@ public interface AntiDragConfig extends Config
name = "Overlay color",
description = "Change the overlay color, duh",
hidden = true,
unhide = "overlay",
position = 5
unhide = "keybind",
position = 6
)
default Color color()
{
@@ -99,7 +134,9 @@ public interface AntiDragConfig extends Config
keyName = "changeCursor",
name = "Change Cursor",
description = "Change cursor when you have anti-drag enabled.",
position = 6
position = 7,
hidden = true,
unhide = "keybind"
)
default boolean changeCursor()
{
@@ -111,22 +148,11 @@ public interface AntiDragConfig extends Config
name = "Cursor",
description = "Select which cursor you wish to use",
hidden = true,
unhide = "changeCursor",
position = 7
unhide = "keybind",
position = 8
)
default CustomCursor selectedCursor()
{
return CustomCursor.DRAGON_SCIMITAR;
}
@ConfigItem(
keyName = "alwaysOn",
name = "Always On",
description = "Makes the anti-drag always active and disables the hotkey toggle",
position = 8
)
default boolean alwaysOn()
{
return false;
}
}

44
runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
View File

@@ -52,7 +52,7 @@ import net.runelite.client.util.HotkeyListener;
public class AntiDragPlugin extends Plugin
{
private static final int DEFAULT_DELAY = 5;
private static final String CONFIG_GROUP_NAME = "antiDrag";
private boolean toggleDrag;
@Inject
@@ -85,10 +85,11 @@ public class AntiDragPlugin extends Plugin
@Override
protected void startUp() throws Exception
{
keyManager.registerKeyListener(hotkeyListener);
toggleDrag = config.alwaysOn();
enableAntiDrag();
if (config.keybind())
{
keyManager.registerKeyListener(hotkeyListener);
}
client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY);
}
@Override
@@ -103,10 +104,23 @@ public class AntiDragPlugin extends Plugin
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
if (event.getGroup().equals(CONFIG_GROUP_NAME))
if (event.getGroup().equals("antiDrag"))
{
toggleDrag = config.alwaysOn();
enableAntiDrag();
if (event.getKey().equals("keybind"))
{
if (config.keybind())
{
keyManager.registerKeyListener(hotkeyListener);
}
else
{
keyManager.unregisterKeyListener(hotkeyListener);
}
}
if (event.getKey().equals("alwaysOn"))
{
client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY);
}
}
}
@@ -123,18 +137,6 @@ public class AntiDragPlugin extends Plugin
}
}
private void enableAntiDrag()
{
if (toggleDrag)
{
client.setInventoryDragDelay(config.dragDelay());
}
else
{
client.setInventoryDragDelay(DEFAULT_DELAY);
}
}
private final HotkeyListener hotkeyListener = new HotkeyListener(() -> config.key())
{
@Override
@@ -170,6 +172,4 @@ public class AntiDragPlugin extends Plugin
}
}
};
}