From d3d94e46d73faaef79dc4f2ed03fe48c50f5aad7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Jun 2016 09:05:35 -0500 Subject: [PATCH] Special flower item models fall back to poppy. Close #375 --- .../handler/ContributorFancinessHandler.java | 5 +-- .../client/model/SpecialFlowerModel.java | 45 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index e8d066e1c..93d8d64ab 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -99,10 +99,7 @@ public final class ContributorFancinessHandler implements LayerRenderer, ModelResourceLocation> itemModels; private final IBakedModel baseModel; - private final LoadingCache bakedBlockModels; - private final LoadingCache bakedItemModels; + private final LoadingCache> bakedBlockModels; + private final LoadingCache> bakedItemModels; SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, ImmutableMap, ModelResourceLocation> itemModels, ImmutableMap cameraTransforms) { @@ -173,7 +173,7 @@ public class SpecialFlowerModel implements IModelCustomData { this.itemModels = itemModels; this.transforms = cameraTransforms; - ModelResourceLocation baseModelPath = blockModels.getOrDefault(Optional.absent(), + ModelResourceLocation baseModelPath = blockModels.getOrDefault(Optional.empty(), new ModelResourceLocation("builtin/missing", "missing")); this.baseModel = ModelLoaderRegistry.getModelOrMissing(baseModelPath) .bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); @@ -182,7 +182,7 @@ public class SpecialFlowerModel implements IModelCustomData { this.bakedItemModels = CacheBuilder.newBuilder().build(new Loader(false)); } - private class Loader extends CacheLoader { + private class Loader extends CacheLoader> { private final boolean loadBlocks; @@ -191,16 +191,17 @@ public class SpecialFlowerModel implements IModelCustomData { } @Override - public IBakedModel load(@Nonnull String key) { + 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) { - loc = new ModelResourceLocation("builtin/missing", "missing"); - } + if(loc == null) + return Optional.empty(); IModel model = ModelLoaderRegistry.getModelOrMissing(loc); - return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); + if(model == ModelLoaderRegistry.getMissingModel()) + return Optional.empty(); + return Optional.of(model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter())); } } @@ -215,9 +216,9 @@ public class SpecialFlowerModel implements IModelCustomData { 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; + Optional specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if(specialModel.isPresent()) + ret = specialModel.get(); } return ret.getQuads(state, face, rand); @@ -229,16 +230,20 @@ public class SpecialFlowerModel implements IModelCustomData { return itemHandler; } + private final ItemStack roseFallback = new ItemStack(Blocks.RED_FLOWER); + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase living) { - IBakedModel item = bakedItemModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); - if(item == null) { - item = bakedBlockModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); - } + Optional item = bakedItemModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); - return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; + if(!item.isPresent()) + item = bakedBlockModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); + + return item.isPresent() + ? item.get() + : Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(roseFallback); } };