Fix copy stack + fishing rod related stuff

Legacy-Visuals-Project · Jan 21, 2025 · 337719e · 337719e
1 parent cbb0904
commit 337719e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,6 +14,6 @@ modmenu_version=13.0.0
 yacl_version=3.6.2+1.21.4-fabric
 
 # Mod Properties
-mod_version=1.0.0-dev-38
+mod_version=1.0.0-dev-39
 maven_group=btw.mixces
 archives_base_name=animatium
diff --git a/src/main/java/btw/mixces/animatium/mixins/renderer/entity/MixinFishingHookRenderer.java b/src/main/java/btw/mixces/animatium/mixins/renderer/entity/MixinFishingHookRenderer.java
@@ -63,14 +63,14 @@ protected MixinFishingHookRenderer(EntityRendererProvider.Context context) {
             float eyeHeight;
             if (AnimatiumConfig.instance().getFishingRodLineInterpolation()) {
                 eyeHeight = Mth.lerp(v, cameraAccessor.getEyeHeightOld(), cameraAccessor.getEyeHeight());
-            } else if (AnimatiumClient.getEnabled() && AnimatiumConfig.instance().getFakeOldSneakEyeHeight()) {
+            } else if (AnimatiumConfig.instance().getFakeOldSneakEyeHeight()) {
                 // Non-lerped eyeheight trick
                 eyeHeight = cameraAccessor.getEyeHeight();
             } else {
                 return originalPos;
             }
 
-            return PlayerUtils.lerpPlayerWithEyeHeight(instance, v, eyeHeight);
+            return PlayerUtils.getPosWithEyeHeight(instance, v, eyeHeight);
         } else {
             return originalPos;
         }

diff --git a/src/main/java/btw/mixces/animatium/mixins/renderer/item/MixinItemInHandRenderer.java b/src/main/java/btw/mixces/animatium/mixins/renderer/item/MixinItemInHandRenderer.java
@@ -142,6 +142,17 @@ public abstract class MixinItemInHandRenderer {
         return (!AnimatiumClient.getEnabled() || !AnimatiumConfig.instance().getShowHeldItemInBoat()) && original.call(instance);
     }
 
+    @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;getMainHandItem()Lnet/minecraft/world/item/ItemStack;"))
+    private ItemStack animatium$fixCopyStack(LocalPlayer instance, Operation<ItemStack> original) {
+        ItemStack originalStack = original.call(instance);
+        if (AnimatiumClient.getEnabled() && AnimatiumConfig.instance().getFixEquipAnimationItemCheck() && original.call(instance).isEmpty()) {
+            // Update the stack to match mutations to the stack in other classes
+            return originalStack.copy();
+        } else {
+            return originalStack;
+        }
+    }
+
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemInHandRenderer;shouldInstantlyReplaceVisibleItem(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z"))
     private boolean animatium$fixEquipAnimationItemCheck(ItemInHandRenderer instance, ItemStack itemStack, ItemStack itemStack2, Operation<Boolean> original, @Local LocalPlayer localPlayer, @Local(ordinal = 0) ItemStack mainHandItem) {
         boolean value = original.call(instance, itemStack, itemStack2);

diff --git a/src/main/kotlin/btw/mixces/animatium/AnimatiumClient.kt b/src/main/kotlin/btw/mixces/animatium/AnimatiumClient.kt
@@ -31,7 +31,7 @@ class AnimatiumClient : ClientModInitializer {
 
         // Info
         const val VERSION = 1.0
-        val DEVELOPMENT_VERSION = Optional.ofNullable(38)
+        val DEVELOPMENT_VERSION = Optional.ofNullable(39)
 
         @JvmStatic
         fun getInfoPayload(): AnimatiumInfoPayloadPacket {

diff --git a/src/main/kotlin/btw/mixces/animatium/util/PlayerUtils.kt b/src/main/kotlin/btw/mixces/animatium/util/PlayerUtils.kt
@@ -39,7 +39,7 @@ object PlayerUtils {
     }
 
     @JvmStatic
-    fun lerpPlayerWithEyeHeight(entity: Player, tickDelta: Float, eyeHeight: Double): Vec3 {
+    fun getPosWithEyeHeight(entity: Player, tickDelta: Float, eyeHeight: Double): Vec3 {
         return entity.getPosition(tickDelta).add(0.0, eyeHeight, 0.0)
     }