diff --git a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java index 6dd956b64..820b0697e 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java @@ -43,6 +43,8 @@ public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { - String speciesUid = TreeDefinition.Oak.getUID(); - + ITree tree = null; + TileLeaves leaves = TileUtil.getTile(world, pos, TileLeaves.class); if (leaves != null) { - ITree tree = leaves.getTree(); - if (tree != null) { - speciesUid = tree.getGenome().getPrimary().getUID(); - } + tree = leaves.getTree(); + } + + if(tree == null){ + tree = TreeDefinition.Oak.getIndividual(); } - ItemStack decorativeLeaves = PluginArboriculture.getBlocks().getDecorativeLeaves(speciesUid); + ItemStack decorativeLeaves = tree.getGenome().getDecorativeLeaves(); if (decorativeLeaves.isEmpty()) { return Collections.emptyList(); } else { diff --git a/src/main/java/forestry/arboriculture/genetics/LeafProvider.java b/src/main/java/forestry/arboriculture/genetics/LeafProvider.java new file mode 100644 index 000000000..b290c9536 --- /dev/null +++ b/src/main/java/forestry/arboriculture/genetics/LeafProvider.java @@ -0,0 +1,31 @@ +package forestry.arboriculture.genetics; + +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ILeafProvider; +import forestry.api.genetics.IAllele; +import forestry.arboriculture.PluginArboriculture; +import net.minecraft.item.ItemStack; + +public class LeafProvider implements ILeafProvider { + + private IAlleleTreeSpecies treeSpecies; + + public LeafProvider() { + } + + @Override + public void init(IAlleleTreeSpecies treeSpecies) { + this.treeSpecies = treeSpecies; + } + + @Override + public ItemStack getDecorativeLeaves() { + IAllele allele = treeSpecies; + if(allele == null){ + allele = TreeDefinition.Oak.getTemplate()[EnumTreeChromosome.SPECIES.ordinal()]; + } + return PluginArboriculture.getBlocks().getDecorativeLeaves(allele.getUID()); + } + +} \ No newline at end of file diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index 1fa11a742..629ff602f 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -99,6 +99,11 @@ public class TreeGenome extends Genome implements ITreeGenome { public IAlleleLeafEffect getEffect() { return (IAlleleLeafEffect) getActiveAllele(EnumTreeChromosome.EFFECT); } + + @Override + public ItemStack getDecorativeLeaves() { + return getPrimary().getLeafProvider().getDecorativeLeaves(); + } @Override public ISpeciesRoot getSpeciesRoot() { diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index 0eadb9b73..b287e61b9 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -18,6 +18,7 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.arboriculture.ILeafProvider; import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeRoot; @@ -27,6 +28,7 @@ import forestry.api.core.IModelManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.api.genetics.IFruitFamily; +import forestry.arboriculture.genetics.LeafProvider; import forestry.core.genetics.alleles.AlleleSpecies; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; @@ -42,7 +44,24 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci private final List fruits = new ArrayList<>(); private final String modID; private EnumPlantType nativeType = EnumPlantType.Plains; + private final ILeafProvider leafProvider; + public AlleleTreeSpecies( + String uid, + String unlocalizedName, + String authority, + String unlocalizedDescription, + boolean isDominant, + IClassification branch, + String binomial, + String modID, + ILeafSpriteProvider leafSpriteProvider, + IGermlingModelProvider germlingModelProvider, + IWoodProvider woodProvider, + ITreeGenerator generator) { + this(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial, modID, leafSpriteProvider, germlingModelProvider, woodProvider, generator, new LeafProvider()); + } + public AlleleTreeSpecies( String uid, String unlocalizedName, @@ -55,13 +74,15 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci ILeafSpriteProvider leafIconProvider, IGermlingModelProvider germlingModelProvider, IWoodProvider woodProvider, - ITreeGenerator generator) { + ITreeGenerator generator, + ILeafProvider leafProvider) { super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial); this.generator = generator; this.germlingModelProvider = germlingModelProvider; this.woodProvider = woodProvider; this.leafSpriteProvider = leafIconProvider; + this.leafProvider = leafProvider; this.modID = modID; } @@ -69,6 +90,7 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci @Override public IAlleleTreeSpecies build() { AlleleManager.alleleRegistry.registerAllele(this, EnumTreeChromosome.SPECIES); + leafProvider.init(this); return this; } @@ -138,6 +160,11 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci return woodProvider; } + @Override + public ILeafProvider getLeafProvider() { + return leafProvider; + } + @Override public String getModID() { return modID;