From 7b94796fa0451a923381fa3858eb87bdfdbf72dc Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Wed, 13 May 2020 22:38:39 +0200 Subject: FluidRenderer Fixes + Made GT_FluidDisplayItem.getIconFromDamage NEVER return null + Made GT_FluidDisplayStackRenderer reset its OpenGL calls before returning Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- .../java/gregtech/common/items/GT_FluidDisplayItem.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/common/items') diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index ace4306608..ba50f99d2e 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -18,9 +18,11 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; -public class GT_FluidDisplayItem - extends GT_Generic_Item { +@SuppressWarnings({"rawtypes","unchecked"}) +public class GT_FluidDisplayItem extends GT_Generic_Item { public GT_FluidDisplayItem() { super("GregTech_FluidDisplay", "Fluid Display", null); ItemList.Display_Fluid.set(this); @@ -49,8 +51,12 @@ public class GT_FluidDisplayItem } public IIcon getIconFromDamage(int aMeta) { - Fluid tFluid = FluidRegistry.getFluid(aMeta); - return tFluid == null ? FluidRegistry.WATER.getStillIcon() : tFluid.getStillIcon(); + return Stream.of(FluidRegistry.getFluid(aMeta), FluidRegistry.WATER) + .filter(Objects::nonNull) + .map(Fluid::getStillIcon) + .filter(Objects::nonNull) + .findFirst() + .orElseThrow(IllegalStateException::new); } @SideOnly(Side.CLIENT) -- cgit