From ebcfd3963d2792d62e883bd6d3a771f19cb39483 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Sat, 12 Sep 2020 14:16:59 +0100
Subject: [PATCH] Remove all references to Minecraft.getMinecraft().player from
 RenderPlayerEvent receivers because some mods render players in the main
 menu, fixes #497 (Actually, it probably doesn't matter because all the
 references were moved inside the situational checks, but it's better to use
 the event parameters anyway)

---
 .../wizardry/client/renderer/effect/RenderShadowWard.java    | 5 +----
 .../wizardry/client/renderer/effect/RenderShield.java        | 5 +----
 .../wizardry/client/renderer/effect/RenderWings.java         | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShadowWard.java b/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShadowWard.java
index 6512394a..6c42d726 100644
--- a/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShadowWard.java
+++ b/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShadowWard.java
@@ -11,7 +11,6 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -103,9 +102,7 @@ public class RenderShadowWard {
 			GlStateManager.disableLighting();
 			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
 
-			Vec3d delta = player.getPositionEyes(event.getPartialRenderTick())
-					.subtract(Minecraft.getMinecraft().player.getPositionEyes(event.getPartialRenderTick()));
-			GlStateManager.translate(delta.x, delta.y, delta.z);
+			GlStateManager.translate(event.getX(), event.getY(), event.getZ());
 
 			GlStateManager.rotate(180, 0, 1, 0);
 			GlStateManager.rotate(-player.renderYawOffset, 0, 1, 0);
diff --git a/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShield.java b/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShield.java
index 99e32caf..cfd6eacf 100644
--- a/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShield.java
+++ b/src/main/java/electroblob/wizardry/client/renderer/effect/RenderShield.java
@@ -13,7 +13,6 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -89,9 +88,7 @@ public class RenderShield {
 			GlStateManager.disableLighting();
 			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
 
-			Vec3d delta = player.getPositionEyes(event.getPartialRenderTick())
-					.subtract(Minecraft.getMinecraft().player.getPositionEyes(event.getPartialRenderTick()));
-			GlStateManager.translate(delta.x, delta.y, delta.z);
+			GlStateManager.translate(event.getX(), event.getY(), event.getZ());
 
 			GlStateManager.translate(0, 1.3, 0);
 
diff --git a/src/main/java/electroblob/wizardry/client/renderer/effect/RenderWings.java b/src/main/java/electroblob/wizardry/client/renderer/effect/RenderWings.java
index 15493577..735d6e43 100644
--- a/src/main/java/electroblob/wizardry/client/renderer/effect/RenderWings.java
+++ b/src/main/java/electroblob/wizardry/client/renderer/effect/RenderWings.java
@@ -12,7 +12,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -41,9 +40,7 @@ public class RenderWings {
 			GlStateManager.disableLighting();
 			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
 
-			Vec3d delta = player.getPositionEyes(event.getPartialRenderTick())
-					.subtract(Minecraft.getMinecraft().player.getPositionEyes(event.getPartialRenderTick()));
-			GlStateManager.translate(delta.x, delta.y, delta.z);
+			GlStateManager.translate(event.getX(), event.getY(), event.getZ());
 
 			// GlStateManager.rotate(-entityplayer.rotationYawHead, 0, 1, 0);
 			GlStateManager.rotate(-player.renderYawOffset, 0, 1, 0);