From 9e7da2829cdc949d211ef5021131b4a48ddc3054 Mon Sep 17 00:00:00 2001 From: nea Date: Sat, 28 Oct 2023 03:54:06 +0200 Subject: Add left handed override for hypixel --- .../kotlin/moe/nea/firmament/features/fixes/Fixes.kt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/main/kotlin/moe/nea/firmament/features') diff --git a/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt b/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt index a6f4965..200bb74 100644 --- a/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt +++ b/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt @@ -6,16 +6,19 @@ package moe.nea.firmament.features.fixes +import moe.nea.jarvis.api.Point +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable +import net.minecraft.client.MinecraftClient +import net.minecraft.client.option.KeyBinding +import net.minecraft.entity.player.PlayerEntity +import net.minecraft.text.Text +import net.minecraft.util.Arm import moe.nea.firmament.events.HudRenderEvent import moe.nea.firmament.events.WorldKeyboardEvent import moe.nea.firmament.features.FirmamentFeature import moe.nea.firmament.gui.config.ManagedConfig import moe.nea.firmament.util.MC -import moe.nea.jarvis.api.Point -import net.minecraft.client.MinecraftClient -import net.minecraft.client.option.KeyBinding -import net.minecraft.text.Text -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable +import moe.nea.firmament.util.errorBoundary object Fixes : FirmamentFeature { override val identifier: String @@ -27,6 +30,7 @@ object Fixes : FirmamentFeature { val autoSprintKeyBinding by keyBindingWithDefaultUnbound("auto-sprint-keybinding") val autoSprintHud by position("auto-sprint-hud", 80, 10) { Point(0.0, 1.0) } val peekChat by keyBindingWithDefaultUnbound("peek-chat") + val useClientSidedHandedness by toggle("clientside-lefthand") { true } } override val config: ManagedConfig @@ -40,6 +44,12 @@ object Fixes : FirmamentFeature { cir.returnValue = true } + fun isLeftHandedHook(entity: PlayerEntity, cit: CallbackInfoReturnable) = errorBoundary { + if (TConfig.useClientSidedHandedness && entity.isMainPlayer) { + cit.returnValue = MC.instance.options.mainArm.value + } + } + override fun onLoad() { WorldKeyboardEvent.subscribe { if (it.matches(TConfig.autoSprintKeyBinding)) { -- cgit