Use a single inject for last head rot, tweak flash target tick times

lucyydotp · Jun 6, 2024 · 375a4e3 · 375a4e3
1 parent 10c3580
commit 375a4e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/main/java/me/lucyydotp/papers/CameraPerspectiveMode.java b/src/main/java/me/lucyydotp/papers/CameraPerspectiveMode.java
@@ -74,7 +74,7 @@ public void transform(PoseStack cameraPoseStack, float tickProgress, long time)
                             .rotateAxis((float) Math.toRadians(Mth.lerp(tickProgress, -lastPose.getX(), -pose.getX())), player.getForward().toVector3f().rotateY((float) (Math.PI / 2f))),
                     0,
                     // fixme: this might be a little low?
-                    (float) (-player.getBbHeight() - player.getMyRidingOffset()),
+                    (float) (-player.getBbHeight()  - player.getMyRidingOffset()),
                     0
             );
         }
@@ -83,9 +83,9 @@ public boolean shouldGlow(ArmorStand entity) {
             if (!entity.is(armorStand)) return false;
             final var diff = armorStand.level.getGameTime() - creationTime;
 
-            return diff < 4 ||
-                    (8 < diff && diff < 12) ||
-                    (16 < diff && diff < 20);
+            return diff < 5 ||
+                    (7 < diff && diff < 12) ||
+                    (15 < diff && diff < 20);
 
         }
     }

diff --git a/src/main/java/me/lucyydotp/papers/mixin/ArmorStandMixin.java b/src/main/java/me/lucyydotp/papers/mixin/ArmorStandMixin.java
@@ -32,22 +32,12 @@ public ArmorStandMixin(EntityType<?> entityType, Level level) {
         throw new AbstractMethodError("Mixin abstract class constructor");
     }
 
-    @Inject(
-            method = "setHeadPose",
-            at = @At("HEAD")
-    )
-    public void setLastHeadPose(Rotations rotations, CallbackInfo ci) {
-        papers$lastHeadRot = headPose;
-    }
-
     @Inject(
             method = "tick",
             at = @At("HEAD")
     )
-    public void clearLastHeadPose(CallbackInfo ci, @Local(name = "rotations") Rotations rotations) {
-        if (this.headPose.equals(rotations)) {
-            papers$lastHeadRot = headPose;
-        }
+    public void clearLastHeadPose(CallbackInfo ci) {
+        papers$lastHeadRot = headPose;
     }
 
     /**