From 384bdb1179dcb9d1641a3cfca06cafef19a567b3 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 22 Jun 2018 10:51:54 +0200 Subject: [PATCH] Move focusGained to mixins Signed-off-by: Tomas Slusny --- .../java/net/runelite/client/callback/Hooks.java | 8 -------- .../java/net/runelite/mixins/RSGameEngineMixin.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index 2f2a32a28d..298e463e98 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -240,14 +240,6 @@ public class Hooks keyManager.processKeyTyped(keyEvent); } - public static void focusGained(KeyFocusListener l, FocusEvent focusEvent) - { - FocusChanged focusChanged = new FocusChanged(); - focusChanged.setFocused(true); - - eventBus.post(focusChanged); - } - public static void focusLost(KeyFocusListener l, FocusEvent focusEvent) { FocusChanged focusChanged = new FocusChanged(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java index 5d9d2259cb..dd0ce6d4ab 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java @@ -24,10 +24,14 @@ */ package net.runelite.mixins; +import java.awt.event.FocusEvent; +import net.runelite.api.events.FocusChanged; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; +import static net.runelite.client.callback.Hooks.eventBus; import net.runelite.rs.api.RSGameEngine; @Mixin(RSGameEngine.class) @@ -59,4 +63,13 @@ public abstract class RSGameEngineMixin implements RSGameEngine thread = Thread.currentThread(); rs$run(); } + + @Inject + @MethodHook("focusGained") + public void onFocusGained(FocusEvent focusEvent) + { + final FocusChanged focusChanged = new FocusChanged(); + focusChanged.setFocused(true); + eventBus.post(focusChanged); + } }