Merge pull request #3073 from deathbeam/anti-drag-only-shift

Change Anti-Drag plugin to work only with SHIFT
This commit is contained in:
Adam
2018-05-21 18:05:57 -04:00
committed by GitHub
2 changed files with 8 additions and 46 deletions

View File

@@ -29,9 +29,9 @@ import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
@ConfigGroup( @ConfigGroup(
keyName = AntiDragPlugin.CONFIG_GROUP, keyName = "antiDrag",
name = "Anti Drag", name = "Anti Drag",
description = "Configuration for the anti drag plugin" description = "Configuration for the anti drag plugin (shift only)"
) )
public interface AntiDragConfig extends Config public interface AntiDragConfig extends Config
{ {
@@ -52,15 +52,4 @@ public interface AntiDragConfig extends Config
description = "" description = ""
) )
void dragDelay(int delay); void dragDelay(int delay);
@ConfigItem(
keyName = "onShiftOnly",
name = "On Shift Only",
description = "Configures whether to only adjust the delay while holding shift",
position = 2
)
default boolean onShiftOnly()
{
return true;
}
} }

View File

@@ -24,27 +24,20 @@
*/ */
package net.runelite.client.plugins.antidrag; package net.runelite.client.plugins.antidrag;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.event.KeyEvent;
import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.events.ConfigChanged;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyListener;
import net.runelite.client.input.KeyManager; import net.runelite.client.input.KeyManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import javax.inject.Inject;
import java.awt.event.KeyEvent;
@PluginDescriptor( @PluginDescriptor(name = "Shift Anti Drag")
name = "Anti Drag",
enabledByDefault = false
)
public class AntiDragPlugin extends Plugin implements KeyListener public class AntiDragPlugin extends Plugin implements KeyListener
{ {
static final String CONFIG_GROUP = "antiDrag"; private static final int DEFAULT_DELAY = 5;
static final int DEFAULT_DELAY = 5;
@Inject @Inject
private Client client; private Client client;
@@ -64,10 +57,6 @@ public class AntiDragPlugin extends Plugin implements KeyListener
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
if (!config.onShiftOnly())
{
client.setInventoryDragDelay(config.dragDelay());
}
keyManager.registerKeyListener(this); keyManager.registerKeyListener(this);
} }
@@ -87,7 +76,7 @@ public class AntiDragPlugin extends Plugin implements KeyListener
@Override @Override
public void keyPressed(KeyEvent e) public void keyPressed(KeyEvent e)
{ {
if (config.onShiftOnly() && e.getKeyCode() == KeyEvent.VK_SHIFT) if (e.getKeyCode() == KeyEvent.VK_SHIFT)
{ {
client.setInventoryDragDelay(config.dragDelay()); client.setInventoryDragDelay(config.dragDelay());
} }
@@ -96,25 +85,9 @@ public class AntiDragPlugin extends Plugin implements KeyListener
@Override @Override
public void keyReleased(KeyEvent e) public void keyReleased(KeyEvent e)
{ {
if (config.onShiftOnly() && e.getKeyCode() == KeyEvent.VK_SHIFT) if (e.getKeyCode() == KeyEvent.VK_SHIFT)
{ {
client.setInventoryDragDelay(DEFAULT_DELAY); client.setInventoryDragDelay(DEFAULT_DELAY);
} }
} }
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
if (event.getGroup().equals(CONFIG_GROUP))
{
if (config.onShiftOnly())
{
client.setInventoryDragDelay(DEFAULT_DELAY);
}
else
{
client.setInventoryDragDelay(config.dragDelay());
}
}
}
} }