From 9bc724d6fd78b78da9933dddefff2584e3fed808 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Mar 2016 12:45:48 -0500 Subject: [PATCH] Fix flower models --- .../client/model/SpecialFlowerModel.java | 29 +++++++++++-------- .../botania/blockstates/specialFlower.json | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 5a1b5f584..a7173fc71 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -34,6 +35,9 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.common.model.TRSRTransformation; @@ -168,15 +172,14 @@ public class SpecialFlowerModel implements IModelCustomData { } private void refreshBakedModels() { - //if(baseModel == null) { - // If not done already, steal all the real baked models and cache them - ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); - baseModel = getBlockModel(manager, Optional.absent()); + if(baseModel == null) { + // If not done already, bake and cache all models + baseModel = getBlockModel(Optional.absent()); ImmutableMap.Builder builder = ImmutableMap.builder(); for(Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { if(e.getKey().isPresent()) { - builder.put(e.getKey().get(), getBlockModel(manager, e.getKey())); + builder.put(e.getKey().get(), getBlockModel(e.getKey())); } } @@ -185,28 +188,30 @@ public class SpecialFlowerModel implements IModelCustomData { ImmutableMap.Builder builder2 = ImmutableMap.builder(); for(Map.Entry, ModelResourceLocation> e : itemModels.entrySet()) { if(e.getKey().isPresent()) { - builder2.put(e.getKey().get(), getItemModel(manager, e.getKey())); + builder2.put(e.getKey().get(), getItemModel(e.getKey())); } } bakedItemModels = builder2.build(); - //} + } } - private IBakedModel getBlockModel(ModelManager manager, Optional opt) { + private IBakedModel getBlockModel(Optional opt) { ModelResourceLocation loc = blockModels.get(opt); if(loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); } - return manager.getModel(loc); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); + return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); } - private IBakedModel getItemModel(ModelManager manager, Optional opt) { + private IBakedModel getItemModel(Optional opt) { ModelResourceLocation loc = itemModels.get(opt); if(loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); } - return manager.getModel(loc); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); + return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); } @Override @@ -265,7 +270,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; + return baseModel.getItemCameraTransforms(); } @Override diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json index 8ed1128f1..a2f835615 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -2,7 +2,7 @@ "forge_marker": 1, "defaults": { "model": "botania_special:specialFlower", - "transform": "forge:default-block" + "transform": "forge:default-item" }, "variants": { "normal": [{