Updates and rework to use CScript

test/src/main/java/io/reisub/openosrs/test/TestConfig.java

@@ -24,14 +24,34 @@
  */
 package io.reisub.openosrs.test;
 
-import net.runelite.client.config.Button;
-import net.runelite.client.config.Config;
-import net.runelite.client.config.ConfigGroup;
-import net.runelite.client.config.ConfigItem;
+import net.runelite.client.config.*;
+
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 
 @ConfigGroup("ChaosTestConfig")
 
 public interface TestConfig extends Config {
+    @ConfigItem(
+            keyName = "hotkeyOne",
+            name = "Hotkey one",
+            description = "",
+            position = 0
+    )
+    default Keybind hotkeyOne() {
+        return new Keybind(KeyEvent.VK_Q, InputEvent.CTRL_DOWN_MASK);
+    }
+
+    @ConfigItem(
+            keyName = "hotkeyTwo",
+            name = "Hotkey two",
+            description = "",
+            position = 1
+    )
+    default Keybind hotkeyTwo() {
+        return new Keybind(KeyEvent.VK_A, InputEvent.CTRL_DOWN_MASK);
+    }
+
     @ConfigItem(
             keyName = "startButton",
             name = "Start/Stop",

test/src/main/java/io/reisub/openosrs/test/TestPlugin.java

@@ -5,19 +5,32 @@ import io.reisub.openosrs.test.tasks.Test;
 import io.reisub.openosrs.util.Task;
 import io.reisub.openosrs.util.Util;
 import lombok.extern.slf4j.Slf4j;
+import net.runelite.api.Actor;
+import net.runelite.api.MenuAction;
+import net.runelite.api.MenuEntry;
+import net.runelite.api.Prayer;
 import net.runelite.api.events.*;
+import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
+import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.input.KeyListener;
+import net.runelite.client.input.KeyManager;
 import net.runelite.client.plugins.PluginDependency;
 import net.runelite.client.plugins.PluginDescriptor;
-import net.runelite.client.plugins.iutils.game.iWidget;
+import net.runelite.client.plugins.iutils.game.InventoryItem;
 import net.runelite.client.plugins.iutils.iUtils;
 import net.runelite.client.plugins.iutils.scripts.iScript;
+import org.apache.commons.lang3.tuple.Pair;
 import org.pf4j.Extension;
 
+import javax.inject.Inject;
+import java.awt.event.KeyEvent;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 @Extension
 @PluginDependency(Util.class)
@@ -28,7 +41,13 @@ import java.util.List;
 	enabledByDefault = false
 )
 @Slf4j
-public class TestPlugin extends iScript {
+public class TestPlugin extends iScript implements KeyListener {
+	@Inject
+	private TestConfig config;
+
+	@Inject
+	private KeyManager keyManager;
+
 	private List<Task> tasks;
 
 	@Provides
@@ -53,8 +72,7 @@ public class TestPlugin extends iScript {
 	protected void onStart() {
 		log.info("Starting Chaos Test");
 
-		log.info("selected itemt slot: " + game.client.getSelectedItemSlot());
-		log.info("is item selected: " + game.client().isItemSelected());
+		keyManager.registerKeyListener(this);
 
 		tasks = new ArrayList<>();
 		tasks.add(injector.getInstance(Test.class));
@@ -66,6 +84,13 @@ public class TestPlugin extends iScript {
 		if (tasks != null) {
 			tasks.clear();
 		}
+
+		keyManager.unregisterKeyListener(this);
+	}
+
+	@Subscribe
+	private void onGameTick(GameTick event) {
+
 	}
 
 	@Subscribe
@@ -85,6 +110,17 @@ public class TestPlugin extends iScript {
 
 	@Subscribe
 	private void onAnimationChanged(AnimationChanged event) {
+		Actor actor = event.getActor();
+		if (actor == null || actor.getName() == null) return;
+
+		if (actor.getName().equals(game.localPlayer().name())) {
+			log.info("player anim: " + actor.getAnimation());
+		}
+
+		if (actor.getName().toLowerCase(Locale.ROOT).contains("hespori")) {
+			log.info("hespori anim: " + actor.getAnimation());
+		}
+
 //		if (event.getActor() != null) {
 //			log.info("actor: " + event.getActor().getName());
 //			log.info("id: " + event.getActor().getAnimation());
@@ -103,5 +139,24 @@ public class TestPlugin extends iScript {
 	private void onHitsplatApplied(HitsplatApplied event) {
 
 
+	}
+
+	@Override
+	public void keyTyped(KeyEvent e) {
+
+	}
+
+	@Override
+	public void keyPressed(KeyEvent e) {
+		if (config.hotkeyOne().matches(e)) {
+			log.info("hotkey 1 pressed: magic");
+		} else if (config.hotkeyTwo().matches(e)) {
+			log.info("hotkey 2 pressed: ranged");
+		}
+	}
+
+	@Override
+	public void keyReleased(KeyEvent e) {
+
 	}
 }

test/src/main/java/io/reisub/openosrs/test/tasks/Test.java

@@ -1,8 +1,6 @@
 package io.reisub.openosrs.test.tasks;
 
 import io.reisub.openosrs.util.Task;
-import net.runelite.api.GameState;
-import net.runelite.client.plugins.iutils.scene.Position;
 import net.runelite.client.plugins.iutils.ui.Chatbox;
 
 public class Test extends Task {