Merge branch 'master' into 1.17

src/main/java/carpet/mixins/ChunkTicketManager_tickMixin.java

@@ -18,6 +18,6 @@ public class ChunkTicketManager_tickMixin
     {
         // pausing expiry of tickets
         // that will prevent also chunks from unloading, so require a deep frozen state
-        if (!TickSpeed.process_entities && TickSpeed.deepFreeze) age--;
+        if (!TickSpeed.process_entities && TickSpeed.deeplyFrozen()) age--;
     }
 }

src/main/java/carpet/mixins/CommandFunctionManager_tickMixin.java

@@ -1,5 +1,6 @@
 package carpet.mixins;
 
+import carpet.helpers.TickSpeed;
 import carpet.utils.CarpetProfiler;
 import net.minecraft.server.function.CommandFunctionManager;
 import org.spongepowered.asm.mixin.Mixin;
@@ -12,9 +13,11 @@ public class CommandFunctionManager_tickMixin
 {
     CarpetProfiler.ProfilerToken currentSection;
 
-    @Inject(method = "tick", at = @At("HEAD"))
+    @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);
     }
 

src/main/java/carpet/mixins/MinecraftClientMixin.java

@@ -1,9 +1,13 @@
 package carpet.mixins;
 
+import carpet.CarpetServer;
+import carpet.helpers.TickSpeed;
 import carpet.network.CarpetClient;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.world.ClientWorld;
 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,9 +15,21 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin
 {
+    @Shadow public ClientWorld world;
+    
     @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("HEAD"))
     private void onCloseGame(Screen screen, CallbackInfo ci)
     {
         CarpetClient.disconnect();
     }
+    
+    @Inject(at = @At("HEAD"), method = "tick")
+    private void onClientTick(CallbackInfo info) {
+        if (this.world != null) {
+            if (CarpetServer.minecraft_server == null)
+                TickSpeed.tick();
+            if (!TickSpeed.process_entities)
+                CarpetClient.shapes.renewShapes();
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package carpet.mixins;
 
 import carpet.fakes.MinecraftServerInterface;
+import carpet.helpers.TickSpeed;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerTask;
 import net.minecraft.server.world.ServerWorld;
@@ -69,6 +70,8 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantThreadExecut
     ))
     public void tickTasks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
+        if (!TickSpeed.process_entities)
+            return;
         TICK.onTick();
         NETHER_TICK.onTick();
         ENDER_TICK.onTick();

src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java

@@ -1,5 +1,6 @@
 package carpet.mixins;
 
+import carpet.fakes.ServerPlayerEntityInterface;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,4 +18,11 @@ public class PlayerManager_scarpetEventsMixin
     {
         PLAYER_RESPAWNS.onPlayerEvent(player);
     }
+
+    @Inject(method = "respawnPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;onSpawn()V"))
+    private void invalidatePreviousInstance(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> cir)
+    {
+        ((ServerPlayerEntityInterface)player).invalidateEntityObjectReference();
+    }
+
 }

src/main/java/carpet/mixins/ScoreboardObjective_scarpetMixin.java

@@ -0,0 +1,12 @@
+package carpet.mixins;
+
+import net.minecraft.scoreboard.ScoreboardCriterion;
+import net.minecraft.scoreboard.ScoreboardObjective;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ScoreboardObjective.class)
+public interface ScoreboardObjective_scarpetMixin {
+    @Accessor("criterion")
+    void setCriterion(ScoreboardCriterion criterion);
+}

src/main/java/carpet/mixins/Scoreboard_scarpetMixin.java

@@ -0,0 +1,16 @@
+package carpet.mixins;
+
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.ScoreboardCriterion;
+import net.minecraft.scoreboard.ScoreboardObjective;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+import java.util.Map;
+
+@Mixin(Scoreboard.class)
+public interface Scoreboard_scarpetMixin {
+    @Accessor("objectivesByCriterion")
+    Map<ScoreboardCriterion, List<ScoreboardObjective>> getObjectivesByCriterion();
+}

src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java

@@ -1,6 +1,7 @@
 package carpet.mixins;
 
 import carpet.fakes.EntityInterface;
+import carpet.fakes.ServerPlayerEntityInterface;
 import carpet.script.EntityEventsGroup;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.Entity;
@@ -28,8 +29,11 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_FINISHED_USING_ITEM;
 import static carpet.script.CarpetEventServer.Event.STATISTICS;
 
 @Mixin(ServerPlayerEntity.class)
-public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
+public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity implements ServerPlayerEntityInterface
 {
+    // to denote if the player reference is valid
+
+    private boolean isInvalidReference = false;
 
     public ServerPlayerEntity_scarpetEventMixin(World world, BlockPos blockPos, float f, GameProfile gameProfile)
     {
@@ -109,6 +113,17 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
             }
             PLAYER_CHANGES_DIMENSION.onDimensionChange(player, previousLocation, to, previousDimension, destination.getRegistryKey());
         }
+    };
+
+    @Override
+    public void invalidateEntityObjectReference()
+    {
+        isInvalidReference = true;
     }
 
+    @Override
+    public boolean isInvalidEntityObject()
+    {
+        return isInvalidReference;
+    }
 }