Uncomment animatium$postBowTransform

Author: lowercasebtw

common/src/main/java/btw/mixces/animatium/mixins/renderer/item/MixinItemInHandRenderer.java

@@ -25,10 +25,7 @@
 
 import btw.mixces.animatium.AnimatiumCommon;
 import btw.mixces.animatium.config.AnimatiumConfig;
-import btw.mixces.animatium.mixins.accessor.ItemRendererAccessor;
-import btw.mixces.animatium.util.FishingRodVersion;
 import btw.mixces.animatium.util.ItemUtils;
-import btw.mixces.animatium.util.MathUtils;
 import btw.mixces.animatium.util.PlayerUtils;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -43,7 +40,6 @@
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.item.Item;
@@ -76,10 +72,6 @@ public abstract class MixinItemInHandRenderer {
     @Final
     private Minecraft minecraft;
 
-    @Shadow
-    @Final
-    private ItemRenderer itemRenderer;
-
     @Unique
     private int animatium$currentSlot = -1;
 
@@ -95,21 +87,20 @@ public abstract class MixinItemInHandRenderer {
         }
     }
 
-    // TODO: Fix NeoForge
-//    @WrapOperation(method = "renderArmWithItem", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;scale(FFF)V", ordinal = 1))
-//    private void animatium$postBowTransform(PoseStack poseStack, float x, float y, float z, Operation<Void> original, @Local(argsOnly = true) AbstractClientPlayer player, @Local(argsOnly = true) InteractionHand hand) {
-//        int direction = PlayerUtils.getHandMultiplier(player, hand);
-//        if (AnimatiumCommon.isEnabled() && AnimatiumConfig.instance().itemPositions) {
-//            poseStack.mulPose(Axis.ZP.rotationDegrees(direction * -335));
-//            poseStack.mulPose(Axis.YP.rotationDegrees(direction * -50.0F));
-//        }
-//
-//        original.call(poseStack, x, y, z);
-//        if (AnimatiumCommon.isEnabled() && AnimatiumConfig.instance().itemPositions) {
-//            poseStack.mulPose(Axis.YP.rotationDegrees(direction * 50.0F));
-//            poseStack.mulPose(Axis.ZP.rotationDegrees(direction * 335));
-//        }
-//    }
+    @WrapOperation(method = "renderArmWithItem", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;scale(FFF)V", ordinal = 1))
+    private void animatium$postBowTransform(PoseStack poseStack, float x, float y, float z, Operation<Void> original, @Local(argsOnly = true) AbstractClientPlayer player, @Local(argsOnly = true) InteractionHand hand) {
+        int direction = PlayerUtils.getHandMultiplier(player, hand);
+        if (AnimatiumCommon.isEnabled() && AnimatiumConfig.instance().itemPositions) {
+            poseStack.mulPose(Axis.ZP.rotationDegrees(direction * -335));
+            poseStack.mulPose(Axis.YP.rotationDegrees(direction * -50.0F));
+        }
+
+        original.call(poseStack, x, y, z);
+        if (AnimatiumCommon.isEnabled() && AnimatiumConfig.instance().itemPositions) {
+            poseStack.mulPose(Axis.YP.rotationDegrees(direction * 50.0F));
+            poseStack.mulPose(Axis.ZP.rotationDegrees(direction * 335));
+        }
+    }
 
     @WrapOperation(method = "renderArmWithItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;getItem()Lnet/minecraft/world/item/Item;"))
     private Item animatium$oldFirstPersonSwordBlock(ItemStack instance, Operation<Item> original, @Local(argsOnly = true) AbstractClientPlayer player, @Local(argsOnly = true) InteractionHand hand, @Local(argsOnly = true) PoseStack poseStack) {
@@ -131,7 +122,7 @@ public abstract class MixinItemInHandRenderer {
     @Inject(method = "renderArmWithItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemInHandRenderer;renderItem(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", ordinal = 1))
     private void animatium$itemPositions(AbstractClientPlayer player, float tickDelta, float pitch, InteractionHand hand, float swingProgress, ItemStack stack, float equipProgress, PoseStack poseStack, MultiBufferSource multiBufferSource, int light, CallbackInfo ci) {
         if (AnimatiumCommon.isEnabled()) {
-            final int direction = PlayerUtils.getHandMultiplier(player, hand);
+//            final int direction = PlayerUtils.getHandMultiplier(player, hand);
             // TODO: Fix NeoForge
 //            if (AnimatiumConfig.instance().fishingRodVersion == FishingRodVersion.V1_7 && ItemUtils.isFishingRodItem(stack)) {
 //                poseStack.mulPose(Axis.YP.rotationDegrees(direction * 180.0F));