From 2746419151a0c5bc0ca8e7b214720377649ecdd3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 May 2020 10:57:22 -0500 Subject: [PATCH] Fix the crash in #3251, but not the underlying bug, which is more involved --- .../client/render/tile/RenderTileGaiaHead.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index 66adfa4cf..f6be5dba5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -40,6 +40,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.helper.ShaderWrappedRenderLayer; import vazkii.botania.client.render.entity.RenderDoppleganger; +import vazkii.botania.common.block.BlockGaiaHead; import javax.annotation.Nullable; @@ -48,6 +49,13 @@ import java.util.Map; public class RenderTileGaiaHead extends SkullTileEntityRenderer { private static final Map MODELS = ObfuscationReflectionHelper.getPrivateValue(SkullTileEntityRenderer.class, null, "field_199358_e"); private static final Map SKINS = ObfuscationReflectionHelper.getPrivateValue(SkullTileEntityRenderer.class, null, "field_199357_d"); + static { + // rendering heads on entities still goes through the original codepath in the superclass, so we need these in the original maps + // here we just use the default steve skin for now + // unfortunately, doing it "right" (showing the appropriate skin for the viewer + shader) requires coremodding to redirect those codepaths. TODO do that? + MODELS.put(BlockGaiaHead.GAIA_TYPE, MODELS.get(SkullBlock.Types.PLAYER)); + SKINS.put(BlockGaiaHead.GAIA_TYPE, SKINS.get(SkullBlock.Types.PLAYER)); + } public RenderTileGaiaHead(TileEntityRendererDispatcher manager) { super(manager); @@ -100,17 +108,17 @@ public class RenderTileGaiaHead extends SkullTileEntityRenderer { } else { switch (facing) { case NORTH: - ms.translate(0.5D, 0.25D, (double) 0.74F); + ms.translate(0.5D, 0.25D, 0.74D); break; case SOUTH: - ms.translate(0.5D, 0.25D, (double) 0.26F); + ms.translate(0.5D, 0.25D, 0.26D); break; case WEST: - ms.translate((double) 0.74F, 0.25D, 0.5D); + ms.translate(0.74D, 0.25D, 0.5D); break; case EAST: default: - ms.translate((double) 0.26F, 0.25D, 0.5D); + ms.translate(0.26D, 0.25D, 0.5D); } }