diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 00f1b9546..49ce3335a 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -307,7 +307,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @Override @SideOnly(Side.CLIENT) public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return Proxies.render.fancyGraphicsEnabled() ? EnumWorldBlockLayer.CUTOUT_MIPPED : EnumWorldBlockLayer.SOLID; } /* MODELS */ diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java index e2dc073dc..a250e26b2 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java @@ -91,7 +91,6 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat } /* STATES */ - @Override public int getMetaFromState(IBlockState state) { return 0; diff --git a/src/main/java/forestry/arboriculture/render/ModelLeaves.java b/src/main/java/forestry/arboriculture/render/ModelLeaves.java index 0af5b8c10..d97080a1e 100644 --- a/src/main/java/forestry/arboriculture/render/ModelLeaves.java +++ b/src/main/java/forestry/arboriculture/render/ModelLeaves.java @@ -30,7 +30,7 @@ public class ModelLeaves extends ModelBlockOverlay { } @Override - public void renderInventory(BlockForestryLeaves block, ItemStack itemStack, IModelBaker baker) { + public void backeInventoryBlock(BlockForestryLeaves block, ItemStack itemStack, IModelBaker baker) { if (!(itemStack.getItem() instanceof ItemBlockLeaves) || block == null) { return; } @@ -62,14 +62,16 @@ public class ModelLeaves extends ModelBlockOverlay { } @Override - public boolean renderInWorld(BlockForestryLeaves block, IBlockAccess world, BlockPos pos, IModelBaker baker) { + public boolean backeWorldBlock(BlockForestryLeaves block, IBlockAccess world, BlockPos pos, IModelBaker baker) { TileLeaves tile = BlockForestryLeaves.getLeafTile(world, pos); if (tile == null) { return false; } + TextureAtlasSprite leaveSprite = tile.getLeaveSprite(Proxies.render.fancyGraphicsEnabled()); + // Render the plain leaf block. - baker.addBlockModel(block, pos, tile.getLeaveSprite(Proxies.render.fancyGraphicsEnabled()), 0); + baker.addBlockModel(block, pos, leaveSprite, 0); // Render overlay for fruit leaves. TextureAtlasSprite fruitSprite = tile.getFruitSprite(); @@ -77,6 +79,9 @@ public class ModelLeaves extends ModelBlockOverlay { if (fruitSprite != null) { baker.addBlockModel(block, pos, fruitSprite, 1); } + + // Set the particle sprite + baker.getCurrentModel().setParticleSprite(leaveSprite); return true; } diff --git a/src/main/java/forestry/core/models/ModelBlockOverlay.java b/src/main/java/forestry/core/models/ModelBlockOverlay.java index 513bf2fa7..581becfe0 100644 --- a/src/main/java/forestry/core/models/ModelBlockOverlay.java +++ b/src/main/java/forestry/core/models/ModelBlockOverlay.java @@ -19,17 +19,20 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; 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.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; - +import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.common.property.IExtendedBlockState; import forestry.api.core.IModelBaker; +import forestry.api.core.IModelBakerModel; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.models.baker.ModelBaker; @@ -37,9 +40,11 @@ import forestry.core.models.baker.ModelBaker; /** * A overlay block model to make a block with 2 or more texture layers */ -public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockModel { +public abstract class ModelBlockOverlay implements IFlexibleBakedModel, ISmartItemModel, ISmartBlockModel { @Nonnull private final Class blockClass; + private IModelBakerModel latestBlockModel; + private IModelBakerModel latestItemModel; protected ModelBlockOverlay(@Nonnull Class blockClass) { this.blockClass = blockClass; @@ -130,27 +135,42 @@ public abstract class ModelBlockOverlay implements ISmartItemMo @Override public boolean isAmbientOcclusion() { - return true; + if(latestItemModel == null && latestBlockModel == null) + return false; + return latestBlockModel != null ? latestBlockModel.isAmbientOcclusion() : latestItemModel.isAmbientOcclusion(); } @Override public boolean isGui3d() { - return true; + return latestItemModel.isGui3d(); } @Override public boolean isBuiltInRenderer() { - return false; + if(latestItemModel == null && latestBlockModel == null) + return false; + return latestBlockModel != null ? latestBlockModel.isBuiltInRenderer() : latestItemModel.isBuiltInRenderer(); } @Override public TextureAtlasSprite getParticleTexture() { + if(latestBlockModel != null) + return latestBlockModel.getParticleTexture(); return null; } @Override public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; + if(latestItemModel == null) + return null; + return latestItemModel.getItemCameraTransforms(); + } + + @Override + public VertexFormat getFormat() { + if(latestItemModel == null && latestBlockModel == null) + return DefaultVertexFormats.BLOCK; + return latestBlockModel != null ? latestBlockModel.getFormat() : latestItemModel.getFormat(); } @Override @@ -168,12 +188,12 @@ public abstract class ModelBlockOverlay implements ISmartItemMo baker.setRenderBoundsFromBlock(block); try { - renderInWorld(bBlock, world, pos, baker); + backeWorldBlock(bBlock, world, pos, baker); } catch (Exception e) { return null; } - return baker.bakeModel(false); + return latestBlockModel = baker.bakeModel(false); } @Override @@ -188,16 +208,16 @@ public abstract class ModelBlockOverlay implements ISmartItemMo block.setBlockBoundsForItemRender(); baker.setRenderBoundsFromBlock(block); try { - renderInventory(bBlock, stack, baker); + backeInventoryBlock(bBlock, stack, baker); } catch (Exception e) { return null; } - return baker.bakeModel(true); + return latestItemModel = baker.bakeModel(true); } - protected abstract void renderInventory(B block, ItemStack item, IModelBaker baker); + protected abstract void backeInventoryBlock(B block, ItemStack item, IModelBaker baker); - protected abstract boolean renderInWorld(B block, IBlockAccess world, BlockPos pos, IModelBaker baker); + protected abstract boolean backeWorldBlock(B block, IBlockAccess world, BlockPos pos, IModelBaker baker); } diff --git a/src/main/java/forestry/core/models/baker/ModelBaker.java b/src/main/java/forestry/core/models/baker/ModelBaker.java index bb0386442..dc85d1a01 100644 --- a/src/main/java/forestry/core/models/baker/ModelBaker.java +++ b/src/main/java/forestry/core/models/baker/ModelBaker.java @@ -111,10 +111,10 @@ public class ModelBaker implements IModelBaker { if(pos != null){ posDOWN = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); posUP = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); - posEAST = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); - posWEST = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); - posNORTH = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); - posSOUTH = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); + posEAST = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); + posWEST = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); + posNORTH = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); + posSOUTH = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); } if (pos == null || block.shouldSideBeRendered(world, posDOWN, EnumFacing.DOWN)) { @@ -126,11 +126,11 @@ public class ModelBaker implements IModelBaker { } if (pos == null || block.shouldSideBeRendered(world, posEAST, EnumFacing.EAST)) { - addFaceXPos(pos, textures[EnumFacing.EAST.ordinal()]); + addFaceXNeg(pos, textures[EnumFacing.EAST.ordinal()]); } if (pos == null || block.shouldSideBeRendered(world, posWEST, EnumFacing.WEST)) { - addFaceXNeg(pos, textures[EnumFacing.WEST.ordinal()]); + addFaceXPos(pos, textures[EnumFacing.WEST.ordinal()]); } if (pos == null || block.shouldSideBeRendered(world, posNORTH, EnumFacing.NORTH)) { diff --git a/src/main/java/forestry/farming/blocks/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java index 1cf1ae89a..1760996b9 100644 --- a/src/main/java/forestry/farming/blocks/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -13,14 +13,11 @@ package forestry.farming.blocks; import java.util.ArrayList; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -47,8 +44,6 @@ import forestry.api.core.IModelManager; import forestry.core.blocks.BlockStructure; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; -import forestry.core.render.ParticleHelper; -import forestry.core.render.ParticleHelper.DefaultCallback; import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.farming.models.EnumFarmBlockTexture; @@ -61,15 +56,12 @@ import forestry.farming.tiles.TileFarmValve; public class BlockFarm extends BlockStructure { - private final ParticleHelper.Callback particleCallback; - public static final PropertyEnum META = PropertyEnum.create("meta", EnumFarmBlockType.class); public BlockFarm() { super(Material.rock); setHardness(1.0f); setHarvestLevel("pickaxe", 0); - this.particleCallback = new FarmCallback(this); setDefaultState(blockState.getBaseState().withProperty(META, EnumFarmBlockType.PLAIN)); } @@ -202,41 +194,9 @@ public class BlockFarm extends BlockStructure { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("forestry:ffarm", "inventory")); - ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("forestry:ffarm", "inventory")); - ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("forestry:ffarm", "inventory")); - ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation("forestry:ffarm", "inventory")); - ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation("forestry:ffarm", "inventory")); - ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation("forestry:ffarm", "inventory")); - } - - /* Particles */ - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { - return ParticleHelper.addHitEffects(worldObj, this, target, effectRenderer, particleCallback); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { - return ParticleHelper.addDestroyEffects(world, this, world.getBlockState(pos), pos, effectRenderer, particleCallback); - } - - private static class FarmCallback extends DefaultCallback { - - public FarmCallback(Block block) { - super(block); + for(int i = 0;i < 6;i++){ + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation("forestry:ffarm", "inventory")); } - - @Override - protected void setTexture(EntityDiggingFX fx, BlockPos pos, IBlockState state) { - IExtendedBlockState extend = (IExtendedBlockState) state; - TileFarm farm = (TileFarm) fx.getEntityWorld().getTileEntity(pos); - - fx.setParticleIcon(EnumFarmBlockTexture.getSprite(farm.getFarmBlockTexture(), 2)); - } - } @Override diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java index 30e537e91..e70432e12 100644 --- a/src/main/java/forestry/farming/models/ModelFarmBlock.java +++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java @@ -18,28 +18,33 @@ public class ModelFarmBlock extends ModelBlockOverlay { } @Override - public void renderInventory(BlockFarm blockFarm, ItemStack item, IModelBaker baker) { + public void backeInventoryBlock(BlockFarm blockFarm, ItemStack item, IModelBaker baker) { if (blockFarm == null) { return; } EnumFarmBlockTexture type = EnumFarmBlockTexture.getFromCompound(item.getTagCompound()); + // Add the plain block. baker.addBlockModel(blockFarm, null, getSprites(type), 0); + // Add the overlay block. baker.addBlockModel(blockFarm, null, getOverlaySprites(EnumFarmBlockType.VALUES[item.getItemDamage()]), 0); } @Override - public boolean renderInWorld(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IModelBaker baker) { + public boolean backeWorldBlock(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IModelBaker baker) { TileFarm farm = (TileFarm) world.getTileEntity(pos); TextureAtlasSprite[] textures = getSprites(farm.getFarmBlockTexture()); - TextureAtlasSprite[] texturesOverlay = getOverlaySprites(farm.getFarmBlockType()); - // Render the plain block. - baker.addBlockModel(blockFarm, pos, getSprites(farm.getFarmBlockTexture()), 0); + // Add the plain block. + baker.addBlockModel(blockFarm, pos, textures, 0); + // Add the overlay block. baker.addBlockModel(blockFarm, pos, getOverlaySprites(farm.getFarmBlockType()), 0); + + // Set the particle sprite + baker.getCurrentModel().setParticleSprite(textures[0]); return true; } @@ -57,22 +62,13 @@ public class ModelFarmBlock extends ModelBlockOverlay { private static TextureAtlasSprite[] getOverlaySprites(EnumFarmBlockType farmType) { TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; - textures[0] = getOverlaySprite(farmType, 0); - textures[1] = getOverlaySprite(farmType, 1); - textures[2] = getOverlaySprite(farmType, 2); - textures[3] = getOverlaySprite(farmType, 3); - textures[4] = getOverlaySprite(farmType, 4); - textures[5] = getOverlaySprite(farmType, 5); + textures[0] = EnumFarmBlockType.getSprite(farmType, 0); + textures[1] = EnumFarmBlockType.getSprite(farmType, 1); + textures[2] = EnumFarmBlockType.getSprite(farmType, 2); + textures[3] = EnumFarmBlockType.getSprite(farmType, 3); + textures[4] = EnumFarmBlockType.getSprite(farmType, 4); + textures[5] = EnumFarmBlockType.getSprite(farmType, 5); return textures; } - private static TextureAtlasSprite getOverlaySprite(EnumFarmBlockType texture, int side) { - return EnumFarmBlockType.getSprite(texture, side); - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return getSprites(EnumFarmBlockTexture.BRICK)[0]; - } - }