From 5d8b5c8f915b1f435e156ef3131a1b72d44e2e89 Mon Sep 17 00:00:00 2001 From: Xander Date: Sat, 25 Nov 2017 13:10:53 +0800 Subject: [PATCH] attempt to counter a weird NPE by checking the key returned something useful and logging otherwise --- .../mekanism/client/render/MekanismRenderer.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index a5b820781..6f4da942a 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -18,6 +18,7 @@ import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.transmitter.RenderLogisticalTransporter; import mekanism.client.render.transmitter.RenderMechanicalPipe; +import mekanism.common.Mekanism; import mekanism.common.base.IMetaItem; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -84,7 +85,7 @@ public class MekanismRenderer public static TextureAtlasSprite missingIcon; - public static Map> textureMap = new HashMap<>(); + private static Map> textureMap = new HashMap<>(); @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) @@ -212,12 +213,23 @@ public class MekanismRenderer public static TextureAtlasSprite getFluidTexture(Fluid fluid, FluidType type) { - if(fluid == null || type == null) + if(fluid == null || type == null) { return missingIcon; } Map map = textureMap.get(type); + + if (map == null){ + String errorType; + if (textureMap.containsKey(type)){ + errorType = "a null got into"; + } else { + errorType = "key "+type.name()+" is missing from"; + } + Mekanism.logger.fatal("MekanismRenderer: Somehow "+errorType+" the texture map cache. This is not normal! Please reload your resources."); + return missingIcon; + } return map.getOrDefault(fluid, missingIcon); }