shrug emoji

Poopooracoocoo · Jan 25, 2024 · a5bf104 · a5bf104
1 parent 1d654db
commit a5bf104
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/main/java/dev/mrsterner/besmirchment/mixin/LivingEntityMixin.java b/src/main/java/dev/mrsterner/besmirchment/mixin/LivingEntityMixin.java
@@ -230,28 +230,6 @@ private void isInSwimmingPose(CallbackInfoReturnable<Boolean> cir) {
         }
     }
 
-    @Inject(method = "swingHand(Lnet/minecraft/util/Hand;)V", at = @At("HEAD"), cancellable = true)
-    private void swingHand(Hand hand, CallbackInfo ci) {
-        if (BSMTransformations.isLich(this, true)) {
-            ci.cancel();
-            if (getWorld().isClient && bsm_lastRoll >= 20) {
-                bsm_lastRoll = 0;
-            }
-        }
-    }
-
-    @Inject(method = "tickMovement", at = @At("TAIL"))
-    private void tickMovement(CallbackInfo ci) {
-        if (getWorld().isClient) {
-            bsm_lastRoll++;
-        }
-    }
-
-    @Override
-    public int getLastRollTicks() {
-        return bsm_lastRoll;
-    }
-
     @Override
     public int getCachedSouls() {
         return bsm_cachedSouls;

diff --git a/src/main/java/dev/mrsterner/besmirchment/mixin/client/LivingEntityRendererMixin.java b/src/main/java/dev/mrsterner/besmirchment/mixin/client/LivingEntityRendererMixin.java
@@ -54,3 +54,25 @@ private void ghostify(Args args, LivingEntity entity, float f, float g, MatrixSt
         }
     }
 }
+
+@Inject(method = "swingHand(Lnet/minecraft/util/Hand;)V", at = @At("HEAD"), cancellable = true)
+private void swingHand(Hand hand, CallbackInfo ci) {
+    if (BSMTransformations.isLich(this, true)) {
+        ci.cancel();
+        if (getWorld().isClient && bsm_lastRoll >= 20) {
+            bsm_lastRoll = 0;
+        }
+    }
+}
+
+@Inject(method = "tickMovement", at = @At("TAIL"))
+private void tickMovement(CallbackInfo ci) {
+    if (getWorld().isClient) {
+        bsm_lastRoll++;
+    }
+}
+
+@Override
+public int getLastRollTicks() {
+    return bsm_lastRoll;
+}