Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: some modifier keybinds not working

Browse Source 
fixes https://github.com/nea89o/Firmament/issues/107
This commit is contained in:
Linnea Gräf
2025-06-07 23:28:02 +02:00
parent 029fd15278
commit d8472888c0
2 changed files with 82 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/features/inventory/PriceData.kt
View File

@@ -48,7 +48,7 @@ object PriceData : FirmamentFeature {
} }
val sbId = it.stack.skyBlockId val sbId = it.stack.skyBlockId
val stackSize = it.stack.count val stackSize = it.stack.count
val isShowingStack = TConfig.stackSizeKey.isPressed(atLeast = true) val isShowingStack = TConfig.stackSizeKey.isPressed()
val multiplier = if (isShowingStack) stackSize else 1 val multiplier = if (isShowingStack) stackSize else 1
val multiplierText = val multiplierText =
if (isShowingStack) if (isShowingStack)

26
src/main/kotlin/keybindings/SavedKeyBinding.kt
View File

@@ -1,5 +1,3 @@
package moe.nea.firmament.keybindings package moe.nea.firmament.keybindings
import org.lwjgl.glfw.GLFW import org.lwjgl.glfw.GLFW
@@ -54,11 +52,19 @@ data class SavedKeyBinding(
} }
private val h get() = MC.window.handle private val h get() = MC.window.handle
fun isShiftDown() = InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_LEFT_SHIFT) fun isShiftDown() = shiftKeys.any { InputUtil.isKeyPressed(h, it) }
|| InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_RIGHT_SHIFT)
fun unbound(): SavedKeyBinding = fun unbound(): SavedKeyBinding =
SavedKeyBinding(GLFW.GLFW_KEY_UNKNOWN) SavedKeyBinding(GLFW.GLFW_KEY_UNKNOWN)
val controlKeys = if (MinecraftClient.IS_SYSTEM_MAC) {
listOf(GLFW.GLFW_KEY_LEFT_SUPER, GLFW.GLFW_KEY_RIGHT_SUPER)
} else {
listOf(GLFW.GLFW_KEY_LEFT_CONTROL, GLFW.GLFW_KEY_RIGHT_CONTROL)
}
val shiftKeys = listOf(GLFW.GLFW_KEY_LEFT_SHIFT, GLFW.GLFW_KEY_RIGHT_SHIFT)
val altKeys = listOf(GLFW.GLFW_KEY_LEFT_ALT, GLFW.GLFW_KEY_RIGHT_ALT)
} }
fun isPressed(atLeast: Boolean = false): Boolean { fun isPressed(atLeast: Boolean = false): Boolean {
@@ -66,14 +72,10 @@ data class SavedKeyBinding(
val h = MC.window.handle val h = MC.window.handle
if (!InputUtil.isKeyPressed(h, keyCode)) return false if (!InputUtil.isKeyPressed(h, keyCode)) return false
val ctrl = if (MinecraftClient.IS_SYSTEM_MAC) { // These are modifiers, so if the searched keyCode is a modifier key, then that key does not count as the modifier
InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_LEFT_SUPER) val ctrl = keyCode !in controlKeys && controlKeys.any { InputUtil.isKeyPressed(h, it) }
|| InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_RIGHT_SUPER) val shift = keyCode !in shiftKeys && isShiftDown()
} else InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_LEFT_CONTROL) val alt = keyCode !in altKeys && altKeys.any { InputUtil.isKeyPressed(h, it) }
|| InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_RIGHT_CONTROL)
val shift = isShiftDown()
val alt = InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_LEFT_ALT)
|| InputUtil.isKeyPressed(h, GLFW.GLFW_KEY_RIGHT_ALT)
if (atLeast) if (atLeast)
return (ctrl >= this.ctrl) && return (ctrl >= this.ctrl) &&
(alt >= this.alt) && (alt >= this.alt) &&