From 1bb254a4fc83ffee1cfa2a039219c0e6a05845e7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jun 2016 19:04:19 -0500 Subject: [PATCH] Workaround subtiles crashing when dug --- .../botania/client/model/SpecialFlowerModel.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index b72874de3..e56aa0266 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,6 +192,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel load(@Nonnull String key) { + if (key == null) Botania.LOGGER.error("Null passed to special model cacheloader?!"); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); @@ -208,10 +209,17 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); - IBakedModel ret = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if(ret == null) - ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); + + IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + if(subtileId != null) { // Todo remove - workaround for subtile ID being null? + IBakedModel specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if(specialModel != null) + ret = specialModel; + } + return ret.getQuads(state, face, rand); }