ItemScaryFix, NewAnim+ImproveLeaked

Aspw-w · May 22, 2024 · ede7661 · ede7661
1 parent 1e76ba8
commit ede7661
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/Animations.kt b/src/main/java/net/aspw/client/features/module/impl/visual/Animations.kt
@@ -40,8 +40,9 @@ class Animations : Module() {
                 "Float",
                 "Remix",
                 "Avatar",
-                "Winter",
                 "Xiv",
+                "Winter",
+                "Yamato",
                 "SlideSwing",
                 "SmallPush",
                 "Reverse",

diff --git a/src/main/java/net/aspw/client/injection/forge/mixins/item/MixinItemRenderer.java b/src/main/java/net/aspw/client/injection/forge/mixins/item/MixinItemRenderer.java
@@ -239,13 +239,13 @@ public void renderItemInFirstPerson(final float partialTicks) {
                                 break;
                             }
                             case "Leaked": {
-                                GL11.glTranslated(Animations.blockPosX.get().doubleValue() + 0.08, Animations.blockPosY.get().doubleValue() - 0.03, Animations.blockPosZ.get().doubleValue() - 0.02);
+                                GL11.glTranslated(Animations.blockPosX.get().doubleValue() + 0.08, Animations.blockPosY.get().doubleValue() + 0.02, Animations.blockPosZ.get().doubleValue());
                                 final float var = MathHelper.sin((float) (MathHelper.sqrt_float(f1) * Math.PI));
                                 if (Animations.cancelEquip.get())
                                     transformFirstPersonItem(0.0F, 0.0f);
                                 else transformFirstPersonItem(f / 1.4F, 0.0f);
                                 doBlockTransformations();
-                                GlStateManager.rotate(-var * 35.5F, 1.0F, 0.7F, -0.2F);
+                                GlStateManager.rotate(-var * 42.5F, 1.1F, 0.8F, -0.3F);
                                 GlStateManager.scale(Animations.scale.get() + 1, Animations.scale.get() + 1, Animations.scale.get() + 1);
                                 break;
                             }
@@ -595,6 +595,18 @@ public void renderItemInFirstPerson(final float partialTicks) {
                                 GlStateManager.scale(Animations.scale.get() + 1, Animations.scale.get() + 1, Animations.scale.get() + 1);
                                 break;
                             }
+                            case "Yamato": {
+                                GL11.glTranslated(Animations.blockPosX.get().doubleValue(), Animations.blockPosY.get().doubleValue(), Animations.blockPosZ.get().doubleValue());
+                                final float var9 = MathHelper.sin(MathHelper.sqrt_float(f1) * 3.1415927F);
+                                GL11.glTranslated(0.0D, 0.0D, 0.0D);
+                                if (Animations.cancelEquip.get())
+                                    this.transformFirstPersonItem(0.0F, 0.0F);
+                                else this.transformFirstPersonItem(f / 2.5f, 0.0f);
+                                doBlockTransformations();
+                                GL11.glRotatef(-var9 * 200F / 2.0F, -9.0F, 5.0F, 9.0F);
+                                GlStateManager.scale(Animations.scale.get() + 1, Animations.scale.get() + 1, Animations.scale.get() + 1);
+                                break;
+                            }
                             case "Aqua": {
                                 GL11.glTranslated(Animations.blockPosX.get().doubleValue(), Animations.blockPosY.get().doubleValue(), Animations.blockPosZ.get().doubleValue());
                                 final float var9 = MathHelper.sin(MathHelper.sqrt_float(this.mc.thePlayer.getSwingProgress(partialTicks)) * 3.1415927F);

diff --git a/src/main/java/net/aspw/client/injection/forge/mixins/render/MixinLayerHeldItem.java b/src/main/java/net/aspw/client/injection/forge/mixins/render/MixinLayerHeldItem.java
@@ -40,7 +40,9 @@ public void doRenderLayer(EntityLivingBase entitylivingbaseIn, float p_177141_2_
 
         if (itemstack != null) {
             GlStateManager.pushMatrix();
-            GlStateManager.scale(Animations.scale.get() + 1, Animations.scale.get() + 1, Animations.scale.get() + 1);
+
+            if (entitylivingbaseIn == MinecraftInstance.mc.thePlayer)
+                GlStateManager.scale(Animations.scale.get() + 1, Animations.scale.get() + 1, Animations.scale.get() + 1);
 
             if (this.livingEntityRenderer.getMainModel().isChild) {
                 float f = 0.5F;