23w43a

src/main/java/carpet/mixins/AbstractArrowMixin.java

@@ -5,7 +5,7 @@ import carpet.logging.logHelpers.TrajectoryLogHelper;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.projectile.AbstractArrow;
-import net.minecraft.world.entity.projectile.Projectile;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.EntityHitResult;
@@ -20,10 +20,10 @@ public abstract class AbstractArrowMixin extends Entity
     private TrajectoryLogHelper logHelper;
     public AbstractArrowMixin(EntityType<?> entityType_1, Level world_1) { super(entityType_1, world_1); }
 
-    @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN"))
-    private void addLogger(EntityType<? extends Projectile> entityType_1, Level world_1, CallbackInfo ci)
+    @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)V", at = @At("RETURN"))
+    private void addLogger(final EntityType entityType, final Level level, final ItemStack itemStack, final CallbackInfo ci)
     {
-        if (LoggerRegistry.__projectiles && !world_1.isClientSide)
+        if (LoggerRegistry.__projectiles && !level.isClientSide)
             logHelper = new TrajectoryLogHelper("projectiles");
     }
 

src/main/java/carpet/mixins/ClientLevel_tickSpeedMixin.java

@@ -1,28 +0,0 @@
-package carpet.mixins;
-
-import carpet.fakes.LevelInterface;
-import carpet.helpers.TickRateManager;
-import net.minecraft.client.multiplayer.ClientLevel;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ClientLevel.class)
-public abstract class ClientLevel_tickSpeedMixin implements LevelInterface
-{
-
-    private TickRateManager tickRateManager;
-
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void onInit(CallbackInfo ci)
-    {
-        this.tickRateManager = new TickRateManager();
-    }
-
-    @Override
-    public TickRateManager tickRateManager()
-    {
-        return tickRateManager;
-    }
-}

src/main/java/carpet/mixins/LevelRenderer_pausedShakeMixin.java

@@ -1,49 +0,0 @@
-package carpet.mixins;
-
-import carpet.fakes.LevelInterface;
-import carpet.fakes.MinecraftClientInferface;
-import carpet.helpers.TickRateManager;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.LevelRenderer;
-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.ModifyVariable;
-
-@Mixin(value = LevelRenderer.class, priority = 69420)
-public class LevelRenderer_pausedShakeMixin
-{
-    @Shadow @Final private Minecraft minecraft;
-
-    @Shadow private ClientLevel level;
-    float initial = -1234.0f;
-
-    // require 0 is for optifine being a bitch as it usually is.
-    @ModifyVariable(method = "renderLevel", argsOnly = true, require = 0, ordinal = 0, at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/client/multiplayer/ClientLevel;entitiesForRendering()Ljava/lang/Iterable;"
-    ))
-    private float changeTickPhase(float previous)
-    {
-        initial = previous;
-        TickRateManager trm = ((LevelInterface)level).tickRateManager();
-        if (!trm.runsNormally())
-            return ((MinecraftClientInferface)minecraft).getPausedTickDelta();
-        return previous;
-    }
-
-    // require 0 is for optifine being a bitch as it usually is.
-    @ModifyVariable(method = "renderLevel", argsOnly = true, require = 0, ordinal = 0 ,at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;F)V",
-            shift = At.Shift.BEFORE
-    ))
-    private float changeTickPhaseBack(float previous)
-    {
-        // this may not set with optifine bitch
-        return initial==-1234.0f?previous:initial;
-    }
-
-}

src/main/java/carpet/mixins/MinecraftMixin.java

@@ -1,6 +1,5 @@
 package carpet.mixins;
 
-import carpet.fakes.LevelInterface;
 import carpet.network.CarpetClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
