Fix rotation issue when in 3rd person

Set the camera direction and position ourselves instead of relying on
Minecraft to do it as it also moves the camera when in 3rd person

Fixes #1

Author: pascallj

src/main/java/nl/pascalroeleven/minecraft/mineshotrevived/client/OrthoViewHandler.java

@@ -23,14 +23,16 @@
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.event.TickEvent.ClientTickEvent;
 import net.minecraftforge.event.TickEvent.Phase;
+import net.minecraftforge.event.TickEvent.RenderTickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
 import nl.pascalroeleven.minecraft.mineshotrevived.client.util.ChatUtils;
+import nl.pascalroeleven.minecraft.mineshotrevived.util.reflection.PrivateAccessor;
 
 @EventBusSubscriber(bus = EventBusSubscriber.Bus.FORGE)
-public class OrthoViewHandler {
+public class OrthoViewHandler implements PrivateAccessor {
 	private static final Minecraft MC = Minecraft.getInstance();
 	private static final String KEY_CATEGORY = "key.categories.mineshotrevived";
 	private static final float ZOOM_STEP = 0.5f;
@@ -75,6 +77,8 @@ public class OrthoViewHandler {
 	private int tickPrevious;
 	private double partialPrevious;
 
+	private int thirdPersonView;
+
 	public OrthoViewHandler() {
 		ClientRegistry.registerKeyBinding(keyToggle);
 		ClientRegistry.registerKeyBinding(keyZoomIn);
@@ -216,13 +220,46 @@ public void onClientTickEvent(final ClientTickEvent event) {
 		tick++;
 	}
 
+	@SubscribeEvent
+	public void onRenderTickStart(RenderTickEvent evt) {
+		if (!enabled || evt.phase != Phase.START) {
+			return;
+		}
+
+		if (!freeCam) {
+			// Turn off thirdPersonView off temporary
+			thirdPersonView = MC.gameSettings.thirdPersonView;
+			MC.gameSettings.thirdPersonView = 0;
+		}
+
+	}
+
 	@SubscribeEvent
 	public void cameraSetup(CameraSetup event) {
 		if (!enabled) {
 			return;
 		}
 
 		if (!freeCam) {
+			// Execute the last part of ActiveRenderInfo->update (but don't care about the
+			// renderViewEntity.isSleeping part) because we have overridden it by turning
+			// thirdPersonView off temporarily.
+			// However this time with our camera angles instead of the entity's.
+			// We also don't need to distinguish between thirdPerson and thirdPersonReverse
+			// cameras
+			setDirection(MC, yRot + 180.0F, xRot);
+
+			if (thirdPersonView > 0) {
+				movePosition(MC, -calcCameraDistance(MC, 4.0D), 0.0D, 0.0D);
+
+				// Make sure the player is rendered for this frame (side effect of temporarily
+				// disabling thirdPersonView)
+				setThirdPerson(MC, true);
+			}
+
+			// Set thirdPersonView back to what it was
+			MC.gameSettings.thirdPersonView = thirdPersonView;
+
 			event.setPitch(xRot);
 			event.setYaw(yRot + 180);
 		}

src/main/java/nl/pascalroeleven/minecraft/mineshotrevived/util/reflection/PrivateAccessor.java

@@ -1,19 +1,28 @@
 package nl.pascalroeleven.minecraft.mineshotrevived.util.reflection;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import net.minecraft.client.MainWindow;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 
 public interface PrivateAccessor {
 	static final Logger L = LogManager.getLogger();
 
 	final Method framebufferSizeUpdate = ObfuscationReflectionHelper.findMethod(MainWindow.class, "func_198102_b",
 			long.class, int.class, int.class);
+	final Method setDirection = ObfuscationReflectionHelper.findMethod(ActiveRenderInfo.class, "func_216776_a",
+			float.class, float.class);
+	final Method movePosition = ObfuscationReflectionHelper.findMethod(ActiveRenderInfo.class, "func_216782_a",
+			double.class, double.class, double.class);
+	final Method calcCameraDistance = ObfuscationReflectionHelper.findMethod(ActiveRenderInfo.class, "func_216779_a",
+			double.class);
+	static final Field thirdPerson = ObfuscationReflectionHelper.findField(ActiveRenderInfo.class, "field_216799_k");
 
 	default void framebufferSizeUpdate(Minecraft mc, int framebufferWidth, int framebufferHeight) {
 		try {
@@ -23,4 +32,38 @@ default void framebufferSizeUpdate(Minecraft mc, int framebufferWidth, int frame
 			L.error("onFramebufferSizeUpdate() failed", ex);
 		}
 	}
+
+	default void setDirection(Minecraft mc, float pitchIn, float yawIn) {
+		try {
+			setDirection.invoke(mc.gameRenderer.getActiveRenderInfo(), pitchIn, yawIn);
+		} catch (Exception ex) {
+			L.error("setDirection() failed", ex);
+		}
+	}
+
+	default void movePosition(Minecraft mc, double distanceOffset, double verticalOffset, double horizontalOffset) {
+		try {
+			movePosition.invoke(mc.gameRenderer.getActiveRenderInfo(), distanceOffset, verticalOffset,
+					horizontalOffset);
+		} catch (Exception ex) {
+			L.error("movePosition() failed", ex);
+		}
+	}
+
+	default double calcCameraDistance(Minecraft mc, double startingDistance) {
+		try {
+			return (double) calcCameraDistance.invoke(mc.gameRenderer.getActiveRenderInfo(), startingDistance);
+		} catch (Exception ex) {
+			L.error("calcCameraDistance() failed", ex);
+		}
+		return -1;
+	}
+
+	default void setThirdPerson(Minecraft mc, boolean thirdPersonIn) {
+		try {
+			thirdPerson.set(mc.gameRenderer.getActiveRenderInfo(), thirdPersonIn);
+		} catch (Exception ex) {
+			L.error("setLook() failed", ex);
+		}
+	}
 }