add option to hand view to disable the eating animation

RacoonDog · Aug 21, 2023 · 775939d · 775939d
1 parent 1101e84
commit 775939d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 15 deletions.
diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/HeldItemRendererMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/HeldItemRendererMixin.java
@@ -16,9 +16,11 @@
 import net.minecraft.client.render.item.HeldItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
@@ -83,6 +85,13 @@ private void onRenderArm(AbstractClientPlayerEntity player, float tickDelta, flo
         MeteorClient.EVENT_BUS.post(ArmRenderEvent.get(hand, matrices));
     }
 
+    @Inject(method = "applyEatOrDrinkTransformation", at = @At(value = "INVOKE", target = "Ljava/lang/Math;pow(DD)D", shift = At.Shift.BEFORE), cancellable = true)
+    private void cancelTransformations(MatrixStack matrices, float tickDelta, Arm arm, ItemStack stack, CallbackInfo ci) {
+        if (Modules.get().get(HandView.class).disableFoodAnimation()) ci.cancel();
+    }
+
+
+    @Unique
     private boolean showSwapping(ItemStack stack1, ItemStack stack2) {
         return !Modules.get().get(HandView.class).showSwapping() || ItemStack.areEqual(stack1, stack2);
     }

diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/HandView.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/HandView.java
@@ -32,6 +32,27 @@ public class HandView extends Module {
         .build()
     );
 
+    public final Setting<Boolean> oldAnimations = sgGeneral.add(new BoolSetting.Builder()
+        .name("old-animations")
+        .description("Changes hit animations to those like 1.8")
+        .defaultValue(false)
+        .build()
+    );
+
+    public final Setting<Boolean> showSwapping = sgGeneral.add(new BoolSetting.Builder()
+        .name("show-swapping")
+        .description("Whether or not to show the item swapping animation")
+        .defaultValue(true)
+        .build()
+    );
+
+    private final Setting<Boolean> disableFoodAnimation = sgGeneral.add(new BoolSetting.Builder()
+        .name("disable-eating-animation")
+        .description("Disables the eating animation. Potentially desirable if it goes offscreen.")
+        .defaultValue(false)
+        .build()
+    );
+
     public final Setting<SwingMode> swingMode = sgGeneral.add(new EnumSetting.Builder<SwingMode>()
         .name("swing-mode")
         .description("Modifies your client & server hand swinging.")
@@ -66,20 +87,6 @@ public class HandView extends Module {
         .build()
     );
 
-    public final Setting<Boolean> oldAnimations = sgGeneral.add(new BoolSetting.Builder()
-        .name("old-animations")
-        .description("Changes hit animations to those like 1.8")
-        .defaultValue(false)
-        .build()
-    );
-
-    public final Setting<Boolean> showSwapping = sgGeneral.add(new BoolSetting.Builder()
-        .name("show-swapping")
-        .description("Whether or not to show the item swapping animation")
-        .defaultValue(true)
-        .build()
-    );
-
     // Main Hand
 
     private final Setting<Vector3d> scaleMain = sgMainHand.add(new Vector3dSetting.Builder()
@@ -109,7 +116,7 @@ public class HandView extends Module {
         .build()
     );
 
-    // Off Hand
+    // Offhand
 
     private final Setting<Vector3d> scaleOff = sgOffHand.add(new Vector3dSetting.Builder()
         .name("scale")
@@ -220,6 +227,10 @@ public boolean showSwapping() {
         return isActive() && showSwapping.get();
     }
 
+    public boolean disableFoodAnimation() {
+        return isActive() && disableFoodAnimation.get();
+    }
+
     public enum SwingMode {
         Offhand,
         Mainhand,