Update slowdown fixes

ViaVersion · Dec 3, 2024 · 6efe7f1 · 6efe7f1
1 parent 0811482
commit 6efe7f1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 46 deletions.
diff --git a/...a/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboardInput.java b/...a/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboardInput.java
diff --git a/...michael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java b/...michael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java
@@ -80,10 +80,29 @@ public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity
     @Shadow
     protected abstract void sendSneakingPacket();
 
+    @Shadow
+    protected abstract boolean shouldStopSprinting();
+
     public MixinClientPlayerEntity(ClientWorld world, GameProfile profile) {
         super(world, profile);
     }
 
+    @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;shouldSlowDown()Z"))
+    private boolean moveSlowDownAbove(ClientPlayerEntity instance) {
+        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_13_2)) {
+            return instance.input.playerInput.sneak();
+        } else if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_14_4)) {
+            return !MinecraftClient.getInstance().player.isSpectator() && (instance.input.playerInput.sneak() || instance.shouldSlowDown());
+        } else {
+            return instance.shouldSlowDown();
+        }
+    }
+
+    @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;shouldStopSprinting()Z"))
+    private boolean keepSprintingStateOff(ClientPlayerEntity instance) {
+        return shouldStopSprinting() && ProtocolTranslator.getTargetVersion().newerThanOrEqualTo(ProtocolVersion.v1_21_4);
+    }
+
     @WrapWithCondition(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;sendSneakingPacket()V"))
     private boolean sendSneakingAfterSprinting(ClientPlayerEntity instance) {
         return ProtocolTranslator.getTargetVersion().newerThanOrEqualTo(ProtocolVersion.v1_21_2);

diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
@@ -49,7 +49,6 @@
     "fixes.minecraft.MixinGameOptions",
     "fixes.minecraft.MixinGameRenderer",
     "fixes.minecraft.MixinKeyboard",
-    "fixes.minecraft.MixinKeyboardInput",
     "fixes.minecraft.MixinLanguageManager",
     "fixes.minecraft.MixinMinecraftClient",
     "fixes.minecraft.MixinMouse",