moar client-server tick speed separation

src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java

@@ -1,8 +1,11 @@
 package carpet.mixins;
 
+import carpet.fakes.MinecraftServerInterface;
+import carpet.helpers.TickRateManager;
 import carpet.helpers.TickSpeed;
 import carpet.utils.CarpetProfiler;
 import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
@@ -34,7 +37,15 @@ public class BoundTickingBlockEntity_tickMixin<T extends BlockEntity>
     ))
     private void checkProcessBEs(BlockEntityTicker<T> blockEntityTicker, Level world, BlockPos pos, BlockState state, T blockEntity)
     {
-        if (TickSpeed.process_entities()) blockEntityTicker.tick(world, pos, state, blockEntity);
+        if (world.isClientSide()) {
+            // client
+            if (TickSpeed.process_entitiesClient()) blockEntityTicker.tick(world, pos, state, blockEntity);
+        } else {
+            // server
+            ServerLevel serverWorld = (ServerLevel) world;
+            TickRateManager tickRateManager = ((MinecraftServerInterface)serverWorld.getServer()).getTickRateManager();
+            if (tickRateManager.process_entities()) blockEntityTicker.tick(world, pos, state, blockEntity);
+        }
     }
 
     @Inject(method = "tick()V", at = @At("RETURN"))

src/main/java/carpet/mixins/ClientPacketListener_customPacketsMixin.java

@@ -1,5 +1,6 @@
 package carpet.mixins;
 
+import carpet.helpers.TickSpeed;
 import carpet.network.CarpetClient;
 import carpet.network.ClientNetworkHandler;
 import net.minecraft.client.Minecraft;
@@ -33,11 +34,13 @@ public abstract class ClientPacketListener_customPacketsMixin
     private void onGameJoined(ClientboundLoginPacket packet, CallbackInfo info)
     {
         CarpetClient.gameJoined(minecraft.player);
+        TickSpeed.resetClient();
     }
 
     @Inject(method = "onDisconnect", at = @At("HEAD"))
     private void onCMDisconnected(Component reason, CallbackInfo ci)
     {
         CarpetClient.disconnect();
+        TickSpeed.resetClient();
     }
 }

src/main/java/carpet/mixins/DistanceManager_tickMixin.java

@@ -1,23 +0,0 @@
-package carpet.mixins;
-
-import carpet.helpers.TickSpeed;
-import net.minecraft.server.level.DistanceManager;
-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.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(DistanceManager.class)
-public class DistanceManager_tickMixin
-{
-    @Shadow private long ticketTickCounter;
-
-    @Inject(method = "purgeStaleTickets", at = @At("HEAD"))
-    private void pauseTicketSystem(CallbackInfo ci)
-    {
-        // pausing expiry of tickets
-        // that will prevent also chunks from unloading, so require a deep frozen state
-        if (!TickSpeed.process_entities() && TickSpeed.deeplyFrozen()) ticketTickCounter--;
-    }
-}

src/main/java/carpet/mixins/Level_tickMixin.java

@@ -1,8 +1,11 @@
 package carpet.mixins;
 
 import carpet.fakes.LevelInterface;
