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

Merge pull request #1331 from Ganom/detach-hotkey

Browse Source 
runeliteplus: add detach cam toggle
This commit is contained in:
Kyleeld
2019-08-15 01:38:37 +01:00
committed by GitHub
parent a782f0ddf1 636eca00ba
commit 727d5899d4
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java
View File

@@ -26,11 +26,6 @@
*/ */
package net.runelite.client.config; package net.runelite.client.config;
import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.Range;
@ConfigGroup("runeliteplus") @ConfigGroup("runeliteplus")
public interface RuneLitePlusConfig extends Config public interface RuneLitePlusConfig extends Config
{ {
@@ -75,10 +70,21 @@ public interface RuneLitePlusConfig extends Config
keyName = "enablePlugins", keyName = "enablePlugins",
name = "Enable loading of external plugins", name = "Enable loading of external plugins",
description = "Enable loading of external plugins", description = "Enable loading of external plugins",
position = 10 position = 3
) )
default boolean enablePlugins() default boolean enablePlugins()
{ {
return false; return false;
} }
}
@ConfigItem(
keyName = "detachHotkey",
name = "Detach Cam",
description = "Detach Camera hotkey, press this and it will activate detatched camera.",
position = 4
)
default Keybind detachHotkey()
{
return Keybind.NOT_SET;
}
}

22
runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
View File

@@ -37,12 +37,14 @@ import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetID;
import static net.runelite.api.widgets.WidgetInfo.*; import static net.runelite.api.widgets.WidgetInfo.*;
import net.runelite.client.callback.ClientThread; import net.runelite.client.callback.ClientThread;
import net.runelite.client.config.Keybind;
import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.config.RuneLitePlusConfig;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
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 net.runelite.client.util.HotkeyListener;
@PluginDescriptor( @PluginDescriptor(
loadWhenOutdated = true, // prevent users from disabling loadWhenOutdated = true, // prevent users from disabling
@@ -68,9 +70,22 @@ public class RuneLitePlusPlugin extends Plugin
@Inject @Inject
private EventBus eventbus; private EventBus eventbus;
private HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind)
{
@Override
public void hotkeyPressed()
{
detach = !detach;
client.setOculusOrbState(detach ? 1 : 0);
client.setOculusOrbNormalSpeed(detach ? 36 : 12);
}
};
private int entered = -1; private int entered = -1;
private int enterIdx; private int enterIdx;
private boolean expectInput; private boolean expectInput;
private boolean detach;
private Keybind keybind;
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
@@ -80,6 +95,8 @@ public class RuneLitePlusPlugin extends Plugin
entered = -1; entered = -1;
enterIdx = 0; enterIdx = 0;
expectInput = false; expectInput = false;
this.keybind = config.detachHotkey();
keyManager.registerKeyListener(hotkeyListener);
} }
@Override @Override
@@ -91,6 +108,7 @@ public class RuneLitePlusPlugin extends Plugin
enterIdx = 0; enterIdx = 0;
expectInput = false; expectInput = false;
keyManager.unregisterKeyListener(keyListener); keyManager.unregisterKeyListener(keyListener);
keyManager.unregisterKeyListener(hotkeyListener);
} }
private void onConfigChanged(ConfigChanged event) private void onConfigChanged(ConfigChanged event)
@@ -100,6 +118,8 @@ public class RuneLitePlusPlugin extends Plugin
return; return;
} }
this.keybind = config.detachHotkey();
if (!config.keyboardPin()) if (!config.keyboardPin())
{ {
entered = 0; entered = 0;
@@ -228,4 +248,4 @@ public class RuneLitePlusPlugin extends Plugin
{ {
} }
} }
} }