From cfb2867ed0e00a7c6f5f0b855837e5f834f6c39f Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 30 Apr 2023 12:35:46 +0200 Subject: Used workaround to fix problems with left click hotkey triggering after sign click --- .../features/garden/farming/GardenCustomKeybinds.kt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/main/java/at') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt index 0cde5344c..367d7009b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt @@ -17,6 +17,7 @@ object GardenCustomKeybinds { private val mcSettings get() = Minecraft.getMinecraft().gameSettings private val map: MutableMap Int> = IdentityHashMap() + private var lastWindowOpenTime = 0L init { map[mcSettings.keyBindAttack] = { shConfig.keyBindAttack } @@ -31,8 +32,20 @@ object GardenCustomKeybinds { private fun isEnabled() = GardenAPI.inGarden() && shConfig.keyBindEnabled - private fun isActive() = isEnabled() && GardenAPI.toolInHand != null && Minecraft.getMinecraft().currentScreen == null + private fun isActive(): Boolean { + if (!isEnabled()) return false + if (GardenAPI.toolInHand == null) return false + if (Minecraft.getMinecraft().currentScreen != null) { + lastWindowOpenTime = System.currentTimeMillis() + return false + } + + // TODO remove workaround + if (System.currentTimeMillis() < lastWindowOpenTime + 300) return false + + return true + } private fun isHeld(keyCode: Int): Boolean { if (keyCode == 0) return false -- cgit