+import carpet.fakes.MinecraftServerInterface;
+import carpet.helpers.TickRateManager;
 import carpet.helpers.TickSpeed;
 import carpet.utils.CarpetProfiler;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.redstone.NeighborUpdater;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -87,13 +90,18 @@ public abstract class Level_tickMixin implements LevelInterface
     private void startEntity(Consumer<Entity> consumer_1, Entity e, CallbackInfo ci)
     {
         // this shows that probably tick speed controller needs to be accessible through level referring to servers on server and client on clientLevel
-        if (isClientSide) {
-            if (!(TickSpeed.process_entitiesClient() || (e instanceof Player) || TickSpeed.isIs_superHotClient() && e.getControllingPassenger() instanceof Player))
+        if (!isClientSide)
+        {
+            ServerLevel serverLevel = (ServerLevel) (Object) this;
+            TickRateManager trm = ((MinecraftServerInterface)serverLevel.getServer()).getTickRateManager();
+            if (!(trm.process_entities() || (e instanceof Player)))
             {
                 ci.cancel();
             }
-        } else {
-            if (!(TickSpeed.gTRM().map(trm -> trm.process_entities).orElse(true) || (e instanceof Player)))
+        }
+        else
+        {
+            if (!(TickSpeed.process_entitiesClient() || (e instanceof Player) || TickSpeed.isIs_superHotClient() && e.getControllingPassenger() instanceof Player))
             {
                 ci.cancel();
             }

src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java

@@ -1,7 +1,6 @@
 package carpet.mixins;
 
 import carpet.fakes.MinecraftServerInterface;
-import carpet.helpers.TickSpeed;
 import carpet.script.CarpetScriptServer;
 import net.minecraft.Util;
 import net.minecraft.core.RegistryAccess;
@@ -89,8 +88,10 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
     ))
     public void tickTasks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
-        if (!TickSpeed.process_entities())
+        if (!getTickRateManager().process_entities())
+        {
             return;
+        }
         TICK.onTick((MinecraftServer) (Object) this);
         NETHER_TICK.onTick((MinecraftServer) (Object) this);
         ENDER_TICK.onTick((MinecraftServer) (Object) this);

src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java

@@ -112,7 +112,7 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantBlockableE
             long msThisTick = 0L;
             long long_1 = 0L;
             float mspt = tickRateManager.mspt;
-            if (tickRateManager.time_warp_start_time != 0 && TickSpeed.continueWarp())
+            if (tickRateManager.time_warp_start_time != 0 && tickRateManager.continueWarp())
             {
                 //making sure server won't flop after the warp or if the warp is interrupted
                 this.nextTickTime = this.lastOverloadWarning = Util.getMillis();
@@ -151,9 +151,9 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantBlockableE
             //this.startMonitor(tickDurationMonitor);
             this.startMetricsRecordingTick();
             this.profiler.push("tick");
-            this.tickServer(TickSpeed.gTRM().map(trm -> trm.time_warp_start_time).orElse(0L) != 0 ? ()->true : this::haveTime);
+            this.tickServer(tickRateManager.time_warp_start_time != 0 ? ()->true : this::haveTime);
             this.profiler.popPush("nextTickWait");
-            if (TickSpeed.gTRM().map(trm -> trm.time_warp_start_time).orElse(0L) != 0) // clearing all hanging tasks no matter what when warping
+            if (tickRateManager.time_warp_start_time != 0) // clearing all hanging tasks no matter what when warping
             {
                 while(this.runEveryTask()) {Thread.yield();}
             }

src/main/java/carpet/mixins/ServerChunkCache_tickMixin.java

@@ -1,8 +1,10 @@
 package carpet.mixins;
 
+import carpet.fakes.MinecraftServerInterface;
 import carpet.fakes.ThreadedAnvilChunkStorageInterface;
-import carpet.helpers.TickSpeed;
+import carpet.helpers.TickRateManager;
 import carpet.utils.CarpetProfiler;
+import net.minecraft.server.level.DistanceManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -78,7 +80,7 @@ public abstract class ServerChunkCache_tickMixin
     private boolean skipChunkTicking(ServerLevel serverWorld)
     {
         boolean debug = serverWorld.isDebug();
-        if (!TickSpeed.process_entities())
+        if (!((MinecraftServerInterface)serverWorld.getServer()).getTickRateManager().process_entities())
         {
             // simplified chunk tick iteration assuming world is frozen otherwise as suggested by Hadron67
             // to be kept in sync with the original injection source
@@ -97,4 +99,17 @@ public abstract class ServerChunkCache_tickMixin
         return debug;
     }
 
+    @Redirect(method = "tick", at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/server/level/DistanceManager;purgeStaleTickets()V"
+    ))
+    private void pauseTicketSystem(DistanceManager distanceManager)
+    {
+        // pausing expiry of tickets
+        // that will prevent also chunks from unloading, so require a deep frozen state
+        TickRateManager trm = ((MinecraftServerInterface) level.getServer()).getTickRateManager();
+        if (!trm.process_entities() && trm.deeplyFrozen()) return;
+        distanceManager.purgeStaleTickets();
+    }
+
 }

src/main/java/carpet/mixins/ServerFunctionManager_tickMixin.java

@@ -1,9 +1,12 @@
 package carpet.mixins;
 
-import carpet.helpers.TickSpeed;
+import carpet.fakes.MinecraftServerInterface;
 import carpet.utils.CarpetProfiler;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerFunctionManager;
+import org.spongepowered.asm.mixin.Final;
 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.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -11,14 +14,20 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(ServerFunctionManager.class)
 public class ServerFunctionManager_tickMixin
 {
+    @Shadow @Final MinecraftServer server;
     CarpetProfiler.ProfilerToken currentSection;
 
     @Inject(method = "tick", at = @At("HEAD"), cancellable = true)
     private void beforeDatapacks(CallbackInfo ci)
     {
-    	if (!TickSpeed.process_entities()) ci.cancel();
-    	else
-        currentSection = CarpetProfiler.start_section(null, "Datapacks", CarpetProfiler.TYPE.GENERAL);
+    	if (! ((MinecraftServerInterface)server).getTickRateManager().process_entities())
+        {
+            ci.cancel();
+        }
+        else
+        {
+            currentSection = CarpetProfiler.start_section(null, "Datapacks", CarpetProfiler.TYPE.GENERAL);
+        }
     }
 
     @Inject(method = "tick", at = @At("RETURN"))

src/main/java/carpet/mixins/ServerGamePacketListenerImpl_tickMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.helpers.TickSpeed;
+import carpet.fakes.MinecraftServerInterface;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
 import net.minecraft.server.level.ServerPlayer;
@@ -27,7 +27,7 @@ public class ServerGamePacketListenerImpl_tickMixin
     {
         if (p.getXxa() != 0.0F || p.getZza() != 0.0F || p.isJumping() || p.isShiftKeyDown())
         {
-            TickSpeed.reset_player_active_timeout();
+            ((MinecraftServerInterface)player.getServer()).getTickRateManager().reset_player_active_timeout();
         }
     }
 
@@ -53,7 +53,7 @@ public class ServerGamePacketListenerImpl_tickMixin
         {
             lastMoved = movedBy;
             lastMovedTick = player.getServer().getTickCount();
-            TickSpeed.reset_player_active_timeout();
+            ((MinecraftServerInterface)player.getServer()).getTickRateManager().reset_player_active_timeout();
         }
     }
 }

