fix #41

gradle.properties

@@ -7,6 +7,6 @@ org.gradle.configureondemand=true
 # Enable advanced multi-module optimizations (share tiny-remaper instance between projects)
 fabric.loom.multiProjectOptimisation=true
 # Mod Properties
-baseVersion = 0.6.19
+baseVersion = 0.6.20
 defaultBranch = 1.20
 branch = 1.20

src/main/java/folk/sisby/surveyor/mixin/client/MixinClientPlayNetworkHandler.java

@@ -1,14 +1,21 @@
 package folk.sisby.surveyor.mixin.client;
 
 import com.mojang.authlib.GameProfile;
+import folk.sisby.surveyor.Surveyor;
+import folk.sisby.surveyor.WorldSummary;
 import folk.sisby.surveyor.client.NetworkHandlerSummary;
+import folk.sisby.surveyor.client.SurveyorClient;
 import folk.sisby.surveyor.client.SurveyorNetworkHandler;
+import folk.sisby.surveyor.landmark.PlayerDeathLandmark;
+import folk.sisby.surveyor.util.TextUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.client.util.telemetry.WorldSession;
 import net.minecraft.network.ClientConnection;
+import net.minecraft.network.packet.s2c.play.DeathMessageS2CPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -32,4 +39,20 @@ private void onInit(MinecraftClient client, Screen screen, ClientConnection conn
         ClientPlayNetworkHandler self = (ClientPlayNetworkHandler) (Object) this;
         surveyor$summary = new NetworkHandlerSummary(self);
     }
+
+    @Inject(method = "onDeathMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;showsDeathScreen()Z"))
+    private void onDeathScreen(DeathMessageS2CPacket packet, CallbackInfo ci) {
+        if (!Surveyor.CONFIG.playerDeathLandmarks) return;
+        ClientPlayerEntity player = MinecraftClient.getInstance().player;
+        if (player == null || player.getWorld() == null) return;
+        WorldSummary summary = WorldSummary.of(player.getWorld());
+        if (summary.isClient()) {
+            if (summary.landmarks() == null) return;
+            summary.landmarks().put(
+                player.getWorld(),
+                new PlayerDeathLandmark(player.getBlockPos(), SurveyorClient.getClientUuid(), TextUtil.stripInteraction(packet.getMessage()), player.getWorld().getTimeOfDay(), player.getRandom().nextInt())
+            );
+        }
+    }
+
 }

src/main/resources/surveyor.mixins.json

@@ -13,8 +13,7 @@
   "client": [
     "client.MixinClientPlayNetworkHandler",
     "client.MixinClientWorld",
-    "client.MixinMinecraftClient",
-    "client.MixinPlayerEntity"
+    "client.MixinMinecraftClient"
   ],
   "injectors": {
     "defaultRequire": 1