diff --git a/src/main/java/forestry/api/arboriculture/IAlleleFruit.java b/src/main/java/forestry/api/arboriculture/IAlleleFruit.java index 4329199c3..e73ba9ba0 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleFruit.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleFruit.java @@ -5,6 +5,8 @@ ******************************************************************************/ package forestry.api.arboriculture; +import javax.annotation.Nonnull; + import forestry.api.genetics.IAlleleProperty; /** @@ -12,10 +14,13 @@ import forestry.api.genetics.IAlleleProperty; */ public interface IAlleleFruit extends IAlleleProperty { + @Nonnull IFruitProvider getProvider(); - + + @Nonnull String getModelName(); - + + @Nonnull String getModID(); } diff --git a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java index fd27638d4..db42fe336 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java @@ -5,10 +5,12 @@ ******************************************************************************/ package forestry.api.arboriculture; +import javax.annotation.Nonnull; import java.util.Collection; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; + import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -20,42 +22,50 @@ import forestry.api.genetics.IFruitFamily; public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty { + @Nonnull @Override ITreeRoot getRoot(); /** * @return Native plant type of this species. */ + @Nonnull EnumPlantType getPlantType(); /** * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species. */ + @Nonnull Collection getSuitableFruit(); /** * @return Tree generator for this species. */ + @Nonnull ITreeGenerator getGenerator(); /** * @return The name of the model from the tree. */ + @Nonnull String getModelName(); /** * @return The modid from the mod of the species. */ + @Nonnull String getModID(); /* MODELS AND OVERRIDES */ @SideOnly(Side.CLIENT) + @Nonnull ILeafSpriteProvider getLeafSpriteProvider(); @SideOnly(Side.CLIENT) int getGermlingColour(EnumGermlingType type, int renderPass); @SideOnly(Side.CLIENT) + @Nonnull ModelResourceLocation getGermlingModel(EnumGermlingType type); @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/api/arboriculture/IFruitProvider.java b/src/main/java/forestry/api/arboriculture/IFruitProvider.java index 851ee8388..468319c6a 100644 --- a/src/main/java/forestry/api/arboriculture/IFruitProvider.java +++ b/src/main/java/forestry/api/arboriculture/IFruitProvider.java @@ -21,6 +21,9 @@ public interface IFruitProvider { int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime); + /** return the color to use for decorative leaves. Usually the ripe color. */ + int getDecorativeColor(); + boolean markAsFruitLeaf(ITreeGenome genome, World world, BlockPos pos); int getRipeningPeriod(); @@ -55,6 +58,9 @@ public interface IFruitProvider { */ short getSpriteIndex(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime, boolean fancy); + /** return the sprite index to display on decorative leaves */ + short getDecorativeSpriteIndex(); + /** * @return true if this fruit provider requires fruit blocks to spawn, false otherwise. */ diff --git a/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java b/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java index c95ab3746..0e5d3ce29 100644 --- a/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java +++ b/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java @@ -5,8 +5,11 @@ ******************************************************************************/ package forestry.api.arboriculture; +import javax.annotation.Nonnull; + import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; + import forestry.api.core.IModelManager; /** @@ -17,5 +20,6 @@ import forestry.api.core.IModelManager; public interface IGermlingModelProvider { void registerModels(Item item, IModelManager manager); + @Nonnull ModelResourceLocation getModel(EnumGermlingType type); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeGenerator.java b/src/main/java/forestry/api/arboriculture/ITreeGenerator.java index cfb14fc3d..9485b9e5a 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeGenerator.java +++ b/src/main/java/forestry/api/arboriculture/ITreeGenerator.java @@ -22,5 +22,5 @@ public interface ITreeGenerator { void setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing); - void setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos, boolean decorative); + void setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeGenome.java b/src/main/java/forestry/api/arboriculture/ITreeGenome.java index 4578d020e..0395dfe31 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeGenome.java +++ b/src/main/java/forestry/api/arboriculture/ITreeGenome.java @@ -5,6 +5,7 @@ ******************************************************************************/ package forestry.api.arboriculture; +import javax.annotation.Nonnull; import java.util.EnumSet; import net.minecraftforge.common.EnumPlantType; @@ -19,6 +20,7 @@ public interface ITreeGenome extends IGenome { @Override IAlleleTreeSpecies getSecondary(); + @Nonnull IFruitProvider getFruitProvider(); IGrowthProvider getGrowthProvider(); diff --git a/src/main/java/forestry/api/core/IModelBaker.java b/src/main/java/forestry/api/core/IModelBaker.java index a835ae3b4..da6cbe5ab 100644 --- a/src/main/java/forestry/api/core/IModelBaker.java +++ b/src/main/java/forestry/api/core/IModelBaker.java @@ -8,6 +8,7 @@ package forestry.api.core; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.BlockPos; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -27,17 +28,17 @@ public interface IModelBaker { void addBlockModel(Block block, BlockPos pos, TextureAtlasSprite sprites, int colorIndex); - void addFaceXNeg(BlockPos pos, TextureAtlasSprite sprite); + void addFaceXNeg(TextureAtlasSprite sprite); - void addFaceYNeg(BlockPos pos, TextureAtlasSprite sprite); + void addFaceYNeg(TextureAtlasSprite sprite); - void addFaceZNeg(BlockPos pos, TextureAtlasSprite sprite); + void addFaceZNeg(TextureAtlasSprite sprite); - void addFaceYPos(BlockPos pos, TextureAtlasSprite sprite); + void addFaceYPos(TextureAtlasSprite sprite); - void addFaceZPos(BlockPos pos, TextureAtlasSprite sprite); + void addFaceZPos(TextureAtlasSprite sprite); - void addFaceXPos(BlockPos pos, TextureAtlasSprite sprite); + void addFaceXPos(TextureAtlasSprite sprite); IModelBakerModel getCurrentModel(); diff --git a/src/main/java/forestry/api/world/ITreeGenData.java b/src/main/java/forestry/api/world/ITreeGenData.java index f2422006a..c37eba8cf 100644 --- a/src/main/java/forestry/api/world/ITreeGenData.java +++ b/src/main/java/forestry/api/world/ITreeGenData.java @@ -23,8 +23,6 @@ public interface ITreeGenData { void setLeaves(World world, GameProfile owner, BlockPos pos); - void setLeavesDecorative(World world, GameProfile owner, BlockPos pos); - void setLogBlock(World world, BlockPos pos, EnumFacing facing); boolean allowsFruitBlocks(); diff --git a/src/main/java/forestry/arboriculture/FruitProviderNone.java b/src/main/java/forestry/arboriculture/FruitProviderNone.java index b71fa572b..bce445047 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderNone.java +++ b/src/main/java/forestry/arboriculture/FruitProviderNone.java @@ -87,6 +87,11 @@ public class FruitProviderNone implements IFruitProvider { return 0xffffff; } + @Override + public int getDecorativeColor() { + return 0xffffff; + } + @Override public boolean markAsFruitLeaf(ITreeGenome genome, World world, BlockPos pos) { return false; @@ -120,7 +125,16 @@ public class FruitProviderNone implements IFruitProvider { return -1; } } - + + @Override + public short getDecorativeSpriteIndex() { + if (overlay != null) { + return overlay.texUID; + } else { + return -1; + } + } + @Override public void registerSprites() { if (overlay != null) { diff --git a/src/main/java/forestry/arboriculture/FruitProviderPod.java b/src/main/java/forestry/arboriculture/FruitProviderPod.java index 5d2fc1209..021ed202b 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderPod.java +++ b/src/main/java/forestry/arboriculture/FruitProviderPod.java @@ -94,7 +94,12 @@ public class FruitProviderPod extends FruitProviderNone { public short getSpriteIndex(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime, boolean fancy) { return type.uids[0]; } - + + @Override + public short getDecorativeSpriteIndex() { + return type.uids[0]; + } + @Override public void registerSprites() { } diff --git a/src/main/java/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java index 3eab10a72..5b5861318 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRipening.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRipening.java @@ -88,11 +88,6 @@ public class FruitProviderRipening extends FruitProviderNone { return products.toArray(new ItemStack[products.size()]); } - @Override - public ItemStack[] getSpecialty() { - return new ItemStack[0]; - } - @Override public boolean markAsFruitLeaf(ITreeGenome genome, World world, BlockPos pos) { return true; @@ -101,7 +96,10 @@ public class FruitProviderRipening extends FruitProviderNone { @Override public int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { float stage = getRipeningStage(ripeningTime); + return getColour(stage); + } + private int getColour(float stage) { int r = (colourCallow >> 16 & 255) + (int) (diffR * stage); int g = (colourCallow >> 8 & 255) + (int) (diffG * stage); int b = (colourCallow & 255) + (int) (diffB * stage); @@ -111,4 +109,8 @@ public class FruitProviderRipening extends FruitProviderNone { return (r & 255) << 16 | (g & 255) << 8 | b & 255; } + @Override + public int getDecorativeColor() { + return getColour(1.0f); + } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java new file mode 100644 index 000000000..4d3f90c35 --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java @@ -0,0 +1,212 @@ +package forestry.arboriculture.blocks; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.IShearable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.arboriculture.blocks.property.PropertyTreeType; +import forestry.arboriculture.genetics.TreeDefinition; +import forestry.core.proxy.Proxies; + +public abstract class BlockDecorativeLeaves extends Block implements IShearable, IItemModelRegister { + private static final int VARIANTS_PER_BLOCK = 16; + private static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; + + public static List create() { + List blocks = new ArrayList<>(); + final int blockCount = PropertyTreeType.getBlockCount(VARIANTS_PER_BLOCK); + for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) { + final PropertyTreeType variant = PropertyTreeType.create("variant", blockNumber, VARIANTS_PER_BLOCK); + BlockDecorativeLeaves block = new BlockDecorativeLeaves(blockNumber) { + @Nonnull + @Override + public PropertyTreeType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private final int blockNumber; + + public BlockDecorativeLeaves(int blockNumber) { + super(Material.leaves); + this.blockNumber = blockNumber; + this.setCreativeTab(Tabs.tabArboriculture); + setStepSound(soundTypeGrass); + } + + public int getBlockNumber() { + return blockNumber; + } + + @Nonnull + public abstract PropertyTreeType getVariant(); + + @Override + protected BlockState createBlockState() { + return new BlockState(this, getVariant()); + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for (IBlockState state : getBlockState().getValidStates()) { + int meta = getMetaFromState(state); + ItemStack itemStack = new ItemStack(item, 1, meta); + list.add(itemStack); + } + } + + @Override + public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { + return true; + } + + @Override + public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { + IBlockState state = world.getBlockState(pos); + int meta = getMetaFromState(state); + return Collections.singletonList(new ItemStack(this, 1, meta)); + } + + @Override + public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + TreeDefinition treeDefinition = state.getValue(getVariant()); + if (TreeDefinition.Willow.equals(treeDefinition)) { + return null; + } + return super.getCollisionBoundingBox(world, pos, state); + } + + @Override + public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entity) { + entity.motionX *= 0.4D; + entity.motionZ *= 0.4D; + } + + /* RENDERING */ + @Override + public boolean isOpaqueCube() { + return !Proxies.render.fancyGraphicsEnabled(); + } + + @SideOnly(Side.CLIENT) + @Override + public int colorMultiplier(IBlockAccess world, BlockPos pos, int renderPass) { + IBlockState state = world.getBlockState(pos); + TreeDefinition treeDefinition = state.getValue(getVariant()); + if (treeDefinition == null) { + return super.colorMultiplier(world, pos, renderPass); + } + + ITreeGenome genome = treeDefinition.getGenome(); + + if (renderPass == 0) { + return genome.getPrimary().getLeafSpriteProvider().getColor(false); + } else { + IFruitProvider fruitProvider = genome.getFruitProvider(); + return fruitProvider.getDecorativeColor(); + } + } + + @Override + public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public EnumWorldBlockLayer getBlockLayer() { + return Proxies.render.fancyGraphicsEnabled() ? EnumWorldBlockLayer.CUTOUT_MIPPED : EnumWorldBlockLayer.SOLID; + } + + /* MODELS */ + @Override + public void registerModel(Item item, IModelManager manager) { + for (IBlockState state : blockState.getValidStates()) { + int meta = getMetaFromState(state); + ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation("forestry:leaves.decorative." + blockNumber, "inventory")); + } + } + + @Override + public IBlockState getStateFromMeta(int meta) { + TreeDefinition type = getTreeType(meta); + return getDefaultState().withProperty(getVariant(), type); + } + + @Nonnull + public TreeDefinition getTreeType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + (blockNumber * VARIANTS_PER_BLOCK); + return TreeDefinition.byMetadata(variantMeta); + } + + @Override + public int getMetaFromState(IBlockState state) { + return damageDropped(state); + } + + @Override + public int damageDropped(IBlockState state) { + return state.getValue(getVariant()).getMetadata() - (blockNumber * VARIANTS_PER_BLOCK); + } + + @Override + public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + TreeDefinition type = getTreeType(meta); + return getDefaultState().withProperty(getVariant(), type); + } + + /* PROPERTIES */ + @Override + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { + return 60; + } + + @Override + public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { + return true; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { + if (face == EnumFacing.DOWN) { + return 20; + } else if (face != EnumFacing.UP) { + return 10; + } else { + return 5; + } + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index f6ee428fa..a3064b58f 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -32,7 +32,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -64,12 +63,13 @@ import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterfly; import forestry.arboriculture.LeafDecayHelper; +import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.TreeDefinition; -import forestry.arboriculture.items.ItemBlockLeaves; import forestry.arboriculture.tiles.TileLeaves; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.proxy.Proxies; +import forestry.core.tiles.TileUtil; import forestry.core.utils.ItemStackUtil; public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityProvider, IShearable, IGrowable, IItemModelRegister { @@ -97,42 +97,21 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP return new TileLeaves(); } - public static TileLeaves getLeafTile(IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileLeaves) { - return (TileLeaves) tile; - } - return null; - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (ITree tree : TreeManager.treeRoot.getIndividualTemplates()) { - TileLeaves leaves = new TileLeaves(); - leaves.setDecorative(); - leaves.setTree(tree); - - NBTTagCompound leavesNBT = new NBTTagCompound(); - leaves.writeToNBTDecorative(leavesNBT); - - ItemStack itemStack = new ItemStack(item, 1, 0); - itemStack.setTagCompound(leavesNBT); - - list.add(itemStack); - } } /* DROP HANDLING */ // Hack: When harvesting leaves we need to get the drops in onBlockHarvested, // because Mojang destroys the block and tile before calling getDrops. - private final ThreadLocal> drops = new ThreadLocal<>(); + private final ThreadLocal> drops = new ThreadLocal<>(); @Override public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { - TileLeaves leafTile = getLeafTile(world, pos); - if (leafTile == null || leafTile.isDecorative()) { + TileLeaves leafTile = TileUtil.getTile(world, pos, TileLeaves.class); + if (leafTile == null) { return; } @@ -150,13 +129,13 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP } } GameProfile playerProfile = player.getGameProfile(); - ArrayList leafDrops = getLeafDrop(world, playerProfile, pos, saplingModifier, fortune); + List leafDrops = getLeafDrop(world, playerProfile, pos, saplingModifier, fortune); drops.set(leafDrops); } @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList ret = drops.get(); + List ret = drops.get(); drops.remove(); // leaves not harvested, get drops normally @@ -167,11 +146,11 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP return ret; } - private static ArrayList getLeafDrop(IBlockAccess world, @Nullable GameProfile playerProfile, BlockPos pos, float saplingModifier, int fortune) { - ArrayList prod = new ArrayList<>(); + private static List getLeafDrop(IBlockAccess world, @Nullable GameProfile playerProfile, BlockPos pos, float saplingModifier, int fortune) { + List prod = new ArrayList<>(); - TileLeaves tile = getLeafTile(world, pos); - if (tile == null || tile.getTree() == null || tile.isDecorative()) { + TileLeaves tile = TileUtil.getTile(world, pos, TileLeaves.class); + if (tile == null || tile.getTree() == null) { return prod; } @@ -194,12 +173,13 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { - ItemStack itemStack = super.getPickBlock(target, world, pos, player); - TileLeaves leaves = getLeafTile(world, pos); - NBTTagCompound leavesNBT = new NBTTagCompound(); - leaves.writeToNBTDecorative(leavesNBT); - itemStack.setTagCompound(leavesNBT); - return itemStack; + TileLeaves leaves = TileUtil.getTile(world, pos, TileLeaves.class); + if (leaves == null) { + return null; + } + ITree tree = leaves.getTree(); + String speciesUid = tree.getGenome().getPrimary().getUID(); + return PluginArboriculture.blocks.getDecorativeLeaves(speciesUid); } @Override @@ -209,26 +189,19 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { - List ret = new ArrayList<>(); - ret.add(new ItemStack(this)); - - TileLeaves leaves = getLeafTile(world, pos); - NBTTagCompound shearedLeavesNBT = new NBTTagCompound(); - leaves.writeToNBTDecorative(shearedLeavesNBT); - - for (ItemStack stack : ret) { - if (stack.getItem() instanceof ItemBlockLeaves) { - stack.setTagCompound(shearedLeavesNBT); - } + TileLeaves leaves = TileUtil.getTile(world, pos, TileLeaves.class); + if (leaves == null) { + return null; } - - return ret; + ITree tree = leaves.getTree(); + String speciesUid = tree.getGenome().getPrimary().getUID(); + return Collections.singletonList(PluginArboriculture.blocks.getDecorativeLeaves(speciesUid)); } @Override public void beginLeavesDecay(World world, BlockPos pos) { - TileLeaves tile = getLeafTile(world, pos); - if (tile == null || tile.isDecorative()) { + TileLeaves tile = TileUtil.getTile(world, pos, TileLeaves.class); + if (tile == null) { return; } super.beginLeavesDecay(world, pos); @@ -236,7 +209,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { - TileLeaves tileLeaves = getLeafTile(world, pos); + TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); if (tileLeaves != null && TreeDefinition.Willow.getUID().equals(tileLeaves.getSpeciesUID())) { return null; } @@ -251,8 +224,8 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - TileLeaves tileLeaves = getLeafTile(world, pos); - if (tileLeaves == null || tileLeaves.isDecorative()) { + TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); + if (tileLeaves == null) { return; } @@ -278,7 +251,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @SideOnly(Side.CLIENT) @Override public int colorMultiplier(IBlockAccess world, BlockPos pos, int renderPass) { - TileLeaves leaves = getLeafTile(world, pos); + TileLeaves leaves = TileUtil.getTile(world, pos, TileLeaves.class); if (leaves == null) { return super.colorMultiplier(world, pos, renderPass); } @@ -356,7 +329,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @Override public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { - TileLeaves leafTile = getLeafTile(world, pos); + TileLeaves leafTile = TileUtil.getTile(world, pos, TileLeaves.class); if (leafTile != null) { return leafTile.hasFruit() && leafTile.getRipeness() < 1.0f; } @@ -370,7 +343,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @Override public void grow(World world, Random rand, BlockPos pos, IBlockState state) { - TileLeaves leafTile = getLeafTile(world, pos); + TileLeaves leafTile = TileUtil.getTile(world, pos, TileLeaves.class); if (leafTile != null) { leafTile.addRipeness(1.0f); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java index c13b6e82a..1e265d6a8 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java @@ -11,13 +11,17 @@ package forestry.arboriculture.blocks; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemStack; import forestry.api.arboriculture.EnumWoodType; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.alleles.AlleleFruit; +import forestry.arboriculture.items.ItemBlockDecorativeLeaves; import forestry.arboriculture.items.ItemBlockLeaves; import forestry.arboriculture.items.ItemBlockWood; import forestry.arboriculture.items.ItemBlockWoodSlab; @@ -40,6 +44,8 @@ public class BlockRegistryArboriculture extends BlockRegistry { public final BlockSapling saplingGE; public final BlockForestryLeaves leaves; + public final List leavesDecorative; + private final Map speciesToLeavesDecorative; public final BlockFruitPod pods; public final BlockArboriculture arboriculture; @@ -136,6 +142,20 @@ public class BlockRegistryArboriculture extends BlockRegistry { // Leaves leaves = registerBlock(new BlockForestryLeaves(), ItemBlockLeaves.class, "leaves"); registerOreDictWildcard("treeLeaves", leaves); + + leavesDecorative = BlockDecorativeLeaves.create(); + speciesToLeavesDecorative = new HashMap<>(); + for (BlockDecorativeLeaves leaves : leavesDecorative) { + registerBlock(leaves, ItemBlockDecorativeLeaves.class, "leaves.decorative." + leaves.getBlockNumber()); + registerOreDictWildcard("treeLeaves", leaves); + + for (IBlockState state : leaves.getBlockState().getValidStates()) { + TreeDefinition treeDefinition = state.getValue(leaves.getVariant()); + String speciesUid = treeDefinition.getUID(); + int meta = leaves.getMetaFromState(state); + speciesToLeavesDecorative.put(speciesUid, new ItemStack(leaves, 1, meta)); + } + } // Pods AlleleFruit.createAlleles(); @@ -144,4 +164,8 @@ public class BlockRegistryArboriculture extends BlockRegistry { // Machines arboriculture = registerBlock(new BlockArboriculture(), ItemBlockForestry.class, "arboriculture"); } + + public ItemStack getDecorativeLeaves(String speciesUid) { + return speciesToLeavesDecorative.get(speciesUid); + } } diff --git a/src/main/java/forestry/arboriculture/blocks/TreeTypePredicate.java b/src/main/java/forestry/arboriculture/blocks/TreeTypePredicate.java new file mode 100644 index 000000000..f30e6e24d --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/TreeTypePredicate.java @@ -0,0 +1,22 @@ +package forestry.arboriculture.blocks; + +import com.google.common.base.Predicate; + +import javax.annotation.Nullable; + +import forestry.arboriculture.genetics.TreeDefinition; + +public class TreeTypePredicate implements Predicate { + private final int minMeta; + private final int maxMeta; + + public TreeTypePredicate(int blockNumber, int variantsPerBlock) { + this.minMeta = blockNumber * variantsPerBlock; + this.maxMeta = minMeta + variantsPerBlock - 1; + } + + @Override + public boolean apply(@Nullable TreeDefinition treeDefinition) { + return treeDefinition.getMetadata() >= minMeta && treeDefinition.getMetadata() <= maxMeta; + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyTreeType.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyTreeType.java new file mode 100644 index 000000000..036279ee9 --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyTreeType.java @@ -0,0 +1,30 @@ +package forestry.arboriculture.blocks.property; + +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; + +import javax.annotation.Nonnull; +import java.util.Collection; + +import net.minecraft.block.properties.PropertyEnum; + +import forestry.arboriculture.blocks.TreeTypePredicate; +import forestry.arboriculture.genetics.TreeDefinition; + +public class PropertyTreeType extends PropertyEnum { + public static int getBlockCount(int variantsPerBlock) { + return (int) Math.ceil((float) TreeDefinition.VALUES.length / variantsPerBlock); + } + + public static PropertyTreeType create(@Nonnull String name, int blockNumber, int variantsPerBlock) { + TreeTypePredicate filter = new TreeTypePredicate(blockNumber, variantsPerBlock); + Collection allowedValues = Collections2.filter(Lists.newArrayList(TreeDefinition.class.getEnumConstants()), filter); + return new PropertyTreeType(name, TreeDefinition.class, allowedValues); + } + + protected PropertyTreeType(String name, Class valueClass, Collection allowedValues) { + super(name, valueClass, allowedValues); + } + + +} diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 1ce11b406..752e3695d 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -215,12 +215,7 @@ public class Tree extends Individual implements ITree, IPlantable { @Override public void setLeaves(World world, GameProfile owner, BlockPos pos) { - genome.getPrimary().getGenerator().setLeaves(genome, world, owner, pos, false); - } - - @Override - public void setLeavesDecorative(World world, GameProfile owner, BlockPos pos) { - genome.getPrimary().getGenerator().setLeaves(genome, world, owner, pos, true); + genome.getPrimary().getGenerator().setLeaves(genome, world, owner, pos); } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index 7ad530345..8f2ee5a23 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -18,6 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -42,7 +43,6 @@ import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.world.ITreeGenData; import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.blocks.BlockForestryLeaves; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; import forestry.arboriculture.render.ModelProviderGermling; @@ -89,9 +89,10 @@ import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.AllelePlantType; import forestry.core.genetics.alleles.EnumAllele; +import forestry.core.tiles.TileUtil; import forestry.core.utils.BlockUtil; -public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { +public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSerializable { Oak(TreeBranchDefinition.QUERCUS, "appleOak", "robur", false, EnumLeafType.DECIDUOUS, new Color(4764952), new Color(4764952).brighter(), 0, new ItemStack(Blocks.log, 1, 0)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { @@ -947,6 +948,8 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } }; + public static TreeDefinition[] VALUES = values(); + private final TreeBranchDefinition branch; private final IAlleleTreeSpecies species; @@ -1031,7 +1034,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - public void setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos, boolean decorative) { + public void setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos) { boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.leaves.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return; @@ -1043,16 +1046,13 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { return; } - TileLeaves tileLeaves = BlockForestryLeaves.getLeafTile(world, pos); + TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); if (tileLeaves == null) { world.setBlockToAir(pos); return; } tileLeaves.setOwner(owner); - if (decorative) { - tileLeaves.setDecorative(); - } tileLeaves.setTree(new Tree(genome)); world.markBlockForUpdate(pos); @@ -1108,4 +1108,20 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { public static void preInit() { } + + @Override + public String getName() { + return name(); + } + + public int getMetadata() { + return ordinal(); + } + + public static TreeDefinition byMetadata(int meta) { + if (meta < 0 || meta >= VALUES.length) { + meta = 0; + } + return VALUES[meta]; + } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index 6743839c5..cbcfbc608 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import javax.annotation.Nonnull; import java.util.EnumSet; import net.minecraft.item.ItemStack; @@ -68,6 +69,7 @@ public class TreeGenome extends Genome implements ITreeGenome { return (IAlleleTreeSpecies) getInactiveAllele(EnumTreeChromosome.SPECIES); } + @Nonnull @Override public IFruitProvider getFruitProvider() { return ((IAlleleFruit) getActiveAllele(EnumTreeChromosome.FRUITS)).getProvider(); diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java index 62c66267c..8fa2b7446 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics.alleles; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -64,17 +65,19 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { } } + @Nonnull private final IFruitProvider provider; - public AlleleFruit(String name, IFruitProvider provider) { + public AlleleFruit(@Nonnull String name, @Nonnull IFruitProvider provider) { this(name, provider, false); } - public AlleleFruit(String name, IFruitProvider provider, boolean isDominant) { + public AlleleFruit(@Nonnull String name, @Nonnull IFruitProvider provider, boolean isDominant) { super(Constants.MOD_ID, "fruit", name, isDominant); this.provider = provider; } + @Nonnull @Override public IFruitProvider getProvider() { return this.provider; @@ -85,11 +88,13 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { return getProvider().getDescription(); } + @Nonnull @Override public String getModelName() { return getProvider().getModelName(); } + @Nonnull @Override public String getModID() { return getProvider().getModID(); diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index df4a25b96..9546ed673 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -10,11 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.genetics.alleles; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; + import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,17 +37,34 @@ import forestry.api.genetics.IFruitFamily; import forestry.core.genetics.alleles.AlleleSpecies; public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesBuilder, IAlleleTreeSpecies { + @Nonnull private final ITreeGenerator generator; + @Nonnull private final IGermlingModelProvider germlingModelProvider; + @Nonnull private final ILeafSpriteProvider leafSpriteProvider; + @Nonnull private final List fruits = new ArrayList<>(); - + @Nonnull private final String modelName; + @Nonnull private final String modID; - + @Nonnull private EnumPlantType nativeType = EnumPlantType.Plains; - public AlleleTreeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, String modID, String modelName, ILeafSpriteProvider leafIconProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) { + public AlleleTreeSpecies( + @Nonnull String uid, + @Nonnull String unlocalizedName, + @Nonnull String authority, + @Nonnull String unlocalizedDescription, + boolean isDominant, + @Nonnull IClassification branch, + @Nonnull String binomial, + @Nonnull String modID, + @Nonnull String modelName, + @Nonnull ILeafSpriteProvider leafIconProvider, + @Nonnull IGermlingModelProvider germlingModelProvider, + @Nonnull ITreeGenerator generator) { super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial); this.generator = generator; @@ -62,6 +81,7 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci return this; } + @Nonnull @Override public ITreeRoot getRoot() { return TreeManager.treeRoot; @@ -80,21 +100,25 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci } /* OTHER */ + @Nonnull @Override public EnumPlantType getPlantType() { return nativeType; } + @Nonnull @Override public List getSuitableFruit() { return fruits; } + @Nonnull @Override public ITreeGenerator getGenerator() { return generator; } + @Nonnull @Override public ILeafSpriteProvider getLeafSpriteProvider() { return leafSpriteProvider; @@ -105,6 +129,7 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci return leafSpriteProvider.getColor(false); } + @Nonnull @SideOnly(Side.CLIENT) @Override public ModelResourceLocation getGermlingModel(EnumGermlingType type) { @@ -125,11 +150,13 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci germlingModelProvider.registerModels(item, manager); } + @Nonnull @Override public String getModID() { return modID; } + @Nonnull @Override public String getModelName() { return modelName; diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockDecorativeLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockDecorativeLeaves.java new file mode 100644 index 000000000..a5e51b6ab --- /dev/null +++ b/src/main/java/forestry/arboriculture/items/ItemBlockDecorativeLeaves.java @@ -0,0 +1,50 @@ +package forestry.arboriculture.items; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.blocks.BlockDecorativeLeaves; +import forestry.arboriculture.genetics.TreeDefinition; +import forestry.core.items.ItemBlockForestry; +import forestry.core.utils.Translator; + +public class ItemBlockDecorativeLeaves extends ItemBlockForestry { + public ItemBlockDecorativeLeaves(Block block) { + super(block); + } + + @Override + public String getItemStackDisplayName(ItemStack itemStack) { + int meta = itemStack.getMetadata(); + BlockDecorativeLeaves block = getBlock(); + TreeDefinition treeDefinition = block.getTreeType(meta); + if (treeDefinition == null) { + return Translator.translateToLocal("trees.grammar.leaves.type"); + } + + String unlocalizedSpeciesName = treeDefinition.getGenome().getPrimary().getUnlocalizedName(); + return ItemBlockLeaves.getDisplayName(unlocalizedSpeciesName); + } + + @Override + public int getColorFromItemStack(ItemStack itemStack, int renderPass) { + int meta = itemStack.getMetadata(); + BlockDecorativeLeaves block = getBlock(); + TreeDefinition treeDefinition = block.getTreeType(meta); + if (treeDefinition == null) { + return PluginArboriculture.proxy.getFoliageColorBasic(); + } + + ITreeGenome genome = treeDefinition.getGenome(); + + if (renderPass == 0) { + return genome.getPrimary().getLeafSpriteProvider().getColor(false); + } else { + IFruitProvider fruitProvider = genome.getFruitProvider(); + return fruitProvider.getDecorativeColor(); + } + } +} diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java index 4c3fb1c35..afc1c8fab 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java @@ -16,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import forestry.arboriculture.PluginArboriculture; @@ -24,7 +23,7 @@ import forestry.arboriculture.blocks.BlockForestryLeaves; import forestry.arboriculture.tiles.TileLeaves; import forestry.core.items.ItemBlockForestry; import forestry.core.proxy.Proxies; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class ItemBlockLeaves extends ItemBlockForestry { @@ -34,25 +33,28 @@ public class ItemBlockLeaves extends ItemBlockForestry { @Override public String getItemStackDisplayName(ItemStack itemstack) { - String type = StringUtil.localize("trees.grammar.leaves.type"); if (!itemstack.hasTagCompound()) { - return type; + return Translator.translateToLocal("trees.grammar.leaves.type"); } TileLeaves tileLeaves = new TileLeaves(); tileLeaves.readFromNBT(itemstack.getTagCompound()); String unlocalizedName = tileLeaves.getUnlocalizedName(); + return getDisplayName(unlocalizedName); + } - String customTreeKey = "trees.custom.leaves." + unlocalizedName.replace("trees.species.", ""); - if (StringUtil.canTranslate(customTreeKey)) { - return StringUtil.localize(customTreeKey); + public static String getDisplayName(String unlocalizedSpeciesName) { + String customTreeKey = "for.trees.custom.leaves." + unlocalizedSpeciesName.replace("for.trees.species.", ""); + if (Translator.canTranslateToLocal(customTreeKey)) { + return Translator.translateToLocal(customTreeKey); } - String grammar = StringUtil.localize("trees.grammar.leaves"); - String localizedName = StatCollector.translateToLocal(unlocalizedName); + String grammar = Translator.translateToLocal("for.trees.grammar.leaves"); + String localizedName = Translator.translateToLocal(unlocalizedSpeciesName); - return grammar.replaceAll("%SPECIES", localizedName).replaceAll("%TYPE", type); + String leaves = Translator.translateToLocal("for.trees.grammar.leaves.type"); + return grammar.replaceAll("%SPECIES", localizedName).replaceAll("%TYPE", leaves); } @Override @@ -74,15 +76,7 @@ public class ItemBlockLeaves extends ItemBlockForestry { @Override public boolean placeBlockAt(ItemStack itemStack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { - if (!itemStack.hasTagCompound()) { - return false; - } - - TileLeaves tileLeaves = new TileLeaves(); - tileLeaves.readFromNBT(itemStack.getTagCompound()); - tileLeaves.getTree().setLeavesDecorative(world, player.getGameProfile(), pos); - - return true; + return false; } } diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index aa566ae3e..ee3005672 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -14,6 +14,8 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.world.ColorizerFoliage; import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.blocks.BlockDecorativeLeaves; +import forestry.arboriculture.render.ModelDecorativeLeaves; import forestry.arboriculture.render.ModelLeaves; import forestry.core.models.BlockModelIndex; import forestry.core.proxy.Proxies; @@ -21,9 +23,20 @@ import forestry.core.proxy.Proxies; public class ProxyArboricultureClient extends ProxyArboriculture { @Override public void initializeModels() { - Proxies.render.registerBlockModel(new BlockModelIndex(new ModelResourceLocation("forestry:leaves"), - new ModelResourceLocation("forestry:leaves", "inventory"), new ModelLeaves(), - PluginArboriculture.blocks.leaves)); + { + ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:leaves"); + ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:leaves", "inventory"); + BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModelLocation, new ModelLeaves(), PluginArboriculture.blocks.leaves); + Proxies.render.registerBlockModel(blockModelIndex); + } + + for (BlockDecorativeLeaves leaves : PluginArboriculture.blocks.leavesDecorative) { + String resourceName = "forestry:leaves.decorative." + leaves.getBlockNumber(); + ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName); + ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory"); + BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModeLocation, new ModelDecorativeLeaves(), leaves); + Proxies.render.registerBlockModel(blockModelIndex); + } } @Override diff --git a/src/main/java/forestry/arboriculture/render/ModelDecorativeLeaves.java b/src/main/java/forestry/arboriculture/render/ModelDecorativeLeaves.java new file mode 100644 index 000000000..ae4efcc9a --- /dev/null +++ b/src/main/java/forestry/arboriculture/render/ModelDecorativeLeaves.java @@ -0,0 +1,107 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ILeafSpriteProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.IModelBaker; +import forestry.arboriculture.blocks.BlockDecorativeLeaves; +import forestry.arboriculture.genetics.TreeDefinition; +import forestry.core.models.ModelBlockOverlay; +import forestry.core.models.baker.ModelBaker; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; + +public class ModelDecorativeLeaves extends ModelBlockOverlay { + + public ModelDecorativeLeaves() { + super(BlockDecorativeLeaves.class); + } + + @Override + public IBakedModel handleBlockState(IBlockState state) { + IModelBaker baker = ModelBaker.getInstance(); + + Block block = state.getBlock(); + if (!blockClass.isInstance(block)) { + return null; + } + BlockDecorativeLeaves bBlock = blockClass.cast(block); + TreeDefinition tree = state.getValue(bBlock.getVariant()); + + baker.setRenderBoundsFromBlock(block); + bakeBlock(bBlock, tree, baker); + + return latestBlockModel = baker.bakeModel(false); + } + + @Override + public IBakedModel handleItemState(ItemStack stack) { + IModelBaker baker = ModelBaker.getInstance(); + Block block = Block.getBlockFromItem(stack.getItem()); + if (!blockClass.isInstance(block)) { + return null; + } + BlockDecorativeLeaves bBlock = blockClass.cast(block); + TreeDefinition tree = bBlock.getTreeType(stack.getMetadata()); + + block.setBlockBoundsForItemRender(); + baker.setRenderBoundsFromBlock(block); + bakeBlock(bBlock, tree, baker); + + return latestItemModel = baker.bakeModel(true); + } + + @Override + protected void bakeInventoryBlock(BlockDecorativeLeaves block, ItemStack item, IModelBaker baker) { + + } + + @Override + protected boolean bakeWorldBlock(BlockDecorativeLeaves block, IBlockAccess world, BlockPos pos, IModelBaker baker) { + return false; + } + + public static boolean bakeBlock(BlockDecorativeLeaves block, TreeDefinition treeDefinition, IModelBaker baker) { + if (treeDefinition == null) { + return false; + } + + ITreeGenome genome = treeDefinition.getGenome(); + IAlleleTreeSpecies species = genome.getPrimary(); + ILeafSpriteProvider leafSpriteProvider = species.getLeafSpriteProvider(); + TextureAtlasSprite leaveSprite = leafSpriteProvider.getSprite(false, Proxies.render.fancyGraphicsEnabled()); + + // Render the plain leaf block. + baker.addBlockModel(block, null, leaveSprite, 0); + + // Render overlay for fruit leaves. + TextureAtlasSprite fruitSprite = TextureManager.getInstance().getSprite(genome.getFruitProvider().getDecorativeSpriteIndex()); + + if (fruitSprite != null) { + baker.addBlockModel(block, null, fruitSprite, 1); + } + + // Set the particle sprite + baker.getCurrentModel().setParticleSprite(leaveSprite); + + return true; + } +} diff --git a/src/main/java/forestry/arboriculture/render/ModelLeaves.java b/src/main/java/forestry/arboriculture/render/ModelLeaves.java index d97080a1e..9b1d4118b 100644 --- a/src/main/java/forestry/arboriculture/render/ModelLeaves.java +++ b/src/main/java/forestry/arboriculture/render/ModelLeaves.java @@ -22,6 +22,7 @@ import forestry.arboriculture.items.ItemBlockLeaves; import forestry.arboriculture.tiles.TileLeaves; import forestry.core.models.ModelBlockOverlay; import forestry.core.proxy.Proxies; +import forestry.core.tiles.TileUtil; public class ModelLeaves extends ModelBlockOverlay { @@ -30,7 +31,7 @@ public class ModelLeaves extends ModelBlockOverlay { } @Override - public void backeInventoryBlock(BlockForestryLeaves block, ItemStack itemStack, IModelBaker baker) { + public void bakeInventoryBlock(BlockForestryLeaves block, ItemStack itemStack, IModelBaker baker) { if (!(itemStack.getItem() instanceof ItemBlockLeaves) || block == null) { return; } @@ -62,8 +63,8 @@ public class ModelLeaves extends ModelBlockOverlay { } @Override - public boolean backeWorldBlock(BlockForestryLeaves block, IBlockAccess world, BlockPos pos, IModelBaker baker) { - TileLeaves tile = BlockForestryLeaves.getLeafTile(world, pos); + public boolean bakeWorldBlock(BlockForestryLeaves block, IBlockAccess world, BlockPos pos, IModelBaker baker) { + TileLeaves tile = TileUtil.getTile(world, pos, TileLeaves.class); if (tile == null) { return false; } diff --git a/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java b/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java index 908366658..4340aec3e 100644 --- a/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java +++ b/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.render; +import javax.annotation.Nonnull; + import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; @@ -37,6 +39,7 @@ public class ModelProviderGermling implements IGermlingModelProvider { manager.registerVariant(item, new ResourceLocation("forestry:pollen")); } + @Nonnull @Override public ModelResourceLocation getModel(EnumGermlingType type) { if (type == EnumGermlingType.POLLEN) { diff --git a/src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java b/src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java index 428987393..869617a42 100644 --- a/src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java +++ b/src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java @@ -10,8 +10,11 @@ ******************************************************************************/ package forestry.arboriculture.render; +import javax.annotation.Nonnull; + import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; + import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.core.IModelManager; @@ -52,6 +55,7 @@ public class ModelProviderGermlingVanilla implements IGermlingModelProvider { pollenModel = manager.getModelLocation("pollen"); } + @Nonnull @Override public ModelResourceLocation getModel(EnumGermlingType type) { if (type == EnumGermlingType.POLLEN) { diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index 114a02cdc..22d2bc213 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.Arrays; import java.util.Collection; @@ -23,8 +24,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import com.mojang.authlib.GameProfile; - import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -49,7 +48,6 @@ import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyNursery; -import forestry.arboriculture.genetics.Tree; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.network.IRipeningPacketReceiver; @@ -62,11 +60,9 @@ import forestry.core.render.TextureManager; import forestry.core.utils.ColourUtil; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.Log; -import forestry.core.utils.PlayerUtil; public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery, IRipeningPacketReceiver { - private ILeafSpriteProvider leafSpriteProvider; private int colourFruits; private short textureIndexFruits = -1; @@ -77,9 +73,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru private int ripeningTime; private short ripeningPeriod = Short.MAX_VALUE - 1; - // set true when placed by a player - private boolean isDecorative = false; - private int maturationTime; private int damage; @@ -88,88 +81,42 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru /* SAVING & LOADING */ @Override public void readFromNBT(NBTTagCompound nbttagcompound) { - // trees from itemStacks will have no coordinates - if (nbttagcompound.hasKey("x")) { - int x = nbttagcompound.getInteger("x"); - int y = nbttagcompound.getInteger("y"); - int z = nbttagcompound.getInteger("z"); - pos = new BlockPos(x, y, z); + super.readFromNBT(nbttagcompound); + + ripeningTime = nbttagcompound.getShort("RT"); + damage = nbttagcompound.getInteger("ENC"); + + if (nbttagcompound.hasKey("CATER")) { + maturationTime = nbttagcompound.getInteger("CATMAT"); + caterpillar = ButterflyManager.butterflyRoot.getMember(nbttagcompound.getCompoundTag("CATER")); } - if (nbttagcompound.hasKey("species")) { - isDecorative = true; - - String speciesUID = nbttagcompound.getString("species"); - IAllele[] treeTemplate = TreeManager.treeRoot.getTemplate(speciesUID); - ITree containedTree = TreeManager.treeRoot.templateAsIndividual(treeTemplate); - setTree(containedTree); - } else { - if (nbttagcompound.hasKey("owner")) { - setOwner(PlayerUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner"))); - } - - ripeningTime = nbttagcompound.getShort("RT"); - damage = nbttagcompound.getInteger("ENC"); - - if (nbttagcompound.hasKey("CATER")) { - maturationTime = nbttagcompound.getInteger("CATMAT"); - caterpillar = ButterflyManager.butterflyRoot.getMember(nbttagcompound.getCompoundTag("CATER")); - } - - if (nbttagcompound.hasKey("ContainedTree")) { - setTree(new Tree(nbttagcompound.getCompoundTag("ContainedTree"))); - } - } - } - - public void writeToNBTDecorative(NBTTagCompound nbtTagCompound) { - String speciesUID = getSpeciesUID(); - if (speciesUID != null) { - nbtTagCompound.setString("species", speciesUID); + ITree tree = getTree(); + if (tree != null) { + setTree(tree); } } @Override public void writeToNBT(NBTTagCompound nbtTagCompound) { - nbtTagCompound.setString("id", "forestry.Leaves"); - nbtTagCompound.setInteger("x", getPos().getX()); - nbtTagCompound.setInteger("y", getPos().getY()); - nbtTagCompound.setInteger("z", getPos().getZ()); + super.writeToNBT(nbtTagCompound); - if (isDecorative) { - writeToNBTDecorative(nbtTagCompound); - } else { - ITree tree = getTree(); - if (tree != null) { - NBTTagCompound subcompound = new NBTTagCompound(); - tree.writeToNBT(subcompound); - nbtTagCompound.setTag("ContainedTree", subcompound); - } + nbtTagCompound.setInteger("RT", getRipeningTime()); + nbtTagCompound.setInteger("ENC", damage); - GameProfile owner = getOwner(); - if (owner != null) { - NBTTagCompound nbt = new NBTTagCompound(); - PlayerUtil.writeGameProfile(nbt, owner); - nbtTagCompound.setTag("owner", nbt); - } + if (caterpillar != null) { + nbtTagCompound.setInteger("CATMAT", maturationTime); - nbtTagCompound.setInteger("RT", getRipeningTime()); - nbtTagCompound.setInteger("ENC", damage); - - if (caterpillar != null) { - nbtTagCompound.setInteger("CATMAT", maturationTime); - - NBTTagCompound subcompound = new NBTTagCompound(); - caterpillar.writeToNBT(subcompound); - nbtTagCompound.setTag("CATER", subcompound); - } + NBTTagCompound caterpillarNbt = new NBTTagCompound(); + caterpillar.writeToNBT(caterpillarNbt); + nbtTagCompound.setTag("CATER", caterpillarNbt); } } @Override public void onBlockTick() { ITree tree = getTree(); - if (isDecorative || tree == null) { + if (tree == null) { return; } @@ -234,8 +181,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru textureIndexFruits = -1; } - leafSpriteProvider = species.getLeafSpriteProvider(); - markDirty(); } @@ -255,7 +200,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru public int getFoliageColour(EntityPlayer player) { final boolean showPollinated = isPollinatedState && GeneticsUtil.hasNaturalistEye(player); - final int baseColor = leafSpriteProvider.getColor(showPollinated); + final int baseColor = getLeafSpriteProvider().getColor(showPollinated); ITree tree = getTree(); if (isDestroyed(tree, damage)) { @@ -283,16 +228,20 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @SideOnly(Side.CLIENT) public TextureAtlasSprite getLeaveSprite(boolean fancy) { - final ILeafSpriteProvider leafSpriteProvider; - if (species == null) { - IAlleleTreeSpecies oakSpecies = TreeDefinition.Oak.getIndividual().getGenome().getPrimary(); - leafSpriteProvider = oakSpecies.getLeafSpriteProvider(); - } else { - leafSpriteProvider = species.getLeafSpriteProvider(); - } + final ILeafSpriteProvider leafSpriteProvider = getLeafSpriteProvider(); return leafSpriteProvider.getSprite(isPollinatedState, fancy); } + @Nonnull + private ILeafSpriteProvider getLeafSpriteProvider() { + if (species != null) { + return species.getLeafSpriteProvider(); + } else { + IAlleleTreeSpecies oakSpecies = TreeDefinition.Oak.getIndividual().getGenome().getPrimary(); + return oakSpecies.getLeafSpriteProvider(); + } + } + @SideOnly(Side.CLIENT) public TextureAtlasSprite getFruitSprite() { if (textureIndexFruits >= 0) { @@ -303,15 +252,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } public int getRipeningTime() { - return isDecorative ? ripeningPeriod : ripeningTime; - } - - public void setDecorative() { - isDecorative = true; - } - - public boolean isDecorative() { - return isDecorative; + return ripeningTime; } /* IPOLLINATABLE */ @@ -326,7 +267,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public boolean canMateWith(ITree individual) { - if (getTree() == null || isDecorative) { + if (getTree() == null) { return false; } if (getTree().getMate() != null) { @@ -338,7 +279,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public void mateWith(ITree individual) { - if (getTree() == null || isDecorative) { + if (getTree() == null) { return; } @@ -348,9 +289,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public ITree getPollen() { - if (isDecorative) { - return null; - } return getTree(); } @@ -439,7 +377,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru setTree(tree); - worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); + worldObj.markBlockForUpdate(getPos()); } } @@ -456,7 +394,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public Collection pickFruit(ItemStack tool) { ITree tree = getTree(); - if (tree == null || !hasFruit() || isDecorative) { + if (tree == null || !hasFruit()) { return Collections.emptyList(); } @@ -493,7 +431,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public void addRipeness(float add) { - if (getTree() == null || !isFruitLeaf || getRipeningTime() >= ripeningPeriod || isDecorative) { + if (getTree() == null || !isFruitLeaf || getRipeningTime() >= ripeningPeriod) { return; } ripeningTime += ripeningPeriod * add; @@ -559,9 +497,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public void setCaterpillar(IButterfly butterfly) { - if (isDecorative) { - return; - } maturationTime = 0; caterpillar = butterfly; sendNetworkUpdate(); @@ -570,6 +505,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public boolean canNurse(IButterfly butterfly) { ITree tree = getTree(); - return !isDecorative && !isDestroyed(tree, damage) && caterpillar == null; + return !isDestroyed(tree, damage) && caterpillar == null; } } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index 6493e2855..956a9b4bd 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.genetics.alleles; +import javax.annotation.Nonnull; import java.util.Collection; import java.util.Map; @@ -45,7 +46,13 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuil private EnumTemperature climate = EnumTemperature.NORMAL; private EnumHumidity humidity = EnumHumidity.NORMAL; - protected AlleleSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial) { + protected AlleleSpecies(@Nonnull String uid, + @Nonnull String unlocalizedName, + @Nonnull String authority, + @Nonnull String unlocalizedDescription, + boolean isDominant, + @Nonnull IClassification branch, + @Nonnull String binomial) { super(uid, unlocalizedName, isDominant); this.branch = branch; diff --git a/src/main/java/forestry/core/models/ModelBlockOverlay.java b/src/main/java/forestry/core/models/ModelBlockOverlay.java index d8a92ed01..5d59f9daf 100644 --- a/src/main/java/forestry/core/models/ModelBlockOverlay.java +++ b/src/main/java/forestry/core/models/ModelBlockOverlay.java @@ -43,87 +43,14 @@ import forestry.core.models.baker.ModelBaker; */ public abstract class ModelBlockOverlay implements IFlexibleBakedModel, ISmartItemModel, ISmartBlockModel { @Nonnull - private final Class blockClass; - private IModelBakerModel latestBlockModel; - private IModelBakerModel latestItemModel; + protected final Class blockClass; + protected IModelBakerModel latestBlockModel; + protected IModelBakerModel latestItemModel; protected ModelBlockOverlay(@Nonnull Class blockClass) { this.blockClass = blockClass; } - protected void addBottomFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { - - BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); - - if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.DOWN)) { - return; - } - - baker.addFaceYNeg(pos, sprite); - - } - - protected void addTopFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { - - BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); - - if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.UP)) { - return; - } - - - baker.addFaceYPos(pos, sprite); - - } - - protected void addEastFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { - - BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); - - if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.EAST)) { - return; - } - - baker.addFaceZNeg(pos, sprite); - - } - - protected void addWestFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { - - BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); - - if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.WEST)) { - return; - } - - baker.addFaceZPos(pos, sprite); - - } - - protected void addNorthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { - - BlockPos posNEW = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); - - if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.NORTH)) { - return; - } - - baker.addFaceXNeg(pos, sprite); - - } - - protected void addSouthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { - - BlockPos posNEW = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); - - if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.SOUTH)) { - return; - } - - baker.addFaceXPos(pos, sprite); - - } - @Override public List getFaceQuads(EnumFacing face) { return Collections.emptyList(); @@ -188,11 +115,7 @@ public abstract class ModelBlockOverlay implements IFlexibleBak B bBlock = blockClass.cast(block); baker.setRenderBoundsFromBlock(block); - try { - backeWorldBlock(bBlock, world, pos, baker); - } catch (RuntimeException e) { - return null; - } + bakeWorldBlock(bBlock, world, pos, baker); return latestBlockModel = baker.bakeModel(false); } @@ -209,7 +132,7 @@ public abstract class ModelBlockOverlay implements IFlexibleBak block.setBlockBoundsForItemRender(); baker.setRenderBoundsFromBlock(block); try { - backeInventoryBlock(bBlock, stack, baker); + bakeInventoryBlock(bBlock, stack, baker); } catch (RuntimeException e) { return null; } @@ -217,8 +140,8 @@ public abstract class ModelBlockOverlay implements IFlexibleBak return latestItemModel = baker.bakeModel(true); } - protected abstract void backeInventoryBlock(B block, ItemStack item, IModelBaker baker); + protected abstract void bakeInventoryBlock(B block, ItemStack item, IModelBaker baker); - protected abstract boolean backeWorldBlock(B block, IBlockAccess world, BlockPos pos, IModelBaker baker); + protected abstract boolean bakeWorldBlock(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 dc85d1a01..6fed45b1f 100644 --- a/src/main/java/forestry/core/models/baker/ModelBaker.java +++ b/src/main/java/forestry/core/models/baker/ModelBaker.java @@ -14,12 +14,6 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import org.lwjgl.util.vector.Vector3f; - -import forestry.api.core.ForestryAPI; -import forestry.api.core.IModelBaker; -import forestry.api.core.IModelBakerModel; -import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BlockFaceUV; @@ -30,10 +24,18 @@ import net.minecraft.client.resources.model.ModelRotation; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; + import net.minecraftforge.client.model.IColoredBakedQuad; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.util.vector.Vector3f; + +import forestry.api.core.ForestryAPI; +import forestry.api.core.IModelBaker; +import forestry.api.core.IModelBakerModel; +import forestry.core.proxy.Proxies; + /** * A model baker to make custom models in the mod */ @@ -118,27 +120,27 @@ public class ModelBaker implements IModelBaker { } if (pos == null || block.shouldSideBeRendered(world, posDOWN, EnumFacing.DOWN)) { - addFaceYNeg(pos, textures[EnumFacing.DOWN.ordinal()]); + addFaceYNeg(textures[EnumFacing.DOWN.ordinal()]); } if (pos == null || block.shouldSideBeRendered(world, posUP, EnumFacing.UP)) { - addFaceYPos(pos, textures[EnumFacing.UP.ordinal()]); + addFaceYPos(textures[EnumFacing.UP.ordinal()]); } if (pos == null || block.shouldSideBeRendered(world, posEAST, EnumFacing.EAST)) { - addFaceXNeg(pos, textures[EnumFacing.EAST.ordinal()]); + addFaceXNeg(textures[EnumFacing.EAST.ordinal()]); } if (pos == null || block.shouldSideBeRendered(world, posWEST, EnumFacing.WEST)) { - addFaceXPos(pos, textures[EnumFacing.WEST.ordinal()]); + addFaceXPos(textures[EnumFacing.WEST.ordinal()]); } if (pos == null || block.shouldSideBeRendered(world, posNORTH, EnumFacing.NORTH)) { - addFaceZNeg(pos, textures[EnumFacing.NORTH.ordinal()]); + addFaceZNeg(textures[EnumFacing.NORTH.ordinal()]); } if (pos == null || block.shouldSideBeRendered(world, posSOUTH, EnumFacing.SOUTH)) { - addFaceZPos(pos, textures[EnumFacing.SOUTH.ordinal()]); + addFaceZPos(textures[EnumFacing.SOUTH.ordinal()]); } setRenderBounds(0, 0, 0, 1, 1, 1); } @@ -150,7 +152,7 @@ public class ModelBaker implements IModelBaker { private final float quadsUV[] = new float[] { 0, 0, 1, 1, 0, 0, 1, 1 }; protected EnumSet renderFaces = EnumSet.allOf(EnumFacing.class); - private List faces = new ArrayList(); + private List faces = new ArrayList<>(); protected float[] getFaceUvs(final EnumFacing face, final Vector3f to_16, final Vector3f from_16) { float from_a = 0; @@ -221,7 +223,7 @@ public class ModelBaker implements IModelBaker { } @Override - public void addFaceXNeg(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceXNeg(TextureAtlasSprite sprite) { boolean isEdge = renderMinX < 0.0001; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMinX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); @@ -230,7 +232,7 @@ public class ModelBaker implements IModelBaker { } @Override - public void addFaceYNeg(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceYNeg(TextureAtlasSprite sprite) { boolean isEdge = renderMinY < 0.0001; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMinY * 16.0f, (float) renderMaxZ * 16.0f); @@ -239,7 +241,7 @@ public class ModelBaker implements IModelBaker { } @Override - public void addFaceZNeg(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceZNeg(TextureAtlasSprite sprite) { boolean isEdge = renderMinZ < 0.0001; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMinZ * 16.0f); @@ -248,7 +250,7 @@ public class ModelBaker implements IModelBaker { } @Override - public void addFaceYPos(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceYPos(TextureAtlasSprite sprite) { boolean isEdge = renderMaxY > 0.9999; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); @@ -257,7 +259,7 @@ public class ModelBaker implements IModelBaker { } @Override - public void addFaceZPos(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceZPos(TextureAtlasSprite sprite) { boolean isEdge = renderMaxZ > 0.9999; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMaxZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); @@ -266,7 +268,7 @@ public class ModelBaker implements IModelBaker { } @Override - public void addFaceXPos(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceXPos(TextureAtlasSprite sprite) { boolean isEdge = renderMaxX > 0.9999; Vector3f to = new Vector3f((float) renderMaxX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); @@ -286,7 +288,8 @@ public class ModelBaker implements IModelBaker { if (flip) mr = ModelRotation.X0_Y180; - for (ModelBakerFace face : faces) { + // TODO: find out why there is a concurrent modification issue with faces + for (ModelBakerFace face : new ArrayList<>(faces)) { final EnumFacing myFace = face.face; final float[] uvs = getFaceUvs(myFace, face.from, face.to); @@ -308,7 +311,7 @@ public class ModelBaker implements IModelBaker { public IModelBakerModel clear() { ModelBakerModel model = currentModel.copy(); currentModel = new ModelBakerModel(); - faces = new ArrayList(); + faces = new ArrayList<>(); return model; } diff --git a/src/main/java/forestry/core/models/baker/ModelBakerModel.java b/src/main/java/forestry/core/models/baker/ModelBakerModel.java index ec6ed9fe4..103b4fae2 100644 --- a/src/main/java/forestry/core/models/baker/ModelBakerModel.java +++ b/src/main/java/forestry/core/models/baker/ModelBakerModel.java @@ -13,9 +13,6 @@ package forestry.core.models.baker; import java.util.ArrayList; import java.util.List; -import org.lwjgl.util.vector.Vector3f; - -import forestry.api.core.IModelBakerModel; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemTransformVec3f; @@ -24,9 +21,14 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.util.vector.Vector3f; + +import forestry.api.core.IModelBakerModel; + @SideOnly(Side.CLIENT) public class ModelBakerModel implements IModelBakerModel { private List[] faces = new List[6]; @@ -170,12 +172,12 @@ public class ModelBakerModel implements IModelBakerModel { } @Override - public List getGeneralQuads() { + public List getGeneralQuads() { return general; } @Override - public List getFaceQuads(EnumFacing face) { + public List getFaceQuads(EnumFacing face) { return faces[face.ordinal()]; } diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java index e70432e12..70663c757 100644 --- a/src/main/java/forestry/farming/models/ModelFarmBlock.java +++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java @@ -18,7 +18,7 @@ public class ModelFarmBlock extends ModelBlockOverlay { } @Override - public void backeInventoryBlock(BlockFarm blockFarm, ItemStack item, IModelBaker baker) { + public void bakeInventoryBlock(BlockFarm blockFarm, ItemStack item, IModelBaker baker) { if (blockFarm == null) { return; } @@ -32,7 +32,7 @@ public class ModelFarmBlock extends ModelBlockOverlay { } @Override - public boolean backeWorldBlock(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IModelBaker baker) { + public boolean bakeWorldBlock(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IModelBaker baker) { TileFarm farm = (TileFarm) world.getTileEntity(pos);