From 2a077adb6fcb09fedffe2889b4de7e589fe0f79e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jan 2016 21:21:26 -0600 Subject: [PATCH] Safeguard in the smartmodels. Closes #66 --- .../java/vazkii/botania/client/model/FloatingFlowerModel.java | 2 ++ .../java/vazkii/botania/client/model/SpecialFlowerModel.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 8c9b1e533..5d37fb211 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -79,6 +79,8 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I @Override public IBakedModel handleBlockState(IBlockState state) { + if (state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); IExtendedBlockState realState = ((IExtendedBlockState) state); IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); String identifier; diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index f52cc9e49..5d99a76e8 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -43,6 +43,7 @@ import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.item.IFloatingFlower; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.vecmath.Matrix4f; @@ -284,6 +285,8 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel handleBlockState(IBlockState state) { + if (state.getBlock() != ModBlocks.specialFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID));