diff --git a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java index 53efcdcc..a5ea28cf 100644 --- a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java +++ b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java @@ -43,6 +43,7 @@ public class RenderUtil { net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); FontRenderer font = getFontRenderer(minecraft, itemStack); + //TODO: Fix the rotation if (rotating) { GlStateManager.pushMatrix(); final float phase = Minecraft.getSystemTime() / 20; @@ -52,11 +53,10 @@ public class RenderUtil { } minecraft.getRenderItem().renderItemAndEffectIntoGUI(null, itemStack, pos.x(), pos.y()); - minecraft.getRenderItem().renderItemOverlayIntoGUI(font, itemStack, pos.x(), pos.y(), null); - if (rotating) { GlStateManager.popMatrix(); } + minecraft.getRenderItem().renderItemOverlayIntoGUI(font, itemStack, pos.x(), pos.y(), null); GlStateManager.disableBlend(); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java index c0b04315..6442d4eb 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java @@ -215,6 +215,11 @@ public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegi return ret; } + @Override + public boolean isWood(IBlockAccess world, BlockPos pos) { + return true; + } + @Override public IBlockState withRotation(IBlockState state, Rotation rot) { switch (rot) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java index cdacd2ce..68b8fbfe 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java @@ -20,14 +20,13 @@ public class WorldGenAlder { protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + 1; float bottom = WorldGenUtils.randBetween(rand, 1, 2); - float width = this.height * WorldGenUtils.randBetween(rand, 0.4f, 0.45f); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.3f * width + girth, 1, EnumReplaceMode.SOFT); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.8f * width + girth, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.5F, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.75F, 1, EnumReplaceMode.SOFT); while (leafSpawn > bottom) { - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, width - 0.25f + girth, 1, EnumReplaceMode.SOFT); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, width - 0.4f + girth, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 2.25F, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 2F, 1, EnumReplaceMode.SOFT); } - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.4f * width + girth, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.75F, 1, EnumReplaceMode.SOFT); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java index 9db10bcf..9b02e3a9 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java @@ -1,39 +1,29 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + import forestry.api.world.ITreeGenData; +import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; +import forestry.core.worldgen.WorldGenHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class WorldGenAsh { - public static class CommonAsh extends WorldGenTree { + public static class CommonAsh extends forestry.arboriculture.worldgen.WorldGenTree { public CommonAsh(ITreeGenData tree) { - super(tree); + super(tree, 5, 2); } - + @Override - public void generate() { - this.generateTreeTrunk(this.height, this.girth); + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.35f, 0.45f); - final float f = 0.0f; - final float h = leafSpawn; - leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.8f * width, 1, this.leaf, false); + float bottom = WorldGenUtils.randBetween(rand, 2, 3); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.75F, 1, WorldGenHelper.EnumReplaceMode.AIR); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; - leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), this.randBetween(0.95f, 1.05f) * width, 1, this.leaf, false); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.25F, 1, WorldGenHelper.EnumReplaceMode.AIR); } - final float f3 = 0.0f; - final float h3 = leafSpawn; - leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.7f * width, 1, this.leaf, false); - } - - @Override - public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth()); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.25F, 1, WorldGenHelper.EnumReplaceMode.AIR); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index eb40a3bc..ca09757b 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -17,10 +17,9 @@ public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height + 1; - final float width = this.height / WorldGenUtils.randBetween(rand, 3f, 3.25f); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.25F * width + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, width + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.75F * width + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1, 1, WorldGenHelper.EnumReplaceMode.AIR); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java index 2d9eb389..d2b03503 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java @@ -1,41 +1,31 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + import forestry.api.world.ITreeGenData; +import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; +import forestry.core.worldgen.WorldGenHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class WorldGenBeech { - public static class CommonBeech extends WorldGenTree { + public static class CommonBeech extends forestry.arboriculture.worldgen.WorldGenTree { public CommonBeech(ITreeGenData tree) { - super(tree); + super(tree, 5, 3); } - + @Override - public void generate() { - this.generateTreeTrunk(this.height, this.girth); + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.47f, 0.5f); - final float f = 0.0f; - final float h = leafSpawn; - leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; - leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + float bottom = WorldGenUtils.randBetween(rand, 2, 3); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; - leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; - leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, this.leaf, false); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 2.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.85F, 1, WorldGenHelper.EnumReplaceMode.AIR); } - final float f5 = 0.0f; - final float h5 = leafSpawn; - leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 1.0f, 1, this.leaf, false); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java index 297f8d28..f2bb043b 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java @@ -1,45 +1,36 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + import forestry.api.world.ITreeGenData; +import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; +import forestry.core.worldgen.WorldGenHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class WorldGenConifer { - public static class WesternHemlock extends WorldGenTree { + public static class WesternHemlock extends forestry.arboriculture.worldgen.WorldGenTree { public WesternHemlock(ITreeGenData tree) { - super(tree); + super(tree, 7, 3); } - + @Override - public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 6; - final float bottom = this.randBetween(2, 3); - float width = this.height / this.randBetween(2.0f, 2.5f); - if (width > 7.0f) { - width = 7.0f; - } + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { + float leafSpawn = this.height + girth * 4; + float bottom = WorldGenUtils.randBetween(rand, 2, 3); final float coneHeight = leafSpawn - bottom; + float width = (girth * height / 3); + if(width > 9){ + width = 9; + } while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; - leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, radius, 1, WorldGenHelper.EnumReplaceMode.AIR); } - final float f2 = 0.0f; - final float h2 = leafSpawn; - leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; - leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, this.leaf, false); - } - - @Override - public void preGenerate() { - this.height = this.determineHeight(7, 3); - this.girth = this.determineGirth(this.treeGen.getGirth()); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + width * 0.7F, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + width * 0.4F, 1, WorldGenHelper.EnumReplaceMode.AIR); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java index 35c8d481..3a1212b4 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java @@ -1,39 +1,26 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + import forestry.api.world.ITreeGenData; +import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; +import forestry.core.worldgen.WorldGenHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class WorldGenPalm { - public static class Coconut extends WorldGenTree { + public static class Coconut extends forestry.arboriculture.worldgen.WorldGenTree { public Coconut(ITreeGenData tree) { - super(tree); + super(tree, 6, 1); } - + @Override - public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - float width = this.height * this.randBetween(0.35f, 0.4f); - if (width < 1.2) { - width = 1.55f; - } - final float f = 0.0f; - final float h = leafSpawn; - leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; - leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; - leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.6f, 1, this.leaf, false); - } - - @Override - public void preGenerate() { - this.height = this.determineHeight(6, 1); - this.girth = this.determineGirth(this.treeGen.getGirth()); + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { + float leafSpawn = this.height + 1; + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth - 1, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 0.5F, 1, WorldGenHelper.EnumReplaceMode.AIR); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth - 0.6F, 1, WorldGenHelper.EnumReplaceMode.AIR); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java index 1ee274ad..f3b1fe94 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java @@ -38,15 +38,13 @@ public class WorldGenShrub { @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { - float leafSpawn = this.height + 1; - float width = this.height * WorldGenUtils.randBetween(rand, 0.7f, 0.9f); - if (width < 1.5f) { - width = 1.5f; - } - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.15f * width + girth, 1, EnumReplaceMode.SOFT); - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.75f * width + girth, 1, EnumReplaceMode.SOFT); + float leafSpawn = this.height; + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 1F, 1, EnumReplaceMode.SOFT); + int i = 0; while (leafSpawn >= 0.0f) { - WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, width + girth, 1, EnumReplaceMode.SOFT); + WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth + 2F + i * 1, 1, EnumReplaceMode.SOFT); + i++; } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java index 92abc81a..7debb973 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java @@ -2,7 +2,6 @@ package binnie.extratrees.gen; import java.util.List; import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; @@ -33,7 +32,7 @@ public class WorldGenWalnut { public Butternut(ITreeGenData tree) { super(tree, 6, 3); } - + @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = this.height + 1; diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 28691e99..93ef3265 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -42,12 +42,16 @@ import forestry.api.arboriculture.IWoodProvider; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IClassification; import forestry.api.world.ITreeGenData; import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.genetics.ClimateGrowthProvider; import forestry.arboriculture.genetics.ITreeDefinition; import forestry.arboriculture.genetics.Tree; import forestry.arboriculture.tiles.TileLeaves; @@ -1570,6 +1574,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, Redcurrant("ribes", "rubrum", EnumLeafType.DECIDUOUS, new Color(0x74AC00), new Color(0x74AC00), EnumSaplingType.Shrub, EnumShrubLog.INSTANCE, new Color(0xFFFFFF)) { @@ -1593,6 +1599,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, Blackberry("rubus", "fruticosus", EnumLeafType.DECIDUOUS, new Color(0x92C15B), new Color(0x92C15B), EnumSaplingType.Shrub, EnumShrubLog.INSTANCE, new Color(0xFFFFFF)) { @@ -1638,6 +1646,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, Blueberry("vaccinium", "corymbosum", EnumLeafType.DECIDUOUS, new Color(0x72C750), new Color(0x72C750), EnumSaplingType.Shrub, EnumShrubLog.INSTANCE, new Color(0xFFFFFF)) { @@ -1661,6 +1671,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, Cranberry("vaccinium", "oxycoccos", EnumLeafType.DECIDUOUS, new Color(0x96D179), new Color(0x96D179), EnumSaplingType.Shrub, EnumShrubLog.INSTANCE, new Color(0xFFFFFF)) { @@ -1684,6 +1696,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, Juniper("juniperus", "communis", EnumLeafType.CONIFERS, new Color(0x90B149), new Color(0x90B149), EnumSaplingType.Shrub, EnumShrubLog.INSTANCE, new Color(0xFFFFFF)) { @@ -1707,6 +1721,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, Gooseberry("ribes", "grossularia", EnumLeafType.DECIDUOUS, new Color(0x79BB00), new Color(0x79BB00), EnumSaplingType.Shrub, EnumShrubLog.INSTANCE, new Color(0xFFFFFF)) { @@ -1729,6 +1745,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, GoldenRaspberry("rubus", "occidentalis", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumShrubLog.INSTANCE, new Color(0xFFFFFF)) { @@ -1752,6 +1770,8 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); species.addFruitFamily(ETFruitFamily.Berry); + species.setRarity(0.0025F); + species.setGrowthProvider(new ClimateGrowthProvider(EnumTemperature.NORMAL, EnumTolerance.BOTH_1, EnumHumidity.NORMAL, EnumTolerance.NONE)); } }, Cinnamon("cinnamomum", "cassia", EnumLeafType.JUNGLE, new Color(0x738E0B), new Color(0x738E0B), EnumSaplingType.Default, EnumETLog.Cinnamon, new Color(0x86583C)) {