Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Garden Keybinds Crash #2969

Merged
merged 3 commits into from
Nov 23, 2024
Merged

Fix: Garden Keybinds Crash #2969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7af4492
fix crash
ItsEmpa Nov 21, 2024
eab1cb8
fix duplicate calculation
ItsEmpa Nov 21, 2024
59ee8c6
fix not checking inventory
ItsEmpa Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.SecondPassedEvent
import at.hannibal2.skyhanni.features.garden.GardenAPI
import at.hannibal2.skyhanni.mixins.transformers.AccessorKeyBinding
import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.ChatUtils
import at.hannibal2.skyhanni.utils.ConditionalUtils
import at.hannibal2.skyhanni.utils.KeyboardManager
import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyClicked
import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
import at.hannibal2.skyhanni.utils.SimpleTimeMark
import io.github.notenoughupdates.moulconfig.observer.Property
import net.minecraft.client.Minecraft
Expand All @@ -34,15 +33,11 @@ object GardenCustomKeybinds {
private var lastDuplicateKeybindsWarnTime = SimpleTimeMark.farPast()
private var isDuplicate = false

private fun Int.keybind() = (mcSettings.keyBindAttack as AccessorKeyBinding).hash_skyhanni.lookup(this)
?: ErrorManager.skyHanniError("Keybind $this not found")

@JvmStatic
fun isKeyDown(keyBinding: KeyBinding, cir: CallbackInfoReturnable<Boolean>) {
if (!isActive()) return
val override = map[keyBinding]?.keybind() ?: return
val accessor = override as AccessorKeyBinding
cir.returnValue = accessor.pressed_skyhanni
val override = map[keyBinding] ?: return
cir.returnValue = override.isKeyHeld()
}

@JvmStatic
Expand Down Expand Up @@ -86,8 +81,7 @@ object GardenCustomKeybinds {
with(mcSettings) {
map = buildMap {
fun add(keyBinding: KeyBinding, property: Property<Int>) {
val value = property.get()
if (value != keyBinding.keyCode) put(keyBinding, value)
put(keyBinding, property.get())
}
add(keyBindAttack, attack)
add(keyBindUseItem, useItem)
Expand All @@ -114,7 +108,9 @@ object GardenCustomKeybinds {
private fun isEnabled() = GardenAPI.inGarden() && config.enabled && !(GardenAPI.onBarnPlot && config.excludeBarn)

private fun isActive(): Boolean =
isEnabled() && GardenAPI.toolInHand != null && !isDuplicate && lastWindowOpenTime.passedSince() > 300.milliseconds
isEnabled() && GardenAPI.toolInHand != null && !isDuplicate && !hasGuiOpen() && lastWindowOpenTime.passedSince() > 300.milliseconds

private fun hasGuiOpen() = Minecraft.getMinecraft().currentScreen != null

@JvmStatic
fun disableAll() {
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorKeyBinding.java
View file
Open in desktop

This file was deleted.

Loading