Add Static Chunk Recording

.gitignore

@@ -3,3 +3,5 @@
 
 build/
 run/
+
+*.psd

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 senseiwells
+Copyright (c) 2024 senseiwells
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
+
 plugins {
     kotlin("jvm")
     id("fabric-loom")
@@ -33,6 +35,7 @@ dependencies {
     })
 
     modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
+    modImplementation("net.fabricmc:fabric-language-kotlin:${property("fabric_kotlin_version")}")
     modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
 
     // I've had some issues with ReplayStudio and slf4j (in dev)
@@ -44,7 +47,6 @@ dependencies {
         exclude(group = "com.google.guava", module = "guava")
         exclude(group = "com.google.code.gson", module = "gson")
     })
-    include(modImplementation("net.fabricmc:fabric-language-kotlin:${property("fabric_kotlin_version")}")!!)
     include(modImplementation("me.lucko:fabric-permissions-api:${property("permissions_version")}")!!)
 
     modImplementation("com.github.gnembon:fabric-carpet:${property("carpet_version")}")
@@ -58,6 +60,10 @@ loom {
     accessWidenerPath.set(file("src/main/resources/serverreplay.accesswidener"))
 }
 
+tasks.remapJar {
+    archiveVersion.set("${project.version}+mc${project.property("minecraft_version")}")
+}
+
 tasks {
     processResources {
         inputs.property("version", project.version)

src/main/java/me/senseiwells/replay/ducks/ServerReplay$ChunkRecordable.java

@@ -0,0 +1,39 @@
+package me.senseiwells.replay.ducks;
+
+import me.senseiwells.replay.chunk.ChunkRecordable;
+import me.senseiwells.replay.chunk.ChunkRecorder;
+import me.senseiwells.replay.chunk.ChunkRecorders;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+public interface ServerReplay$ChunkRecordable extends ChunkRecordable {
+	@NotNull
+	@Override
+	default Collection<ChunkRecorder> getRecorders() {
+		return this.replay$getRecorders();
+	}
+
+	@Override
+	default void addRecorder(@NotNull ChunkRecorder recorder) {
+		this.replay$addRecorder(recorder);
+	}
+
+	@Override
+	default void removeRecorder(@NotNull ChunkRecorder recorder) {
+		this.replay$removeRecorder(recorder);
+	}
+
+	@Override
+	default void removeAllRecorders() {
+		this.replay$removeAllRecorders();
+	}
+
+	Collection<ChunkRecorder> replay$getRecorders();
+
+	void replay$addRecorder(ChunkRecorder recorder);
+
+	void replay$removeRecorder(ChunkRecorder recorder);
+
+	void replay$removeAllRecorders();
+}

src/main/java/me/senseiwells/replay/mixin/MinecraftServerMixin.java

@@ -1,5 +1,7 @@
 package me.senseiwells.replay.mixin;
 
+import me.senseiwells.replay.chunk.ChunkRecorder;
+import me.senseiwells.replay.chunk.ChunkRecorders;
 import me.senseiwells.replay.config.ReplayConfig;
 import me.senseiwells.replay.player.PlayerRecorder;
 import me.senseiwells.replay.player.PlayerRecorders;
@@ -8,6 +10,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
@@ -21,17 +24,36 @@ public class MinecraftServerMixin {
 	)
 	private void onServerLoaded(CallbackInfo ci) {
 		ReplayConfig.read();
+
+		if (ReplayConfig.getEnabled()) {
+			ReplayConfig.startChunks((MinecraftServer) (Object) this);
+		}
 	}
 
 	@Inject(
-		method = "stopServer",
+		method = "saveAllChunks",
 		at = @At("TAIL")
 	)
-	private void onServerStopped(CallbackInfo ci) {
+	private void onSave(
+		boolean suppressLog,
+		boolean flush,
+		boolean forced,
+		CallbackInfoReturnable<Boolean> cir
+	) {
 		ReplayConfig.write();
+	}
 
+	@Inject(
+		method = "stopServer",
+		at = @At("TAIL")
+	)
+	private void onServerStopped(CallbackInfo ci) {
 		for (PlayerRecorder recorder : PlayerRecorders.all()) {
 			recorder.stop();
 		}
+
+		for (ChunkRecorder recorder : ChunkRecorders.all()) {
+			recorder.stop();
+		}
 	}
 }

src/main/java/me/senseiwells/replay/mixin/ServerCommonPacketListenerImplMixin.java

@@ -33,7 +33,7 @@ private void onPacket(Packet<?> packet, PacketSendListener listener, CallbackInf
 		at = @At("TAIL")
 	)
 	private void onDisconnect(Component reason, CallbackInfo ci) {
-		PlayerRecorder recorder = PlayerRecorders.removeByUUID(this.playerProfile().getId());
+		PlayerRecorder recorder = PlayerRecorders.getByUUID(this.playerProfile().getId());
 		if (recorder != null) {
 			recorder.stop();
 		}

src/main/java/me/senseiwells/replay/mixin/ServerLevelMixin.java

@@ -1,27 +1,47 @@
 package me.senseiwells.replay.mixin;
 
+import com.llamalad7.mixinextras.sugar.Local;
+import me.senseiwells.replay.chunk.ChunkRecorder;
+import me.senseiwells.replay.chunk.ChunkRecorders;
 import me.senseiwells.replay.player.PlayerRecorder;
 import me.senseiwells.replay.player.PlayerRecorders;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
-import net.minecraft.network.protocol.game.ClientboundLevelEventPacket;
-import net.minecraft.network.protocol.game.ClientboundSoundPacket;
+import net.minecraft.network.protocol.game.ClientboundExplodePacket;
+import net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.ExplosionDamageCalculator;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.storage.WritableLevelData;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 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;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.function.Supplier;
 
 @Mixin(ServerLevel.class)
-public abstract class ServerLevelMixin {
+public abstract class ServerLevelMixin extends Level {
+	protected ServerLevelMixin(WritableLevelData levelData, ResourceKey<Level> dimension, RegistryAccess registryAccess, Holder<DimensionType> dimensionTypeRegistration, Supplier<ProfilerFiller> profiler, boolean isClientSide, boolean isDebug, long biomeZoomSeed, int maxChainedNeighborUpdates) {
+		super(levelData, dimension, registryAccess, dimensionTypeRegistration, profiler, isClientSide, isDebug, biomeZoomSeed, maxChainedNeighborUpdates);
+	}
+
 	@Shadow @Nullable public abstract Entity getEntity(int id);
 
 	@Inject(
@@ -36,42 +56,68 @@ private void onDestroyBlockProgress(int breakerId, BlockPos pos, int progress, C
 				 recorder.record(new ClientboundBlockDestructionPacket(breakerId, pos, progress));
 			 }
 		 }
+
+		 ChunkPos chunkPos = new ChunkPos(pos);
+		 for (ChunkRecorder recorder : ChunkRecorders.containing(this.dimension(), chunkPos)) {
+			 recorder.record(new ClientboundBlockDestructionPacket(breakerId, pos, progress));
+		 }
 	}
 
 	@Inject(
-		method = "playSeededSound(Lnet/minecraft/world/entity/player/Player;DDDLnet/minecraft/core/Holder;Lnet/minecraft/sounds/SoundSource;FFJ)V",
-		at = @At("HEAD")
+		method = "explode",
+		at = @At("TAIL")
 	)
-	private void onPlaySound(
-		@Nullable Player player,
-		double x,
-		double y,
-		double z,
-		Holder<SoundEvent> sound,
-		SoundSource source,
-		float volume,
-		float pitch,
-		long seed,
-		CallbackInfo ci
+	private void onExplode(
+		Entity entity,
+		DamageSource source,
+		ExplosionDamageCalculator calculator,
+		double posX,
+		double posY,
+		double posZ,
+		float radius,
+		boolean causeFire,
+		Level.ExplosionInteraction interaction,
+		ParticleOptions smallParticles,
+		ParticleOptions largeParticles,
+		SoundEvent sound,
+		CallbackInfoReturnable<Explosion> cir,
+		@Local Explosion explosion
 	) {
-		if (player != null) {
-			PlayerRecorder recorder = PlayerRecorders.getByUUID(player.getUUID());
-			if (recorder != null) {
-				recorder.record(new ClientboundSoundPacket(sound, source, x, y, z, volume, pitch, seed));
-			}
+		ChunkPos chunkPos = new ChunkPos(BlockPos.containing(posX, posY, posZ));
+		for (ChunkRecorder recorder : ChunkRecorders.containing(this.dimension(), chunkPos)) {
+			recorder.record(new ClientboundExplodePacket(
+				posX, posY, posZ, radius,
+				explosion.getToBlow(),
+				// Knock-back
+				Vec3.ZERO,
+				explosion.getBlockInteraction(),
+				explosion.getSmallExplosionParticles(),
+				explosion.getLargeExplosionParticles(),
+				explosion.getExplosionSound()
+			));
 		}
 	}
 
 	@Inject(
-		method = "levelEvent",
-		at = @At("HEAD")
+		method = "sendParticles(Lnet/minecraft/core/particles/ParticleOptions;DDDIDDDD)I",
+		at = @At("TAIL")
 	)
-	private void onLevelEvent(@Nullable Player player, int type, BlockPos pos, int data, CallbackInfo ci) {
-		if (player != null) {
-			PlayerRecorder recorder = PlayerRecorders.getByUUID(player.getUUID());
-			if (recorder != null) {
-				recorder.record(new ClientboundLevelEventPacket(type, pos, data, false));
-			}
+	private <T extends ParticleOptions> void onSendParticles(
+		T type,
+		double posX,
+		double posY,
+		double posZ,
+		int particleCount,
+		double xOffset,
+		double yOffset,
+		double zOffset,
+		double speed,
+		CallbackInfoReturnable<Integer> cir,
+		@Local ClientboundLevelParticlesPacket packet
+	) {
+		ChunkPos chunkPos = new ChunkPos(BlockPos.containing(posX, posY, posZ));
+		for (ChunkRecorder recorder : ChunkRecorders.containing(this.dimension(), chunkPos)) {
+			recorder.record(packet);
 		}
 	}
 }

src/main/java/me/senseiwells/replay/mixin/ServerLoginPacketListenerImplMixin.java

@@ -1,11 +1,10 @@
 package me.senseiwells.replay.mixin;
 
 import com.mojang.authlib.GameProfile;
-import me.senseiwells.replay.ServerReplay;
 import me.senseiwells.replay.config.ReplayConfig;
-import me.senseiwells.replay.player.PlayerRecorder;
 import me.senseiwells.replay.player.PlayerRecorders;
 import me.senseiwells.replay.player.predicates.ReplayPlayerContext;
+import me.senseiwells.replay.recorder.ReplayRecorder;
 import net.minecraft.network.protocol.login.ServerboundLoginAcknowledgedPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
@@ -35,9 +34,9 @@ private void onLoggedIn(
 		CallbackInfo ci
 	) {
 		GameProfile profile = this.authenticatedProfile;
-		if (profile != null && ReplayConfig.getEnabled() && PlayerRecorders.predicate.test(new ReplayPlayerContext(this.server, profile))) {
-			ServerReplay.logger.info("Started to record player '{}'", profile.getName());
-			PlayerRecorder recorder = PlayerRecorders.create(this.server, profile);
+		if (profile != null && ReplayConfig.getEnabled() && ReplayConfig.predicate.test(new ReplayPlayerContext(this.server, profile))) {
+			ReplayRecorder recorder = PlayerRecorders.create(this.server, profile);
+			recorder.logStart();
 			recorder.afterLogin();
 		}
 	}