From 0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Wed, 10 Aug 2022 13:07:08 +0800 Subject: do not return IAlignment if MTE is not IAlignmentProvider (#1234) --- src/main/java/gregtech/common/render/GT_RenderedTexture.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/common/render') diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GT_RenderedTexture.java index 8cead2889b..94b0e72419 100644 --- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java +++ b/src/main/java/gregtech/common/render/GT_RenderedTexture.java @@ -1,5 +1,6 @@ package gregtech.common.render; +import com.gtnewhorizon.structurelib.alignment.IAlignment; import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider; import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing; import com.gtnewhorizon.structurelib.alignment.enumerable.Flip; @@ -365,16 +366,18 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final World w = player.getEntityWorld(); if (w == null) return ExtendedFacing.DEFAULT; final TileEntity te = w.getTileEntity(x, y, z); + IAlignment alignment = null; if (te instanceof IGregTechTileEntity) { final IMetaTileEntity meta = ((IGregTechTileEntity) te).getMetaTileEntity(); if (meta instanceof IAlignmentProvider) { - return ((IAlignmentProvider) meta).getAlignment().getExtendedFacing(); + alignment = ((IAlignmentProvider) meta).getAlignment(); } else if (meta != null) { return ExtendedFacing.of(ForgeDirection.getOrientation(meta.getBaseMetaTileEntity().getFrontFacing())); } } else if (te instanceof IAlignmentProvider) { - return ((IAlignmentProvider) te).getAlignment().getExtendedFacing(); + alignment = ((IAlignmentProvider) te).getAlignment(); } + if (alignment != null) return alignment.getExtendedFacing(); return ExtendedFacing.DEFAULT; } -} \ No newline at end of file +} -- cgit