Fix compatibility with future freecam

pynttari · Apr 2, 2020 · ab9b007 · ab9b007
1 parent 933b06e
commit ab9b007
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/main/java/com/matt/forgehax/Helper.java b/src/main/java/com/matt/forgehax/Helper.java
@@ -6,9 +6,6 @@
 import com.matt.forgehax.util.FileManager;
 import com.matt.forgehax.util.command.CommandGlobal;
 import com.matt.forgehax.util.mod.loader.ModManager;
-import java.util.Optional;
-import java.util.Scanner;
-import javax.annotation.Nullable;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.multiplayer.PlayerControllerMP;
@@ -24,6 +21,10 @@
 import net.minecraftforge.fml.client.FMLClientHandler;
 import org.apache.logging.log4j.Logger;
 
+import javax.annotation.Nullable;
+import java.util.Optional;
+import java.util.Scanner;
+
 /**
  * Created on 4/25/2017 by fr1kin
  */
@@ -48,7 +49,11 @@ public static FileManager getFileManager() {
   public static Logger getLog() {
     return LOGGER;
   }
-
+
+  public static Entity getRenderEntity() {
+    return MC.getRenderViewEntity();
+  }
+
   public static EntityPlayerSP getLocalPlayer() {
     return MC.player;
   }

diff --git a/src/main/java/com/matt/forgehax/mods/CompassMod.java b/src/main/java/com/matt/forgehax/mods/CompassMod.java
@@ -62,7 +62,7 @@ private double getX(double rad) {
 
   private double getY(double rad) {
     final double epicPitch = MathHelper
-        .clamp(Helper.getLocalPlayer().rotationPitch + 30f, -90f, 90f);
+        .clamp(Helper.getRenderEntity().rotationPitch + 30f, -90f, 90f);
     final double pitchRadians = Math.toRadians(epicPitch); // player pitch
     return Math.cos(rad) * Math.sin(pitchRadians) * (scale.getAsDouble() * 10);
   }
@@ -71,7 +71,7 @@ private double getY(double rad) {
   private static double getPosOnCompass(Direction dir) {
     double yaw =
         Math.toRadians(
-            MathHelper.wrapDegrees(Helper.getLocalPlayer().rotationYaw)); // player yaw
+            MathHelper.wrapDegrees(Helper.getRenderEntity().rotationYaw)); // player yaw
     int index = dir.ordinal();
     return yaw + (index * HALF_PI);
   }

diff --git a/src/main/java/com/matt/forgehax/mods/services/RenderEventService.java b/src/main/java/com/matt/forgehax/mods/services/RenderEventService.java
@@ -1,7 +1,5 @@
 package com.matt.forgehax.mods.services;
 
-import static com.matt.forgehax.Helper.getLocalPlayer;
-
 import com.matt.forgehax.events.Render2DEvent;
 import com.matt.forgehax.events.RenderEvent;
 import com.matt.forgehax.util.entity.EntityUtils;
@@ -17,6 +15,8 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.opengl.GL11;
 
+import static com.matt.forgehax.Helper.getRenderEntity;
+
 /**
  * Created on 6/14/2017 by fr1kin
  */
@@ -41,7 +41,7 @@ public void onRenderWorld(RenderWorldLastEvent event) {
 
     GlStateManager.glLineWidth(1.f);
 
-    Vec3d renderPos = EntityUtils.getInterpolatedPos(getLocalPlayer(), event.getPartialTicks());
+    Vec3d renderPos = EntityUtils.getInterpolatedPos(getRenderEntity(), event.getPartialTicks());
 
     RenderEvent e = new RenderEvent(TESSELLATOR, renderPos, event.getPartialTicks());
     e.resetTranslation();