Merge branch 'arch/1.20.4' into arch/1.20

# Conflicts:
#	CHANGELOG.md
#	gradle.properties

CHANGELOG.md

@@ -1 +1 @@
-- Fixed compatibility with controlify 2.0.
+- Fixed a very elusive bug causing the mod to sometimes just not work.

build.gradle

@@ -132,3 +132,9 @@ subprojects {
         inputDir = "assets/${mod_id}/lang"
     }
 }
+
+tasks.register('publishAll') {
+    group 'publishing'
+    dependsOn 'publish'
+    dependsOn 'publishMods'
+}

common/src/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

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;

common/src/main/resources/do_a_barrel_roll.mixins.json

@@ -24,7 +24,6 @@
     "client.roll.GameRendererMixin",
     "client.roll.MouseMixin",
     "client.roll.PlayerEntityRendererMixin",
-    "client.roll.entity.AbstractClientPlayerEntityMixin",
     "client.roll.entity.ClientPlayerEntityMixin"
   ],
   "server": [

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Project
-mod_version=3.5.5
+mod_version=3.5.6
 group=nl.enjarai
 
 # Common