Trying to fix tickadvance... again (#21)

Maybe this time...

Author: ScribbleTAS

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
 	repositories {
-		//mavenLocal() // For development purposes
+		// mavenLocal() // For development purposes
 		mavenCentral()
 		maven {
 			url = "https://maven.mgnet.work/main"

src/main/java/com/minecrafttas/lotas_light/LoTASLightClient.java

@@ -91,13 +91,12 @@ private void increaseTickrate(Minecraft client) {
 		if (client.level == null) {
 			return;
 		}
-		TickRateManager clientTickrateChanger = client.level.tickRateManager();
 		IntegratedServer server = client.getSingleplayerServer();
 		if (server == null) {
 			return;
 		}
 		ServerTickRateManager serverTickrateChanger = server.tickRateManager();
-		rateIndex = findClosestRateIndex(clientTickrateChanger.tickrate());
+		rateIndex = findClosestRateIndex(serverTickrateChanger.tickrate());
 
 		rateIndex++;
 		//# 1.20.6
@@ -114,20 +113,18 @@ private void increaseTickrate(Minecraft client) {
 			client.gui.getChat().addMessage(Component.translatable("msg.lotaslight.setTickrate", tickrate));
 		}
 		serverTickrateChanger.setTickRate(tickrate);
-		clientTickrateChanger.setTickRate(tickrate);
 	}
 
 	private void decreaseTickrate(Minecraft client) {
 		if (client.level == null) {
 			return;
 		}
-		TickRateManager clientTickrateChanger = client.level.tickRateManager();
 		IntegratedServer server = client.getSingleplayerServer();
 		if (server == null) {
 			return;
 		}
 		ServerTickRateManager serverTickrateChanger = server.tickRateManager();
-		rateIndex = findClosestRateIndex(clientTickrateChanger.tickrate());
+		rateIndex = findClosestRateIndex(serverTickrateChanger.tickrate());
 
 		rateIndex--;
 		//# 1.20.6
@@ -145,25 +142,21 @@ private void decreaseTickrate(Minecraft client) {
 			client.gui.getChat().addMessage(Component.translatable("msg.lotaslight.setTickrate", tickrate));
 		}
 		serverTickrateChanger.setTickRate(tickrate);
-		clientTickrateChanger.setTickRate(tickrate);
 	}
 
 	private void freezeTickrate(Minecraft client) {
 		if (client.level == null) {
 			return;
 		}
-		TickRateManager clientTickrateManager = client.level.tickRateManager();
 		IntegratedServer server = client.getSingleplayerServer();
 		if (server == null) {
 			return;
 		}
 		ServerTickRateManager serverTickrateManager = server.tickRateManager();
 
-		Tickratechanger clientTickrateChanger = (Tickratechanger) clientTickrateManager;
 		Tickratechanger serverTickrateChanger = (Tickratechanger) serverTickrateManager;
 
-		boolean enable = clientTickrateManager.tickrate() != 0;
-		clientTickrateChanger.enableTickrate0(enable);
+		boolean enable = serverTickrateManager.tickrate() != 0;
 		serverTickrateChanger.enableTickrate0(enable);
 	}
 

src/main/java/com/minecrafttas/lotas_light/mixin/MixinServerTickRateManager.java

@@ -0,0 +1,25 @@
+package com.minecrafttas.lotas_light.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import com.minecrafttas.lotas_light.duck.Tickratechanger;
+
+import net.minecraft.server.ServerTickRateManager;
+
+@Mixin(ServerTickRateManager.class)
+public abstract class MixinServerTickRateManager {
+
+	@Redirect(method = "setTickRate", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/ServerTickRateManager;updateStateToClients()V"))
+	public void redirect_setTickRate(ServerTickRateManager manager) {
+		Tickratechanger tickratechanger = (Tickratechanger) (Object) this;
+		if (!tickratechanger.isAdvanceTick()) {
+			this.updateStateToClients();
+		}
+	}
+
+	@Shadow
+	protected abstract void updateStateToClients();
+}

src/main/java/com/minecrafttas/lotas_light/mixin/MixinTickRateManager.java

@@ -15,13 +15,12 @@
 import com.minecrafttas.lotas_light.duck.Tickratechanger;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.server.ServerTickRateManager;
 import net.minecraft.util.TimeUtil;
 import net.minecraft.world.TickRateManager;
 
 /**
- * Changes the vanilla tickrate manager to allow for lower tickrates,
- * better freeze and stepping functionality.
+ * Changes the vanilla tickrate manager to allow for lower tickrates, better
+ * freeze and stepping functionality.
  * 
  * @author Scribble
  */
@@ -30,9 +29,7 @@ public abstract class MixinTickRateManager implements Tickratechanger {
 	@Unique
 	private static float tickrateSaved = 20;
 	@Unique
-	private boolean advanceTickrateServer;
-	@Unique
-	private boolean advanceTickrateClient;
+	private boolean advanceTickrate;
 	@Unique
 	private boolean isDisconnecting;
 
@@ -82,8 +79,7 @@ public float getTickrateSaved() {
 
 	@Override
 	public void toggleTickrate0() {
-		advanceTickrateServer = false;
-		advanceTickrateClient = false;
+		advanceTickrate = false;
 		if (tickrate == 0) {
 			setTickRate(tickrateSaved);
 		} else {
@@ -93,8 +89,7 @@ public void toggleTickrate0() {
 
 	@Override
 	public void enableTickrate0(boolean enable) {
-		advanceTickrateServer = false;
-		advanceTickrateClient = false;
+		advanceTickrate = false;
 		if (enable) {
 			if (tickrate != 0)
 				setTickRate(0f);
@@ -107,17 +102,14 @@ public void enableTickrate0(boolean enable) {
 	@Override
 	public void advanceTick() {
 		if (tickrate == 0) {
+			this.advanceTickrate = true;
 			setTickRate(tickrateSaved);
-			if (isServer())
-				this.advanceTickrateServer = true;
-			else
-				this.advanceTickrateClient = true;
 		}
 	}
 
 	@Override
 	public boolean isAdvanceTick() {
-		return advanceTickrateServer || advanceTickrateClient;
+		return advanceTickrate;
 	}
 
 	@Override
@@ -131,12 +123,9 @@ public void disconnect() {
 
 	@Inject(method = "tick", at = @At("RETURN"))
 	public void inject_Tick(CallbackInfo ci) {
-		if (advanceTickrateServer || advanceTickrateClient) {
-			if (isServer())
-				this.advanceTickrateServer = false;
-			else
-				this.advanceTickrateClient = false;
+		if (advanceTickrate) {
 			setTickRate(0);
+			this.advanceTickrate = false;
 		}
 	}
 
@@ -161,10 +150,6 @@ public long getAdjustedMilliseconds() {
 		return (long) (fakeTimeSinceTC + time);
 	}
 
-	private boolean isServer() {
-		return ((TickRateManager) (Object) this) instanceof ServerTickRateManager;
-	}
-
 	@Shadow
 	protected abstract void setTickRate(float f);
 

src/main/resources/lotaslight.mixins.json

@@ -8,7 +8,8 @@
 		"MixinMinecraftServer",
 		"AccessorLevelStorage",
 		"AccessorServerPlayer",
-		"MixinLevelStorageAccess"
+		"MixinLevelStorageAccess",
+		"MixinServerTickRateManager"
 	],
 	"client":[
 		"MixinMinecraft",