Move replay camera entity creation into dedicated mixin

2025-06-13 14:02:40 +02:00
parent 8246085b84
commit d7b563768f
3 changed files with 109 additions and 83 deletions
--- a/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java
+++ b/src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java
@@ -1,39 +1,16 @@
 package com.replaymod.replay.mixin;

-import com.replaymod.replay.ReplayModReplay;
 import com.replaymod.replay.camera.CameraEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
 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.CallbackInfoReturnable;

-//#if MC>=11400
-import net.minecraft.client.world.ClientWorld;
-//#else
-//$$ import net.minecraft.world.World;
-//#endif
-
-//#if MC>=11200
-//#if MC>=11400
-import net.minecraft.client.recipebook.ClientRecipeBook;
-//#else
-//$$ import net.minecraft.stats.RecipeBook;
-//#endif
-//#endif
-//#if MC>=10904
-import net.minecraft.stat.StatHandler;
-//#else
-//$$ import net.minecraft.stats.StatFileWriter;
-//#endif
-
 //#if MC>=10800
-import net.minecraft.client.network.ClientPlayerEntity;
 //#else
-//$$ import net.minecraft.client.entity.EntityClientPlayerMP;
 //$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 //#endif

@@ -43,66 +20,6 @@ public abstract class MixinPlayerControllerMP {
    @Shadow
    private MinecraftClient client;

-    @Shadow
-    //#if MC>=10904
-    private ClientPlayNetworkHandler networkHandler;
-    //#else
-    //$$ private NetHandlerPlayClient netClientHandler;
-    //#endif
-
-    //#if MC>=11400
-    //#if MC>=11602
-    @Inject(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;", at=@At("HEAD"), cancellable = true)
-    //#else
-    //$$ @Inject(method = "createPlayer", at=@At("HEAD"), cancellable = true)
-    //#endif
-    private void replayModReplay_createReplayCamera(
-            //#if MC>=11400
-            ClientWorld worldIn,
-            //#else
-            //$$ World worldIn,
-            //#endif
-            StatHandler statisticsManager,
-            ClientRecipeBook recipeBookClient,
-            //#if MC>=11600
-            boolean lastIsHoldingSneakKey,
-            boolean lastSprinting,
-            //#endif
-            CallbackInfoReturnable<ClientPlayerEntity> ci
-    ) {
-        if (ReplayModReplay.instance.getReplayHandler() != null) {
-            ci.setReturnValue(new CameraEntity(this.client, worldIn, this.networkHandler, statisticsManager, recipeBookClient));
-    //#else
-    //#if MC>=11200
-    //$$ @Inject(method = "func_192830_a", at=@At("HEAD"), cancellable = true)
-    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatisticsManager statisticsManager, RecipeBook recipeBook, CallbackInfoReturnable<EntityPlayerSP> ci) {
-    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
-    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.connection, statisticsManager, recipeBook));
-    //#else
-    //#if MC>=10904
-    //$$ @Inject(method = "createClientPlayer", at=@At("HEAD"), cancellable = true)
-    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatisticsManager statisticsManager, CallbackInfoReturnable<EntityPlayerSP> ci) {
-    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
-    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.connection, statisticsManager));
-    //#else
-    //#if MC>=10800
-    //$$ @Inject(method = "func_178892_a", at=@At("HEAD"), cancellable = true)
-    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatFileWriter statFileWriter, CallbackInfoReturnable<EntityPlayerSP> ci) {
-    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
-    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.netClientHandler, statFileWriter));
-    //#else
-    //$$ @Inject(method = "createPlayer", at=@At("HEAD"), cancellable = true)
-    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatFileWriter statFileWriter, CallbackInfoReturnable<EntityClientPlayerMP> ci) {
-    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
-    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.mc.getSession(), this.netClientHandler, statFileWriter));
-    //#endif
-    //#endif
-    //#endif
-    //#endif
-            ci.cancel();
-        }
-    }
-
    //#if MC>=10800
    //#if MC>=11400
    @Inject(method = "isFlyingLocked", at=@At("HEAD"), cancellable = true)
