Update to 1.21.11 (#1106)

Co-authored-by: Jonas Herzig <me@johni0702.de>

src/main/java/com/replaymod/render/blend/Util.java

@@ -139,7 +139,10 @@ public class Util {
     //#if MC>=10800
     public static Vector3f getCameraPos() {
         MinecraftClient mc = MinecraftClient.getInstance();
-        //#if MC>=11400
+        //#if MC>=12111
+        //$$ Vec3d pos = mc.getEntityRenderDispatcher().camera.getCameraPos();
+        //$$ return new Vector3f((float) pos.x, (float) pos.y, (float) pos.z);
+        //#elseif MC>=11400
         Vec3d pos = mc.getEntityRenderDispatcher().camera.getPos();
         return new Vector3f((float) pos.x, (float) pos.y, (float) pos.z);
         //#else

src/main/java/com/replaymod/render/gui/progress/VirtualWindow.java

@@ -134,7 +134,11 @@ public class VirtualWindow implements Closeable {
 
         applyScaleFactor();
         if (mc.currentScreen != null) {
+            //#if MC>=12111
+            //$$ mc.currentScreen.resize(window.getScaledWidth(), window.getScaledHeight());
+            //#else
             mc.currentScreen.resize(mc, window.getScaledWidth(), window.getScaledHeight());
+            //#endif
         }
     }
 

src/main/java/com/replaymod/render/hooks/EntityRendererHandler.java

@@ -14,6 +14,11 @@ import de.johni0702.minecraft.gui.utils.EventRegistrations;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 
+//#if MC>=12111
+//$$ import net.minecraft.client.render.CameraOverride;
+//$$ import org.joml.Vector3f;
+//#endif
+
 //#if MC>=11400
 import com.replaymod.core.events.PostRenderCallback;
 import com.replaymod.core.events.PreRenderCallback;
@@ -98,7 +103,9 @@ public class EntityRendererHandler extends EventRegistrations implements WorldRe
                 mc.options.pauseOnLostFocus = false; // do not want the pause menu to open if the window is unfocused
                 if (omnidirectional) {
                     // makes no sense, we wouldn't even know where to put it
-                    //#if MC>=12106
+                    //#if MC>=12111
+                    //$$ mc.gameRenderer.setCameraOverride(new CameraOverride(new Vector3f(mc.gameRenderer.getCamera().getHorizontalPlane())));
+                    //#elseif MC>=12106
                     //$$ mc.gameRenderer.setRenderingPanorama(false);
                     //#else
                     gameRenderer.setRenderHand(false);
@@ -120,7 +127,9 @@ public class EntityRendererHandler extends EventRegistrations implements WorldRe
             } finally {
                 mc.currentScreen = orgScreen;
                 mc.options.pauseOnLostFocus = orgPauseOnLostFocus;
-                //#if MC>=12106
+                //#if MC>=12111
+                //$$ mc.gameRenderer.setCameraOverride(null);
+                //#elseif MC>=12106
                 //$$ mc.gameRenderer.setRenderingPanorama(orgRenderHand);
                 //#else
                 gameRenderer.setRenderHand(orgRenderHand);

src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java

@@ -18,8 +18,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  */
 @Mixin(WorldRenderer.class)
 public abstract class Mixin_ChromaKeyColorSky {
-    @Shadow @Final private MinecraftClient client;
-
     //#if MC>=11800
     //$$ @Inject(
             //#if MC>=12102
@@ -44,14 +42,17 @@ public abstract class Mixin_ChromaKeyColorSky {
     //#else
     //$$ @Inject(method = "renderSky(FI)V", at = @At("HEAD"), cancellable = true)
     //#endif
+    //#if MC>=12111
+    //$$ static
+    //#endif
     private void chromaKeyingSky(CallbackInfo ci) {
-        EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) this.client.gameRenderer).replayModRender_getHandler();
+        EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) MinecraftClient.getInstance().gameRenderer).replayModRender_getHandler();
         if (handler != null) {
             ReadableColor color = handler.getSettings().getChromaKeyingColor();
             if (color != null) {
                 //#if MC>=12105
                 //$$ RenderSystem.getDevice().createCommandEncoder().clearColorTexture(
-                //$$         this.client.getFramebuffer().getColorAttachment(),
+                //$$         MinecraftClient.getInstance().getFramebuffer().getColorAttachment(),
                 //$$         (0xff << 24) | (color.getRed() << 16) | (color.getGreen() << 8) | color.getBlue()
                 //$$ );
                 //#else

src/main/java/com/replaymod/render/mixin/Mixin_StabilizeCamera.java

@@ -5,6 +5,7 @@ import com.replaymod.render.hooks.EntityRendererHandler;
 import com.replaymod.replay.camera.CameraEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -46,7 +47,11 @@ public abstract class Mixin_StabilizeCamera {
     //#endif
     private void replayModRender_beforeSetupCameraTransform(
             //#if MC>=11400
+            //#if MC>=12111
+            //$$ World blockView,
+            //#else
             BlockView blockView,
+            //#endif
             Entity entity,
             boolean thirdPerson,
             boolean inverseView,
@@ -106,7 +111,11 @@ public abstract class Mixin_StabilizeCamera {
     //#endif
     private void replayModRender_afterSetupCameraTransform(
             //#if MC>=11400
+            //#if MC>=12111
+            //$$ World blockView,
+            //#else
             BlockView blockView,
+            //#endif
             Entity entity,
             boolean thirdPerson,
             boolean inverseView,

src/main/java/com/replaymod/render/rendering/VideoRenderer.java

@@ -394,7 +394,11 @@ public class VideoRenderer implements RenderInfo {
             cameraPathExporter.setup(totalFrames);
         }
 
+        //#if MC>=12111
+        //$$ gui.toMinecraft().init(mc.getWindow().getScaledWidth(), mc.getWindow().getScaledHeight());
+        //#else
         gui.toMinecraft().init(mc, mc.getWindow().getScaledWidth(), mc.getWindow().getScaledHeight());
+        //#endif
 
         forceChunkLoadingHook = new ForceChunkLoadingHook(mc.worldRenderer);
     }
@@ -599,7 +603,11 @@ public class VideoRenderer implements RenderInfo {
             //#endif
             //#endif
 
+            //#if MC>=12111
+            //$$ gui.toMinecraft().init(window.getScaledWidth(), window.getScaledHeight());
+            //#else
             gui.toMinecraft().init(mc, window.getScaledWidth(), window.getScaledHeight());
+            //#endif
 
             // Events are polled on 1.13+ in mainWindow.update which is called later
             //#if MC<11400
@@ -624,7 +632,11 @@ public class VideoRenderer implements RenderInfo {
             //$$ GameRendererAccessor gameRenderer = (GameRendererAccessor) mc.gameRenderer;
             //$$ GuiRenderState guiRenderState = gameRenderer.getGuiState();
             //$$ guiRenderState.clear();
+            //#if MC>=12111
+            //$$ DrawContext drawContext = new DrawContext(mc, guiRenderState, mouseX, mouseY);
+            //#else
             //$$ DrawContext drawContext = new DrawContext(mc, guiRenderState);
+            //#endif
             //#elseif MC>=12000
             //$$ DrawContext drawContext = new DrawContext(mc, mc.getBufferBuilders().getEntityVertexConsumers());
             //#endif