From 566efc7a963beac4959f7e709d88fffc83b5243b Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 6 May 2016 19:13:36 +0200 Subject: [PATCH] Improve models --- .../core/models/ModelBlockDefault.java | 7 +- .../java/forestry/core/models/ModelCrate.java | 75 ++++++++++--------- .../render/ModelButterflyItem.java | 3 - 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/main/java/forestry/core/models/ModelBlockDefault.java b/src/main/java/forestry/core/models/ModelBlockDefault.java index f2844a3e0..7d9400ce6 100644 --- a/src/main/java/forestry/core/models/ModelBlockDefault.java +++ b/src/main/java/forestry/core/models/ModelBlockDefault.java @@ -36,13 +36,11 @@ import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.models.baker.ModelBaker; -/** - * A overlay block model to make a block with 2 or more texture layers - */ public abstract class ModelBlockDefault implements IBakedModel { private ItemOverrideList overrideList; @Nonnull protected final Class blockClass; + protected IModelBakerModel blockModel; protected IModelBakerModel itemModel; @@ -83,6 +81,9 @@ public abstract class ModelBlockDefault implements IBakedModel @Override public boolean isGui3d() { + if(itemModel == null) { + return false; + } return itemModel.isGui3d(); } diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index a89b28b27..2d0bc4d2c 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -15,7 +15,6 @@ import com.google.common.collect.Maps; import org.apache.commons.io.IOUtils; -import java.io.Closeable; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; @@ -66,8 +65,9 @@ public class ModelCrate extends BlankItemModel { private static ModelBlock MODEL_GENERATED; private static ModelBlock MODEL_ENTITY; - - //Init the model + /** + * Init the model with datas from the ModelBakeEvent. + */ public static void initModel(ModelBakeEvent event){ try { crateModel = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/crate-filled")); @@ -78,31 +78,8 @@ public class ModelCrate extends BlankItemModel { } } - - //Bake the crate content models - private List bakeContentModels(ItemCrated crateItem, IBakedModel crateModel) { - List models = new ArrayList(); - - IBakedModel containedModel = getModel(crateItem.getContained()); - - IdentityHashMap> modelResourceLocations = ObfuscationReflectionHelper.getPrivateValue(ItemModelMesherForge.class, (ItemModelMesherForge) Minecraft.getMinecraft().getRenderItem().getItemModelMesher(), 0); - - ModelResourceLocation modelResource = modelResourceLocations.get(crateItem.getContained().getItem()).get(crateItem.getContained().getItemDamage()); - ResourceLocation location = getItemLocation(modelResource); - - models.add(crateModel); - - if (hasItemModel(location)) { - models.add(new TRSRBakedModel(containedModel, -0.0625F, 0, 0.0625F, 0.5F)); - models.add(new TRSRBakedModel(containedModel, -0.0625F, 0, -0.0625F, 0.5F)); - } else { - models.add(new TRSRBakedModel(containedModel, -0.0625F, 0, 0, 0.5F)); - } - return models; - } - /** - * @return The item model {@link ResourceLocation} from a {@link ModelResourceLocation} + * @return The item model ResourceLocation from a ModelResourceLocation */ private ResourceLocation getItemLocation(ModelResourceLocation modelResource) { ResourceLocation resourcelocation = new ResourceLocation(modelResource.toString().replaceAll("#.*", "")); @@ -110,7 +87,7 @@ public class ModelCrate extends BlankItemModel { } /** - * @return Return true, when the model a item model is + * @return Return true, when the model a item model is. */ private boolean hasItemModel(ResourceLocation location) { try { @@ -125,14 +102,15 @@ public class ModelCrate extends BlankItemModel { } } - protected ModelBlock loadModel(ResourceLocation location) throws IOException - { + /** + * @return Load a model from the location. + */ + private ModelBlock loadModel(ResourceLocation location) throws IOException{ Reader reader = null; IResource iresource = null; ModelBlock model; - try - { + try{ String s = location.getResourcePath(); if (!"builtin/generated".equals(s)){ @@ -171,8 +149,7 @@ public class ModelCrate extends BlankItemModel { model = MODEL_GENERATED; } - finally - { + finally{ IOUtils.closeQuietly(reader); IOUtils.closeQuietly(iresource); } @@ -185,7 +162,7 @@ public class ModelCrate extends BlankItemModel { } /** - * @return The baked model from the filled crate + * @return The model from the item of the stack. */ private IBakedModel getModel(ItemStack stack) { return Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); @@ -196,6 +173,30 @@ public class ModelCrate extends BlankItemModel { return new CrateOverrideList(); } + /** + * Bake the crate model. + */ + private List bakeModel(ItemCrated crateItem, IBakedModel crateModel) { + List models = new ArrayList(); + + IBakedModel containedModel = getModel(crateItem.getContained()); + + IdentityHashMap> modelResourceLocations = ObfuscationReflectionHelper.getPrivateValue(ItemModelMesherForge.class, (ItemModelMesherForge) Minecraft.getMinecraft().getRenderItem().getItemModelMesher(), 0); + + ModelResourceLocation modelResource = modelResourceLocations.get(crateItem.getContained().getItem()).get(crateItem.getContained().getItemDamage()); + ResourceLocation location = getItemLocation(modelResource); + + models.add(crateModel); + + if (hasItemModel(location)) { + models.add(new TRSRBakedModel(containedModel, -0.0625F, 0, 0.0625F, 0.5F)); + models.add(new TRSRBakedModel(containedModel, -0.0625F, 0, -0.0625F, 0.5F)); + } else { + models.add(new TRSRBakedModel(containedModel, -0.0625F, 0, 0, 0.5F)); + } + return models; + } + private class CrateOverrideList extends ItemOverrideList{ public CrateOverrideList() { @@ -216,14 +217,14 @@ public class ModelCrate extends BlankItemModel { ObfuscationReflectionHelper.setPrivateValue(BakedQuad.class, quad, 100, 1); } - crates.put(crateUID, new IPerspectiveAwareModel.MapWrapper(new CrateBakedModel( bakeContentModels(crated, baseBaked)), ModelManager.getInstance().DEFAULT_ITEM)); + crates.put(crateUID, new IPerspectiveAwareModel.MapWrapper(new CrateBakedModel( bakeModel(crated, baseBaked)), ModelManager.getInstance().DEFAULT_ITEM)); } return crates.get(crateUID); } } - private static class CrateBakedModel extends BlankItemModel{ + private class CrateBakedModel extends BlankItemModel{ public final List models; diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index daf26932f..b753a2f75 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -17,7 +17,6 @@ import java.util.Collections; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.ModelRotation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -25,9 +24,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IRetexturableModel; -import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly;