Fixed some issues that I created :D

Polyfrost · Dec 25, 2023 · 8baa6b1 · 8baa6b1
1 parent 57295a0
commit 8baa6b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/org/polyfrost/overflowanimations/mixin/EntityLivingBaseMixin.java b/src/main/java/org/polyfrost/overflowanimations/mixin/EntityLivingBaseMixin.java
@@ -35,9 +35,9 @@ public void modifySwingSpeed(CallbackInfoReturnable<Integer> cir) {
         ItemPositionAdvancedSettings advanced = OldAnimationsSettings.advancedSettings;
         if (OldAnimationsSettings.globalPositions && settings.enabled) {
             if (isPotionActive(Potion.digSpeed) && !ItemPositionAdvancedSettings.ignoreHaste) {
-                cir.setReturnValue(Math.max((int) (6 - (1 + getActivePotionEffect(Potion.digSpeed).getAmplifier()) * Math.exp(-advanced.itemSwingSpeedHaste)), 1));
+                cir.setReturnValue(Math.max((6 - (1 + getActivePotionEffect(Potion.digSpeed).getAmplifier())) * (int) Math.exp(-advanced.itemSwingSpeedHaste), 1));
             } else if (isPotionActive(Potion.digSlowdown)) {
-                cir.setReturnValue(Math.max((int) (6 + (1 + getActivePotionEffect(Potion.digSlowdown).getAmplifier()) * 2 * Math.exp(-advanced.itemSwingSpeedFatigue)), 1));
+                cir.setReturnValue(Math.max((6 + (1 + getActivePotionEffect(Potion.digSlowdown).getAmplifier())) * 2 * (int) Math.exp(-advanced.itemSwingSpeedFatigue), 1));
             } else {
                 cir.setReturnValue(Math.max((int) (6 * Math.exp(-advanced.itemSwingSpeed)), 1));
             }

diff --git a/src/main/java/org/polyfrost/overflowanimations/mixin/RenderItemMixin.java b/src/main/java/org/polyfrost/overflowanimations/mixin/RenderItemMixin.java
@@ -68,12 +68,11 @@ private void modifyNormalValue(WorldRenderer instance, float x, float y, float z
         }
     }
 
-    @Redirect(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;hasEffect()Z"))
-    private boolean disableGlintOnSprite(ItemStack instance, ItemStack stack, IBakedModel model) {
+    @Inject(method = "renderEffect", at = @At(value = "HEAD"), cancellable = true)
+    public void disableGlintOnSprite(IBakedModel model, CallbackInfo ci) {
         if (OldAnimationsSettings.itemSprites && OldAnimationsSettings.spritesGlint && OldAnimationsSettings.INSTANCE.enabled && TransformTypeHook.shouldNotHaveGlint()) {
-            return false;
+            ci.cancel();
         }
-        return instance.hasEffect();
     }
 
     @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderModel(Lnet/minecraft/client/resources/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V"))