src/main/java/carpet/mixins/ServerLevel_tickMixin.java

@@ -1,6 +1,6 @@
 package carpet.mixins;
 
-import carpet.helpers.TickSpeed;
+import carpet.fakes.MinecraftServerInterface;
 import carpet.utils.CarpetProfiler;
 import net.minecraft.core.Holder;
 import net.minecraft.core.RegistryAccess;
@@ -159,13 +159,13 @@ public abstract class ServerLevel_tickMixin extends Level
     ))
     private void tickWorldBorder(WorldBorder worldBorder)
     {
-        if (TickSpeed.process_entities()) worldBorder.tick();
+        if (((MinecraftServerInterface)getServer()).getTickRateManager().process_entities()) worldBorder.tick();
     }
 
     @Inject(method = "advanceWeatherCycle", cancellable = true, at = @At("HEAD"))
     private void tickWeather(CallbackInfo ci)
     {
-        if (!TickSpeed.process_entities()) ci.cancel();
+        if (!((MinecraftServerInterface)getServer()).getTickRateManager().process_entities()) ci.cancel();
     }
 
     @Redirect(method = "tick", at = @At(
@@ -174,7 +174,7 @@ public abstract class ServerLevel_tickMixin extends Level
     ))
     private void tickTimeConditionally(ServerLevel serverWorld)
     {
-        if (TickSpeed.process_entities()) tickTime();
+        if (((MinecraftServerInterface)getServer()).getTickRateManager().process_entities()) tickTime();
     }
 
     @Redirect(method = "tick", at = @At(
@@ -183,7 +183,7 @@ public abstract class ServerLevel_tickMixin extends Level
     ))
     private boolean tickPendingBlocks(ServerLevel serverWorld)
     {
-        if (!TickSpeed.process_entities()) return true;
+        if (!((MinecraftServerInterface)getServer()).getTickRateManager().process_entities()) return true;
         return serverWorld.isDebug(); // isDebug()
     }
 
@@ -193,7 +193,7 @@ public abstract class ServerLevel_tickMixin extends Level
     ))
     private void tickConditionally(Raids raidManager)
     {
-        if (TickSpeed.process_entities()) raidManager.tick();
+        if (((MinecraftServerInterface)getServer()).getTickRateManager().process_entities()) raidManager.tick();
     }
 
     @Redirect(method = "tick", at = @At(
@@ -202,6 +202,6 @@ public abstract class ServerLevel_tickMixin extends Level
     ))
     private void tickConditionally(ServerLevel serverWorld)
     {
-        if (TickSpeed.process_entities()) runBlockEvents();
+        if (((MinecraftServerInterface)getServer()).getTickRateManager().process_entities()) runBlockEvents();
     }
 }