diff --git a/src/main/java/forestry/api/core/IModelBaker.java b/src/main/java/forestry/api/core/IModelBaker.java index c96b77a19..4bc805e00 100644 --- a/src/main/java/forestry/api/core/IModelBaker.java +++ b/src/main/java/forestry/api/core/IModelBaker.java @@ -9,6 +9,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; @@ -38,7 +39,7 @@ public interface IModelBaker { void addModel(@Nonnull AxisAlignedBB renderBounds, @Nonnull TextureAtlasSprite texture, int colorIndex); - void addBakedModel(@Nonnull IBakedModel model); + void addBakedModel(@Nullable IBlockState state, @Nonnull IBakedModel model); void addFace(@Nonnull EnumFacing facing, @Nonnull TextureAtlasSprite sprite); diff --git a/src/main/java/forestry/core/models/baker/ModelBaker.java b/src/main/java/forestry/core/models/baker/ModelBaker.java index 552c907ab..b4383c981 100644 --- a/src/main/java/forestry/core/models/baker/ModelBaker.java +++ b/src/main/java/forestry/core/models/baker/ModelBaker.java @@ -13,6 +13,7 @@ package forestry.core.models.baker; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.util.vector.Vector3f; import java.util.ArrayList; @@ -48,7 +49,7 @@ public class ModelBaker implements IModelBaker { private static final float quadsUV[] = new float[]{0, 0, 1, 1, 0, 0, 1, 1}; private final List faces = new ArrayList<>(); - private final List bakedModels = new ArrayList<>(); + private final List> bakedModels = new ArrayList<>(); protected AxisAlignedBB renderBounds; @@ -126,8 +127,10 @@ public class ModelBaker implements IModelBaker { } @Override - public void addBakedModel(@Nonnull IBakedModel model) { - this.bakedModels.add(model); + public void addBakedModel(@Nullable IBlockState state, @Nonnull IBakedModel model) { + if(model != null){ + this.bakedModels.add(Pair.of(state, model)); + } } protected static float[] getFaceUvs(final EnumFacing face, final Vector3f to_16, final Vector3f from_16) { @@ -217,7 +220,7 @@ public class ModelBaker implements IModelBaker { } //Add baked models to the current model. - for(IBakedModel bakedModel : bakedModels){ + for(Pair bakedModel : bakedModels){ currentModel.addModelQuads(bakedModel); } diff --git a/src/main/java/forestry/core/models/baker/ModelBakerModel.java b/src/main/java/forestry/core/models/baker/ModelBakerModel.java index 36b948b1a..d199dd23d 100644 --- a/src/main/java/forestry/core/models/baker/ModelBakerModel.java +++ b/src/main/java/forestry/core/models/baker/ModelBakerModel.java @@ -49,7 +49,7 @@ public class ModelBakerModel implements IModelBakerModel { private final Map> faceQuads; private final List generalQuads; - private final List models; + private final List> models; private float[] rotation = getDefaultRotation(); private float[] translation = getDefaultTranslation(); @@ -68,7 +68,7 @@ public class ModelBakerModel implements IModelBakerModel { } } - private ModelBakerModel(List models, Map> faceQuads, List generalQuads, boolean isGui3d, boolean isAmbientOcclusion, IModelState modelState, float[] rotation, float[] translation, float[] scale, TextureAtlasSprite particleSprite) { + private ModelBakerModel(List> models, Map> faceQuads, List generalQuads, boolean isGui3d, boolean isAmbientOcclusion, IModelState modelState, float[] rotation, float[] translation, float[] scale, TextureAtlasSprite particleSprite) { this.models = models; this.faceQuads = faceQuads; this.generalQuads = generalQuads; @@ -178,8 +178,10 @@ public class ModelBakerModel implements IModelBakerModel { return modelState; } - public void addModelQuads(IBakedModel model) { - this.models.add(model); + public void addModelQuads(Pair model) { + if(model != null){ + this.models.add(model); + } } @Override @@ -194,8 +196,11 @@ public class ModelBakerModel implements IModelBakerModel { @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { List quads = new ArrayList<>(); - for (IBakedModel model : this.models) { - quads.addAll(model.getQuads(state, side, rand)); + for (Pair model : this.models) { + List modelQuads = model.getRight().getQuads(model.getLeft(), side, rand); + if(modelQuads != null && !modelQuads.isEmpty()){ + quads.addAll(modelQuads); + } } if(side != null){ quads.addAll(faceQuads.get(side)); diff --git a/src/main/java/forestry/core/utils/CamouflageUtil.java b/src/main/java/forestry/core/utils/CamouflageUtil.java index 66b8e9984..59f61fff4 100644 --- a/src/main/java/forestry/core/utils/CamouflageUtil.java +++ b/src/main/java/forestry/core/utils/CamouflageUtil.java @@ -64,15 +64,15 @@ public class CamouflageUtil { } TileEntity tile = world.getTileEntity(pos); + if(tile instanceof ICamouflageHandler){ + return (ICamouflageHandler) tile; + } if(tile instanceof IMultiblockComponent){ IMultiblockComponent component = (IMultiblockComponent) tile; if(component.getMultiblockLogic().getController() instanceof ICamouflageHandler){ return (ICamouflageHandler) component.getMultiblockLogic().getController(); } } - if(tile instanceof ICamouflageHandler){ - return (ICamouflageHandler) tile; - } return null; } diff --git a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java index 2ffd12e93..9275f9ed7 100644 --- a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java +++ b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java @@ -14,6 +14,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockModelShapes; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -51,8 +52,9 @@ public class ModelGreenhouse extends ModelBlockDefault { private static void bakeBlockModel(@Nonnull BlockGreenhouse block, @Nullable IBlockAccess world, @Nullable BlockPos pos, @Nullable IExtendedBlockState stateExtended, @Nonnull IModelBaker baker, @Nullable ItemStack camouflageStack) { if (camouflageStack != null) { BlockModelShapes modelShapes = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes(); + IBlockState state = Block.getBlockFromItem(camouflageStack.getItem()).getStateFromMeta(camouflageStack.getItemDamage()); - baker.addBakedModel(modelShapes.getModelForState(Block.getBlockFromItem(camouflageStack.getItem()).getStateFromMeta(camouflageStack.getItemDamage()))); + baker.addBakedModel(state, modelShapes.getModelForState(state)); baker.setParticleSprite(modelShapes.getModelForState(Block.getBlockFromItem(camouflageStack.getItem()).getStateFromMeta(camouflageStack.getItemDamage())).getParticleTexture()); }