diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index 2cd93758..4dcf9901 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -1,18 +1,5 @@ package binnie; -import java.awt.Color; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; - -import forestry.core.fluids.BlockForestryFluid; -import forestry.core.fluids.Fluids; -import forestry.core.items.DrinkProperties; -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - public final class Constants { public static final String CORE_MOD_ID = "binniecore"; public static final String BOTANY_MOD_ID = "botany"; diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 9590609a..52624a6e 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -62,6 +63,11 @@ class BlockMachine extends BlockContainer implements IBlockMachine { public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.MODEL; } + + @Override + public boolean canRenderInLayer(BlockRenderLayer layer) { + return layer == BlockRenderLayer.CUTOUT; + } @Override public int getMetaFromState(IBlockState state) { diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 830e5ab5..53c18cd9 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -9,10 +9,8 @@ import binnie.core.gui.IBinnieGUID; import binnie.core.network.packet.MessageBase; import forestry.core.models.BlockModelEntry; import forestry.core.models.ModelEntry; -import forestry.core.models.ModelManager; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java index 8cd0e8eb..513bb99e 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java @@ -13,7 +13,6 @@ import binnie.craftgui.window.Panel; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.lumbermill.LumbermillMachine; import binnie.extratrees.machines.lumbermill.LumbermillRecipes; -import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index a6054925..04606b78 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -31,7 +31,6 @@ import binnie.extratrees.proxy.Proxy; import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.AlleleSpeciesRegisterEvent; -import forestry.arboriculture.blocks.BlockDecorativeLeaves; import forestry.arboriculture.blocks.BlockForestryStairs; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -166,7 +165,7 @@ public class ExtraTrees extends AbstractMod { @SubscribeEvent public void speciesRegister(AlleleSpeciesRegisterEvent event) { if (event.getRoot() instanceof ITreeRoot) { - for (final ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) { + for (final AlleleETFruit fruit : AlleleETFruit.values()) { AlleleManager.alleleRegistry.registerAllele(fruit); } ETTreeDefinition.preInitTrees(); diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index df84b609..b6c77fbb 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -1,5 +1,7 @@ package binnie.extratrees.block; +import java.util.Locale; + import binnie.core.BinnieCore; public enum FruitPod { @@ -21,6 +23,10 @@ public enum FruitPod { public short[] getTextures() { return this.textures; } + + public String getModelName() { + return name().toLowerCase(Locale.ENGLISH); + } // @Override // @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java index dc5ac7da..0a2d31b9 100644 --- a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java @@ -6,8 +6,6 @@ import binnie.extratrees.genetics.ETTreeDefinition; 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.arboriculture.items.ItemBlockLeaves; import forestry.core.items.IColoredItem; import forestry.core.items.ItemBlockForestry; diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 74f609db..b60bf191 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -26,11 +26,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; import forestry.api.recipes.RecipeManagers; import forestry.arboriculture.WoodAccess; -import forestry.arboriculture.blocks.BlockDecorativeLeaves; import forestry.arboriculture.blocks.BlockForestryStairs; -import forestry.arboriculture.genetics.LeafProvider; -import forestry.arboriculture.genetics.TreeDefinition; -import forestry.arboriculture.items.ItemBlockDecorativeLeaves; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.OreDictUtil; import net.minecraft.block.Block; diff --git a/src/main/java/binnie/extratrees/block/TreeTypePredicate.java b/src/main/java/binnie/extratrees/block/TreeTypePredicate.java index c1e4541a..ecf8e2c5 100644 --- a/src/main/java/binnie/extratrees/block/TreeTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/TreeTypePredicate.java @@ -5,7 +5,6 @@ import javax.annotation.Nullable; import com.google.common.base.Predicate; import binnie.extratrees.genetics.ETTreeDefinition; -import forestry.arboriculture.genetics.TreeDefinition; public class TreeTypePredicate implements Predicate { private final int minMeta; diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 16dad8a3..7194df50 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -7,7 +7,7 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.EnumExtraTreeLog; import binnie.extratrees.block.PlankType; -import binnie.extratrees.genetics.ExtraTreeFruitGene; +import binnie.extratrees.genetics.AlleleETFruit; import binnie.extratrees.genetics.ETTreeDefinition; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IWoodType; @@ -45,15 +45,15 @@ public class ModuleCore implements IInitializable { Collections.addAll(logQueue, EnumExtraTreeLog.values()); final Queue plankQueue = new LinkedList<>(); Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.values()); - final Queue fruitQueue = new LinkedList<>(); - for (final ExtraTreeFruitGene wood3 : ExtraTreeFruitGene.values()) { + final Queue fruitQueue = new LinkedList<>(); + for (final AlleleETFruit wood3 : AlleleETFruit.values()) { fruitQueue.add(wood3); } final Queue designQueue = new LinkedList<>(); for (final IDesign wood4 : CarpentryManager.carpentryInterface.getSortedDesigns()) { designQueue.add(wood4); } - fruitQueue.remove(ExtraTreeFruitGene.Apple); + fruitQueue.remove(AlleleETFruit.Apple); outputSpecies.println(""); while (!speciesQueue.isEmpty()) { outputSpecies.println(""); @@ -98,7 +98,7 @@ public class ModuleCore implements IInitializable { while (!fruitQueue.isEmpty()) { outputFruit.println(""); for (int i = 0; i < 4; ++i) { - final ExtraTreeFruitGene wood6 = fruitQueue.poll(); + final AlleleETFruit wood6 = fruitQueue.poll(); if (wood6 == null) { outputFruit.println(""); } else { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java index 045b2a88..9a92d8c2 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenAlder { public static class CommonAlder extends WorldGenTree { - public CommonAlder(final ITree tree) { + public CommonAlder(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenApple.java b/src/main/java/binnie/extratrees/gen/WorldGenApple.java index a25061a2..e7329790 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenApple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenApple.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenApple { public static class OrchardApple extends WorldGenTree { - public OrchardApple(final ITree tree) { + public OrchardApple(ITreeGenData tree) { super(tree); } @@ -28,7 +28,7 @@ public class WorldGenApple { } public static class SweetCrabapple extends WorldGenTree { - public SweetCrabapple(final ITree tree) { + public SweetCrabapple(ITreeGenData tree) { super(tree); } @@ -54,7 +54,7 @@ public class WorldGenApple { } public static class FloweringCrabapple extends WorldGenTree { - public FloweringCrabapple(final ITree tree) { + public FloweringCrabapple(ITreeGenData tree) { super(tree); } @@ -78,7 +78,7 @@ public class WorldGenApple { } public static class PrairieCrabapple extends WorldGenTree { - public PrairieCrabapple(final ITree tree) { + public PrairieCrabapple(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java index b6ad5dc3..9db10bcf 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenAsh { public static class CommonAsh extends WorldGenTree { - public CommonAsh(final ITree tree) { + public CommonAsh(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index 5168da86..2e95005b 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -1,9 +1,9 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenBanana extends WorldGenTree { - public WorldGenBanana(final ITree tree) { + public WorldGenBanana(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java index dbf9874b..2d9eb389 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenBeech { public static class CommonBeech extends WorldGenTree { - public CommonBeech(final ITree tree) { + public CommonBeech(ITreeGenData tree) { super(tree); } @@ -41,7 +41,7 @@ public class WorldGenBeech { } public static class CopperBeech extends CommonBeech { - public CopperBeech(final ITree tree) { + public CopperBeech(ITreeGenData tree) { super(tree); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java index cf1804ac..297f8d28 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenConifer { public static class WesternHemlock extends WorldGenTree { - public WesternHemlock(final ITree tree) { + public WesternHemlock(ITreeGenData tree) { super(tree); } @@ -45,7 +45,7 @@ public class WorldGenConifer { } public static class Cypress extends WorldGenTree { - public Cypress(final ITree tree) { + public Cypress(ITreeGenData tree) { super(tree); } @@ -87,7 +87,7 @@ public class WorldGenConifer { } public static class Yew extends WorldGenTree { - public Yew(final ITree tree) { + public Yew(ITreeGenData tree) { super(tree); } @@ -125,7 +125,7 @@ public class WorldGenConifer { } public static class Cedar extends WorldGenTree { - public Cedar(final ITree tree) { + public Cedar(ITreeGenData tree) { super(tree); } @@ -191,7 +191,7 @@ public class WorldGenConifer { } public static class LoblollyPine extends WorldGenTree { - public LoblollyPine(final ITree tree) { + public LoblollyPine(ITreeGenData tree) { super(tree); } @@ -229,7 +229,7 @@ public class WorldGenConifer { } public static class MonkeyPuzzle extends WorldGenTree { - public MonkeyPuzzle(final ITree tree) { + public MonkeyPuzzle(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java b/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java index 67615aff..cdc742fc 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenEucalyptus { public static class SwampGum extends WorldGenTree { - public SwampGum(final ITree tree) { + public SwampGum(ITreeGenData tree) { super(tree); } @@ -61,7 +61,7 @@ public class WorldGenEucalyptus { } public static class RoseGum extends WorldGenTree { - public RoseGum(final ITree tree) { + public RoseGum(ITreeGenData tree) { super(tree); } @@ -110,7 +110,7 @@ public class WorldGenEucalyptus { } public static class RainbowGum extends WorldGenTree { - public RainbowGum(final ITree tree) { + public RainbowGum(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenFir.java b/src/main/java/binnie/extratrees/gen/WorldGenFir.java index d287d2fc..e671aee5 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenFir.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenFir.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenFir { public static class DouglasFir extends WorldGenTree { - public DouglasFir(final ITree tree) { + public DouglasFir(ITreeGenData tree) { super(tree); } @@ -56,7 +56,7 @@ public class WorldGenFir { } public static class SilverFir extends WorldGenTree { - public SilverFir(final ITree tree) { + public SilverFir(ITreeGenData tree) { super(tree); } @@ -96,7 +96,7 @@ public class WorldGenFir { } public static class BalsamFir extends WorldGenTree { - public BalsamFir(final ITree tree) { + public BalsamFir(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenHolly.java b/src/main/java/binnie/extratrees/gen/WorldGenHolly.java index caceb6e7..a95b6203 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenHolly.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenHolly.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenHolly { public static class Holly extends WorldGenTree { - public Holly(final ITree tree) { + public Holly(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenJungle.java b/src/main/java/binnie/extratrees/gen/WorldGenJungle.java index f174de61..cef6a33a 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenJungle.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenJungle.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenJungle { public static class Brazilwood extends WorldGenTree { - public Brazilwood(final ITree tree) { + public Brazilwood(ITreeGenData tree) { super(tree); } @@ -38,7 +38,7 @@ public class WorldGenJungle { } public static class Logwood extends WorldGenTree { - public Logwood(final ITree tree) { + public Logwood(ITreeGenData tree) { super(tree); } @@ -76,7 +76,7 @@ public class WorldGenJungle { } public static class Rosewood extends WorldGenTree { - public Rosewood(final ITree tree) { + public Rosewood(ITreeGenData tree) { super(tree); } @@ -118,7 +118,7 @@ public class WorldGenJungle { } public static class Purpleheart extends WorldGenTree { - public Purpleheart(final ITree tree) { + public Purpleheart(ITreeGenData tree) { super(tree); } @@ -158,7 +158,7 @@ public class WorldGenJungle { } public static class OsangeOsange extends WorldGenTree { - public OsangeOsange(final ITree tree) { + public OsangeOsange(ITreeGenData tree) { super(tree); } @@ -196,7 +196,7 @@ public class WorldGenJungle { } public static class OldFustic extends WorldGenTree { - public OldFustic(final ITree tree) { + public OldFustic(ITreeGenData tree) { super(tree); } @@ -234,7 +234,7 @@ public class WorldGenJungle { } public static class Coffee extends WorldGenTree { - public Coffee(final ITree tree) { + public Coffee(ITreeGenData tree) { super(tree); } @@ -272,7 +272,7 @@ public class WorldGenJungle { } public static class BrazilNut extends WorldGenTree { - public BrazilNut(final ITree tree) { + public BrazilNut(ITreeGenData tree) { super(tree); } @@ -314,7 +314,7 @@ public class WorldGenJungle { } public static class Shrub15 extends WorldGenTree { - public Shrub15(final ITree tree) { + public Shrub15(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenLazy.java b/src/main/java/binnie/extratrees/gen/WorldGenLazy.java index e35d18ed..aa87d37a 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenLazy.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenLazy.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenLazy { public static class Tree extends WorldGenTree { - public Tree(final ITree tree) { + public Tree(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenMaple.java b/src/main/java/binnie/extratrees/gen/WorldGenMaple.java index ccd624c1..46f0c256 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenMaple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenMaple.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenMaple { public static class RedMaple extends WorldGenTree { - public RedMaple(final ITree tree) { + public RedMaple(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java index 1d1f99f3..35c8d481 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenPalm { public static class Coconut extends WorldGenTree { - public Coconut(final ITree tree) { + public Coconut(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java b/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java index ac5d2198..b2f7f4cb 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenPoplar { public static class Aspen extends WorldGenTree { - public Aspen(final ITree tree) { + public Aspen(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java index fdb752f8..c3585f0e 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java @@ -1,13 +1,13 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenShrub { - public static class Shrub extends WorldGenTree { - public Shrub(final ITree tree) { + public static class Shrub extends WorldGenTree{ + public Shrub(ITreeGenData tree) { super(tree); } - + @Override public void generate() { float leafSpawn = this.height; @@ -30,13 +30,12 @@ public class WorldGenShrub { this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); } } - + @Override public void preGenerate() { this.minHeight = 1; this.height = this.determineHeight(1, 1); this.girth = this.determineGirth(this.treeGen.getGirth()); } - } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java b/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java index 3010860a..f243c603 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenSorbus { public static class Whitebeam extends WorldGenTree { - public Whitebeam(final ITree tree) { + public Whitebeam(ITreeGenData tree) { super(tree); } @@ -26,7 +26,7 @@ public class WorldGenSorbus { } public static class Rowan extends WorldGenTree { - public Rowan(final ITree tree) { + public Rowan(ITreeGenData tree) { super(tree); } @@ -46,7 +46,7 @@ public class WorldGenSorbus { } public static class ServiceTree extends WorldGenTree { - public ServiceTree(final ITree tree) { + public ServiceTree(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree.java b/src/main/java/binnie/extratrees/gen/WorldGenTree.java index a32fe513..8a5b22d0 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree.java @@ -12,7 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenerator; import java.util.Random; -public abstract class WorldGenTree extends WorldGenerator { +public class WorldGenTree extends WorldGenerator { protected ITreeGenData treeGen; protected World world; protected Random rand; @@ -79,7 +79,7 @@ public abstract class WorldGenTree extends WorldGenerator { return new BlockTypeLog(treeGen); } - public WorldGenTree(final ITreeGenData tree) { + public WorldGenTree(ITreeGenData tree) { this.minHeight = 3; this.maxHeight = 80; this.spawnPods = false; @@ -88,9 +88,7 @@ public abstract class WorldGenTree extends WorldGenerator { this.air = new BlockTypeVoid(); this.bushiness = 0.0f; this.spawnPods = tree.allowsFruitBlocks(); - if (tree instanceof ITreeGenData) { - this.treeGen = tree; - } + this.treeGen = tree; } @Override diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree2.java b/src/main/java/binnie/extratrees/gen/WorldGenTree2.java index 02e71a40..1a209f0c 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree2.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree2.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenTree2 { public static class Olive extends WorldGenTree { - public Olive(final ITree tree) { + public Olive(ITreeGenData tree) { super(tree); } @@ -39,7 +39,7 @@ public class WorldGenTree2 { } public static class Sweetgum extends WorldGenTree { - public Sweetgum(final ITree tree) { + public Sweetgum(ITreeGenData tree) { super(tree); } @@ -76,7 +76,7 @@ public class WorldGenTree2 { } public static class Locust extends WorldGenTree { - public Locust(final ITree tree) { + public Locust(ITreeGenData tree) { super(tree); } @@ -121,7 +121,7 @@ public class WorldGenTree2 { } public static class Pear extends WorldGenTree { - public Pear(final ITree tree) { + public Pear(ITreeGenData tree) { super(tree); } @@ -154,7 +154,7 @@ public class WorldGenTree2 { } public static class Iroko extends WorldGenTree { - public Iroko(final ITree tree) { + public Iroko(ITreeGenData tree) { super(tree); } @@ -197,7 +197,7 @@ public class WorldGenTree2 { } public static class Gingko extends WorldGenTree { - public Gingko(final ITree tree) { + public Gingko(ITreeGenData tree) { super(tree); } @@ -252,7 +252,7 @@ public class WorldGenTree2 { } public static class Box extends WorldGenTree { - public Box(final ITree tree) { + public Box(ITreeGenData tree) { super(tree); } @@ -278,7 +278,7 @@ public class WorldGenTree2 { } public static class Clove extends WorldGenTree { - public Clove(final ITree tree) { + public Clove(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree3.java b/src/main/java/binnie/extratrees/gen/WorldGenTree3.java index 90f32cdc..0caa42d4 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree3.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree3.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenTree3 { public static class Hazel extends WorldGenTree { - public Hazel(final ITree tree) { + public Hazel(ITreeGenData tree) { super(tree); } @@ -49,7 +49,7 @@ public class WorldGenTree3 { } public static class Sycamore extends WorldGenTree { - public Sycamore(final ITree tree) { + public Sycamore(ITreeGenData tree) { super(tree); } @@ -90,7 +90,7 @@ public class WorldGenTree3 { } public static class Hawthorn extends WorldGenTree { - public Hawthorn(final ITree tree) { + public Hawthorn(ITreeGenData tree) { super(tree); } @@ -131,7 +131,7 @@ public class WorldGenTree3 { } public static class Pecan extends WorldGenTree { - public Pecan(final ITree tree) { + public Pecan(ITreeGenData tree) { super(tree); } @@ -180,7 +180,7 @@ public class WorldGenTree3 { } public static class Elm extends WorldGenTree { - public Elm(final ITree tree) { + public Elm(ITreeGenData tree) { super(tree); } @@ -221,7 +221,7 @@ public class WorldGenTree3 { } public static class Elder extends WorldGenTree { - public Elder(final ITree tree) { + public Elder(ITreeGenData tree) { super(tree); } @@ -266,7 +266,7 @@ public class WorldGenTree3 { } public static class Hornbeam extends WorldGenTree { - public Hornbeam(final ITree tree) { + public Hornbeam(ITreeGenData tree) { super(tree); } @@ -303,7 +303,7 @@ public class WorldGenTree3 { } public static class Sallow extends WorldGenTree { - public Sallow(final ITree tree) { + public Sallow(ITreeGenData tree) { super(tree); } @@ -352,7 +352,7 @@ public class WorldGenTree3 { } public static class AcornOak extends WorldGenTree { - public AcornOak(final ITree tree) { + public AcornOak(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTropical.java b/src/main/java/binnie/extratrees/gen/WorldGenTropical.java index 9c9f7dc2..1c606768 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTropical.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTropical.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenTropical { public static class Mango extends WorldGenTree { - public Mango(final ITree tree) { + public Mango(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java index 632d11a9..903c414b 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java @@ -1,10 +1,10 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class WorldGenWalnut { public static class BlackWalnut extends WorldGenTree { - public BlackWalnut(final ITree tree) { + public BlackWalnut(ITreeGenData tree) { super(tree); } @@ -29,7 +29,7 @@ public class WorldGenWalnut { } public static class Butternut extends WorldGenTree { - public Butternut(final ITree tree) { + public Butternut(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java new file mode 100644 index 00000000..4c412587 --- /dev/null +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -0,0 +1,553 @@ +package binnie.extratrees.genetics; + +import binnie.Binnie; +import binnie.Constants; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.FruitPod; +import binnie.extratrees.config.ConfigurationMain; +import binnie.extratrees.item.Food; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IFruitFamily; +import forestry.arboriculture.FruitProviderNone; +import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; +import forestry.core.genetics.alleles.AlleleCategorized; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; + + +public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider { + + /*public static void createAlleles() { + List fruitAlleles = Arrays.asList( + fruitNone = new AlleleFruit("none", new FruitProviderNone("for.fruits.none", null)), + fruitApple = new AlleleFruit("apple", new FruitProviderRandom("for.fruits.apple", EnumFruitFamily.POMES, new ItemStack(Items.APPLE), 1.0f) + .setColour(new Color(0xff2e2e)) + .setOverlay("pomes")), + fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("for.fruits.cocoa", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.COCOA, new ItemStack(Items.DYE, 1, EnumDyeColor.BROWN.getDyeDamage()))), + // .setColours(0xecdca5, 0xc4d24a), true); + fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("for.fruits.chestnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.CHESTNUT.getStack(), 1.0f) + .setRipeningPeriod(6) + .setColours(new Color(0x7f333d), new Color(0xc4d24a)) + .setOverlay("nuts"), true), + fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("for.fruits.walnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.WALNUT.getStack(), 1.0f) + .setRipeningPeriod(8) + .setColours(new Color(0xfba248), new Color(0xc4d24a)) + .setOverlay("nuts"), true), + fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("for.fruits.cherry", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.CHERRY.getStack(), 1.0f) + .setColours(new Color(0xff2e2e), new Color(0xc4d24a)) + .setOverlay("berries"), true), + fruitDates = new AlleleFruit("dates", new FruitProviderPod("for.fruits.dates", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.DATES, ItemFruit.EnumFruit.DATES.getStack(4))), + fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("for.fruits.papaya", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.PAPAYA, ItemFruit.EnumFruit.PAPAYA.getStack())), + fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("for.fruits.lemon", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.LEMON.getStack(), 1.0f) + .setColours(new Color(0xeeee00), new Color(0x99ff00)) + .setOverlay("citrus"), true), + fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("for.fruits.plum", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.PLUM.getStack(), 1.0f) + .setColours(new Color(0x663446), new Color(0xeeff1a)) + .setOverlay("plums"), true) + ); + + for (IAlleleFruit fruitAllele : fruitAlleles) { + AlleleManager.alleleRegistry.registerAllele(fruitAllele, EnumTreeChromosome.FRUITS); + } + }*/ + public static final AlleleETFruit Blackthorn = new AlleleETFruit("Blackthorn", 10, 7180062, 14561129, FruitSprite.SMALL); + public static final AlleleETFruit CherryPlum = new AlleleETFruit("CherryPlum", 10, 7180062, 15211595, FruitSprite.SMALL); + public static final AlleleETFruit Peach = new AlleleETFruit("Peach", 10, 7180062, 16424995, FruitSprite.AVERAGE); + public static final AlleleETFruit Nectarine = new AlleleETFruit("Nectarine", 10, 7180062, 16405795, FruitSprite.AVERAGE); + public static final AlleleETFruit Apricot = new AlleleETFruit("Apricot", 10, 7180062, 16437027, FruitSprite.AVERAGE); + public static final AlleleETFruit Almond = new AlleleETFruit("Almond", 10, 7180062, 9364342, FruitSprite.SMALL); + public static final AlleleETFruit WildCherry = new AlleleETFruit("WildCherry", 10, 7180062, 16711680, FruitSprite.TINY); + public static final AlleleETFruit SourCherry = new AlleleETFruit("SourCherry", 10, 7180062, 10225963, FruitSprite.TINY); + public static final AlleleETFruit BlackCherry = new AlleleETFruit("BlackCherry", 10, 7180062, 4852249, FruitSprite.TINY); + public static final AlleleETFruit Orange = new AlleleETFruit("Orange", 10, 3665987, 16749578, FruitSprite.AVERAGE); + public static final AlleleETFruit Manderin = new AlleleETFruit("Manderin", 10, 3665987, 16749578, FruitSprite.AVERAGE); + public static final AlleleETFruit Tangerine = new AlleleETFruit("Tangerine", 10, 3665987, 16749578, FruitSprite.AVERAGE); + public static final AlleleETFruit Satsuma = new AlleleETFruit("Satsuma", 10, 3665987, 16749578, FruitSprite.AVERAGE); + public static final AlleleETFruit KeyLime = new AlleleETFruit("KeyLime", 10, 3665987, 10223428, FruitSprite.SMALL); + public static final AlleleETFruit Lime = new AlleleETFruit("Lime", 10, 3665987, 10223428, FruitSprite.AVERAGE); + public static final AlleleETFruit FingerLime = new AlleleETFruit("FingerLime", 10, 3665987, 11156280, FruitSprite.SMALL); + public static final AlleleETFruit Pomelo = new AlleleETFruit("Pomelo", 10, 3665987, 6083402, FruitSprite.LARGER); + public static final AlleleETFruit Grapefruit = new AlleleETFruit("Grapefruit", 10, 3665987, 16749578, FruitSprite.LARGE); + public static final AlleleETFruit Kumquat = new AlleleETFruit("Kumquat", 10, 3665987, 16749578, FruitSprite.SMALL); + public static final AlleleETFruit Citron = new AlleleETFruit("Citron", 10, 3665987, 16772192, FruitSprite.LARGE); + public static final AlleleETFruit BuddhaHand = new AlleleETFruit("BuddhaHand", 10, 3665987, 16772192, FruitSprite.LARGE); + public static final AlleleETFruit Apple = new AlleleETFruit("Apple", 10, 7915859, 16193046, FruitSprite.AVERAGE); + public static final AlleleETFruit Crabapple = new AlleleETFruit("Crabapple", 10, 7915859, 16760140, FruitSprite.AVERAGE); + public static final AlleleETFruit Banana = new AlleleETFruit("Banana", FruitPod.Banana); + public static final AlleleETFruit RedBanana = new AlleleETFruit("Red Banana", FruitPod.RedBanana); + public static final AlleleETFruit Plantain = new AlleleETFruit("Platain", FruitPod.Plantain); + public static final AlleleETFruit Hazelnut = new AlleleETFruit("Hazelnut", 7, 8223006, 14463606, FruitSprite.SMALL); + public static final AlleleETFruit Butternut = new AlleleETFruit("Butternut", 7, 11712336, 16102498, FruitSprite.SMALL); + public static final AlleleETFruit Beechnut = new AlleleETFruit("Beechnut", 8, 14401148, 6241845, FruitSprite.TINY); + public static final AlleleETFruit Pecan = new AlleleETFruit("Pecan", 8, 10660940, 15781769, FruitSprite.SMALL); + public static final AlleleETFruit BrazilNut = new AlleleETFruit("BrazilNut", 10, 5875561, 9852208, FruitSprite.LARGE); + public static final AlleleETFruit Fig = new AlleleETFruit("Fig", 9, 14201186, 7094086, FruitSprite.SMALL); + public static final AlleleETFruit Acorn = new AlleleETFruit("Acorn", 6, 7516710, 11364893, FruitSprite.TINY); + public static final AlleleETFruit Elderberry = new AlleleETFruit("Elderberry", 9, 7444317, 5331779, FruitSprite.TINY); + public static final AlleleETFruit Olive = new AlleleETFruit("Olive", 9, 8887861, 6444842, FruitSprite.SMALL); + public static final AlleleETFruit GingkoNut = new AlleleETFruit("GingkoNut", 7, 9213787, 15063725, FruitSprite.TINY); + public static final AlleleETFruit Coffee = new AlleleETFruit("Coffee", 8, 7433501, 16273254, FruitSprite.TINY); + public static final AlleleETFruit Pear = new AlleleETFruit("Pear", 10, 10456913, 10474833, FruitSprite.PEAR); + public static final AlleleETFruit OsangeOsange = new AlleleETFruit("OsangeOsange", 10, 9934674, 10665767, FruitSprite.LARGER); + public static final AlleleETFruit Clove = new AlleleETFruit("Clove", 9, 6847532, 11224133, FruitSprite.TINY); + public static final AlleleETFruit Coconut = new AlleleETFruit("Coconut", FruitPod.Coconut); + public static final AlleleETFruit Cashew = new AlleleETFruit("Cashew", 8, 12879132, 15289111, FruitSprite.AVERAGE); + public static final AlleleETFruit Avacado = new AlleleETFruit("Avacado", 10, 10272370, 2170640, FruitSprite.PEAR); + public static final AlleleETFruit Nutmeg = new AlleleETFruit("Nutmeg", 9, 14861101, 11305813, FruitSprite.TINY); + public static final AlleleETFruit Allspice = new AlleleETFruit("Allspice", 9, 15180922, 7423542, FruitSprite.TINY); + public static final AlleleETFruit Chilli = new AlleleETFruit("Chilli", 10, 7430757, 15145010, FruitSprite.SMALL); + public static final AlleleETFruit StarAnise = new AlleleETFruit("StarAnise", 8, 8733742, 13917189, FruitSprite.TINY); + public static final AlleleETFruit Mango = new AlleleETFruit("Mango", 10, 6654997, 15902262, FruitSprite.AVERAGE); + public static final AlleleETFruit Starfruit = new AlleleETFruit("Starfruit", 10, 9814541, 15061550, FruitSprite.AVERAGE); + public static final AlleleETFruit Candlenut = new AlleleETFruit("Candlenut", 8, 8235123, 14600882, FruitSprite.SMALL); + public static final AlleleETFruit Papayimar = new AlleleETFruit("Papayimar", FruitPod.Papayimar); + public static final AlleleETFruit Blackcurrant = new AlleleETFruit("Blackcurrant", 8, 9407571, 4935251, FruitSprite.TINY); + public static final AlleleETFruit Redcurrant = new AlleleETFruit("Redcurrant", 8, 13008910, 15080974, FruitSprite.TINY); + public static final AlleleETFruit Blackberry = new AlleleETFruit("Blackberry", 8, 9399665, 4801393, FruitSprite.TINY); + public static final AlleleETFruit Raspberry = new AlleleETFruit("Raspberry", 8, 15520197, 14510449, FruitSprite.TINY); + public static final AlleleETFruit Blueberry = new AlleleETFruit("Blueberry", 8, 10203799, 6329278, FruitSprite.TINY); + public static final AlleleETFruit Cranberry = new AlleleETFruit("Cranberry", 8, 12232496, 14555696, FruitSprite.TINY); + public static final AlleleETFruit Juniper = new AlleleETFruit("Juniper", 8, 10194034, 6316914, FruitSprite.TINY); + public static final AlleleETFruit Gooseberry = new AlleleETFruit("Gooseberry", 8, 12164944, 12177232, FruitSprite.TINY); + public static final AlleleETFruit GoldenRaspberry = new AlleleETFruit("GoldenRaspberry", 8, 12496955, 15970363, FruitSprite.TINY); + + IFruitFamily family; + boolean isRipening; + int diffR, diffG, diffB; + FruitPod pod; + int ripeningPeriod; + int colourUnripe; + int colour; + FruitSprite sprite; + HashMap products; + + + private static LinkedList list; + + public static List values() { + if (list == null) { + list = new LinkedList<>(); + for (Field f : AlleleETFruit.class.getFields()) { + if (f.getType() == AlleleETFruit.class) { + try { + list.add((AlleleETFruit) f.get(AlleleETFruit.Acorn)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + } + + return list; + } + + public static void init() { + final IFruitFamily familyPrune = AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"); + final IFruitFamily familyPome = AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"); + final IFruitFamily familyJungle = AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"); + final IFruitFamily familyNuts = AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"); + final IFruitFamily familyBerry = ETFruitFamily.Berry; + final IFruitFamily familyCitrus = ETFruitFamily.Citrus; + AlleleManager.alleleRegistry.registerFruitFamily(familyBerry); + AlleleManager.alleleRegistry.registerFruitFamily(familyCitrus); + AlleleETFruit.Apple.addProduct(new ItemStack(Items.APPLE), 1.0f); + AlleleETFruit.Apple.setFamily(familyPome); + AlleleETFruit.Crabapple.addProduct(Food.CRABAPPLE.get(1), 1.0f); + AlleleETFruit.Crabapple.setFamily(familyPome); + AlleleETFruit.Orange.addProduct(Food.ORANGE.get(1), 1.0f); + AlleleETFruit.Orange.setFamily(familyCitrus); + AlleleETFruit.Manderin.addProduct(Food.MANDERIN.get(1), 1.0f); + AlleleETFruit.Manderin.setFamily(familyCitrus); + AlleleETFruit.Tangerine.addProduct(Food.TANGERINE.get(1), 1.0f); + AlleleETFruit.Tangerine.setFamily(familyCitrus); + AlleleETFruit.Satsuma.addProduct(Food.SATSUMA.get(1), 1.0f); + AlleleETFruit.Satsuma.setFamily(familyCitrus); + AlleleETFruit.KeyLime.addProduct(Food.KEY_LIME.get(1), 1.0f); + AlleleETFruit.KeyLime.setFamily(familyCitrus); + AlleleETFruit.Lime.addProduct(Food.LIME.get(1), 1.0f); + AlleleETFruit.Lime.setFamily(familyCitrus); + AlleleETFruit.FingerLime.addProduct(Food.FINGER_LIME.get(1), 1.0f); + AlleleETFruit.FingerLime.setFamily(familyCitrus); + AlleleETFruit.Pomelo.addProduct(Food.POMELO.get(1), 1.0f); + AlleleETFruit.Pomelo.setFamily(familyCitrus); + AlleleETFruit.Grapefruit.addProduct(Food.GRAPEFRUIT.get(1), 1.0f); + AlleleETFruit.Grapefruit.setFamily(familyCitrus); + AlleleETFruit.Kumquat.addProduct(Food.KUMQUAT.get(1), 1.0f); + AlleleETFruit.Kumquat.setFamily(familyCitrus); + AlleleETFruit.Citron.addProduct(Food.CITRON.get(1), 1.0f); + AlleleETFruit.Citron.setFamily(familyCitrus); + AlleleETFruit.BuddhaHand.addProduct(Food.BUDDHA_HAND.get(1), 1.0f); + AlleleETFruit.BuddhaHand.setFamily(familyCitrus); + AlleleETFruit.Blackthorn.addProduct(Food.Blackthorn.get(1), 1.0f); + AlleleETFruit.Blackthorn.setFamily(familyPrune); + AlleleETFruit.CherryPlum.addProduct(Food.CHERRY_PLUM.get(1), 1.0f); + AlleleETFruit.CherryPlum.setFamily(familyPrune); + AlleleETFruit.Peach.addProduct(Food.PEACH.get(1), 1.0f); + AlleleETFruit.Peach.setFamily(familyPrune); + AlleleETFruit.Nectarine.addProduct(Food.NECTARINE.get(1), 1.0f); + AlleleETFruit.Nectarine.setFamily(familyPrune); + AlleleETFruit.Apricot.addProduct(Food.APRICOT.get(1), 1.0f); + AlleleETFruit.Apricot.setFamily(familyPrune); + AlleleETFruit.Almond.addProduct(Food.ALMOND.get(1), 1.0f); + AlleleETFruit.Almond.setFamily(familyPrune); + AlleleETFruit.WildCherry.addProduct(Food.WILD_CHERRY.get(1), 1.0f); + AlleleETFruit.WildCherry.setFamily(familyPrune); + AlleleETFruit.SourCherry.addProduct(Food.SOUR_CHERRY.get(1), 1.0f); + AlleleETFruit.SourCherry.setFamily(familyPrune); + AlleleETFruit.BlackCherry.addProduct(Food.BLACK_CHERRY.get(1), 1.0f); + AlleleETFruit.BlackCherry.setFamily(familyPrune); + AlleleETFruit.Hazelnut.addProduct(Food.HAZELNUT.get(1), 1.0f); + AlleleETFruit.Hazelnut.setFamily(familyNuts); + AlleleETFruit.Butternut.addProduct(Food.BUTTERNUT.get(1), 1.0f); + AlleleETFruit.Butternut.setFamily(familyNuts); + AlleleETFruit.Beechnut.addProduct(Food.BEECHNUT.get(1), 1.0f); + AlleleETFruit.Beechnut.setFamily(familyNuts); + AlleleETFruit.Pecan.addProduct(Food.PECAN.get(1), 1.0f); + AlleleETFruit.Pecan.setFamily(familyNuts); + AlleleETFruit.Banana.addProduct(Food.BANANA.get(2), 1.0f); + AlleleETFruit.Banana.setFamily(familyJungle); + AlleleETFruit.RedBanana.addProduct(Food.RED_BANANA.get(2), 1.0f); + AlleleETFruit.RedBanana.setFamily(familyJungle); + AlleleETFruit.Plantain.addProduct(Food.PLANTAIN.get(2), 1.0f); + AlleleETFruit.Plantain.setFamily(familyJungle); + AlleleETFruit.BrazilNut.addProduct(Food.BRAZIL_NUT.get(4), 1.0f); + AlleleETFruit.BrazilNut.setFamily(familyNuts); + AlleleETFruit.Fig.addProduct(Food.FIG.get(1), 1.0f); + AlleleETFruit.Fig.setFamily(familyPrune); + AlleleETFruit.Acorn.addProduct(Food.ACORN.get(1), 1.0f); + AlleleETFruit.Acorn.setFamily(familyNuts); + AlleleETFruit.Elderberry.addProduct(Food.ELDERBERRY.get(1), 1.0f); + AlleleETFruit.Elderberry.setFamily(familyPrune); + AlleleETFruit.Olive.addProduct(Food.OLIVE.get(1), 1.0f); + AlleleETFruit.Olive.setFamily(familyPrune); + AlleleETFruit.GingkoNut.addProduct(Food.GINGKO_NUT.get(1), 1.0f); + AlleleETFruit.GingkoNut.setFamily(familyNuts); + AlleleETFruit.Coffee.addProduct(Food.COFFEE.get(1), 1.0f); + AlleleETFruit.Coffee.setFamily(familyJungle); + AlleleETFruit.Pear.addProduct(Food.PEAR.get(1), 1.0f); + AlleleETFruit.Pear.setFamily(familyPome); + AlleleETFruit.OsangeOsange.addProduct(Food.OSANGE_ORANGE.get(1), 1.0f); + AlleleETFruit.OsangeOsange.setFamily(familyPome); + AlleleETFruit.Clove.addProduct(Food.CLOVE.get(1), 1.0f); + AlleleETFruit.Clove.setFamily(familyNuts); + AlleleETFruit.Blackcurrant.addProduct(Food.BLACKCURRANT.get(2), 1.0f); + AlleleETFruit.Blackcurrant.setFamily(familyBerry); + AlleleETFruit.Redcurrant.addProduct(Food.REDCURRANT.get(2), 1.0f); + AlleleETFruit.Redcurrant.setFamily(familyBerry); + AlleleETFruit.Blackberry.addProduct(Food.BLACKBERRY.get(2), 1.0f); + AlleleETFruit.Blackberry.setFamily(familyBerry); + AlleleETFruit.Raspberry.addProduct(Food.RASPBERRY.get(2), 1.0f); + AlleleETFruit.Raspberry.setFamily(familyBerry); + AlleleETFruit.Blueberry.addProduct(Food.BLUEBERRY.get(2), 1.0f); + AlleleETFruit.Blueberry.setFamily(familyBerry); + AlleleETFruit.Cranberry.addProduct(Food.CRANBERRY.get(2), 1.0f); + AlleleETFruit.Cranberry.setFamily(familyBerry); + AlleleETFruit.Juniper.addProduct(Food.JUNIPER.get(2), 1.0f); + AlleleETFruit.Juniper.setFamily(familyBerry); + AlleleETFruit.Gooseberry.addProduct(Food.GOOSEBERRY.get(2), 1.0f); + AlleleETFruit.Gooseberry.setFamily(familyBerry); + AlleleETFruit.GoldenRaspberry.addProduct(Food.GOLDEN_RASPBERRY.get(2), 1.0f); + AlleleETFruit.GoldenRaspberry.setFamily(familyBerry); + AlleleETFruit.Coconut.addProduct(Food.COCONUT.get(1), 1.0f); + AlleleETFruit.Coconut.setFamily(familyJungle); + AlleleETFruit.Cashew.addProduct(Food.CASHEW.get(1), 1.0f); + AlleleETFruit.Cashew.setFamily(familyJungle); + AlleleETFruit.Avacado.addProduct(Food.AVACADO.get(1), 1.0f); + AlleleETFruit.Avacado.setFamily(familyJungle); + AlleleETFruit.Nutmeg.addProduct(Food.NUTMEG.get(1), 1.0f); + AlleleETFruit.Nutmeg.setFamily(familyJungle); + AlleleETFruit.Allspice.addProduct(Food.ALLSPICE.get(1), 1.0f); + AlleleETFruit.Allspice.setFamily(familyJungle); + AlleleETFruit.Chilli.addProduct(Food.CHILLI.get(1), 1.0f); + AlleleETFruit.Chilli.setFamily(familyJungle); + AlleleETFruit.StarAnise.addProduct(Food.STAR_ANISE.get(1), 1.0f); + AlleleETFruit.StarAnise.setFamily(familyJungle); + AlleleETFruit.Mango.addProduct(Food.MANGO.get(1), 1.0f); + AlleleETFruit.Mango.setFamily(familyPome); + AlleleETFruit.Starfruit.addProduct(Food.STARFRUIT.get(1), 1.0f); + AlleleETFruit.Starfruit.setFamily(familyJungle); + AlleleETFruit.Candlenut.addProduct(Food.CANDLENUT.get(1), 1.0f); + AlleleETFruit.Candlenut.setFamily(familyJungle); + if (ConfigurationMain.alterLemon) { + try { + final IAlleleFruit lemon = (IAlleleFruit) AlleleManager.alleleRegistry.getAllele("forestry.fruitLemon"); + final FruitProviderNone prov = (FruitProviderNone) lemon.getProvider(); + final Field f = FruitProviderNone.class.getDeclaredField("family"); + final Field modifiersField = Field.class.getDeclaredField("modifiers"); + f.setAccessible(true); + modifiersField.setAccessible(true); + modifiersField.setInt(f, f.getModifiers() & 0xFFFFFFEF); + f.set(prov, familyCitrus); + } catch (Exception e) { + e.printStackTrace(); + } + } + for (final IAlleleSpecies tree : Binnie.Genetics.treeBreedingSystem.getAllSpecies()) { + if (tree instanceof AlleleTreeSpecies && ((IAlleleTreeSpecies) tree).getSuitableFruit().contains(familyPrune)) { + ((AlleleTreeSpecies) tree).addFruitFamily(familyCitrus); + } + } + } + + private AlleleETFruit(String name, int time, int unripe, int colour, FruitSprite sprite) { + super(Constants.EXTRA_TREES_MOD_ID, "fruit", name, true); + this.isRipening = false; + this.diffB = 0; + this.pod = null; + this.ripeningPeriod = 0; + this.products = new HashMap<>(); + this.colour = colour; + this.sprite = sprite; + this.setRipening(time, unripe); + } + + private AlleleETFruit(String name, FruitPod pod) { + super(Constants.EXTRA_TREES_MOD_ID, "fruit", name, true); + this.isRipening = false; + this.diffB = 0; + this.sprite = null; + this.products = new HashMap<>(); + this.pod = pod; + this.ripeningPeriod = 2; + } + + public void setRipening(int time, int unripe) { + this.ripeningPeriod = time; + this.colourUnripe = unripe; + this.isRipening = true; + this.diffR = (this.colour >> 16 & 0xFF) - (unripe >> 16 & 0xFF); + this.diffG = (this.colour >> 8 & 0xFF) - (unripe >> 8 & 0xFF); + this.diffB = (this.colour & 0xFF) - (unripe & 0xFF); + } + + public void addProduct(ItemStack product, float chance) { + this.products.put(product, chance); + } + + private void setFamily(IFruitFamily family) { + this.family = family; + } + + @Override + public IFruitProvider getProvider() { + return this; + } + + @Override + public void registerSprites() { + if(this == Apple){ + for(FruitSprite sprite : FruitSprite.VALUES){ + sprite.registerSprites(); + } + } + } + + @Nullable + @Override + public ResourceLocation getSprite(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { + if(sprite != null){ + return sprite.getLocation(); + }else{ + return null; + } + } + + @Override + public int compareTo(@Nonnull IAlleleFruit o) { + return o == this ? 0 : -1; + } + + @Nonnull + @Override + public Map getSpecialty() { + return new HashMap<>(); + } + + @Override + public int getDecorativeColor() { + return getColour(1.0f); + } + + @Override + public boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos) { + if(this.pod != null && world.rand.nextFloat() <= genome.getSappiness()){ + TreeManager.treeRoot.setFruitBlock(world, this, genome.getSappiness(), pos); + } + return false; + } + + @Nonnull + @Override + public List getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { + if (this.pod != null) { + if (ripeningTime >= 2) { + List products = new ArrayList(); + for (Map.Entry product : this.products.entrySet()) { + ItemStack single = product.getKey().copy(); + single.stackSize = 1; + for (int i = 0; i < product.getKey().stackSize; ++i) { + if (world.rand.nextFloat() <= product.getValue()) { + products.add(single.copy()); + } + } + } + return products; + } + return Collections.emptyList(); + } else { + ArrayList products = new ArrayList(); + float stage = this.getRipeningStage(ripeningTime); + if (stage < 0.5f) { + return Collections.emptyList(); + } + float modeYieldMod = 1.0f; + for (final Map.Entry product : this.products.entrySet()) { + if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * product.getValue() * 5.0f * stage) { + products.add(product.getKey().copy()); + } + } + return products; + } + } + + @Nullable + @Override + public String getModelName() { + if(pod != null){ + return pod.name(); + }else{ + return null; + } + } + + @Override + public boolean isFruitLeaf(ITreeGenome genome, World world, BlockPos pos) { + return sprite != null; + } + + @Nonnull + @Override + public String getModID() { + return Constants.EXTRA_TREES_MOD_ID; + } + + @Override + public int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { + if (!this.isRipening) { + return this.colour; + } + float stage = getRipeningStage(ripeningTime); + return getColour(stage); + } + + private int getColour(float stage) { + final int r = (this.colourUnripe >> 16 & 0xFF) + (int) (this.diffR * stage); + final int g = (this.colourUnripe >> 8 & 0xFF) + (int) (this.diffG * stage); + final int b = (this.colourUnripe & 0xFF) + (int) (this.diffB * stage); + return (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF); + } + + + @Override + public String getDescription() { + return ExtraTrees.proxy.localise("item.food." + this.getClass().getTypeName().toLowerCase()); + } + + @Override + public IFruitFamily getFamily() { + return this.family; + } + + @Override + public int getRipeningPeriod() { + return this.ripeningPeriod; + } + + @Nonnull + @Override + public HashMap getProducts() { + return products; + } + + private float getRipeningStage(final int ripeningTime) { + if (ripeningTime >= this.ripeningPeriod) { + return 1.0f; + } + return ripeningTime / this.ripeningPeriod; + } + + @Override + public boolean requiresFruitBlocks() { + return this.pod != null; + } + +// @Override +// public short getIconIndex(final ITreeGenome genome, final IBlockAccess world, final int x, final int y, final int z, final int ripeningTime, final boolean fancy) { +// return this.index.getIndex(); +// } +// +// @Override +// @SideOnly(Side.CLIENT) +// public void registerIcons(final IIconRegister register) { +// if (this.ordinal() == 0) { +// for (final FruitSprite sprite : FruitSprite.values()) { +// sprite.registerIcons(register); +// } +// } +// } + + + @Nullable + @Override + public ResourceLocation getDecorativeSprite() { + if(sprite != null){ + return sprite.getLocation(); + }else{ + return null; + } + } + + @Override + public String getName() { + return this.getDescription(); + } + + public String getNameOfFruit() { + if (this == AlleleETFruit.Apple) { + return "Apple"; + } + for (final ItemStack stack : this.products.keySet()) { + if (stack.getItem() == ExtraTrees.itemFood) { + return Food.values()[stack.getItemDamage()].toString(); + } + } + return "NoFruit"; + } + + @Override + public String getUnlocalizedName() { + return this.getUID(); + } +} diff --git a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java index 004e45ce..4b319f16 100644 --- a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java +++ b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java @@ -5,8 +5,6 @@ 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 forestry.arboriculture.genetics.LeafProvider; import forestry.arboriculture.genetics.TreeDefinition; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 3b0db535..28d92f97 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -9,25 +9,43 @@ import forestry.api.genetics.AlleleManager; 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.ITreeDefinition; import forestry.arboriculture.genetics.Tree; -import forestry.arboriculture.genetics.TreeDefinition; +import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.worldgen.WorldGenLemon; import forestry.arboriculture.worldgen.WorldGenPlum; +import forestry.core.genetics.alleles.AlleleBoolean; +import forestry.core.tiles.TileUtil; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLog; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import org.apache.commons.lang3.StringUtils; +import com.mojang.authlib.GameProfile; + import java.awt.*; import java.util.Arrays; import java.util.Locale; -public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { - OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B), WorldGenApple.OrchardApple.class){ +public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, ITreeGenerator { + OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenApple.OrchardApple(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Apple); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Apple); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Higher.getAllele()); } @@ -38,10 +56,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - SweetCrabapple("malus", "coronaria", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B), WorldGenApple.SweetCrabapple.class){ + SweetCrabapple("malus", "coronaria", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenApple.SweetCrabapple(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Crabapple); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Crabapple); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); @@ -54,10 +78,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - FloweringCrabapple("malus", "hopa", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B), WorldGenApple.FloweringCrabapple.class){ + FloweringCrabapple("malus", "hopa", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenApple.FloweringCrabapple(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Crabapple); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Crabapple); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -71,10 +101,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - PrairieCrabapple("malus", "ioensis", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B), WorldGenApple.PrairieCrabapple.class){ + PrairieCrabapple("malus", "ioensis", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumExtraTreeLog.Apple, new Color(0x7B7A7B)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenApple.PrairieCrabapple(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Crabapple); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Crabapple); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -88,10 +124,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Blackthorn("prunus", "spinosa", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){ + Blackthorn("prunus", "spinosa", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Blackthorn); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blackthorn); template.set(EnumTreeChromosome.HEIGHT,ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD,ForestryAllele.Yield.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS,ForestryAllele.Sappiness.Average.getAllele()); @@ -105,10 +147,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - CherryPlum("prunus", "cerasifera", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){ + CherryPlum("prunus", "cerasifera", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.CherryPlum); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.CherryPlum); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS,ForestryAllele.Sappiness.Average.getAllele()); @@ -122,10 +170,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Peach("prunus", "persica", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){ + Peach("prunus", "persica", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Peach); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Peach); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -139,10 +193,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Nectarine("prunus", "nectarina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){ + Nectarine("prunus", "nectarina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Nectarine); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Nectarine); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); @@ -155,10 +215,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Apricot("prunus", "armeniaca", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF5B8D8), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){ + Apricot("prunus", "armeniaca", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF5B8D8), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Apricot); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Apricot); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); @@ -171,10 +237,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Almond("prunus", "amygdalus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF584C0), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){ + Almond("prunus", "amygdalus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF584C0), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Almond); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Almond); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele());; @@ -187,10 +259,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - WildCherry("prunus", "avium", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850), WorldGenPlum.class){ + WildCherry("prunus", "avium", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.WildCherry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.WildCherry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); @@ -205,10 +283,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - SourCherry("prunus", "cerasus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850), WorldGenPlum.class){ + SourCherry("prunus", "cerasus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.SourCherry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.SourCherry); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele());; } @@ -220,10 +304,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - BlackCherry("prunus", "serotina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFAE1F8), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850), WorldGenPlum.class){ + BlackCherry("prunus", "serotina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFAE1F8), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPlum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.BlackCherry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.BlackCherry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -238,10 +328,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Orange("citrus", "sinensis", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Orange("citrus", "sinensis", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Orange); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Orange); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); @@ -255,10 +351,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Manderin("citrus", "reticulata", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Manderin("citrus", "reticulata", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Manderin); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Manderin); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -272,10 +374,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Satsuma("citrus", "unshiu", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Satsuma("citrus", "unshiu", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Satsuma); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Satsuma); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -289,10 +397,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Tangerine("citrus", "tangerina", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Tangerine("citrus", "tangerina", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Tangerine); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Tangerine); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -307,10 +421,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Lime("citrus", "latifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Lime("citrus", "latifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Lime); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Lime); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -323,10 +443,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - KeyLime("citrus", "aurantifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + KeyLime("citrus", "aurantifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.KeyLime); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.KeyLime); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -341,10 +467,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - FingerLime("citrus", "australasica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + FingerLime("citrus", "australasica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.FingerLime); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.FingerLime); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -358,10 +490,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Pomelo("citrus", "maxima", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Pomelo("citrus", "maxima", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Pomelo); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Pomelo); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -375,10 +513,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Grapefruit("citrus", "paradisi", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Grapefruit("citrus", "paradisi", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Grapefruit); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Grapefruit); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -393,10 +537,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Kumquat("citrus", "margarita", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Kumquat("citrus", "margarita", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Kumquat); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Kumquat); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -409,10 +559,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Citron("citrus", "medica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + Citron("citrus", "medica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Citron); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Citron); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); @@ -425,10 +581,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - BuddhaHand("citrus", "sarcodactylus", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){ + BuddhaHand("citrus", "sarcodactylus", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLemon(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.BuddhaHand); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.BuddhaHand); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); } @@ -440,10 +602,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Banana("musa", "sinensis", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F), WorldGenBanana.class){ + Banana("musa", "sinensis", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenBanana(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Banana); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Banana); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); @@ -455,10 +623,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - RedBanana("musa", "rubra", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F), WorldGenBanana.class){ + RedBanana("musa", "rubra", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenBanana(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.RedBanana); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.RedBanana); } @Override @@ -467,10 +641,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Plantain("musa", "paradisiaca", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F), WorldGenBanana.class){ + Plantain("musa", "paradisiaca", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenBanana(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Plantain); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Plantain); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); } @@ -481,10 +661,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Butternut("juglans", "cinerea", EnumLeafType.DECIDUOUS, new Color(0x82B58C), new Color(0x82DD8C), EnumSaplingType.Default, EnumExtraTreeLog.Butternut, new Color(0xB7ADA0), WorldGenWalnut.Butternut.class){ + Butternut("juglans", "cinerea", EnumLeafType.DECIDUOUS, new Color(0x82B58C), new Color(0x82DD8C), EnumSaplingType.Default, EnumExtraTreeLog.Butternut, new Color(0xB7ADA0)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenWalnut.Butternut(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Butternut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Butternut); template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -498,7 +684,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Rowan("sorbus", "aucuparia", EnumLeafType.DECIDUOUS, new Color(0x9EC79B), new Color(0x9EE8B2), EnumSaplingType.Default, EnumExtraTreeLog.Rowan, new Color(0xB6B09B), WorldGenSorbus.Rowan.class){ + Rowan("sorbus", "aucuparia", EnumLeafType.DECIDUOUS, new Color(0x9EC79B), new Color(0x9EE8B2), EnumSaplingType.Default, EnumExtraTreeLog.Rowan, new Color(0xB6B09B)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenSorbus.Rowan(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Larger.getAllele()); @@ -512,7 +704,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Hemlock("tsuga", "heterophylla", EnumLeafType.CONIFERS, new Color(0x5CAC72), new Color(0x5CD172), EnumSaplingType.Default, EnumExtraTreeLog.Hemlock, new Color(0xADA39B), WorldGenConifer.WesternHemlock.class){ + Hemlock("tsuga", "heterophylla", EnumLeafType.CONIFERS, new Color(0x5CAC72), new Color(0x5CD172), EnumSaplingType.Default, EnumExtraTreeLog.Hemlock, new Color(0xADA39B)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenConifer.WesternHemlock(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -521,7 +719,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); } }, - Ash("fraxinus", "excelsior", EnumLeafType.DECIDUOUS, new Color(0x488E2B), new Color(0x48E42B), EnumSaplingType.Default, EnumExtraTreeLog.Ash, new Color(0x898982), WorldGenAsh.CommonAsh.class){ + Ash("fraxinus", "excelsior", EnumLeafType.DECIDUOUS, new Color(0x488E2B), new Color(0x48E42B), EnumSaplingType.Default, EnumExtraTreeLog.Ash, new Color(0x898982)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenAsh.CommonAsh(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -536,7 +740,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Alder("alnus", "glutinosa", EnumLeafType.DECIDUOUS, new Color(0x698A33), new Color(0x69AE33), EnumSaplingType.Default, EnumExtraTreeLog.Alder, new Color(0xC6C0B8), WorldGenAlder.CommonAlder.class){ + Alder("alnus", "glutinosa", EnumLeafType.DECIDUOUS, new Color(0x698A33), new Color(0x69AE33), EnumSaplingType.Default, EnumExtraTreeLog.Alder, new Color(0xC6C0B8)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenAlder.CommonAlder(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -550,10 +760,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Beech("fagus", "sylvatica", EnumLeafType.DECIDUOUS, new Color(0x83A04C), new Color(0x83C64C), EnumSaplingType.Default, EnumExtraTreeLog.Beech, new Color(0xB2917E), WorldGenBeech.CommonBeech.class){ + Beech("fagus", "sylvatica", EnumLeafType.DECIDUOUS, new Color(0x83A04C), new Color(0x83C64C), EnumSaplingType.Default, EnumExtraTreeLog.Beech, new Color(0xB2917E)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenBeech.CommonBeech(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Beechnut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Beechnut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); } @@ -564,10 +780,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - CopperBeech("fagus", "purpurea", EnumLeafType.DECIDUOUS, new Color(0x801318), new Color(0xD15B4D), EnumSaplingType.Default, EnumExtraTreeLog.Beech, new Color(0xB2917E), WorldGenBeech.CopperBeech.class){ + CopperBeech("fagus", "purpurea", EnumLeafType.DECIDUOUS, new Color(0x801318), new Color(0xD15B4D), EnumSaplingType.Default, EnumExtraTreeLog.Beech, new Color(0xB2917E)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenBeech.CopperBeech(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Beechnut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Beechnut); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } @@ -577,7 +799,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Aspen("populus", "tremula", EnumLeafType.DECIDUOUS, new Color(0x8ACC37), new Color(0x8AE18F), EnumSaplingType.Default, EnumForestryWoodType.POPLAR, new Color(0x8CA687), WorldGenPoplar.Aspen.class){ + Aspen("populus", "tremula", EnumLeafType.DECIDUOUS, new Color(0x8ACC37), new Color(0x8AE18F), EnumSaplingType.Default, EnumForestryWoodType.POPLAR, new Color(0x8CA687)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPoplar.Aspen(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); @@ -590,14 +818,26 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Yew("taxus", "baccata", EnumLeafType.CONIFERS, new Color(0x948A4D), new Color(0x94AE4D), EnumSaplingType.Default, EnumExtraTreeLog.Yew, new Color(0xD1BBC1), WorldGenConifer.Yew.class){ + Yew("taxus", "baccata", EnumLeafType.CONIFERS, new Color(0x948A4D), new Color(0x94AE4D), EnumSaplingType.Default, EnumExtraTreeLog.Yew, new Color(0xD1BBC1)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenConifer.Yew(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } }, - Cypress("chamaecyparis", "lawsoniana", EnumLeafType.CONIFERS, new Color(0x89C9A7), new Color(0x89DDC6), EnumSaplingType.Poplar, EnumExtraTreeLog.Cypress, new Color(0x9A8483), WorldGenConifer.Cypress.class){ + Cypress("chamaecyparis", "lawsoniana", EnumLeafType.CONIFERS, new Color(0x89C9A7), new Color(0x89DDC6), EnumSaplingType.Poplar, EnumExtraTreeLog.Cypress, new Color(0x9A8483)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenConifer.Cypress(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Larger.getAllele()); @@ -606,7 +846,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - DouglasFir("pseudotsuga", "menziesii", EnumLeafType.CONIFERS, new Color(0x99B582), new Color(0x99D1AA), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382), WorldGenFir.DouglasFir.class){ + DouglasFir("pseudotsuga", "menziesii", EnumLeafType.CONIFERS, new Color(0x99B582), new Color(0x99D1AA), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenFir.DouglasFir(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); @@ -615,10 +861,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); } }, - Hazel("Corylus", "avellana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Default, EnumExtraTreeLog.Hazel, new Color(0xAA986F), WorldGenTree3.Hazel.class){ + Hazel("Corylus", "avellana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Default, EnumExtraTreeLog.Hazel, new Color(0xAA986F)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Hazel(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Hazelnut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Hazelnut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -631,10 +883,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Sycamore("ficus", "sycomorus", EnumLeafType.DECIDUOUS, new Color(0xA0A52F), new Color(0xB4D55C), EnumSaplingType.Default, EnumExtraTreeLog.Fig, new Color(0x807357), WorldGenTree3.Sycamore.class){ + Sycamore("ficus", "sycomorus", EnumLeafType.DECIDUOUS, new Color(0xA0A52F), new Color(0xB4D55C), EnumSaplingType.Default, EnumExtraTreeLog.Fig, new Color(0x807357)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Sycamore(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Fig); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Fig); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } @@ -646,7 +904,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Whitebeam("sorbus", "aria", EnumLeafType.DECIDUOUS, new Color(0xBACE99), new Color(0x72863F), EnumSaplingType.Default, EnumExtraTreeLog.Whitebeam, new Color(0x786A6D), WorldGenSorbus.Whitebeam.class){ + Whitebeam("sorbus", "aria", EnumLeafType.DECIDUOUS, new Color(0xBACE99), new Color(0x72863F), EnumSaplingType.Default, EnumExtraTreeLog.Whitebeam, new Color(0x786A6D)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenSorbus.Whitebeam(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); @@ -658,7 +922,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); } }, - Hawthorn("crataegus", "monogyna", EnumLeafType.DECIDUOUS, new Color(0x6BA84A), new Color(0x98B77B), EnumSaplingType.Default, EnumExtraTreeLog.Hawthorn, new Color(0x5F5745), WorldGenTree3.Hawthorn.class){ + Hawthorn("crataegus", "monogyna", EnumLeafType.DECIDUOUS, new Color(0x6BA84A), new Color(0x98B77B), EnumSaplingType.Default, EnumExtraTreeLog.Hawthorn, new Color(0x5F5745)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Hawthorn(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -670,10 +940,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Pecan("carya", "illinoinensis", EnumLeafType.DECIDUOUS, new Color(0x85B674), new Color(0x2C581B), EnumSaplingType.Default, EnumExtraTreeLog.Hickory, new Color(0x3E3530), WorldGenTree3.Pecan.class){ + Pecan("carya", "illinoinensis", EnumLeafType.DECIDUOUS, new Color(0x85B674), new Color(0x2C581B), EnumSaplingType.Default, EnumExtraTreeLog.Hickory, new Color(0x3E3530)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Pecan(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Pecan); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Pecan); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); @@ -687,7 +963,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Elm("ulmus", "procera", EnumLeafType.DECIDUOUS, new Color(0x7C9048), new Color(0x7CBE48), EnumSaplingType.Default, EnumExtraTreeLog.Elm, new Color(0x848386), WorldGenTree3.Elm.class){ + Elm("ulmus", "procera", EnumLeafType.DECIDUOUS, new Color(0x7C9048), new Color(0x7CBE48), EnumSaplingType.Default, EnumExtraTreeLog.Elm, new Color(0x848386)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Elm(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); @@ -701,10 +983,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); } }, - Elder("sambucus", "nigra", EnumLeafType.DECIDUOUS, new Color(0xAEB873), new Color(0xE0E7BD), EnumSaplingType.Default, EnumExtraTreeLog.Elder, new Color(0xD8B874), WorldGenTree3.Elder.class){ + Elder("sambucus", "nigra", EnumLeafType.DECIDUOUS, new Color(0xAEB873), new Color(0xE0E7BD), EnumSaplingType.Default, EnumExtraTreeLog.Elder, new Color(0xD8B874)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Elder(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Elderberry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Elderberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); } @@ -717,7 +1005,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Holly("ilex", "aquifolium", EnumLeafType.DECIDUOUS, new Color(0x254B4C), new Color(0x6E9284), EnumSaplingType.Default, EnumExtraTreeLog.Holly, new Color(0xB5AA85), WorldGenHolly.Holly.class){ + Holly("ilex", "aquifolium", EnumLeafType.DECIDUOUS, new Color(0x254B4C), new Color(0x6E9284), EnumSaplingType.Default, EnumExtraTreeLog.Holly, new Color(0xB5AA85)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenHolly.Holly(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -731,7 +1025,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Hornbeam("carpinus", "betulus", EnumLeafType.DECIDUOUS, new Color(0x96A71B), new Color(0x96DD1B), EnumSaplingType.Default, EnumExtraTreeLog.Hornbeam, new Color(0xA39276), WorldGenTree3.Hornbeam.class){ + Hornbeam("carpinus", "betulus", EnumLeafType.DECIDUOUS, new Color(0x96A71B), new Color(0x96DD1B), EnumSaplingType.Default, EnumExtraTreeLog.Hornbeam, new Color(0xA39276)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Hornbeam(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); @@ -746,7 +1046,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Sallow("salix", "caprea", EnumLeafType.WILLOW, new Color(0xAEB323), new Color(0xB7EC25), EnumSaplingType.Default, EnumForestryWoodType.WILLOW, new Color(0xA19A95), WorldGenTree3.Sallow.class){ + Sallow("salix", "caprea", EnumLeafType.WILLOW, new Color(0xAEB323), new Color(0xB7EC25), EnumSaplingType.Default, EnumForestryWoodType.WILLOW, new Color(0xA19A95)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.Sallow(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); @@ -760,10 +1066,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - AcornOak("quercus", "robur", EnumLeafType.DECIDUOUS, new Color(0x66733E), new Color(0x9EA231), EnumSaplingType.Default, EnumVanillaWoodType.OAK, new Color(0x614D30), WorldGenTree3.AcornOak.class){ + AcornOak("quercus", "robur", EnumLeafType.DECIDUOUS, new Color(0x66733E), new Color(0x9EA231), EnumSaplingType.Default, EnumVanillaWoodType.OAK, new Color(0x614D30)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree3.AcornOak(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Acorn); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Acorn); template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -777,7 +1089,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Fir("abies", "alba", EnumLeafType.CONIFERS, new Color(0x6F7C20), new Color(0x6FD120), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382), WorldGenFir.SilverFir.class){ + Fir("abies", "alba", EnumLeafType.CONIFERS, new Color(0x6F7C20), new Color(0x6FD120), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenFir.SilverFir(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); @@ -785,7 +1103,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - Cedar("cedrus", "libani", EnumLeafType.CONIFERS, new Color(0x95A370), new Color(0x95E870), EnumSaplingType.Default, EnumExtraTreeLog.Cedar, new Color(0xAD764F), WorldGenConifer.Cedar.class){ + Cedar("cedrus", "libani", EnumLeafType.CONIFERS, new Color(0x95A370), new Color(0x95E870), EnumSaplingType.Default, EnumExtraTreeLog.Cedar, new Color(0xAD764F)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenConifer.Cedar(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); @@ -794,10 +1118,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); } }, - Olive("olea", "europaea", EnumLeafType.DECIDUOUS, new Color(0x3C4834), new Color(0x3C4834), EnumSaplingType.Default, EnumExtraTreeLog.Olive, new Color(0x7B706A), WorldGenTree2.Olive.class){ + Olive("olea", "europaea", EnumLeafType.DECIDUOUS, new Color(0x3C4834), new Color(0x3C4834), EnumSaplingType.Default, EnumExtraTreeLog.Olive, new Color(0x7B706A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Olive(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Olive); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Olive); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); } @@ -808,7 +1138,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - RedMaple("acer", "ubrum", EnumLeafType.MAPLE, new Color(0xE82E17), new Color(0xE82E17), EnumSaplingType.Default, EnumForestryWoodType.MAPLE, new Color(0x8A8781), WorldGenMaple.RedMaple.class){ + RedMaple("acer", "ubrum", EnumLeafType.MAPLE, new Color(0xE82E17), new Color(0xE82E17), EnumSaplingType.Default, EnumForestryWoodType.MAPLE, new Color(0x8A8781)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenMaple.RedMaple(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); @@ -822,7 +1158,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - BalsamFir("abies", "balsamea", EnumLeafType.CONIFERS, new Color(0x74A07C), new Color(0x74A07C), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382), WorldGenFir.BalsamFir.class){ + BalsamFir("abies", "balsamea", EnumLeafType.CONIFERS, new Color(0x74A07C), new Color(0x74A07C), EnumSaplingType.Default, EnumExtraTreeLog.Fir, new Color(0x828382)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenFir.BalsamFir(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -830,7 +1172,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - LoblollyPine("pinus", "taeda", EnumLeafType.CONIFERS, new Color(0x6F8A47), new Color(0x6F8A47), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649), WorldGenConifer.LoblollyPine.class){ + LoblollyPine("pinus", "taeda", EnumLeafType.CONIFERS, new Color(0x6F8A47), new Color(0x6F8A47), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenConifer.LoblollyPine(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); @@ -838,7 +1186,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - Sweetgum("liquidambar", "styraciflua", EnumLeafType.DECIDUOUS, new Color(0x8B8762), new Color(0x8B8762), EnumSaplingType.Default, EnumExtraTreeLog.Sweetgum, new Color(0xA1A19C), WorldGenTree2.Sweetgum.class){ + Sweetgum("liquidambar", "styraciflua", EnumLeafType.DECIDUOUS, new Color(0x8B8762), new Color(0x8B8762), EnumSaplingType.Default, EnumExtraTreeLog.Sweetgum, new Color(0xA1A19C)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Sweetgum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -852,7 +1206,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Locust("robinia", "pseudoacacia", EnumLeafType.DECIDUOUS, new Color(0x887300), new Color(0x887300), EnumSaplingType.Default, EnumExtraTreeLog.Locust, new Color(0xADACBC), WorldGenTree2.Locust.class){ + Locust("robinia", "pseudoacacia", EnumLeafType.DECIDUOUS, new Color(0x887300), new Color(0x887300), EnumSaplingType.Default, EnumExtraTreeLog.Locust, new Color(0xADACBC)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Locust(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); @@ -865,10 +1225,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Pear("pyrus", "communis", EnumLeafType.DECIDUOUS, new Color(0x5E8826), new Color(0x5E8826), EnumSaplingType.Default, EnumExtraTreeLog.Pear, new Color(0xA89779), WorldGenTree2.Pear.class){ + Pear("pyrus", "communis", EnumLeafType.DECIDUOUS, new Color(0x5E8826), new Color(0x5E8826), EnumSaplingType.Default, EnumExtraTreeLog.Pear, new Color(0xA89779)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Pear(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Pear); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Pear); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -883,10 +1249,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - OsangeOsange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumExtraTreeLog.Maclura, new Color(0x8B5734), WorldGenJungle.OsangeOsange.class){ + OsangeOsange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumExtraTreeLog.Maclura, new Color(0x8B5734)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.OsangeOsange(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.OsangeOsange); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.OsangeOsange); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); } @@ -898,7 +1270,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - OldFustic("maclura", "tinctoria", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumExtraTreeLog.Maclura, new Color(0x8B5734), WorldGenJungle.OldFustic.class){ + OldFustic("maclura", "tinctoria", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumExtraTreeLog.Maclura, new Color(0x8B5734)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.OldFustic(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); @@ -910,7 +1288,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Brazilwood("caesalpinia", "echinata", EnumLeafType.JUNGLE, new Color(0x607459), new Color(0x607459), EnumSaplingType.Default, EnumExtraTreeLog.Brazilwood, new Color(0x9E8068), WorldGenJungle.Brazilwood.class){ + Brazilwood("caesalpinia", "echinata", EnumLeafType.JUNGLE, new Color(0x607459), new Color(0x607459), EnumSaplingType.Default, EnumExtraTreeLog.Brazilwood, new Color(0x9E8068)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.Brazilwood(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); @@ -924,7 +1308,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Logwood("haematoxylum", "campechianum", EnumLeafType.JUNGLE, new Color(0x889F6B), new Color(0x889F6B), EnumSaplingType.Default, EnumExtraTreeLog.Logwood, new Color(0xF9E2D2), WorldGenJungle.Logwood.class){ + Logwood("haematoxylum", "campechianum", EnumLeafType.JUNGLE, new Color(0x889F6B), new Color(0x889F6B), EnumSaplingType.Default, EnumExtraTreeLog.Logwood, new Color(0xF9E2D2)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.Logwood(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -937,7 +1327,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Rosewood("dalbergia", "latifolia", EnumLeafType.JUNGLE, new Color(0x879B22), new Color(0x879B22), EnumSaplingType.Default, EnumExtraTreeLog.Rosewood, new Color(0x998666), WorldGenJungle.Rosewood.class){ + Rosewood("dalbergia", "latifolia", EnumLeafType.JUNGLE, new Color(0x879B22), new Color(0x879B22), EnumSaplingType.Default, EnumExtraTreeLog.Rosewood, new Color(0x998666)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.Rosewood(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -949,7 +1345,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Purpleheart("peltogyne", "spp", EnumLeafType.JUNGLE, new Color(0x778F55), new Color(0x778F55), EnumSaplingType.Default, EnumExtraTreeLog.Purpleheart, new Color(0x9392A2), WorldGenJungle.Purpleheart.class){ + Purpleheart("peltogyne", "spp", EnumLeafType.JUNGLE, new Color(0x778F55), new Color(0x778F55), EnumSaplingType.Default, EnumExtraTreeLog.Purpleheart, new Color(0x9392A2)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.Purpleheart(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); @@ -961,7 +1363,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Iroko("milicia", "excelsa", EnumLeafType.DECIDUOUS, new Color(0xAFC86C), new Color(0xAFC86C), EnumSaplingType.Default, EnumExtraTreeLog.Iroko, new Color(0x605C5B), WorldGenTree2.Iroko.class){ + Iroko("milicia", "excelsa", EnumLeafType.DECIDUOUS, new Color(0xAFC86C), new Color(0xAFC86C), EnumSaplingType.Default, EnumExtraTreeLog.Iroko, new Color(0x605C5B)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Iroko(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -974,10 +1382,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Gingko("ginkgo", "biloba", EnumLeafType.JUNGLE, new Color(0x719651), new Color(0x719651), EnumSaplingType.Default, EnumExtraTreeLog.Gingko, new Color(0xADAE9C), WorldGenTree2.Gingko.class){ + Gingko("ginkgo", "biloba", EnumLeafType.JUNGLE, new Color(0x719651), new Color(0x719651), EnumSaplingType.Default, EnumExtraTreeLog.Gingko, new Color(0xADAE9C)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Gingko(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.GingkoNut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.GingkoNut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -989,10 +1403,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Brazilnut("bertholletia", "excelsa", EnumLeafType.JUNGLE, new Color(0x7C8F7B), new Color(0x7C8F7B), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenJungle.BrazilNut.class){ + Brazilnut("bertholletia", "excelsa", EnumLeafType.JUNGLE, new Color(0x7C8F7B), new Color(0x7C8F7B), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.BrazilNut(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.BrazilNut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.BrazilNut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Larger.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -1004,7 +1424,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - RoseGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0x9CA258), new Color(0x9CA258), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus, new Color(0xEADEDA), WorldGenEucalyptus.RoseGum.class){ + RoseGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0x9CA258), new Color(0x9CA258), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus, new Color(0xEADEDA)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenEucalyptus.RoseGum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Largest.getAllele()); @@ -1019,7 +1445,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - SwampGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0xA2C686), new Color(0xA2C686), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus2, new Color(0x867E65), WorldGenEucalyptus.SwampGum.class){ + SwampGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0xA2C686), new Color(0xA2C686), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus2, new Color(0x867E65)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenEucalyptus.SwampGum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); @@ -1033,7 +1465,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Box("boxus", "sempervirens", EnumLeafType.DECIDUOUS, new Color(0x72996D), new Color(0x72996D), EnumSaplingType.Default, EnumExtraTreeLog.Box, new Color(0xAB6F57), WorldGenTree2.Box.class){ + Box("boxus", "sempervirens", EnumLeafType.DECIDUOUS, new Color(0x72996D), new Color(0x72996D), EnumSaplingType.Default, EnumExtraTreeLog.Box, new Color(0xAB6F57)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Box(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); @@ -1048,10 +1486,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Clove("syzygium", "aromaticum", EnumLeafType.DECIDUOUS, new Color(0x7A821F), new Color(0x7A821F), EnumSaplingType.Default, EnumExtraTreeLog.Syzgium, new Color(0xAB6F57), WorldGenTree2.Clove.class){ + Clove("syzygium", "aromaticum", EnumLeafType.DECIDUOUS, new Color(0x7A821F), new Color(0x7A821F), EnumSaplingType.Default, EnumExtraTreeLog.Syzgium, new Color(0xAB6F57)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree2.Clove(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Clove); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Clove); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -1065,10 +1509,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Coffee("coffea", "arabica", EnumLeafType.JUNGLE, new Color(0x6F9065), new Color(0x6F9065), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenJungle.Coffee.class){ + Coffee("coffea", "arabica", EnumLeafType.JUNGLE, new Color(0x6F9065), new Color(0x6F9065), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenJungle.Coffee(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Coffee); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Coffee); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); @@ -1080,7 +1530,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - MonkeyPuzzle("araucaria", "araucana", EnumLeafType.CONIFERS, new Color(0x576158), new Color(0x576158), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649), WorldGenConifer.MonkeyPuzzle.class){ + MonkeyPuzzle("araucaria", "araucana", EnumLeafType.CONIFERS, new Color(0x576158), new Color(0x576158), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenConifer.MonkeyPuzzle(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); @@ -1095,7 +1551,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - RainbowGum("eucalyptus", "deglupta", EnumLeafType.JUNGLE, new Color(0xB7F025), new Color(0xB7F025), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus3, new Color(0x6CB03F), WorldGenEucalyptus.RainbowGum.class){ + RainbowGum("eucalyptus", "deglupta", EnumLeafType.JUNGLE, new Color(0xB7F025), new Color(0xB7F025), EnumSaplingType.Default, EnumExtraTreeLog.Eucalyptus3, new Color(0x6CB03F)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenEucalyptus.RainbowGum(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1108,7 +1570,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - PinkIvory("berchemia", "zeyheri", EnumLeafType.DECIDUOUS, new Color(0x7C9159), new Color(0x7C9159), EnumSaplingType.Default, EnumExtraTreeLog.PinkIvory, new Color(0x7F6554), WorldGenTree.class){ + PinkIvory("berchemia", "zeyheri", EnumLeafType.DECIDUOUS, new Color(0x7C9159), new Color(0x7C9159), EnumSaplingType.Default, EnumExtraTreeLog.PinkIvory, new Color(0x7F6554)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); @@ -1120,10 +1588,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Blackcurrant("ribes", "nigrum", EnumLeafType.DECIDUOUS, new Color(0xA6DA5C), new Color(0xA6DA5C), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Blackcurrant("ribes", "nigrum", EnumLeafType.DECIDUOUS, new Color(0xA6DA5C), new Color(0xA6DA5C), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Blackcurrant); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blackcurrant); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1138,10 +1612,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Redcurrant("ribes", "rubrum", EnumLeafType.DECIDUOUS, new Color(0x74AC00), new Color(0x74AC00), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Redcurrant("ribes", "rubrum", EnumLeafType.DECIDUOUS, new Color(0x74AC00), new Color(0x74AC00), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Redcurrant); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Redcurrant); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1156,10 +1636,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Blackberry("rubus", "fruticosus", EnumLeafType.DECIDUOUS, new Color(0x92C15B), new Color(0x92C15B), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Blackberry("rubus", "fruticosus", EnumLeafType.DECIDUOUS, new Color(0x92C15B), new Color(0x92C15B), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Blackberry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blackberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -1173,10 +1659,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Raspberry("rubus", "idaeus", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Raspberry("rubus", "idaeus", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Raspberry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Raspberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1191,10 +1683,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Blueberry("vaccinium", "corymbosum", EnumLeafType.DECIDUOUS, new Color(0x72C750), new Color(0x72C750), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Blueberry("vaccinium", "corymbosum", EnumLeafType.DECIDUOUS, new Color(0x72C750), new Color(0x72C750), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Blueberry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blueberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1209,10 +1707,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Cranberry("vaccinium", "oxycoccos", EnumLeafType.DECIDUOUS, new Color(0x96D179), new Color(0x96D179), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Cranberry("vaccinium", "oxycoccos", EnumLeafType.DECIDUOUS, new Color(0x96D179), new Color(0x96D179), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Cranberry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Cranberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -1227,10 +1731,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Juniper("juniperus", "communis", EnumLeafType.CONIFERS, new Color(0x90B149), new Color(0x90B149), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Juniper("juniperus", "communis", EnumLeafType.CONIFERS, new Color(0x90B149), new Color(0x90B149), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Juniper); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Juniper); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -1245,10 +1755,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Gooseberry("ribes", "grossularia", EnumLeafType.DECIDUOUS, new Color(0x79BB00), new Color(0x79BB00), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + Gooseberry("ribes", "grossularia", EnumLeafType.DECIDUOUS, new Color(0x79BB00), new Color(0x79BB00), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Gooseberry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Gooseberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.High.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -1262,10 +1778,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - GoldenRaspberry("rubus", "occidentalis", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF), WorldGenShrub.Shrub.class){ + GoldenRaspberry("rubus", "occidentalis", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumExtraTreeLog.EMPTY, new Color(0xFFFFFF)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.GoldenRaspberry); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.GoldenRaspberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1280,7 +1802,13 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Berry); } }, - Cinnamon("cinnamomum", "cassia", EnumLeafType.JUNGLE, new Color(0x738E0B), new Color(0x738E0B), EnumSaplingType.Default, EnumExtraTreeLog.Cinnamon, new Color(0x86583C), WorldGenLazy.Tree.class){ + Cinnamon("cinnamomum", "cassia", EnumLeafType.JUNGLE, new Color(0x738E0B), new Color(0x738E0B), EnumSaplingType.Default, EnumExtraTreeLog.Cinnamon, new Color(0x86583C)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); @@ -1294,10 +1822,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Coconut("cocous", "nucifera", EnumLeafType.PALM, new Color(0x649923), new Color(0x649923), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenPalm.Coconut.class){ + Coconut("cocous", "nucifera", EnumLeafType.PALM, new Color(0x649923), new Color(0x649923), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenPalm.Coconut(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Coconut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Coconut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1309,10 +1843,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Cashew("anacardium", "occidentale", EnumLeafType.JUNGLE, new Color(0xABB962), new Color(0xABB962), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + Cashew("anacardium", "occidentale", EnumLeafType.JUNGLE, new Color(0xABB962), new Color(0xABB962), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Cashew); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Cashew); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); } @@ -1322,10 +1862,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Avacado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + Avacado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Avacado); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Avacado); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); } @@ -1337,10 +1883,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Nutmeg("myristica", "fragrans", EnumLeafType.JUNGLE, new Color(0x488D4C), new Color(0x488D4C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + Nutmeg("myristica", "fragrans", EnumLeafType.JUNGLE, new Color(0x488D4C), new Color(0x488D4C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Nutmeg); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Nutmeg); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -1352,10 +1904,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Allspice("pimenta", "dioica", EnumLeafType.JUNGLE, new Color(0x7C9724), new Color(0x7C9724), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + Allspice("pimenta", "dioica", EnumLeafType.JUNGLE, new Color(0x7C9724), new Color(0x7C9724), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Allspice); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Allspice); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -1367,10 +1925,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Chilli("capsicum", "annuum", EnumLeafType.JUNGLE, new Color(0x2A9F01), new Color(0x2A9F01), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + Chilli("capsicum", "annuum", EnumLeafType.JUNGLE, new Color(0x2A9F01), new Color(0x2A9F01), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Chilli); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Chilli); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Higher.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -1383,10 +1947,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - StarAnise("illicium", "verum", EnumLeafType.JUNGLE, new Color(0x7FC409), new Color(0x7FC409), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + StarAnise("illicium", "verum", EnumLeafType.JUNGLE, new Color(0x7FC409), new Color(0x7FC409), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.StarAnise); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.StarAnise); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); } @@ -1397,10 +1967,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Mango("mangifera", "indica", EnumLeafType.JUNGLE, new Color(0x87B574), new Color(0x87B574), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenTropical.Mango.class){ + Mango("mangifera", "indica", EnumLeafType.JUNGLE, new Color(0x87B574), new Color(0x87B574), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenTropical.Mango(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Mango); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Mango); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1416,10 +1992,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Starfruit("averrhoa", "carambola", EnumLeafType.JUNGLE, new Color(0x6DA92D), new Color(0x6DA92D), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + Starfruit("averrhoa", "carambola", EnumLeafType.JUNGLE, new Color(0x6DA92D), new Color(0x6DA92D), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Starfruit); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Starfruit); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); } @@ -1431,10 +2013,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(ETFruitFamily.Citrus); } }, - Candlenut("aleurites", "moluccana", EnumLeafType.DECIDUOUS, new Color(0x8AA36C), new Color(0x8AA36C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A), WorldGenLazy.Tree.class){ + Candlenut("aleurites", "moluccana", EnumLeafType.DECIDUOUS, new Color(0x8AA36C), new Color(0x8AA36C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenLazy.Tree(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Candlenut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Candlenut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -1447,10 +2035,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - DwarfHazel("Corylus", "americana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Shrub, EnumExtraTreeLog.Hazel, new Color(0xAA986F), WorldGenShrub.Shrub.class){ + DwarfHazel("Corylus", "americana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Shrub, EnumExtraTreeLog.Hazel, new Color(0xAA986F)){ + + @Override + public WorldGenerator getWorldGenerator(ITreeGenData tree) { + return new WorldGenShrub.Shrub(tree); + } + @Override protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.FRUITS, ExtraTreeFruitGene.Hazelnut); + template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Hazelnut); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Faster.getAllele()); @@ -1475,7 +2069,6 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { private EnumSaplingType saplingType; private IWoodType woodType; private IWoodProvider woodProvider; - private ITreeGenerator treeGenerator; private IClassification branch; private IAlleleTreeSpecies species; private ITreeGenome genome; @@ -1483,7 +2076,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { private static final String unlocalizedName = "extratrees.species.%s.name"; private static final String unlocalizedDesc = "extratrees.species.%s.desc"; - ETTreeDefinition(String branch, String binomial, EnumLeafType leafType, Color leafColor, Color leafPollinatedColor, EnumSaplingType saplingType, IWoodType woodType, Color woodColor, Class treeGenerator) { + ETTreeDefinition(String branch, String binomial, EnumLeafType leafType, Color leafColor, Color leafPollinatedColor, EnumSaplingType saplingType, IWoodType woodType, Color woodColor) { this.binomial = binomial; this.leafType = leafType; this.leafColor = leafColor; @@ -1492,7 +2085,6 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { this.saplingType = saplingType; this.woodType = woodType; this.woodProvider = new WoodProvider(woodType); - this.treeGenerator = new TreeGenerator(treeGenerator, woodType); this.woodColor = woodColor; this.branchName = branch; @@ -1522,7 +2114,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); } IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(getUID(), String.format(unlocalizedName, getUID()), getAuthority(), String.format(unlocalizedDesc, getUID()), isDominant(), - branch, getBinomial(), Constants.EXTRA_TREES_MOD_ID, leafSpriteProvider, saplingType.getGermlingModelProvider(leafColor, woodColor), woodProvider, treeGenerator, new ETLeafProvider()); + branch, getBinomial(), Constants.EXTRA_TREES_MOD_ID, leafSpriteProvider, saplingType.getGermlingModelProvider(leafColor, woodColor), woodProvider, this, new ETLeafProvider()); setSpeciesProperties(speciesBuilder); species = speciesBuilder.build(); branch.addMemberSpecies(species); @@ -1617,6 +2209,42 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition { public String getName() { return name().toLowerCase(Locale.ENGLISH); } + + @Override + public boolean setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing) { + AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); + boolean fireproof = fireproofAllele.getValue(); + IBlockState logBlock = TreeManager.woodAccess.getBlock(woodType, WoodBlockKind.LOG, fireproof); + + BlockLog.EnumAxis axis = BlockLog.EnumAxis.fromFacingAxis(facing.getAxis()); + return world.setBlockState(pos, logBlock.withProperty(BlockLog.LOG_AXIS, axis)); + } + + @Override + public boolean setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos) { + boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.leaves.getDefaultState()); + if (!placed) { + return false; + } + + Block block = world.getBlockState(pos).getBlock(); + if (PluginArboriculture.blocks.leaves != block) { + world.setBlockToAir(pos); + return false; + } + + TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); + if (tileLeaves == null) { + world.setBlockToAir(pos); + return false; + } + + tileLeaves.getOwnerHandler().setOwner(owner); + tileLeaves.setTree(new Tree(genome)); + + world.markBlockRangeForRenderUpdate(pos, pos); + return true; + } private static class AlleleTemplate { IAllele[] alleles; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java deleted file mode 100644 index 0a558d96..00000000 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ /dev/null @@ -1,568 +0,0 @@ -package binnie.extratrees.genetics; - -import binnie.Binnie; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.FruitPod; -import binnie.extratrees.config.ConfigurationMain; -import binnie.extratrees.item.Food; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IFruitFamily; -import forestry.arboriculture.FruitProviderNone; -import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Random; - - -public class ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { - public static final ExtraTreeFruitGene Blackthorn = new ExtraTreeFruitGene("Blackthorn", 10, 7180062, 14561129, FruitSprite.Small); - public static final ExtraTreeFruitGene CherryPlum = new ExtraTreeFruitGene("CherryPlum", 10, 7180062, 15211595, FruitSprite.Small); - public static final ExtraTreeFruitGene Peach = new ExtraTreeFruitGene("Peach ", 10, 7180062, 16424995, FruitSprite.Average); - public static final ExtraTreeFruitGene Nectarine = new ExtraTreeFruitGene("Nectarine", 10, 7180062, 16405795, FruitSprite.Average); - public static final ExtraTreeFruitGene Apricot = new ExtraTreeFruitGene("Apricot", 10, 7180062, 16437027, FruitSprite.Average); - public static final ExtraTreeFruitGene Almond = new ExtraTreeFruitGene("Almond", 10, 7180062, 9364342, FruitSprite.Small); - public static final ExtraTreeFruitGene WildCherry = new ExtraTreeFruitGene("WildCherry", 10, 7180062, 16711680, FruitSprite.Tiny); - public static final ExtraTreeFruitGene SourCherry = new ExtraTreeFruitGene("SourCherry", 10, 7180062, 10225963, FruitSprite.Tiny); - public static final ExtraTreeFruitGene BlackCherry = new ExtraTreeFruitGene("BlackCherry", 10, 7180062, 4852249, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Orange = new ExtraTreeFruitGene("Orange", 10, 3665987, 16749578, FruitSprite.Average); - public static final ExtraTreeFruitGene Manderin = new ExtraTreeFruitGene("Manderin", 10, 3665987, 16749578, FruitSprite.Average); - public static final ExtraTreeFruitGene Tangerine = new ExtraTreeFruitGene("Tangerine", 10, 3665987, 16749578, FruitSprite.Average); - public static final ExtraTreeFruitGene Satsuma = new ExtraTreeFruitGene("Satsuma", 10, 3665987, 16749578, FruitSprite.Average); - public static final ExtraTreeFruitGene KeyLime = new ExtraTreeFruitGene("KeyLime", 10, 3665987, 10223428, FruitSprite.Small); - public static final ExtraTreeFruitGene Lime = new ExtraTreeFruitGene("Lime", 10, 3665987, 10223428, FruitSprite.Average); - public static final ExtraTreeFruitGene FingerLime = new ExtraTreeFruitGene("FingerLime", 10, 3665987, 11156280, FruitSprite.Small); - public static final ExtraTreeFruitGene Pomelo = new ExtraTreeFruitGene("Pomelo", 10, 3665987, 6083402, FruitSprite.Larger); - public static final ExtraTreeFruitGene Grapefruit = new ExtraTreeFruitGene("Grapefruit", 10, 3665987, 16749578, FruitSprite.Large); - public static final ExtraTreeFruitGene Kumquat = new ExtraTreeFruitGene("Kumquat", 10, 3665987, 16749578, FruitSprite.Small); - public static final ExtraTreeFruitGene Citron = new ExtraTreeFruitGene("Citron", 10, 3665987, 16772192, FruitSprite.Large); - public static final ExtraTreeFruitGene BuddhaHand = new ExtraTreeFruitGene("BuddhaHand", 10, 3665987, 16772192, FruitSprite.Large); - public static final ExtraTreeFruitGene Apple = new ExtraTreeFruitGene("Apple", 10, 7915859, 16193046, FruitSprite.Average); - public static final ExtraTreeFruitGene Crabapple = new ExtraTreeFruitGene("Crabapple ", 10, 7915859, 16760140, FruitSprite.Average); - public static final ExtraTreeFruitGene Banana = new ExtraTreeFruitGene("Banana", "Banana", FruitPod.Banana); - public static final ExtraTreeFruitGene RedBanana = new ExtraTreeFruitGene("RedBanana", "Red Banana", FruitPod.RedBanana); - public static final ExtraTreeFruitGene Plantain = new ExtraTreeFruitGene("Plantain", "Platain", FruitPod.Plantain); - public static final ExtraTreeFruitGene Hazelnut = new ExtraTreeFruitGene("Hazelnut", 7, 8223006, 14463606, FruitSprite.Small); - public static final ExtraTreeFruitGene Butternut = new ExtraTreeFruitGene("Butternut", 7, 11712336, 16102498, FruitSprite.Small); - public static final ExtraTreeFruitGene Beechnut = new ExtraTreeFruitGene("Beechnut", 8, 14401148, 6241845, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Pecan = new ExtraTreeFruitGene("Pecan", 8, 10660940, 15781769, FruitSprite.Small); - public static final ExtraTreeFruitGene BrazilNut = new ExtraTreeFruitGene("BrazilNut", 10, 5875561, 9852208, FruitSprite.Large); - public static final ExtraTreeFruitGene Fig = new ExtraTreeFruitGene("Fig", 9, 14201186, 7094086, FruitSprite.Small); - public static final ExtraTreeFruitGene Acorn = new ExtraTreeFruitGene("Acorn", 6, 7516710, 11364893, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Elderberry = new ExtraTreeFruitGene("Elderberry", 9, 7444317, 5331779, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Olive = new ExtraTreeFruitGene("Olive", 9, 8887861, 6444842, FruitSprite.Small); - public static final ExtraTreeFruitGene GingkoNut = new ExtraTreeFruitGene("GingkoNut", 7, 9213787, 15063725, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Coffee = new ExtraTreeFruitGene("Coffee", 8, 7433501, 16273254, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Pear = new ExtraTreeFruitGene("Pear", 10, 10456913, 10474833, FruitSprite.Pear); - public static final ExtraTreeFruitGene OsangeOsange = new ExtraTreeFruitGene("OsangeOsange", 10, 9934674, 10665767, FruitSprite.Larger); - public static final ExtraTreeFruitGene Clove = new ExtraTreeFruitGene("Clove", 9, 6847532, 11224133, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Coconut = new ExtraTreeFruitGene("Coconut", "Coconut", FruitPod.Coconut); - public static final ExtraTreeFruitGene Cashew = new ExtraTreeFruitGene("Cashew", 8, 12879132, 15289111, FruitSprite.Average); - public static final ExtraTreeFruitGene Avacado = new ExtraTreeFruitGene("Avacado", 10, 10272370, 2170640, FruitSprite.Pear); - public static final ExtraTreeFruitGene Nutmeg = new ExtraTreeFruitGene("Nutmeg", 9, 14861101, 11305813, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Allspice = new ExtraTreeFruitGene("Allspice", 9, 15180922, 7423542, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Chilli = new ExtraTreeFruitGene("Chilli", 10, 7430757, 15145010, FruitSprite.Small); - public static final ExtraTreeFruitGene StarAnise = new ExtraTreeFruitGene("StarAnise", 8, 8733742, 13917189, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Mango = new ExtraTreeFruitGene("Mango", 10, 6654997, 15902262, FruitSprite.Average); - public static final ExtraTreeFruitGene Starfruit = new ExtraTreeFruitGene("Starfruit", 10, 9814541, 15061550, FruitSprite.Average); - public static final ExtraTreeFruitGene Candlenut = new ExtraTreeFruitGene("Candlenut", 8, 8235123, 14600882, FruitSprite.Small); - public static final ExtraTreeFruitGene Papayimar = new ExtraTreeFruitGene("Papayimar", "Papayimar", FruitPod.Papayimar); - public static final ExtraTreeFruitGene Blackcurrant = new ExtraTreeFruitGene("Blackcurrant", 8, 9407571, 4935251, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Redcurrant = new ExtraTreeFruitGene("Redcurrant", 8, 13008910, 15080974, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Blackberry = new ExtraTreeFruitGene("Blackberry", 8, 9399665, 4801393, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Raspberry = new ExtraTreeFruitGene("Raspberry", 8, 15520197, 14510449, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Blueberry = new ExtraTreeFruitGene("Blueberry", 8, 10203799, 6329278, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Cranberry = new ExtraTreeFruitGene("Cranberry", 8, 12232496, 14555696, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Juniper = new ExtraTreeFruitGene("Juniper", 8, 10194034, 6316914, FruitSprite.Tiny); - public static final ExtraTreeFruitGene Gooseberry = new ExtraTreeFruitGene("Gooseberry", 8, 12164944, 12177232, FruitSprite.Tiny); - public static final ExtraTreeFruitGene GoldenRaspberry = new ExtraTreeFruitGene("GoldenRaspberry", 8, 12496955, 15970363, FruitSprite.Tiny); - - IFruitFamily family; - boolean isRipening; - int diffR; - int diffG; - int diffB; - FruitPod pod; - int ripeningPeriod; - int colourUnripe; - int colour; - FruitSprite index; - HashMap products; - - - private static LinkedList list; - - public static List values() { - if (list == null) { - list = new LinkedList<>(); - for (Field f : ExtraTreeFruitGene.class.getFields()) { - if (f.getType() == ExtraTreeFruitGene.class) { - try { - list.add((ExtraTreeFruitGene) f.get(ExtraTreeFruitGene.Acorn)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - } - } - - return list; - } - - public static void init() { - final IFruitFamily familyPrune = AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"); - final IFruitFamily familyPome = AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"); - final IFruitFamily familyJungle = AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"); - final IFruitFamily familyNuts = AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"); - final IFruitFamily familyBerry = ETFruitFamily.Berry; - final IFruitFamily familyCitrus = ETFruitFamily.Citrus; - AlleleManager.alleleRegistry.registerFruitFamily(familyBerry); - AlleleManager.alleleRegistry.registerFruitFamily(familyCitrus); - ExtraTreeFruitGene.Apple.addProduct(new ItemStack(Items.APPLE), 1.0f); - ExtraTreeFruitGene.Apple.setFamily(familyPome); - ExtraTreeFruitGene.Crabapple.addProduct(Food.CRABAPPLE.get(1), 1.0f); - ExtraTreeFruitGene.Crabapple.setFamily(familyPome); - ExtraTreeFruitGene.Orange.addProduct(Food.ORANGE.get(1), 1.0f); - ExtraTreeFruitGene.Orange.setFamily(familyCitrus); - ExtraTreeFruitGene.Manderin.addProduct(Food.MANDERIN.get(1), 1.0f); - ExtraTreeFruitGene.Manderin.setFamily(familyCitrus); - ExtraTreeFruitGene.Tangerine.addProduct(Food.TANGERINE.get(1), 1.0f); - ExtraTreeFruitGene.Tangerine.setFamily(familyCitrus); - ExtraTreeFruitGene.Satsuma.addProduct(Food.SATSUMA.get(1), 1.0f); - ExtraTreeFruitGene.Satsuma.setFamily(familyCitrus); - ExtraTreeFruitGene.KeyLime.addProduct(Food.KEY_LIME.get(1), 1.0f); - ExtraTreeFruitGene.KeyLime.setFamily(familyCitrus); - ExtraTreeFruitGene.Lime.addProduct(Food.LIME.get(1), 1.0f); - ExtraTreeFruitGene.Lime.setFamily(familyCitrus); - ExtraTreeFruitGene.FingerLime.addProduct(Food.FINGER_LIME.get(1), 1.0f); - ExtraTreeFruitGene.FingerLime.setFamily(familyCitrus); - ExtraTreeFruitGene.Pomelo.addProduct(Food.POMELO.get(1), 1.0f); - ExtraTreeFruitGene.Pomelo.setFamily(familyCitrus); - ExtraTreeFruitGene.Grapefruit.addProduct(Food.GRAPEFRUIT.get(1), 1.0f); - ExtraTreeFruitGene.Grapefruit.setFamily(familyCitrus); - ExtraTreeFruitGene.Kumquat.addProduct(Food.KUMQUAT.get(1), 1.0f); - ExtraTreeFruitGene.Kumquat.setFamily(familyCitrus); - ExtraTreeFruitGene.Citron.addProduct(Food.CITRON.get(1), 1.0f); - ExtraTreeFruitGene.Citron.setFamily(familyCitrus); - ExtraTreeFruitGene.BuddhaHand.addProduct(Food.BUDDHA_HAND.get(1), 1.0f); - ExtraTreeFruitGene.BuddhaHand.setFamily(familyCitrus); - ExtraTreeFruitGene.Blackthorn.addProduct(Food.Blackthorn.get(1), 1.0f); - ExtraTreeFruitGene.Blackthorn.setFamily(familyPrune); - ExtraTreeFruitGene.CherryPlum.addProduct(Food.CHERRY_PLUM.get(1), 1.0f); - ExtraTreeFruitGene.CherryPlum.setFamily(familyPrune); - ExtraTreeFruitGene.Peach.addProduct(Food.PEACH.get(1), 1.0f); - ExtraTreeFruitGene.Peach.setFamily(familyPrune); - ExtraTreeFruitGene.Nectarine.addProduct(Food.NECTARINE.get(1), 1.0f); - ExtraTreeFruitGene.Nectarine.setFamily(familyPrune); - ExtraTreeFruitGene.Apricot.addProduct(Food.APRICOT.get(1), 1.0f); - ExtraTreeFruitGene.Apricot.setFamily(familyPrune); - ExtraTreeFruitGene.Almond.addProduct(Food.ALMOND.get(1), 1.0f); - ExtraTreeFruitGene.Almond.setFamily(familyPrune); - ExtraTreeFruitGene.WildCherry.addProduct(Food.WILD_CHERRY.get(1), 1.0f); - ExtraTreeFruitGene.WildCherry.setFamily(familyPrune); - ExtraTreeFruitGene.SourCherry.addProduct(Food.SOUR_CHERRY.get(1), 1.0f); - ExtraTreeFruitGene.SourCherry.setFamily(familyPrune); - ExtraTreeFruitGene.BlackCherry.addProduct(Food.BLACK_CHERRY.get(1), 1.0f); - ExtraTreeFruitGene.BlackCherry.setFamily(familyPrune); - ExtraTreeFruitGene.Hazelnut.addProduct(Food.HAZELNUT.get(1), 1.0f); - ExtraTreeFruitGene.Hazelnut.setFamily(familyNuts); - ExtraTreeFruitGene.Butternut.addProduct(Food.BUTTERNUT.get(1), 1.0f); - ExtraTreeFruitGene.Butternut.setFamily(familyNuts); - ExtraTreeFruitGene.Beechnut.addProduct(Food.BEECHNUT.get(1), 1.0f); - ExtraTreeFruitGene.Beechnut.setFamily(familyNuts); - ExtraTreeFruitGene.Pecan.addProduct(Food.PECAN.get(1), 1.0f); - ExtraTreeFruitGene.Pecan.setFamily(familyNuts); - ExtraTreeFruitGene.Banana.addProduct(Food.BANANA.get(2), 1.0f); - ExtraTreeFruitGene.Banana.setFamily(familyJungle); - ExtraTreeFruitGene.RedBanana.addProduct(Food.RED_BANANA.get(2), 1.0f); - ExtraTreeFruitGene.RedBanana.setFamily(familyJungle); - ExtraTreeFruitGene.Plantain.addProduct(Food.PLANTAIN.get(2), 1.0f); - ExtraTreeFruitGene.Plantain.setFamily(familyJungle); - ExtraTreeFruitGene.BrazilNut.addProduct(Food.BRAZIL_NUT.get(4), 1.0f); - ExtraTreeFruitGene.BrazilNut.setFamily(familyNuts); - ExtraTreeFruitGene.Fig.addProduct(Food.FIG.get(1), 1.0f); - ExtraTreeFruitGene.Fig.setFamily(familyPrune); - ExtraTreeFruitGene.Acorn.addProduct(Food.ACORN.get(1), 1.0f); - ExtraTreeFruitGene.Acorn.setFamily(familyNuts); - ExtraTreeFruitGene.Elderberry.addProduct(Food.ELDERBERRY.get(1), 1.0f); - ExtraTreeFruitGene.Elderberry.setFamily(familyPrune); - ExtraTreeFruitGene.Olive.addProduct(Food.OLIVE.get(1), 1.0f); - ExtraTreeFruitGene.Olive.setFamily(familyPrune); - ExtraTreeFruitGene.GingkoNut.addProduct(Food.GINGKO_NUT.get(1), 1.0f); - ExtraTreeFruitGene.GingkoNut.setFamily(familyNuts); - ExtraTreeFruitGene.Coffee.addProduct(Food.COFFEE.get(1), 1.0f); - ExtraTreeFruitGene.Coffee.setFamily(familyJungle); - ExtraTreeFruitGene.Pear.addProduct(Food.PEAR.get(1), 1.0f); - ExtraTreeFruitGene.Pear.setFamily(familyPome); - ExtraTreeFruitGene.OsangeOsange.addProduct(Food.OSANGE_ORANGE.get(1), 1.0f); - ExtraTreeFruitGene.OsangeOsange.setFamily(familyPome); - ExtraTreeFruitGene.Clove.addProduct(Food.CLOVE.get(1), 1.0f); - ExtraTreeFruitGene.Clove.setFamily(familyNuts); - ExtraTreeFruitGene.Blackcurrant.addProduct(Food.BLACKCURRANT.get(2), 1.0f); - ExtraTreeFruitGene.Blackcurrant.setFamily(familyBerry); - ExtraTreeFruitGene.Redcurrant.addProduct(Food.REDCURRANT.get(2), 1.0f); - ExtraTreeFruitGene.Redcurrant.setFamily(familyBerry); - ExtraTreeFruitGene.Blackberry.addProduct(Food.BLACKBERRY.get(2), 1.0f); - ExtraTreeFruitGene.Blackberry.setFamily(familyBerry); - ExtraTreeFruitGene.Raspberry.addProduct(Food.RASPBERRY.get(2), 1.0f); - ExtraTreeFruitGene.Raspberry.setFamily(familyBerry); - ExtraTreeFruitGene.Blueberry.addProduct(Food.BLUEBERRY.get(2), 1.0f); - ExtraTreeFruitGene.Blueberry.setFamily(familyBerry); - ExtraTreeFruitGene.Cranberry.addProduct(Food.CRANBERRY.get(2), 1.0f); - ExtraTreeFruitGene.Cranberry.setFamily(familyBerry); - ExtraTreeFruitGene.Juniper.addProduct(Food.JUNIPER.get(2), 1.0f); - ExtraTreeFruitGene.Juniper.setFamily(familyBerry); - ExtraTreeFruitGene.Gooseberry.addProduct(Food.GOOSEBERRY.get(2), 1.0f); - ExtraTreeFruitGene.Gooseberry.setFamily(familyBerry); - ExtraTreeFruitGene.GoldenRaspberry.addProduct(Food.GOLDEN_RASPBERRY.get(2), 1.0f); - ExtraTreeFruitGene.GoldenRaspberry.setFamily(familyBerry); - ExtraTreeFruitGene.Coconut.addProduct(Food.COCONUT.get(1), 1.0f); - ExtraTreeFruitGene.Coconut.setFamily(familyJungle); - ExtraTreeFruitGene.Cashew.addProduct(Food.CASHEW.get(1), 1.0f); - ExtraTreeFruitGene.Cashew.setFamily(familyJungle); - ExtraTreeFruitGene.Avacado.addProduct(Food.AVACADO.get(1), 1.0f); - ExtraTreeFruitGene.Avacado.setFamily(familyJungle); - ExtraTreeFruitGene.Nutmeg.addProduct(Food.NUTMEG.get(1), 1.0f); - ExtraTreeFruitGene.Nutmeg.setFamily(familyJungle); - ExtraTreeFruitGene.Allspice.addProduct(Food.ALLSPICE.get(1), 1.0f); - ExtraTreeFruitGene.Allspice.setFamily(familyJungle); - ExtraTreeFruitGene.Chilli.addProduct(Food.CHILLI.get(1), 1.0f); - ExtraTreeFruitGene.Chilli.setFamily(familyJungle); - ExtraTreeFruitGene.StarAnise.addProduct(Food.STAR_ANISE.get(1), 1.0f); - ExtraTreeFruitGene.StarAnise.setFamily(familyJungle); - ExtraTreeFruitGene.Mango.addProduct(Food.MANGO.get(1), 1.0f); - ExtraTreeFruitGene.Mango.setFamily(familyPome); - ExtraTreeFruitGene.Starfruit.addProduct(Food.STARFRUIT.get(1), 1.0f); - ExtraTreeFruitGene.Starfruit.setFamily(familyJungle); - ExtraTreeFruitGene.Candlenut.addProduct(Food.CANDLENUT.get(1), 1.0f); - ExtraTreeFruitGene.Candlenut.setFamily(familyJungle); - if (ConfigurationMain.alterLemon) { - try { - final IAlleleFruit lemon = (IAlleleFruit) AlleleManager.alleleRegistry.getAllele("forestry.fruitLemon"); - final FruitProviderNone prov = (FruitProviderNone) lemon.getProvider(); - final Field f = FruitProviderNone.class.getDeclaredField("family"); - final Field modifiersField = Field.class.getDeclaredField("modifiers"); - f.setAccessible(true); - modifiersField.setAccessible(true); - modifiersField.setInt(f, f.getModifiers() & 0xFFFFFFEF); - f.set(prov, familyCitrus); - } catch (Exception e) { - e.printStackTrace(); - } - } - for (final IAlleleSpecies tree : Binnie.Genetics.treeBreedingSystem.getAllSpecies()) { - if (tree instanceof AlleleTreeSpecies && ((IAlleleTreeSpecies) tree).getSuitableFruit().contains(familyPrune)) { - ((AlleleTreeSpecies) tree).addFruitFamily(familyCitrus); - } - } - } - - private void setFamily(final IFruitFamily family) { - this.family = family; - } - - String uuid; - - private ExtraTreeFruitGene(final String uuid, final int time, final int unripe, final int colour, final FruitSprite index) { - this.isRipening = false; - this.diffB = 0; - this.pod = null; - this.ripeningPeriod = 0; - this.products = new HashMap<>(); - this.colour = colour; - this.index = index; - this.setRipening(time, unripe); - this.uuid = uuid; - } - - private ExtraTreeFruitGene(final String uuid, final String name, final FruitPod pod) { - this.isRipening = false; - this.diffB = 0; - this.pod = null; - this.ripeningPeriod = 0; - this.products = new HashMap<>(); - this.pod = pod; - this.ripeningPeriod = 2; - this.uuid = uuid; - } - - public void setRipening(final int time, final int unripe) { - this.ripeningPeriod = time; - this.colourUnripe = unripe; - this.isRipening = true; - this.diffR = (this.colour >> 16 & 0xFF) - (unripe >> 16 & 0xFF); - this.diffG = (this.colour >> 8 & 0xFF) - (unripe >> 8 & 0xFF); - this.diffB = (this.colour & 0xFF) - (unripe & 0xFF); - } - - public void addProduct(final ItemStack product, final float chance) { - this.products.put(product, chance); - } - - @Override - public String getUID() { - return "extratrees.fruit." + this.uuid.toLowerCase().trim(); - } - - @Override - public boolean isDominant() { - return true; - } - - @Override - public IFruitProvider getProvider() { - return this; - } - -// @Override -// public ItemStack[] getProducts() { -// return this.products.keySet().toArray(new ItemStack[0]); -// } -// -// @Override -// public ItemStack[] getSpecialty() { -// return new ItemStack[0]; -// } - - //TODO implement this - @Override - public void registerSprites() { - - } - - - //TODO implement this - @Nullable - @Override - public ResourceLocation getSprite(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { - return new ResourceLocation("extratrees:" + this.getUID()); - } - - //TODO implement this - @Override - public int compareTo(@Nonnull IAlleleFruit o) { - return o == this ? 0 : -1; - } - - //TODO implement this - @Nonnull - @Override - public Map getSpecialty() { - return new HashMap<>(); - } - - //TODO implement this - @Override - public int getDecorativeColor() { - return 0; - } - - //TODO implement this - @Override - public boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos) { - return false; - } - - //TODO implement this - @Nonnull - @Override - public List getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { - return new ArrayList<>(); - } - - //TODO implement this - @Nullable - @Override - public String getModelName() { - return "extratrees:" + getUID(); - } - - //TODO implement this - @Override - public boolean isFruitLeaf(ITreeGenome genome, World world, BlockPos pos) { - return false; - } - - //TODO implement this - @Nonnull - @Override - public String getModID() { - return "extratrees"; - } - - @Override - public int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { - if (!this.isRipening) { - return this.colour; - } - final float stage = this.getRipeningStage(ripeningTime); - final int r = (this.colourUnripe >> 16 & 0xFF) + (int) (this.diffR * stage); - final int g = (this.colourUnripe >> 8 & 0xFF) + (int) (this.diffG * stage); - final int b = (this.colourUnripe & 0xFF) + (int) (this.diffB * stage); - return (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF); - } - - @Override - public String getDescription() { - return ExtraTrees.proxy.localise("item.food." + this.getClass().getTypeName().toLowerCase()); - } - - @Override - public IFruitFamily getFamily() { - return this.family; - } - - -// @Override -// public boolean markAsFruitLeaf(final ITreeGenome genome, final World world, final int x, final int y, final int z) { -// return this.pod == null; -// } - - @Override - public int getRipeningPeriod() { - return this.ripeningPeriod; - } - - - //TODO producsts - @Nonnull - @Override - public HashMap getProducts() { - return products; - } - - // @Override -// public ItemStack[] getFruits(final ITreeGenome genome, final World world, final int x, final int y, final int z, final int ripeningTime) { -// if (this.pod != null) { -// if (ripeningTime >= 2) { -// final List product = new ArrayList(); -// for (final Map.Entry entry : this.products.entrySet()) { -// final ItemStack single = entry.getKey().copy(); -// single.stackSize = 1; -// for (int i = 0; i < entry.getKey().stackSize; ++i) { -// if (world.rand.nextFloat() <= entry.getValue()) { -// product.add(single.copy()); -// } -// } -// } -// return product.toArray(new ItemStack[0]); -// } -// return new ItemStack[0]; -// } -// else { -// final ArrayList product2 = new ArrayList(); -// final float stage = this.getRipeningStage(ripeningTime); -// if (stage < 0.5f) { -// return new ItemStack[0]; -// } -// final float modeYieldMod = 1.0f; -// for (final Map.Entry entry2 : this.products.entrySet()) { -// if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) { -// product2.add(entry2.getKey().copy()); -// } -// } -// return product2.toArray(new ItemStack[0]); -// } -// } - - private float getRipeningStage(final int ripeningTime) { - if (ripeningTime >= this.ripeningPeriod) { - return 1.0f; - } - return ripeningTime / this.ripeningPeriod; - } - - @Override - public boolean requiresFruitBlocks() { - return this.pod != null; - } - -// @Override -// public boolean trySpawnFruitBlock(final ITreeGenome genome, final World world, final int x, final int y, final int z) { -// return this.pod != null && world.rand.nextFloat() <= genome.getSappiness() && Binnie.Genetics.getTreeRoot().setFruitBlock(world, (IAlleleFruit) genome.getActiveAllele(EnumTreeChromosome.FRUITS), genome.getSappiness(), this.pod.getTextures(), x, y, z); -// } - - public boolean setFruitBlock(final World world, final IAlleleFruit allele, final float sappiness, final int x, final int y, final int z) { - return true; - } - -// public static int getDirectionalMetadata(final World world, final int x, final int y, final int z) { -// for (int i = 0; i < 4; ++i) { -// if (isValidPot(world, x, y, z, i)) { -// return i; -// } -// } -// return -1; -// } - -// public static boolean isValidPot(final World world, int x, final int y, int z, final int notchDirection) { -// x += Direction.offsetX[notchDirection]; -// z += Direction.offsetZ[notchDirection]; -// final Block block = world.getBlock(x, y, z); -// if (block == Blocks.log || block == Blocks.log2) { -// return BlockLog.func_150165_c(world.getBlockMetadata(x, y, z)) == 3; -// } -// return block != null && block.isWood(world, x, y, z); -// } - -// @Override -// public short getIconIndex(final ITreeGenome genome, final IBlockAccess world, final int x, final int y, final int z, final int ripeningTime, final boolean fancy) { -// return this.index.getIndex(); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// if (this.ordinal() == 0) { -// for (final FruitSprite sprite : FruitSprite.values()) { -// sprite.registerIcons(register); -// } -// } -// } - - - @Nullable - @Override - public ResourceLocation getDecorativeSprite() { - return null; - } - - @Override - public String getName() { - return this.getDescription(); - } - - public String getNameOfFruit() { - if (this == ExtraTreeFruitGene.Apple) { - return "Apple"; - } - for (final ItemStack stack : this.products.keySet()) { - if (stack.getItem() == ExtraTrees.itemFood) { - return Food.values()[stack.getItemDamage()].toString(); - } - } - return "NoFruit"; - } - - @Override - public String getUnlocalizedName() { - return this.getUID(); - } -} diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/src/main/java/binnie/extratrees/genetics/FruitSprite.java index 0fdab33c..896a3bce 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -1,35 +1,36 @@ package binnie.extratrees.genetics; -import binnie.core.resource.BinnieIcon; +import java.util.Locale; -public enum FruitSprite //implements IIconProvider -{ - Tiny, - Small, - Average, - Large, - Larger, - Pear; +import binnie.Constants; +import forestry.core.proxy.Proxies; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; - BinnieIcon icon; +public enum FruitSprite{ + TINY, + SMALL, + AVERAGE, + LARGE, + LARGER, + PEAR; - public short getIndex() { - return (short) (this.ordinal() + 4200); + public static final FruitSprite[] VALUES = values(); + private final ResourceLocation location; + + private FruitSprite() { + location = new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/fruit/" + name().toLowerCase(Locale.ENGLISH)); + } + + public ResourceLocation getLocation() { + return location; + } + + @SideOnly(Side.CLIENT) + public void registerSprites() { + TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); + map.registerSprite(location); } - -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final short texUID) { -// final int index = texUID - 4200; -// if (index >= 0 && index < values().length) { -// return values()[index].icon.getIcon(); -// } -// return null; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.icon = Binnie.Resource.getBlockIcon(ExtraTrees.instance, "fruit/" + this.toString().toLowerCase()); -// } } diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 343f37b9..2a20699e 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -26,7 +26,7 @@ public class ModuleGenetics implements IInitializable { @Override public void init() { - ExtraTreeFruitGene.init(); + AlleleETFruit.init(); ETTreeDefinition.initTrees(); ExtraTreeMutation.init(); } diff --git a/src/main/java/binnie/extratrees/genetics/TreeGenerator.java b/src/main/java/binnie/extratrees/genetics/TreeGenerator.java deleted file mode 100644 index 9f8b1567..00000000 --- a/src/main/java/binnie/extratrees/genetics/TreeGenerator.java +++ /dev/null @@ -1,75 +0,0 @@ -package binnie.extratrees.genetics; - -import binnie.extratrees.gen.WorldGenDefault; -import com.mojang.authlib.GameProfile; -import forestry.api.arboriculture.*; -import forestry.api.world.ITreeGenData; -import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.genetics.Tree; -import forestry.arboriculture.tiles.TileLeaves; -import forestry.core.genetics.alleles.AlleleBoolean; -import forestry.core.tiles.TileUtil; -import net.minecraft.block.Block; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -import javax.annotation.Nullable; - -public class TreeGenerator implements ITreeGenerator { - Class generator; - IWoodType woodType; - - public TreeGenerator(Class generator, @Nullable IWoodType woodType) { - this.generator = generator; - this.woodType = woodType; - } - - @Override - public WorldGenerator getWorldGenerator(ITreeGenData tree) { - try { - return generator.getConstructor(ITree.class).newInstance(tree); - } catch (Exception ex) { - ex.printStackTrace(); - } - return new WorldGenDefault(tree); - } - - @Override - public boolean setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing) { - if (woodType != null) { - AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); - boolean fireproof = fireproofAllele.getValue(); - return world.setBlockState(pos, TreeManager.woodAccess.getBlock(woodType, WoodBlockKind.LOG, fireproof), 2); - } - return false; - } - - @Override - public boolean setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos) { - boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.leaves.getDefaultState()); - if (!placed) { - return false; - } - - Block block = world.getBlockState(pos).getBlock(); - if (PluginArboriculture.blocks.leaves != block) { - world.setBlockToAir(pos); - return false; - } - - TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); - if (tileLeaves == null) { - world.setBlockToAir(pos); - return false; - } - - tileLeaves.getOwnerHandler().setOwner(owner); - tileLeaves.setTree(new Tree(genome)); - - world.markBlockRangeForRenderUpdate(pos, pos); - return true; - } - -} diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index c0ef2a7d..3afb56a7 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -4,7 +4,6 @@ import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; -import binnie.core.item.ItemMisc; import binnie.core.liquid.ItemFluidContainer; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.EnumExtraTreeLog; @@ -132,9 +131,9 @@ public class ModuleItems implements IInitializable { RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(ExtraTrees.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(ExtraTrees.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); RecipeManagers.stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); - RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), null, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); + RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), null, ExtraTrees.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); if (Binnie.Liquid.getFluidStack("Creosote Oil", 100) != null) { - RecipeManagers.carpenterManager.addRecipe(25, Binnie.Liquid.getFluidStack("Creosote Oil", 50), null, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); + RecipeManagers.carpenterManager.addRecipe(25, Binnie.Liquid.getFluidStack("Creosote Oil", 50), null, ExtraTrees.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); } for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { if (data.fluid.isFluidEqual(Binnie.Liquid.getFluidStack("water", 0)) && data.fluid.amount == 1000) { diff --git a/src/main/java/binnie/extratrees/proxy/Proxy.java b/src/main/java/binnie/extratrees/proxy/Proxy.java index 2e5b2a73..e1fc3d83 100644 --- a/src/main/java/binnie/extratrees/proxy/Proxy.java +++ b/src/main/java/binnie/extratrees/proxy/Proxy.java @@ -1,16 +1,7 @@ package binnie.extratrees.proxy; -import javax.annotation.Nonnull; - import binnie.core.proxy.BinnieModProxy; -import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; -import forestry.core.models.ModelManager; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraftforge.client.model.ModelLoader; public class Proxy extends BinnieModProxy implements IExtraTreeProxy { @Override diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index c82eb504..de1a5d36 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -8,20 +8,9 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.BlockETDecorativeLeaves; import binnie.extratrees.block.slab.BlockETSlab; import binnie.extratrees.models.ModelETDecorativeLeaves; -import forestry.api.arboriculture.EnumPileType; import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.blocks.BlockDecorativeLeaves; -import forestry.arboriculture.blocks.slab.BlockArbSlab; -import forestry.arboriculture.models.ModelDecorativeLeaves; -import forestry.arboriculture.models.ModelLeaves; -import forestry.arboriculture.models.ModelWoodPile; -import forestry.arboriculture.models.WoodModelLoader; -import forestry.arboriculture.proxy.ProxyArboricultureClient; -import forestry.arboriculture.render.CharcoalPileRenderer; -import forestry.arboriculture.tiles.TilePile; import forestry.core.models.BlockModelEntry; import forestry.core.models.ModelEntry; -import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -29,8 +18,6 @@ import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.fml.client.registry.ClientRegistry; public class ProxyClient extends Proxy implements IExtraTreeProxy { public static ModelManager modelManager = new ModelManager(Constants.EXTRA_TREES_MOD_ID); @@ -42,7 +29,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { @Override public void registerBlockModel(@Nonnull final BlockModelEntry index) { - getModelManager().registerCustomBlockModel(index); + ModelManager.registerCustomBlockModel(index); if(index.addStateMapper){ StateMapperBase ignoreState = new BlockModeStateMapper(index); ModelLoader.setCustomStateMapper(index.block, ignoreState); @@ -51,7 +38,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { @Override public void registerModel(@Nonnull ModelEntry index) { - getModelManager().registerCustomModel(index); + ModelManager.registerCustomModel(index); } @Override diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java index af9fad44..708d9706 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java @@ -13,7 +13,6 @@ import org.apache.commons.lang3.time.DurationFormatUtils; import javax.annotation.Nullable; import java.awt.Color; -import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.Arrays; import java.util.Map; @@ -86,7 +85,7 @@ public class InoculatorRecipeWrapper extends BlankRecipeWrapper { } // todo: 1.11 use MinecraftForgeClient#getLocale() for integer formatting - NumberFormat decimalFormat = DecimalFormat.getIntegerInstance(); + NumberFormat decimalFormat = NumberFormat.getIntegerInstance(); String powerString = decimalFormat.format(power) + " RF"; int xPower = 15 + (recipeWidth - minecraft.fontRendererObj.getStringWidth(powerString)) / 2; minecraft.fontRendererObj.drawString(powerString, xPower, 5, Color.gray.getRGB()); diff --git a/src/main/resources/assets/binniecore/models/block/machine.json b/src/main/resources/assets/binniecore/models/block/machine.json new file mode 100644 index 00000000..31b8c72f --- /dev/null +++ b/src/main/resources/assets/binniecore/models/block/machine.json @@ -0,0 +1,86 @@ +{ + "elements": [ + { + "__comment": "base_back", + "from": [ 0, 0, 0 ], + "to": [ 16, 4, 16 ], + "faces": { + "down": { "uv": [ 8, 15, 4, 11 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 8, 11, 12, 15 ], "texture": "#texture" }, + "north": { "uv": [ 12, 16, 8, 15 ], "texture": "#texture", "rotation": 180 }, + "south": { "uv": [ 4, 15, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 12, 15, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 15, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "tank_product", + "from": [ 8, 0, 2 ], + "to": [ 14, 16, 14 ], + "faces": { + "down": { "uv": [ 7.5, 5.5, 4.5, 7 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 1.5, 5.5, 4.5, 7 ], "texture": "#texture", "rotation": 270 }, + "north": { "uv": [ 6, 11, 4.5, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 7, 1.5, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1.5, 7, 4.5, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "base_front", + "from": [ 0, 12, 0.0001 ], + "to": [ 16, 16, 16.0001 ], + "faces": { + "down": { "uv": [ 12, 15, 8, 11 ], "texture": "#texture" }, + "up": { "uv": [ 4, 11, 8, 15 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 12, 16, 8, 15 ], "texture": "#texture" }, + "south": { "uv": [ 4, 15, 8, 16 ], "texture": "#texture", "rotation": 180 }, + "west": { "uv": [ 0, 15, 4, 16 ], "texture": "#texture", "rotation": 180 }, + "east": { "uv": [ 12, 15, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "tank_resource", + "from": [ 2, 0, 2 ], + "to": [ 8, 16, 14 ], + "faces": { + "down": { "uv": [ 7.5, 1.5, 4.5, 0 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 1.5, 0, 4.5, 1.5 ], "texture": "#texture", "rotation": 270 }, + "north": { "uv": [ 6, 5.5, 4.5, 1.5 ], "texture": "#texture" }, + "south": { "uv": [ 0, 1.5, 1.5, 5.5 ], "texture": "#texture" }, + "west": { "uv": [ 1.5, 1.5, 4.5, 5.5 ], "texture": "#texture", "rotation": 180 } + } + } + ], + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 1, 1, 1] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 315, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 315, 0 ], + "translation": [ 0, 0, 0], + "scale": [ 0.4, 0.4, 0.4 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/blockstates/machine.json b/src/main/resources/assets/extratrees/blockstates/machine.json new file mode 100644 index 00000000..fb79cf6b --- /dev/null +++ b/src/main/resources/assets/extratrees/blockstates/machine.json @@ -0,0 +1,65 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "binniecore:machine" + }, + + "variants": { + "normal": [{}], + "inventory": [{}], + "machine_type":{ + "0": { + "textures":{ + "texture": "extratrees:blocks/sawmill" + } + }, + "1": { + "textures":{ + "texture": "extratrees:blocks/carpenter" + } + }, + "2": { + "textures":{ + "texture": "extratrees:blocks/paneler" + } + }, + "3": { + "textures":{ + "texture": "extratrees:blocks/sawmill" + } + }, + "4": { + "textures":{ + "texture": "extratrees:blocks/press" + } + }, + "5": { + "textures":{ + "texture": "extratrees:blocks/brewery" + } + }, + "6": { + "textures":{ + "texture": "extratrees:blocks/distillery" + } + }, + "7": { + "textures":{ + "texture": "extratrees:blocks/paneler" + } + }, + "8": { + "textures":{ + "texture": "extratrees:blocks/tileworker" + } + }, + "9": {}, + "10": {}, + "11": {}, + "12": {}, + "13": {}, + "14": {}, + "15": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/textures/blocks/brewery.png b/src/main/resources/assets/extratrees/textures/blocks/brewery.png new file mode 100644 index 00000000..86f8c673 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/brewery.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/carpenter.png b/src/main/resources/assets/extratrees/textures/blocks/carpenter.png new file mode 100644 index 00000000..36c6ea1d Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/carpenter.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/distillery.png b/src/main/resources/assets/extratrees/textures/blocks/distillery.png new file mode 100644 index 00000000..3a99e957 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/distillery.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/incubator.png b/src/main/resources/assets/extratrees/textures/blocks/incubator.png new file mode 100644 index 00000000..0fd03aa8 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/incubator.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/infuser.png b/src/main/resources/assets/extratrees/textures/blocks/infuser.png new file mode 100644 index 00000000..fb82a4ec Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/infuser.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/paneler.png b/src/main/resources/assets/extratrees/textures/blocks/paneler.png new file mode 100644 index 00000000..a2bfd673 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/paneler.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/press.png b/src/main/resources/assets/extratrees/textures/blocks/press.png new file mode 100644 index 00000000..832cdf5c Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/press.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/sawmill.png b/src/main/resources/assets/extratrees/textures/blocks/sawmill.png new file mode 100644 index 00000000..b59fdc54 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/sawmill.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/tileworker.png b/src/main/resources/assets/extratrees/textures/blocks/tileworker.png new file mode 100644 index 00000000..7bb2a3df Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/tileworker.png differ