@@ -25,7 +24,7 @@ public class MinecraftMixin
     @Inject(at = @At("HEAD"), method = "tick")
     private void onClientTick(CallbackInfo info) {
         if (this.level != null) {
-            boolean runsNormally = ((LevelInterface)this.level).tickRateManager().runsNormally();
+            boolean runsNormally = level.tickRateManager().runsNormally();
             // hope server doesn't need to tick - should be handled by the server on its own
             if (!runsNormally)
                 CarpetClient.shapes.renewShapes();

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

@@ -7,6 +7,7 @@ import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerFunctionManager;
+import net.minecraft.server.ServerTickRateManager;
 import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.players.PlayerList;
@@ -40,12 +41,6 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
 
     @Shadow protected abstract void tickServer(BooleanSupplier booleanSupplier_1);
 
-    @Shadow private long nextTickTime;
-
-    @Shadow private long lastOverloadWarning;
-
-    @Shadow public abstract boolean pollTask();
-
     @Shadow @Final protected LevelStorageSource.LevelStorageAccess storageSource;
 
     @Shadow @Final private Map<ResourceKey<Level>, ServerLevel> levels;
@@ -62,11 +57,18 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
 
     @Shadow @Final private StructureTemplateManager structureTemplateManager;
 
+    @Shadow public abstract ServerTickRateManager tickRateManager();
+
+    @Shadow private long nextTickTimeNanos;
+
+    @Shadow private long lastOverloadWarningNanos;
+
     @Override
     public void forceTick(BooleanSupplier isAhead)
     {
-        nextTickTime = lastOverloadWarning = Util.getMillis();
+        nextTickTimeNanos = lastOverloadWarningNanos = Util.getNanos();
         tickServer(isAhead);
+        pollTask();
         while(pollTask()) {Thread.yield();}
     }
 
@@ -88,7 +90,7 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
     ))
     public void tickTasks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
-        if (!getTickRateManager().runsNormally())
+        if (!tickRateManager().runsNormally())
         {
             return;
         }

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

@@ -1,7 +1,6 @@
 package carpet.mixins;
 
 import carpet.fakes.MinecraftServerInterface;
-import carpet.helpers.ServerTickRateManager;
 import carpet.utils.CarpetProfiler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.TickTask;
@@ -23,20 +22,6 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantBlockableE
 
     CarpetProfiler.ProfilerToken currentSection;
 
-    private ServerTickRateManager serverTickRateManager;
-
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void onInit(CallbackInfo ci)
-    {
-        serverTickRateManager = new ServerTickRateManager((MinecraftServer)(Object)this);
-    }
-
-    @Override
-    public ServerTickRateManager getTickRateManager()
-    {
-        return serverTickRateManager;
-    }
-
     // Replaced the above cancelled while statement with this one
     // could possibly just inject that mspt selection at the beginning of the loop, but then adding all mspt's to
     // replace 50L will be a hassle

src/main/java/carpet/mixins/Minecraft_pausedShakeMixin.java

@@ -1,18 +0,0 @@
-package carpet.mixins;
-
-import carpet.fakes.MinecraftClientInferface;
-import net.minecraft.client.Minecraft;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(Minecraft.class)
-public class Minecraft_pausedShakeMixin implements MinecraftClientInferface
-{
-    @Shadow private float pausePartialTick;
-
-    @Override
-    public float getPausedTickDelta()
-    {
-        return pausePartialTick;
-    }
-}

src/main/java/carpet/mixins/Minecraft_tickMixin.java

@@ -0,0 +1,22 @@
+package carpet.mixins;
+
+import carpet.CarpetSettings;
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Minecraft.class)
+public class Minecraft_tickMixin
+{
+    @Inject(method = "getTickTargetMillis", at = @At("HEAD"), cancellable = true)
+    private void onGetTickTargetMillis(final float f, final CallbackInfoReturnable<Float> cir)
+    {
+        if (!CarpetSettings.smoothClientAnimations) {
+            cir.setReturnValue(f);
+        }
+    }
+
+
+}

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

@@ -1,8 +1,6 @@
 package carpet.mixins;
 
 import carpet.fakes.LevelInterface;
-import carpet.fakes.MinecraftServerInterface;
-import carpet.helpers.TickRateManager;
 import carpet.utils.CarpetProfiler;
 import net.minecraft.core.Holder;
 import net.minecraft.core.RegistryAccess;
@@ -28,12 +26,6 @@ public abstract class ServerLevel_tickMixin extends Level implements LevelInterf
         super(writableLevelData, resourceKey, registryAccess, holder, supplier, bl, bl2, l, i);
     }
 
-    @Override
-    public TickRateManager tickRateManager()
-    {
-        return ((MinecraftServerInterface)getServer()).getTickRateManager();
-    }
-
     private CarpetProfiler.ProfilerToken currentSection;
 
     @Inject(method = "tick", at = @At(