From 01d47279fdea15a706cbbd3753847026cde491bf Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Tue, 23 Feb 2021 00:59:56 +0100
Subject: [PATCH] Split off 1.12.2 overwrite from MixinCamera

---
 .../replaymod/replay/mixin/MixinCamera.java   | 41 ++++---------------
 .../replaymod/replay/mixin/MixinCamera.java   | 30 ++++++++++++++
 2 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 versions/1.14.4/src/main/java/com/replaymod/replay/mixin/MixinCamera.java

diff --git a/src/main/java/com/replaymod/replay/mixin/MixinCamera.java b/src/main/java/com/replaymod/replay/mixin/MixinCamera.java
index 75c5f79c..7c1166d6 100644
--- a/src/main/java/com/replaymod/replay/mixin/MixinCamera.java
+++ b/src/main/java/com/replaymod/replay/mixin/MixinCamera.java
@@ -1,31 +1,20 @@
-//#if MC>=11400
 package com.replaymod.replay.mixin;
 
 import com.replaymod.replay.camera.CameraEntity;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Final;
 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;
 
-//#if MC>=11500
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.client.util.math.Vector3f;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Shadow;
-//#else
-//$$ import com.mojang.blaze3d.platform.GlStateManager;
-//$$ import net.minecraft.world.BlockView;
-//#endif
-
-//#if MC>=11500
-@Mixin(net.minecraft.client.render.GameRenderer.class)
-//#else
-//$$ @Mixin(net.minecraft.client.render.Camera.class)
-//#endif
+@Mixin(GameRenderer.class)
 public class MixinCamera {
-    //#if MC>=11500
     @Shadow @Final private MinecraftClient client;
     @Inject(
             method = "renderWorld",
@@ -40,20 +29,4 @@ public class MixinCamera {
             matrixStack.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(((CameraEntity) entity).roll));
         }
     }
-    //#else
-    //$$ @Inject(
-    //$$         method = "update",
-    //$$         at = @At(
-    //$$                 value = "INVOKE",
-    //$$                 target = "Lcom/mojang/blaze3d/platform/GlStateManager;rotatef(FFFF)V",
-    //$$                 ordinal = 0
-    //$$         )
-    //$$ )
-    //$$ private void applyRoll(BlockView blockView, Entity view, boolean boolean_1, boolean boolean_2, float float_1, CallbackInfo ci) {
-    //$$     if (view instanceof CameraEntity) {
-    //$$         GlStateManager.rotatef(((CameraEntity) view).roll, 0.0F, 0.0F, 1.0F);
-    //$$     }
-    //$$ }
-    //#endif
 }
-//#endif
diff --git a/versions/1.14.4/src/main/java/com/replaymod/replay/mixin/MixinCamera.java b/versions/1.14.4/src/main/java/com/replaymod/replay/mixin/MixinCamera.java
new file mode 100644
index 00000000..a0c0d58a
--- /dev/null
+++ b/versions/1.14.4/src/main/java/com/replaymod/replay/mixin/MixinCamera.java
@@ -0,0 +1,30 @@
+//#if MC>=11400
+package com.replaymod.replay.mixin;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.replaymod.replay.camera.CameraEntity;
+import net.minecraft.client.render.Camera;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.BlockView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Camera.class)
+public class MixinCamera {
+    @Inject(
+            method = "update",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lcom/mojang/blaze3d/platform/GlStateManager;rotatef(FFFF)V",
+                    ordinal = 0
+            )
+    )
+    private void applyRoll(BlockView blockView, Entity view, boolean boolean_1, boolean boolean_2, float float_1, CallbackInfo ci) {
+        if (view instanceof CameraEntity) {
+            GlStateManager.rotatef(((CameraEntity) view).roll, 0.0F, 0.0F, 1.0F);
+        }
+    }
+}
+//#endif