From cfbde3eb83fa460f35350e4f8e9f6c04465735a9 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 27 Nov 2014 11:42:10 -0800 Subject: [PATCH] Minor tree cleanup --- .../arboriculture/genetics/AlleleTreeSpecies.java | 11 +---------- .../arboriculture/worldgen/WorldGenArboriculture.java | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java index d3e86e7a5..ef410bfb0 100755 --- a/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java @@ -83,16 +83,7 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci private EnumPlantType nativeType = EnumPlantType.Plains; private final ArrayList fruits = new ArrayList(); - private ItemStack wood; - - public AlleleTreeSpecies(String uid, boolean isDominant, String name, IClassification branch, String binomial, int primaryColor, int secondaryColor) { - super(uid, isDominant, name, branch, binomial); - - this.root = (ITreeRoot)AlleleManager.alleleRegistry.getSpeciesRoot(TreeHelper.UID); - this.primaryColour = primaryColor; - //this.secondaryColour = secondaryColor; - leafType = leafTypes.get("deciduous"); - } + private final ItemStack wood; public AlleleTreeSpecies(String uid, boolean isDominant, String name, IClassification branch, String binomial, int primaryColor, Class generator, ItemStack wood) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index cb868ed4b..f97a08730 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -24,7 +24,7 @@ import forestry.core.worldgen.WorldGenBase; public abstract class WorldGenArboriculture extends WorldGenBase { - protected ITreeGenData tree; + protected final ITreeGenData tree; protected int startX; protected int startY; protected int startZ;