HELLLLLLLLLLLLLLLLLLL FUCKING YEAAAA

enjarai · Apr 29, 2024 · 23ca8d9 · 23ca8d9
1 parent 0379beb
commit 23ca8d9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/...va/nl/enjarai/doabarrelroll/mixin/client/roll/entity/AbstractClientPlayerEntityMixin.java b/...va/nl/enjarai/doabarrelroll/mixin/client/roll/entity/AbstractClientPlayerEntityMixin.java
diff --git a/.../main/java/nl/enjarai/doabarrelroll/mixin/client/roll/entity/ClientPlayerEntityMixin.java b/.../main/java/nl/enjarai/doabarrelroll/mixin/client/roll/entity/ClientPlayerEntityMixin.java
@@ -7,6 +7,7 @@
 import nl.enjarai.doabarrelroll.config.Sensitivity;
 import nl.enjarai.doabarrelroll.flight.RotationModifiers;
 import nl.enjarai.doabarrelroll.math.MagicNumbers;
+import nl.enjarai.doabarrelroll.mixin.roll.entity.PlayerEntityMixin;
 import nl.enjarai.doabarrelroll.net.register.RollSyncClient;
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,7 +18,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayerEntity.class)
-public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntityMixin {
+public abstract class ClientPlayerEntityMixin extends PlayerEntityMixin {
 	@Shadow public float renderYaw;
 	@Shadow public float lastRenderYaw;
 
@@ -42,11 +43,10 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
 	}
 
 	@Override
-	protected void doABarrelRoll$baseTickTail(CallbackInfo ci) {
+	@Unique
+	protected void doABarrelRoll$baseTickTail2() {
 		// Update rolling status
 		doABarrelRoll$setRolling(RollEvents.shouldRoll());
-
-		super.doABarrelRoll$baseTickTail(ci);
 	}
 
 	@Override

diff --git a/common/src/main/java/nl/enjarai/doabarrelroll/mixin/roll/entity/PlayerEntityMixin.java b/common/src/main/java/nl/enjarai/doabarrelroll/mixin/roll/entity/PlayerEntityMixin.java
@@ -18,13 +18,19 @@ public abstract class PlayerEntityMixin extends LivingEntityMixin {
 
     @Override
     protected void doABarrelRoll$baseTickTail(CallbackInfo ci) {
+        doABarrelRoll$baseTickTail2();
+
         prevRoll = doABarrelRoll$getRoll();
 
         if (!doABarrelRoll$isRolling()) {
             doABarrelRoll$setRoll(0.0f);
         }
     }
 
+    @Unique
+    protected void doABarrelRoll$baseTickTail2() {
+    }
+
     @Override
     public boolean doABarrelRoll$isRolling() {
         return isRolling;

diff --git a/common/src/main/resources/do_a_barrel_roll.mixins.json b/common/src/main/resources/do_a_barrel_roll.mixins.json
@@ -25,7 +25,6 @@
     "client.roll.GameRendererMixin",
     "client.roll.MouseMixin",
     "client.roll.PlayerEntityRendererMixin",
-    "client.roll.entity.AbstractClientPlayerEntityMixin",
     "client.roll.entity.ClientPlayerEntityMixin"
   ],
   "server": [