@@ -117,6 +34,9 @@ public abstract class MixinPlayerControllerMP {
    //#endif

    //#if MC<=10710
+    //$$ @Shadow
+    //$$ private NetHandlerPlayClient netClientHandler;
+    //$$
    //$$ // Prevent the disconnect GUI from being opened during the short time when the replay is restarted
    //$$ // at which the old network manager is closed but still getting ticked (hence the disconnect GUI opening).
    //$$ @Inject(method = "updateController", at = @At("HEAD"), cancellable = true)
--- a/src/main/java/com/replaymod/replay/mixin/Mixin_CreateReplayCamera.java
+++ b/src/main/java/com/replaymod/replay/mixin/Mixin_CreateReplayCamera.java
@@ -0,0 +1,105 @@
+package com.replaymod.replay.mixin;
+
+import com.replaymod.replay.ReplayModReplay;
+import com.replaymod.replay.camera.CameraEntity;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+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.CallbackInfoReturnable;
+
+//#if MC>=11400
+import net.minecraft.client.world.ClientWorld;
+//#else
+//$$ import net.minecraft.world.World;
+//#endif
+
+//#if MC>=11200
+//#if MC>=11400
+import net.minecraft.client.recipebook.ClientRecipeBook;
+//#else
+//$$ import net.minecraft.stats.RecipeBook;
+//#endif
+//#endif
+//#if MC>=10904
+import net.minecraft.stat.StatHandler;
+//#else
+//$$ import net.minecraft.stats.StatFileWriter;
+//#endif
+
+//#if MC>=10800
+import net.minecraft.client.network.ClientPlayerEntity;
+//#else
+//$$ import net.minecraft.client.entity.EntityClientPlayerMP;
+//#endif
+
+
+@Mixin(ClientPlayerInteractionManager.class)
+public abstract class Mixin_CreateReplayCamera {
+
+    @Shadow
+    private MinecraftClient client;
+
+    @Shadow
+    //#if MC>=10904
+    private ClientPlayNetworkHandler networkHandler;
+    //#else
+    //$$ private NetHandlerPlayClient netClientHandler;
+    //#endif
+
+    //#if MC>=11400
+    //#if MC>=11602
+    @Inject(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;", at=@At("HEAD"), cancellable = true)
+    //#else
+    //$$ @Inject(method = "createPlayer", at=@At("HEAD"), cancellable = true)
+    //#endif
+    private void replayModReplay_createReplayCamera(
+            //#if MC>=11400
+            ClientWorld worldIn,
+            //#else
+            //$$ World worldIn,
+            //#endif
+            StatHandler statisticsManager,
+            ClientRecipeBook recipeBookClient,
+            //#if MC>=11600
+            boolean lastIsHoldingSneakKey,
+            boolean lastSprinting,
+            //#endif
+            CallbackInfoReturnable<ClientPlayerEntity> ci
+    ) {
+        if (ReplayModReplay.instance.getReplayHandler() != null) {
+            ci.setReturnValue(new CameraEntity(this.client, worldIn, this.networkHandler, statisticsManager, recipeBookClient));
+    //#else
+    //#if MC>=11200
+    //$$ @Inject(method = "func_192830_a", at=@At("HEAD"), cancellable = true)
+    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatisticsManager statisticsManager, RecipeBook recipeBook, CallbackInfoReturnable<EntityPlayerSP> ci) {
+    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
+    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.connection, statisticsManager, recipeBook));
+    //#else
+    //#if MC>=10904
+    //$$ @Inject(method = "createClientPlayer", at=@At("HEAD"), cancellable = true)
+    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatisticsManager statisticsManager, CallbackInfoReturnable<EntityPlayerSP> ci) {
+    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
+    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.connection, statisticsManager));
+    //#else
+    //#if MC>=10800
+    //$$ @Inject(method = "func_178892_a", at=@At("HEAD"), cancellable = true)
+    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatFileWriter statFileWriter, CallbackInfoReturnable<EntityPlayerSP> ci) {
+    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
+    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.netClientHandler, statFileWriter));
+    //#else
+    //$$ @Inject(method = "createPlayer", at=@At("HEAD"), cancellable = true)
+    //$$ private void replayModReplay_createReplayCamera(World worldIn, StatFileWriter statFileWriter, CallbackInfoReturnable<EntityClientPlayerMP> ci) {
+    //$$     if (ReplayModReplay.instance.getReplayHandler() != null) {
+    //$$         ci.setReturnValue(new CameraEntity(this.mc, worldIn, this.mc.getSession(), this.netClientHandler, statFileWriter));
+    //#endif
+    //#endif
+    //#endif
+    //#endif
+            ci.cancel();
+        }
+    }
+}
--- a/src/main/resources/mixins.replay.replaymod.json
+++ b/src/main/resources/mixins.replay.replaymod.json
@@ -55,6 +55,7 @@
    //#endif
    "MixinKeyboardListener",
    "MixinPlayerControllerMP",
+    "Mixin_CreateReplayCamera",
    "MixinRenderItem",
    "MixinRenderLivingBase",
    "MixinTileEntityEndPortalRenderer",