From 8423607b29f9a6a980eb64bd2b897b1377c1df8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 18:30:31 -0500 Subject: [PATCH] Reinstate null subtile check. Closes #428 --- .../vazkii/botania/client/model/SpecialFlowerModel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 325d0bfa2..f382459c1 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,15 +192,16 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public Optional 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)); if(loc == null) return Optional.empty(); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); if(model == ModelLoaderRegistry.getMissingModel()) return Optional.empty(); + return Optional.of(model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter())); } } @@ -210,11 +211,12 @@ 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); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - Optional specialModel = bakedBlockModels.getUnchecked(subtileId); + Optional specialModel = bakedBlockModels.getUnchecked(subtileId == null ? "" : subtileId); if(specialModel.isPresent()) ret = specialModel.get();