From c54276ee6644e5c9f90b55ada86c23a7f0d905bc Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Wed, 10 Jul 2024 17:43:44 +0200 Subject: Remove client side left hand patch --- .../firmament/mixins/PlayerLeftHandedPatch.java | 27 ---------------------- .../moe/nea/firmament/features/fixes/Fixes.kt | 7 ------ 2 files changed, 34 deletions(-) delete mode 100644 src/main/java/moe/nea/firmament/mixins/PlayerLeftHandedPatch.java diff --git a/src/main/java/moe/nea/firmament/mixins/PlayerLeftHandedPatch.java b/src/main/java/moe/nea/firmament/mixins/PlayerLeftHandedPatch.java deleted file mode 100644 index 6935cd6..0000000 --- a/src/main/java/moe/nea/firmament/mixins/PlayerLeftHandedPatch.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2023 Linnea Gräf - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package moe.nea.firmament.mixins; - -import moe.nea.firmament.features.fixes.Fixes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Arm; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(PlayerEntity.class) -public class PlayerLeftHandedPatch { - @Inject( - method = "getMainArm", - at = @At("HEAD"), - cancellable = true - ) - public void onGetMainArm(CallbackInfoReturnable cir) { - Fixes.INSTANCE.isLeftHandedHook((PlayerEntity) (Object) this, cir); - } -} 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 26cfe6b..47ff86a 100644 --- a/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt +++ b/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt @@ -31,7 +31,6 @@ 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 @@ -45,12 +44,6 @@ 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 - } - } - @Subscribe fun onRenderHud(it: HudRenderEvent) { if (!TConfig.autoSprintKeyBinding.isBound) return -- cgit