Fix wrong item swing injections

ViaVersion · Dec 2, 2024 · 3fa76e8 · 3fa76e8
1 parent 5d51aef
commit 3fa76e8
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/...de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java b/...de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java
@@ -93,15 +93,19 @@ private boolean disableSwing(ClientPlayerEntity instance, Hand hand) {
         return ProtocolTranslator.getTargetVersion().newerThanOrEqualTo(ProtocolVersion.v1_15);
     }
 
-    @WrapWithCondition(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;resetEquipProgress(Lnet/minecraft/util/Hand;)V"))
-    private boolean disableSwing2(HeldItemRenderer instance, Hand hand) {
-        return ProtocolTranslator.getTargetVersion().newerThanOrEqualTo(ProtocolVersion.v1_15);
+    @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ActionResult$Success;swingSource()Lnet/minecraft/util/ActionResult$SwingSource;", ordinal = 0))
+    private ActionResult.SwingSource disableSwing(ActionResult.Success instance) {
+        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_14_4)) {
+            return ActionResult.SwingSource.NONE;
+        } else {
+            return instance.swingSource();
+        }
     }
 
-    @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ActionResult$Success;swingSource()Lnet/minecraft/util/ActionResult$SwingSource;"))
-    private ActionResult.SwingSource swingWhenConsume(ActionResult.Success instance) {
-        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_14_4) && instance.isAccepted()) {
-            return ActionResult.SwingSource.CLIENT;
+    @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ActionResult$Success;swingSource()Lnet/minecraft/util/ActionResult$SwingSource;", ordinal = 2))
+    private ActionResult.SwingSource disableSwing2(ActionResult.Success instance) {
+        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_14_4)) {
+            return ActionResult.SwingSource.NONE;
         } else {
             return instance.swingSource();
         }