Add decorative leaves and food models

This commit is contained in:
Nedelosk committed 2017-01-21 15:57:39 +01:00
1 parent 31d7d6e76e
commit 192943cb3e
121 files changed
+1589 -542

No files matched your search

+19 -6
View File
@@ -1,5 +1,18 @@
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";
@@ -7,10 +20,10 @@ public final class Constants {
public static final String EXTRA_TREES_MOD_ID = "extratrees";
public static final String GENETICS_MOD_ID = "genetics";
public static final String LiquidJuice = "juice";
public static final String LiquidWater = "water";
public static final String LiquidSeedOil = "seedoil";
public static final String LiquidCreosote = "Creosote Oil";
public static final String LiquidEthanol = "bioethanol";
public static final String LiquidHoney = "for.honey";
public static final String LIQUID_JUICE = "juice";
public static final String LIQUID_WATER = "water";
public static final String LIQUID_SEED_OIL = "seedoil";
public static final String LIQUID_CREOSOTE = "Creosote Oil";
public static final String LIQUID_BIO_ETHANOL = "bioethanol";
public static final String LIQUID_FOR_HONEY= "for.honey";
}
@@ -1,12 +1,18 @@
package binnie.core.proxy;
import javax.annotation.Nonnull;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
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;
@@ -82,6 +88,12 @@ public class BinnieModProxy implements IBinnieModProxy {
public void registermodel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
}
public void registerBlockModel(@Nonnull final BlockModelEntry index) {
}
public void registerModel(@Nonnull ModelEntry index) {
}
// @Override
@@ -11,6 +11,7 @@ import binnie.core.proxy.IProxyCore;
import binnie.extrabees.ExtraBees;
import binnie.extratrees.alcohol.ModuleAlcohol;
import binnie.extratrees.alcohol.drink.ItemDrink;
import binnie.extratrees.block.BlockETDecorativeLeaves;
import binnie.extratrees.block.ModuleBlocks;
import binnie.extratrees.block.decor.BlockHedge;
import binnie.extratrees.block.decor.BlockMultiFence;
@@ -30,10 +31,12 @@ 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;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
@@ -70,6 +73,8 @@ public class ExtraTrees extends AbstractMod {
public static List<BlockETSlab> slabsDoubleFireproof;
public static List<BlockForestryStairs> stairs;
public static List<BlockForestryStairs> stairsFireproof;
public static List<BlockETDecorativeLeaves> leavesDecorative;
public static Map<String, ItemStack> speciesToLeavesDecorative;
public static Block blockStairs;
public static BlockCarpentry blockCarpentry;
public static Block blockMachine;
@@ -164,7 +169,7 @@ public class ExtraTrees extends AbstractMod {
for (final ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) {
AlleleManager.alleleRegistry.registerAllele(fruit);
}
ExtraTreeSpecies.preInitTrees();
ETTreeDefinition.preInitTrees();
if (BinnieCore.isLepidopteryActive()) {
for (final ButterflySpecies species2 : ButterflySpecies.values()) {
@@ -187,10 +192,10 @@ public class ExtraTrees extends AbstractMod {
.filter(mrl -> mrl.getResourceDomain().startsWith(Constants.EXTRA_TREES_MOD_ID))
.filter(mrl -> mrl.getResourcePath().startsWith("germlings")).collect(Collectors.toList());
//Replace model
Map<String, ExtraTreeSpecies> map = Arrays.stream(ExtraTreeSpecies.values()).collect(Collectors.toMap(o -> o.name().toLowerCase(), o -> o));
Map<String, ETTreeDefinition> map = Arrays.stream(ETTreeDefinition.values()).collect(Collectors.toMap(o -> o.name().toLowerCase(), o -> o));
models.forEach(model -> {
String species = model.getVariant().split("=")[1];
ExtraTreeSpecies treeSpecies = map.get(species);
ETTreeDefinition treeSpecies = map.get(species);
int primaryColor = treeSpecies.getLeafColor().getRGB();
int secondaryColor = treeSpecies.getWoodColor().getRGB();
e.getModelRegistry().putObject(model, new DoublePassBakedModel(e.getModelRegistry().getObject(model), primaryColor, secondaryColor));
@@ -0,0 +1,260 @@
package binnie.extratrees.block;
import javax.annotation.Nonnull;
import binnie.Constants;
import binnie.extratrees.block.property.PropertyETType;
import binnie.extratrees.genetics.ETTreeDefinition;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.IFruitProvider;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.genetics.TreeDefinition;
import forestry.core.blocks.IColoredBlock;
import forestry.core.proxy.Proxies;
public abstract class BlockETDecorativeLeaves extends Block implements IItemModelRegister, IColoredBlock, IShearable {
private static final int VARIANTS_PER_BLOCK = 16;
public static List<BlockETDecorativeLeaves> create() {
List<BlockETDecorativeLeaves> blocks = new ArrayList<>();
final int blockCount = PropertyETType.getBlockCount(VARIANTS_PER_BLOCK);
for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) {
final PropertyETType variant = PropertyETType.create("variant", blockNumber, VARIANTS_PER_BLOCK);
BlockETDecorativeLeaves block = new BlockETDecorativeLeaves(blockNumber) {
@Nonnull
@Override
public PropertyETType getVariant() {
return variant;
}
};
blocks.add(block);
}
return blocks;
}
private final int blockNumber;
public BlockETDecorativeLeaves(int blockNumber) {
super(Material.LEAVES);
this.blockNumber = blockNumber;
this.setCreativeTab(Tabs.tabArboriculture);
this.setHardness(0.2F);
this.setLightOpacity(1);
this.setSoundType(SoundType.PLANT);
String name = "leaves.decorative." + blockNumber;
setUnlocalizedName(name);
setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name));
}
public int getBlockNumber() {
return blockNumber;
}
@Nonnull
public abstract PropertyETType getVariant();
@Override
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, getVariant());
}
/**
* returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
*/
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
for (IBlockState state : getBlockState().getValidStates()) {
int meta = getMetaFromState(state);
ItemStack itemStack = new ItemStack(item, 1, meta);
list.add(itemStack);
}
}
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) {
ETTreeDefinition treeDefinition = blockState.getValue(getVariant());
if (TreeDefinition.Willow.equals(treeDefinition)) {
return null;
}
return super.getCollisionBoundingBox(blockState, worldIn, pos);
}
/**
* Called When an Entity Collided with the Block
*/
@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
entityIn.motionX *= 0.4D;
entityIn.motionZ *= 0.4D;
}
/**
* Used to determine ambient occlusion and culling when rebuilding chunks for render
*/
@Override
public boolean isOpaqueCube(IBlockState state) {
return !Proxies.render.fancyGraphicsEnabled();
}
@Override
public boolean isVisuallyOpaque()
{
return false;
}
@Override
public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
return (Proxies.render.fancyGraphicsEnabled() || blockAccess.getBlockState(pos.offset(side)).getBlock() != this) && super.shouldSideBeRendered(blockState, blockAccess, pos, side);
}
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
return BlockRenderLayer.CUTOUT_MIPPED; // fruit overlays require CUTOUT_MIPPED, even in Fast graphics
}
/* MODELS */
@Override
@SideOnly(Side.CLIENT)
public void registerModel(Item item, IModelManager manager) {
for (IBlockState state : blockState.getValidStates()) {
int meta = getMetaFromState(state);
ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(getRegistryName(), "inventory"));
}
}
/**
* Convert the given metadata into a BlockState for this Block
*/
@Override
public IBlockState getStateFromMeta(int meta) {
ETTreeDefinition type = getTreeType(meta);
return getDefaultState().withProperty(getVariant(), type);
}
@Nonnull
public ETTreeDefinition getTreeType(int meta) {
int variantCount = getVariant().getAllowedValues().size();
int variantMeta = (meta % variantCount) + blockNumber * VARIANTS_PER_BLOCK;
return ETTreeDefinition.byMetadata(variantMeta);
}
/**
* Convert the BlockState into the correct metadata value
*/
@Override
public int getMetaFromState(IBlockState state) {
/**
* Gets the metadata of the item this Block can drop. This method is called when the block gets destroyed. It returns
* the metadata of the dropped item based on the old metadata of the block.
*/
return damageDropped(state);
}
/**
* Gets the metadata of the item this Block can drop. This method is called when the block gets destroyed. It returns
* the metadata of the dropped item based on the old metadata of the block.
*/
@Override
public int damageDropped(IBlockState state) {
return state.getValue(getVariant()).getMetadata() - blockNumber * VARIANTS_PER_BLOCK;
}
@Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
return Collections.emptyList();
}
/**
* Called by ItemBlocks just before a block is actually set in the world, to allow for adjustments to the IBlockstate
*/
@Override
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) {
ETTreeDefinition type = getTreeType(meta);
return getDefaultState().withProperty(getVariant(), type);
}
/* PROPERTIES */
@Override
public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) {
return 60;
}
@Override
public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) {
return true;
}
@Override
public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) {
if (face == EnumFacing.DOWN) {
return 20;
} else if (face != EnumFacing.UP) {
return 10;
} else {
return 5;
}
}
@Override
public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) {
return true;
}
@Override
public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) {
IBlockState state = world.getBlockState(pos);
return Collections.singletonList(new ItemStack(this, 1, damageDropped(state)));
}
@Override
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) {
ETTreeDefinition treeDefinition = state.getValue(getVariant());
if (treeDefinition == null) {
return PluginArboriculture.proxy.getFoliageColorBasic();
}
ITreeGenome genome = treeDefinition.getGenome();
if (tintIndex == 0) {
return genome.getPrimary().getLeafSpriteProvider().getColor(false);
} else {
IFruitProvider fruitProvider = genome.getFruitProvider();
return fruitProvider.getDecorativeColor();
}
}
}
@@ -0,0 +1,52 @@
package binnie.extratrees.block;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
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;
import forestry.core.utils.Translator;
public class ItemBlockETDecorativeLeaves extends ItemBlockForestry<BlockETDecorativeLeaves> implements IColoredItem {
public ItemBlockETDecorativeLeaves(Block block) {
super(block);
}
@Override
public String getItemStackDisplayName(ItemStack itemStack) {
int meta = itemStack.getMetadata();
BlockETDecorativeLeaves block = getBlock();
ETTreeDefinition treeDefinition = block.getTreeType(meta);
if (treeDefinition == null) {
return Translator.translateToLocal("trees.grammar.leaves.type");
}
String unlocalizedSpeciesName = treeDefinition.getGenome().getPrimary().getUnlocalizedName();
return ItemBlockLeaves.getDisplayName(unlocalizedSpeciesName);
}
@Override
public int getColorFromItemstack(ItemStack itemStack, int renderPass) {
int meta = itemStack.getMetadata();
BlockETDecorativeLeaves block = getBlock();
ETTreeDefinition treeDefinition = block.getTreeType(meta);
if (treeDefinition == null) {
return PluginArboriculture.proxy.getFoliageColorBasic();
}
ITreeGenome genome = treeDefinition.getGenome();
if (renderPass == 0) {
return genome.getPrimary().getLeafSpriteProvider().getColor(false);
} else {
IFruitProvider fruitProvider = genome.getFruitProvider();
return fruitProvider.getDecorativeColor();
}
}
}
@@ -1,6 +1,7 @@
package binnie.extratrees.block;
import java.util.ArrayList;
import java.util.HashMap;
import binnie.Constants;
import binnie.core.IInitializable;
@@ -16,6 +17,7 @@ import binnie.extratrees.block.plank.ItemETPlank;
import binnie.extratrees.block.slab.BlockETSlab;
import binnie.extratrees.block.slab.ItemETSlab;
import binnie.extratrees.block.stairs.ItemETStairs;
import binnie.extratrees.genetics.ETTreeDefinition;
import binnie.extratrees.item.ExtraTreeLiquid;
import forestry.api.arboriculture.EnumVanillaWoodType;
import forestry.api.arboriculture.IWoodAccess;
@@ -24,7 +26,11 @@ 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;
@@ -47,7 +53,7 @@ public class ModuleBlocks implements IInitializable {
@Override
public void preInit() {
PlankType.setup();
//TODO: clean up
ExtraTrees.logs = BlockETLog.create(false);
for (BlockETLog block : ExtraTrees.logs) {
@@ -165,6 +171,19 @@ public class ModuleBlocks implements IInitializable {
FMLInterModComms.sendMessage("forestry", "add-fence-block", "ExtraTrees:gate");
FMLInterModComms.sendMessage("forestry", "add-fence-block", "ExtraTrees:multifence");
//ModuleBlocks.hedgeRenderID = BinnieCore.proxy.getUniqueRenderID();
ExtraTrees.leavesDecorative = BlockETDecorativeLeaves.create();
ExtraTrees.speciesToLeavesDecorative = new HashMap<>();
for (BlockETDecorativeLeaves leaves : ExtraTrees.leavesDecorative) {
ExtraTrees.proxy.registerBlock(leaves, new ItemBlockETDecorativeLeaves(leaves));
registerOreDictWildcard(OreDictUtil.TREE_LEAVES, leaves);
for (IBlockState state : leaves.getBlockState().getValidStates()) {
ETTreeDefinition treeDefinition = state.getValue(leaves.getVariant());
String speciesUid = treeDefinition.getUID();
int meta = leaves.getMetaFromState(state);
ExtraTrees.speciesToLeavesDecorative.put(speciesUid, new ItemStack(leaves, 1, meta));
}
}
}
@Override
@@ -251,4 +270,12 @@ public class ModuleBlocks implements IInitializable {
private static void registerOreDictWildcard(String oreDictName, Block block) {
OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE));
}
public static ItemStack getDecorativeLeaves(String speciesUid) {
ItemStack itemStack = ExtraTrees.speciesToLeavesDecorative.get(speciesUid);
if (itemStack == null) {
return null;
}
return itemStack.copy();
}
}
@@ -1,36 +0,0 @@
package binnie.extratrees.block;
import net.minecraft.block.properties.PropertyEnum;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
public class PropertyEnumWoodType extends PropertyEnum<EnumExtraTreeLog> {
int group;
private PropertyEnumWoodType(Collection<EnumExtraTreeLog> allowedValues, int group) {
super("wood_type", EnumExtraTreeLog.class, allowedValues);
this.group = group;
}
public static PropertyEnumWoodType[] create(int variants_per_block){
int groups = (int) Math.ceil(EnumExtraTreeLog.values().length / (float) variants_per_block);
PropertyEnumWoodType[] result = new PropertyEnumWoodType[groups];
for (int i = 0; i < groups; i++) {
int finalI = i;
List allowed = Arrays.stream(EnumExtraTreeLog.values()).filter(l -> l.getMetadata() >= finalI * variants_per_block && l.getMetadata() < finalI * variants_per_block + variants_per_block).collect(Collectors.toList());
result[i] = new PropertyEnumWoodType(allowed, i);
}
return result;
}
public EnumExtraTreeLog getFirstValue(){
return getAllowedValues().iterator().next();
}
public int getGroup() {
return group;
}
}
@@ -0,0 +1,23 @@
package binnie.extratrees.block;
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<ETTreeDefinition> {
private final int minMeta;
private final int maxMeta;
public TreeTypePredicate(int blockNumber, int variantsPerBlock) {
this.minMeta = blockNumber * variantsPerBlock;
this.maxMeta = minMeta + variantsPerBlock - 1;
}
@Override
public boolean apply(@Nullable ETTreeDefinition treeDefinition) {
return treeDefinition.getMetadata() >= minMeta && treeDefinition.getMetadata() <= maxMeta;
}
}
@@ -2,7 +2,7 @@ package binnie.extratrees.block.log;
import binnie.Constants;
import binnie.extratrees.block.EnumExtraTreeLog;
import binnie.extratrees.block.PropertyExtraTreeWoodType;
import binnie.extratrees.block.property.PropertyETWoodType;
import forestry.arboriculture.blocks.log.BlockForestryLog;
import forestry.arboriculture.blocks.property.PropertyWoodType;
import net.minecraft.util.ResourceLocation;
@@ -13,9 +13,9 @@ import javax.annotation.Nonnull;
public abstract class BlockETLog extends BlockForestryLog<EnumExtraTreeLog> {
public static List<BlockETLog> create(boolean fireproof) {
List<BlockETLog> blocks = new ArrayList<>();
PropertyExtraTreeWoodType[] variants = PropertyExtraTreeWoodType.create("variant", VARIANTS_PER_BLOCK);
PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK);
for (int i = 0; i < variants.length; i++) {
PropertyExtraTreeWoodType variant = variants[i];
PropertyETWoodType variant = variants[i];
BlockETLog block = new BlockETLog(fireproof, i) {
@Nonnull
@Override
@@ -2,7 +2,7 @@ package binnie.extratrees.block.plank;
import binnie.Constants;
import binnie.extratrees.block.EnumExtraTreeLog;
import binnie.extratrees.block.PropertyExtraTreeWoodType;
import binnie.extratrees.block.property.PropertyETWoodType;
import forestry.arboriculture.blocks.planks.BlockForestryPlanks;
import net.minecraft.util.ResourceLocation;
import java.util.ArrayList;
@@ -14,13 +14,13 @@ public abstract class BlockETPlank extends BlockForestryPlanks<EnumExtraTreeLog>
public static List<BlockETPlank> create(boolean fireproof) {
List<BlockETPlank> blocks = new ArrayList<>();
PropertyExtraTreeWoodType[] variants = PropertyExtraTreeWoodType.create("variant", VARIANTS_PER_BLOCK);
PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK);
for (int i = 0; i < variants.length; i++) {
PropertyExtraTreeWoodType variant = variants[i];
PropertyETWoodType variant = variants[i];
BlockETPlank block = new BlockETPlank(fireproof, i) {
@Nonnull
@Override
public PropertyExtraTreeWoodType getVariant() {
public PropertyETWoodType getVariant() {
return variant;
}
};
@@ -0,0 +1,29 @@
package binnie.extratrees.block.property;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import binnie.extratrees.block.TreeTypePredicate;
import binnie.extratrees.genetics.ETTreeDefinition;
import javax.annotation.Nonnull;
import java.util.Collection;
import net.minecraft.block.properties.PropertyEnum;
public class PropertyETType extends PropertyEnum<ETTreeDefinition> {
public static int getBlockCount(int variantsPerBlock) {
return (int) Math.ceil((float) ETTreeDefinition.VALUES.length / variantsPerBlock);
}
public static PropertyETType create(@Nonnull String name, int blockNumber, int variantsPerBlock) {
TreeTypePredicate filter = new TreeTypePredicate(blockNumber, variantsPerBlock);
Collection<ETTreeDefinition> allowedValues = Collections2.filter(Lists.newArrayList(ETTreeDefinition.class.getEnumConstants()), filter);
return new PropertyETType(name, ETTreeDefinition.class, allowedValues);
}
protected PropertyETType(String name, Class<ETTreeDefinition> valueClass, Collection<ETTreeDefinition> allowedValues) {
super(name, valueClass, allowedValues);
}
}
@@ -1,4 +1,4 @@
package binnie.extratrees.block;
package binnie.extratrees.block.property;
import java.util.Collection;
@@ -7,22 +7,23 @@ import javax.annotation.Nonnull;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import binnie.extratrees.block.EnumExtraTreeLog;
import forestry.arboriculture.blocks.WoodTypePredicate;
import forestry.arboriculture.blocks.property.PropertyWoodType;
public class PropertyExtraTreeWoodType extends PropertyWoodType<EnumExtraTreeLog> {
public static PropertyExtraTreeWoodType[] create(@Nonnull String name, int variantsPerBlock) {
public class PropertyETWoodType extends PropertyWoodType<EnumExtraTreeLog> {
public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock) {
final int variantCount = (int) Math.ceil((float) EnumExtraTreeLog.VALUES.length / variantsPerBlock);
PropertyExtraTreeWoodType[] variants = new PropertyExtraTreeWoodType[variantCount];
PropertyETWoodType[] variants = new PropertyETWoodType[variantCount];
for (int variantNumber = 0; variantNumber < variantCount; variantNumber++) {
WoodTypePredicate filter = new WoodTypePredicate(variantNumber, variantsPerBlock);
Collection<EnumExtraTreeLog> allowedValues = Collections2.filter(Lists.newArrayList(EnumExtraTreeLog.class.getEnumConstants()), filter);
variants[variantNumber] = new PropertyExtraTreeWoodType(name, EnumExtraTreeLog.class, allowedValues);
variants[variantNumber] = new PropertyETWoodType(name, EnumExtraTreeLog.class, allowedValues);
}
return variants;
}
protected PropertyExtraTreeWoodType(String name, Class<EnumExtraTreeLog> valueClass, Collection<EnumExtraTreeLog> allowedValues) {
protected PropertyETWoodType(String name, Class<EnumExtraTreeLog> valueClass, Collection<EnumExtraTreeLog> allowedValues) {
super(name, valueClass, allowedValues);
}
}
@@ -2,7 +2,7 @@ package binnie.extratrees.block.slab;
import binnie.Constants;
import binnie.extratrees.block.EnumExtraTreeLog;
import binnie.extratrees.block.PropertyExtraTreeWoodType;
import binnie.extratrees.block.property.PropertyETWoodType;
import forestry.arboriculture.blocks.slab.BlockForestrySlab;
import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull;
@@ -13,13 +13,13 @@ import java.util.List;
public abstract class BlockETSlab extends BlockForestrySlab<EnumExtraTreeLog> {
public static List<BlockETSlab> create(boolean fireproof, final boolean doubleSlab) {
List<BlockETSlab> blocks = new ArrayList<>();
PropertyExtraTreeWoodType[] variants = PropertyExtraTreeWoodType.create("variant", VARIANTS_PER_BLOCK);
PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK);
for (int i = 0; i < variants.length; i++) {
PropertyExtraTreeWoodType variant = variants[i];
PropertyETWoodType variant = variants[i];
BlockETSlab block = new BlockETSlab(fireproof, i) {
@Nonnull
@Override
public PropertyExtraTreeWoodType getVariant() {
public PropertyETWoodType getVariant() {
return variant;
}
@@ -8,7 +8,7 @@ import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.block.EnumExtraTreeLog;
import binnie.extratrees.block.PlankType;
import binnie.extratrees.genetics.ExtraTreeFruitGene;
import binnie.extratrees.genetics.ExtraTreeSpecies;
import binnie.extratrees.genetics.ETTreeDefinition;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.IWoodType;
@@ -38,7 +38,7 @@ public class ModuleCore implements IInitializable {
final PrintWriter outputFruit = new PrintWriter(new FileWriter("data/fruit.html"));
final PrintWriter outputDesigns = new PrintWriter(new FileWriter("data/designs.html"));
final Queue<IAlleleTreeSpecies> speciesQueue = new LinkedList<>();
for (final ExtraTreeSpecies s : ExtraTreeSpecies.values()) {
for (final ETTreeDefinition s : ETTreeDefinition.values()) {
speciesQueue.add(s.getSpecies());
}
final Queue<IWoodType> logQueue = new LinkedList<>();
@@ -2,7 +2,7 @@ package binnie.extratrees.genetics;
import forestry.api.genetics.IFruitFamily;
public enum ExtraTreeFruitFamily implements IFruitFamily {
public enum ETFruitFamily implements IFruitFamily {
Berry("Berries", "berry", "berri"),
Citrus("Citrus", "citrus", "citrus");
@@ -10,7 +10,7 @@ public enum ExtraTreeFruitFamily implements IFruitFamily {
String uid;
String scientific;
ExtraTreeFruitFamily(final String name, final String uid, final String scientific) {
ETFruitFamily(final String name, final String uid, final String scientific) {
this.name = name;
this.uid = uid;
this.scientific = scientific;
@@ -0,0 +1,34 @@
package binnie.extratrees.genetics;
import binnie.extratrees.block.ModuleBlocks;
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;
public class ETLeafProvider implements ILeafProvider {
private IAlleleTreeSpecies treeSpecies;
public ETLeafProvider() {
}
@Override
public void init(IAlleleTreeSpecies treeSpecies) {
this.treeSpecies = treeSpecies;
}
@Override
public ItemStack getDecorativeLeaves() {
IAllele allele = treeSpecies;
if(allele == null){
allele = TreeDefinition.Oak.getTemplate()[EnumTreeChromosome.SPECIES.ordinal()];
}
return ModuleBlocks.getDecorativeLeaves(allele.getUID());
}
}
@@ -9,14 +9,21 @@ import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IClassification;
import forestry.arboriculture.genetics.ITreeDefinition;
import forestry.arboriculture.genetics.Tree;
import forestry.arboriculture.genetics.TreeDefinition;
import forestry.arboriculture.worldgen.WorldGenLemon;
import forestry.arboriculture.worldgen.WorldGenPlum;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.world.gen.feature.WorldGenerator;
import org.apache.commons.lang3.StringUtils;
import java.awt.*;
import java.util.Arrays;
import java.util.Locale;
public enum ExtraTreeSpecies {
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){
@Override
protected void setAlleles(AlleleTemplate template) {
@@ -28,7 +35,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -44,7 +51,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -61,7 +68,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -78,7 +85,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Blackthorn("prunus", "spinosa", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){
@@ -95,7 +102,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
CherryPlum("prunus", "cerasifera", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){
@@ -112,7 +119,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Peach("prunus", "persica", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){
@@ -129,7 +136,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Nectarine("prunus", "nectarina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){
@@ -145,7 +152,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Apricot("prunus", "armeniaca", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF5B8D8), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){
@@ -161,7 +168,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Almond("prunus", "amygdalus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF584C0), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661), WorldGenPlum.class){
@@ -177,7 +184,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
WildCherry("prunus", "avium", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850), WorldGenPlum.class){
@@ -195,7 +202,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
SourCherry("prunus", "cerasus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850), WorldGenPlum.class){
@@ -210,7 +217,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
BlackCherry("prunus", "serotina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFAE1F8), EnumSaplingType.Fruit, EnumExtraTreeLog.Cherry, new Color(0x716850), WorldGenPlum.class){
@@ -228,7 +235,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Orange("citrus", "sinensis", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -245,7 +252,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Manderin("citrus", "reticulata", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -262,7 +269,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Satsuma("citrus", "unshiu", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -279,7 +286,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Tangerine("citrus", "tangerina", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -297,7 +304,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Lime("citrus", "latifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -313,7 +320,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
KeyLime("citrus", "aurantifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -331,7 +338,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
FingerLime("citrus", "australasica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -348,7 +355,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Pomelo("citrus", "maxima", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -365,7 +372,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Grapefruit("citrus", "paradisi", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -383,7 +390,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Kumquat("citrus", "margarita", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -399,7 +406,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Citron("citrus", "medica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -415,7 +422,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
BuddhaHand("citrus", "sarcodactylus", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39), WorldGenLemon.class){
@@ -430,7 +437,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Citrus);
}
},
Banana("musa", "sinensis", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumExtraTreeLog.Banana, new Color(0x85924F), WorldGenBanana.class){
@@ -488,7 +495,7 @@ public enum ExtraTreeSpecies {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -502,7 +509,7 @@ public enum ExtraTreeSpecies {
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -526,7 +533,7 @@ public enum ExtraTreeSpecies {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -636,7 +643,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -677,7 +684,7 @@ public enum ExtraTreeSpecies {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -706,8 +713,8 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
species.addFruitFamily(ETFruitFamily.Berry);
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){
@@ -721,7 +728,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -750,7 +757,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -798,7 +805,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -812,7 +819,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -855,7 +862,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -873,7 +880,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -888,7 +895,7 @@ public enum ExtraTreeSpecies {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -1038,7 +1045,7 @@ public enum ExtraTreeSpecies {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -1128,7 +1135,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1146,7 +1153,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1163,7 +1170,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1181,7 +1188,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1199,7 +1206,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1217,7 +1224,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1235,7 +1242,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1252,7 +1259,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1270,7 +1277,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
species.addFruitFamily(ExtraTreeFruitFamily.Berry);
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){
@@ -1327,7 +1334,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -1406,7 +1413,7 @@ public enum ExtraTreeSpecies {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -1421,7 +1428,7 @@ public enum ExtraTreeSpecies {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"));
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"));
species.addFruitFamily(ExtraTreeFruitFamily.Citrus);
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){
@@ -1455,6 +1462,8 @@ public enum ExtraTreeSpecies {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
}
};
public static ETTreeDefinition[] VALUES = values();
private String branchName;
private String binomial;
@@ -1474,7 +1483,7 @@ public enum ExtraTreeSpecies {
private static final String unlocalizedName = "extratrees.species.%s.name";
private static final String unlocalizedDesc = "extratrees.species.%s.desc";
ExtraTreeSpecies(String branch, String binomial, EnumLeafType leafType, Color leafColor, Color leafPollinatedColor, EnumSaplingType saplingType, IWoodType woodType, Color woodColor, Class<? extends WorldGenerator> treeGenerator) {
ETTreeDefinition(String branch, String binomial, EnumLeafType leafType, Color leafColor, Color leafPollinatedColor, EnumSaplingType saplingType, IWoodType woodType, Color woodColor, Class<? extends WorldGenerator> treeGenerator) {
this.binomial = binomial;
this.leafType = leafType;
this.leafColor = leafColor;
@@ -1491,16 +1500,16 @@ public enum ExtraTreeSpecies {
}
public static void initTrees() {
for (ExtraTreeSpecies tree : values()) {
for (ETTreeDefinition tree : values()) {
tree.init();
}
for (ExtraTreeSpecies tree : values()) {
for (ETTreeDefinition tree : values()) {
tree.registerMutations();
}
}
public static void preInitTrees() {
for (ExtraTreeSpecies tree : values()) {
for (ETTreeDefinition tree : values()) {
tree.preInit();
}
}
@@ -1513,7 +1522,7 @@ public enum ExtraTreeSpecies {
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);
branch, getBinomial(), Constants.EXTRA_TREES_MOD_ID, leafSpriteProvider, saplingType.getGermlingModelProvider(leafColor, woodColor), woodProvider, treeGenerator, new ETLeafProvider());
setSpeciesProperties(speciesBuilder);
species = speciesBuilder.build();
branch.addMemberSpecies(species);
@@ -1526,6 +1535,28 @@ public enum ExtraTreeSpecies {
genome = TreeManager.treeRoot.templateAsGenome(template.getAlleles());
TreeManager.treeRoot.registerTemplate(template.getAlleles());
}
@Override
public final ITreeGenome getGenome() {
return genome;
}
@Override
public final ITree getIndividual() {
return new Tree(genome);
}
@Override
public final ItemStack getMemberStack(EnumGermlingType treeType) {
ITree tree = getIndividual();
return TreeManager.treeRoot.getMemberStack(tree, treeType);
}
@Override
public final IAllele[] getTemplate() {
IAllele[] alleles = template.getAlleles();
return Arrays.copyOf(alleles, alleles.length);
}
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
@@ -1570,6 +1601,22 @@ public enum ExtraTreeSpecies {
public IAlleleTreeSpecies getSpecies() {
return species;
}
public int getMetadata() {
return ordinal();
}
public static ETTreeDefinition byMetadata(int meta) {
if (meta < 0 || meta >= VALUES.length) {
meta = 0;
}
return VALUES[meta];
}
@Override
public String getName() {
return name().toLowerCase(Locale.ENGLISH);
}
private static class AlleleTemplate {
IAllele[] alleles;
@@ -131,127 +131,127 @@ public class ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
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 = ExtraTreeFruitFamily.Berry;
final IFruitFamily familyCitrus = ExtraTreeFruitFamily.Citrus;
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.addProduct(Food.CRABAPPLE.get(1), 1.0f);
ExtraTreeFruitGene.Crabapple.setFamily(familyPome);
ExtraTreeFruitGene.Orange.addProduct(Food.Orange.get(1), 1.0f);
ExtraTreeFruitGene.Orange.addProduct(Food.ORANGE.get(1), 1.0f);
ExtraTreeFruitGene.Orange.setFamily(familyCitrus);
ExtraTreeFruitGene.Manderin.addProduct(Food.Manderin.get(1), 1.0f);
ExtraTreeFruitGene.Manderin.addProduct(Food.MANDERIN.get(1), 1.0f);
ExtraTreeFruitGene.Manderin.setFamily(familyCitrus);
ExtraTreeFruitGene.Tangerine.addProduct(Food.Tangerine.get(1), 1.0f);
ExtraTreeFruitGene.Tangerine.addProduct(Food.TANGERINE.get(1), 1.0f);
ExtraTreeFruitGene.Tangerine.setFamily(familyCitrus);
ExtraTreeFruitGene.Satsuma.addProduct(Food.Satsuma.get(1), 1.0f);
ExtraTreeFruitGene.Satsuma.addProduct(Food.SATSUMA.get(1), 1.0f);
ExtraTreeFruitGene.Satsuma.setFamily(familyCitrus);
ExtraTreeFruitGene.KeyLime.addProduct(Food.KeyLime.get(1), 1.0f);
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.addProduct(Food.LIME.get(1), 1.0f);
ExtraTreeFruitGene.Lime.setFamily(familyCitrus);
ExtraTreeFruitGene.FingerLime.addProduct(Food.FingerLime.get(1), 1.0f);
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.addProduct(Food.POMELO.get(1), 1.0f);
ExtraTreeFruitGene.Pomelo.setFamily(familyCitrus);
ExtraTreeFruitGene.Grapefruit.addProduct(Food.Grapefruit.get(1), 1.0f);
ExtraTreeFruitGene.Grapefruit.addProduct(Food.GRAPEFRUIT.get(1), 1.0f);
ExtraTreeFruitGene.Grapefruit.setFamily(familyCitrus);
ExtraTreeFruitGene.Kumquat.addProduct(Food.Kumquat.get(1), 1.0f);
ExtraTreeFruitGene.Kumquat.addProduct(Food.KUMQUAT.get(1), 1.0f);
ExtraTreeFruitGene.Kumquat.setFamily(familyCitrus);
ExtraTreeFruitGene.Citron.addProduct(Food.Citron.get(1), 1.0f);
ExtraTreeFruitGene.Citron.addProduct(Food.CITRON.get(1), 1.0f);
ExtraTreeFruitGene.Citron.setFamily(familyCitrus);
ExtraTreeFruitGene.BuddhaHand.addProduct(Food.BuddhaHand.get(1), 1.0f);
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.CherryPlum.get(1), 1.0f);
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.addProduct(Food.PEACH.get(1), 1.0f);
ExtraTreeFruitGene.Peach.setFamily(familyPrune);
ExtraTreeFruitGene.Nectarine.addProduct(Food.Nectarine.get(1), 1.0f);
ExtraTreeFruitGene.Nectarine.addProduct(Food.NECTARINE.get(1), 1.0f);
ExtraTreeFruitGene.Nectarine.setFamily(familyPrune);
ExtraTreeFruitGene.Apricot.addProduct(Food.Apricot.get(1), 1.0f);
ExtraTreeFruitGene.Apricot.addProduct(Food.APRICOT.get(1), 1.0f);
ExtraTreeFruitGene.Apricot.setFamily(familyPrune);
ExtraTreeFruitGene.Almond.addProduct(Food.Almond.get(1), 1.0f);
ExtraTreeFruitGene.Almond.addProduct(Food.ALMOND.get(1), 1.0f);
ExtraTreeFruitGene.Almond.setFamily(familyPrune);
ExtraTreeFruitGene.WildCherry.addProduct(Food.WildCherry.get(1), 1.0f);
ExtraTreeFruitGene.WildCherry.addProduct(Food.WILD_CHERRY.get(1), 1.0f);
ExtraTreeFruitGene.WildCherry.setFamily(familyPrune);
ExtraTreeFruitGene.SourCherry.addProduct(Food.SourCherry.get(1), 1.0f);
ExtraTreeFruitGene.SourCherry.addProduct(Food.SOUR_CHERRY.get(1), 1.0f);
ExtraTreeFruitGene.SourCherry.setFamily(familyPrune);
ExtraTreeFruitGene.BlackCherry.addProduct(Food.BlackCherry.get(1), 1.0f);
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.addProduct(Food.HAZELNUT.get(1), 1.0f);
ExtraTreeFruitGene.Hazelnut.setFamily(familyNuts);
ExtraTreeFruitGene.Butternut.addProduct(Food.Butternut.get(1), 1.0f);
ExtraTreeFruitGene.Butternut.addProduct(Food.BUTTERNUT.get(1), 1.0f);
ExtraTreeFruitGene.Butternut.setFamily(familyNuts);
ExtraTreeFruitGene.Beechnut.addProduct(Food.Beechnut.get(1), 1.0f);
ExtraTreeFruitGene.Beechnut.addProduct(Food.BEECHNUT.get(1), 1.0f);
ExtraTreeFruitGene.Beechnut.setFamily(familyNuts);
ExtraTreeFruitGene.Pecan.addProduct(Food.Pecan.get(1), 1.0f);
ExtraTreeFruitGene.Pecan.addProduct(Food.PECAN.get(1), 1.0f);
ExtraTreeFruitGene.Pecan.setFamily(familyNuts);
ExtraTreeFruitGene.Banana.addProduct(Food.Banana.get(2), 1.0f);
ExtraTreeFruitGene.Banana.addProduct(Food.BANANA.get(2), 1.0f);
ExtraTreeFruitGene.Banana.setFamily(familyJungle);
ExtraTreeFruitGene.RedBanana.addProduct(Food.RedBanana.get(2), 1.0f);
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.addProduct(Food.PLANTAIN.get(2), 1.0f);
ExtraTreeFruitGene.Plantain.setFamily(familyJungle);
ExtraTreeFruitGene.BrazilNut.addProduct(Food.BrazilNut.get(4), 1.0f);
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.addProduct(Food.FIG.get(1), 1.0f);
ExtraTreeFruitGene.Fig.setFamily(familyPrune);
ExtraTreeFruitGene.Acorn.addProduct(Food.Acorn.get(1), 1.0f);
ExtraTreeFruitGene.Acorn.addProduct(Food.ACORN.get(1), 1.0f);
ExtraTreeFruitGene.Acorn.setFamily(familyNuts);
ExtraTreeFruitGene.Elderberry.addProduct(Food.Elderberry.get(1), 1.0f);
ExtraTreeFruitGene.Elderberry.addProduct(Food.ELDERBERRY.get(1), 1.0f);
ExtraTreeFruitGene.Elderberry.setFamily(familyPrune);
ExtraTreeFruitGene.Olive.addProduct(Food.Olive.get(1), 1.0f);
ExtraTreeFruitGene.Olive.addProduct(Food.OLIVE.get(1), 1.0f);
ExtraTreeFruitGene.Olive.setFamily(familyPrune);
ExtraTreeFruitGene.GingkoNut.addProduct(Food.GingkoNut.get(1), 1.0f);
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.addProduct(Food.COFFEE.get(1), 1.0f);
ExtraTreeFruitGene.Coffee.setFamily(familyJungle);
ExtraTreeFruitGene.Pear.addProduct(Food.Pear.get(1), 1.0f);
ExtraTreeFruitGene.Pear.addProduct(Food.PEAR.get(1), 1.0f);
ExtraTreeFruitGene.Pear.setFamily(familyPome);
ExtraTreeFruitGene.OsangeOsange.addProduct(Food.OsangeOrange.get(1), 1.0f);
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.addProduct(Food.CLOVE.get(1), 1.0f);
ExtraTreeFruitGene.Clove.setFamily(familyNuts);
ExtraTreeFruitGene.Blackcurrant.addProduct(Food.Blackcurrant.get(2), 1.0f);
ExtraTreeFruitGene.Blackcurrant.addProduct(Food.BLACKCURRANT.get(2), 1.0f);
ExtraTreeFruitGene.Blackcurrant.setFamily(familyBerry);
ExtraTreeFruitGene.Redcurrant.addProduct(Food.Redcurrant.get(2), 1.0f);
ExtraTreeFruitGene.Redcurrant.addProduct(Food.REDCURRANT.get(2), 1.0f);
ExtraTreeFruitGene.Redcurrant.setFamily(familyBerry);
ExtraTreeFruitGene.Blackberry.addProduct(Food.Blackberry.get(2), 1.0f);
ExtraTreeFruitGene.Blackberry.addProduct(Food.BLACKBERRY.get(2), 1.0f);
ExtraTreeFruitGene.Blackberry.setFamily(familyBerry);
ExtraTreeFruitGene.Raspberry.addProduct(Food.Raspberry.get(2), 1.0f);
ExtraTreeFruitGene.Raspberry.addProduct(Food.RASPBERRY.get(2), 1.0f);
ExtraTreeFruitGene.Raspberry.setFamily(familyBerry);
ExtraTreeFruitGene.Blueberry.addProduct(Food.Blueberry.get(2), 1.0f);
ExtraTreeFruitGene.Blueberry.addProduct(Food.BLUEBERRY.get(2), 1.0f);
ExtraTreeFruitGene.Blueberry.setFamily(familyBerry);
ExtraTreeFruitGene.Cranberry.addProduct(Food.Cranberry.get(2), 1.0f);
ExtraTreeFruitGene.Cranberry.addProduct(Food.CRANBERRY.get(2), 1.0f);
ExtraTreeFruitGene.Cranberry.setFamily(familyBerry);
ExtraTreeFruitGene.Juniper.addProduct(Food.Juniper.get(2), 1.0f);
ExtraTreeFruitGene.Juniper.addProduct(Food.JUNIPER.get(2), 1.0f);
ExtraTreeFruitGene.Juniper.setFamily(familyBerry);
ExtraTreeFruitGene.Gooseberry.addProduct(Food.Gooseberry.get(2), 1.0f);
ExtraTreeFruitGene.Gooseberry.addProduct(Food.GOOSEBERRY.get(2), 1.0f);
ExtraTreeFruitGene.Gooseberry.setFamily(familyBerry);
ExtraTreeFruitGene.GoldenRaspberry.addProduct(Food.GoldenRaspberry.get(2), 1.0f);
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.addProduct(Food.COCONUT.get(1), 1.0f);
ExtraTreeFruitGene.Coconut.setFamily(familyJungle);
ExtraTreeFruitGene.Cashew.addProduct(Food.Cashew.get(1), 1.0f);
ExtraTreeFruitGene.Cashew.addProduct(Food.CASHEW.get(1), 1.0f);
ExtraTreeFruitGene.Cashew.setFamily(familyJungle);
ExtraTreeFruitGene.Avacado.addProduct(Food.Avacado.get(1), 1.0f);
ExtraTreeFruitGene.Avacado.addProduct(Food.AVACADO.get(1), 1.0f);
ExtraTreeFruitGene.Avacado.setFamily(familyJungle);
ExtraTreeFruitGene.Nutmeg.addProduct(Food.Nutmeg.get(1), 1.0f);
ExtraTreeFruitGene.Nutmeg.addProduct(Food.NUTMEG.get(1), 1.0f);
ExtraTreeFruitGene.Nutmeg.setFamily(familyJungle);
ExtraTreeFruitGene.Allspice.addProduct(Food.Allspice.get(1), 1.0f);
ExtraTreeFruitGene.Allspice.addProduct(Food.ALLSPICE.get(1), 1.0f);
ExtraTreeFruitGene.Allspice.setFamily(familyJungle);
ExtraTreeFruitGene.Chilli.addProduct(Food.Chilli.get(1), 1.0f);
ExtraTreeFruitGene.Chilli.addProduct(Food.CHILLI.get(1), 1.0f);
ExtraTreeFruitGene.Chilli.setFamily(familyJungle);
ExtraTreeFruitGene.StarAnise.addProduct(Food.StarAnise.get(1), 1.0f);
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.addProduct(Food.MANGO.get(1), 1.0f);
ExtraTreeFruitGene.Mango.setFamily(familyPome);
ExtraTreeFruitGene.Starfruit.addProduct(Food.Starfruit.get(1), 1.0f);
ExtraTreeFruitGene.Starfruit.addProduct(Food.STARFRUIT.get(1), 1.0f);
ExtraTreeFruitGene.Starfruit.setFamily(familyJungle);
ExtraTreeFruitGene.Candlenut.addProduct(Food.Candlenut.get(1), 1.0f);
ExtraTreeFruitGene.Candlenut.addProduct(Food.CANDLENUT.get(1), 1.0f);
ExtraTreeFruitGene.Candlenut.setFamily(familyJungle);
if (ConfigurationMain.alterLemon) {
try {
@@ -29,103 +29,103 @@ public class ExtraTreeMutation implements ITreeMutation {
public static void init() {
final IAlleleTreeSpecies lemon = (IAlleleTreeSpecies) getVanilla("Lemon");
new ExtraTreeMutation(getVanilla("Cherry"), lemon, ExtraTreeSpecies.KeyLime.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.KeyLime.getSpecies(), lemon, ExtraTreeSpecies.FingerLime.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), lemon, ExtraTreeSpecies.Pomelo.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Pomelo.getSpecies(), getVanilla("Cherry"), ExtraTreeSpecies.Manderin.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Pomelo.getSpecies(), lemon, ExtraTreeSpecies.Citron.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Manderin.getSpecies(), getVanilla("Cherry"), ExtraTreeSpecies.Kumquat.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Pomelo.getSpecies(), ExtraTreeSpecies.Manderin.getSpecies(), ExtraTreeSpecies.Orange.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Citron.getSpecies(), ExtraTreeSpecies.Manderin.getSpecies(), ExtraTreeSpecies.BuddhaHand.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Kumquat.getSpecies(), ExtraTreeSpecies.Manderin.getSpecies(), ExtraTreeSpecies.Tangerine.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Kumquat.getSpecies(), ExtraTreeSpecies.Manderin.getSpecies(), ExtraTreeSpecies.Satsuma.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Pomelo.getSpecies(), ExtraTreeSpecies.Orange.getSpecies(), ExtraTreeSpecies.Grapefruit.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Pomelo.getSpecies(), ExtraTreeSpecies.KeyLime.getSpecies(), ExtraTreeSpecies.Lime.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Oak"), getVanilla("Cherry"), ExtraTreeSpecies.OrchardApple.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.OrchardApple.getSpecies(), getVanilla("Maple"), ExtraTreeSpecies.SweetCrabapple.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.OrchardApple.getSpecies(), ExtraTreeSpecies.SweetCrabapple.getSpecies(), ExtraTreeSpecies.FloweringCrabapple.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.OrchardApple.getSpecies(), getVanilla("Birch"), ExtraTreeSpecies.PrairieCrabapple.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), ExtraTreeSpecies.OrchardApple.getSpecies(), ExtraTreeSpecies.Blackthorn.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Cherry"), ExtraTreeSpecies.CherryPlum.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Chestnut"), ExtraTreeSpecies.Peach.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), ExtraTreeSpecies.Peach.getSpecies(), ExtraTreeSpecies.Nectarine.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), ExtraTreeSpecies.Peach.getSpecies(), ExtraTreeSpecies.Apricot.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Walnut"), ExtraTreeSpecies.Almond.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Lime"), getVanilla("Cherry"), ExtraTreeSpecies.WildCherry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Willow"), getVanilla("Cherry"), ExtraTreeSpecies.SourCherry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Cherry"), ExtraTreeSpecies.BlackCherry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Jungle"), ExtraTreeSpecies.Banana.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Banana.getSpecies(), getVanilla("Kapok"), ExtraTreeSpecies.RedBanana.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Banana.getSpecies(), getVanilla("Teak"), ExtraTreeSpecies.Plantain.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Birch"), getVanilla("Oak"), ExtraTreeSpecies.Beech.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Birch"), ExtraTreeSpecies.Beech.getSpecies(), ExtraTreeSpecies.Alder.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.Beech.getSpecies(), ExtraTreeSpecies.Aspen.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Aspen.getSpecies(), ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.Rowan.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Beech.getSpecies(), ExtraTreeSpecies.Aspen.getSpecies(), ExtraTreeSpecies.Hazel.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Beech.getSpecies(), ExtraTreeSpecies.Rowan.getSpecies(), ExtraTreeSpecies.Hawthorn.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.Aspen.getSpecies(), ExtraTreeSpecies.Elder.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.Rowan.getSpecies(), ExtraTreeSpecies.Holly.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Willow"), ExtraTreeSpecies.Aspen.getSpecies(), ExtraTreeSpecies.Sallow.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Beech.getSpecies(), getVanilla("Birch"), ExtraTreeSpecies.Pecan.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Beech.getSpecies(), getVanilla("Spruce"), ExtraTreeSpecies.CopperBeech.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Lime"), getVanilla("Spruce"), ExtraTreeSpecies.Ash.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Ash.getSpecies(), getVanilla("Birch"), ExtraTreeSpecies.Whitebeam.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Ash.getSpecies(), getVanilla("Pine"), ExtraTreeSpecies.Elm.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Ash.getSpecies(), getVanilla("Larch"), ExtraTreeSpecies.Hornbeam.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Ash.getSpecies(), getVanilla("Maple"), ExtraTreeSpecies.Sycamore.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Larch"), getVanilla("Spruce"), ExtraTreeSpecies.Yew.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Larch"), ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.BalsamFir.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Pine"), ExtraTreeSpecies.BalsamFir.getSpecies(), ExtraTreeSpecies.Fir.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Pine"), ExtraTreeSpecies.Fir.getSpecies(), ExtraTreeSpecies.Hemlock.getSpecies(), 10).setHeight(80);
new ExtraTreeMutation(ExtraTreeSpecies.Fir.getSpecies(), getVanilla("Larch"), ExtraTreeSpecies.Cedar.getSpecies(), 10).setHeight(60);
new ExtraTreeMutation(ExtraTreeSpecies.Fir.getSpecies(), getVanilla("Spruce"), ExtraTreeSpecies.DouglasFir.getSpecies(), 10).setHeight(60);
new ExtraTreeMutation(getVanilla("Pine"), getVanilla("Spruce"), ExtraTreeSpecies.Cypress.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Pine"), getVanilla("Spruce"), ExtraTreeSpecies.LoblollyPine.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Walnut"), getVanilla("Cherry"), ExtraTreeSpecies.Butternut.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Walnut"), getVanilla("Oak"), ExtraTreeSpecies.AcornOak.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.Olive.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Maple"), getVanilla("Lime"), ExtraTreeSpecies.RedMaple.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Maple"), getVanilla("Larch"), ExtraTreeSpecies.Sweetgum.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Lime"), ExtraTreeSpecies.Locust.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Teak"), ExtraTreeSpecies.Iroko.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.OrchardApple.getSpecies(), getVanilla("Birch"), ExtraTreeSpecies.Pear.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ExtraTreeSpecies.OldFustic.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.OldFustic.getSpecies(), getVanilla("Kapok"), ExtraTreeSpecies.OsangeOsange.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ExtraTreeSpecies.Brazilwood.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Brazilwood.getSpecies(), getVanilla("Kapok"), ExtraTreeSpecies.Purpleheart.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ExtraTreeSpecies.Rosewood.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Rosewood.getSpecies(), getVanilla("Kapok"), ExtraTreeSpecies.Logwood.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Lime"), ExtraTreeSpecies.Gingko.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Beech.getSpecies(), getVanilla("Jungle"), ExtraTreeSpecies.Brazilnut.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Jungle"), ExtraTreeSpecies.RoseGum.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.RoseGum.getSpecies(), getVanilla("Mahogony"), ExtraTreeSpecies.SwampGum.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Coffee.getSpecies(), getVanilla("Teak"), ExtraTreeSpecies.Clove.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), getVanilla("Jungle"), ExtraTreeSpecies.Coffee.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Holly.getSpecies(), ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.Box.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Hemlock.getSpecies(), getVanilla("Jungle"), ExtraTreeSpecies.MonkeyPuzzle.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.RoseGum.getSpecies(), getVanilla("Balsa"), ExtraTreeSpecies.RainbowGum.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.RoseGum.getSpecies(), ExtraTreeSpecies.Brazilwood.getSpecies(), ExtraTreeSpecies.PinkIvory.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), ExtraTreeSpecies.Elder.getSpecies(), ExtraTreeSpecies.Raspberry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), ExtraTreeSpecies.Elder.getSpecies(), ExtraTreeSpecies.Redcurrant.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.BlackCherry.getSpecies(), ExtraTreeSpecies.Redcurrant.getSpecies(), ExtraTreeSpecies.Blackcurrant.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.BlackCherry.getSpecies(), ExtraTreeSpecies.Raspberry.getSpecies(), ExtraTreeSpecies.Blackberry.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Blackberry.getSpecies(), ExtraTreeSpecies.Raspberry.getSpecies(), ExtraTreeSpecies.Blueberry.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Blackberry.getSpecies(), ExtraTreeSpecies.CherryPlum.getSpecies(), ExtraTreeSpecies.Cranberry.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Raspberry.getSpecies(), ExtraTreeSpecies.Fir.getSpecies(), ExtraTreeSpecies.Juniper.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Raspberry.getSpecies(), ExtraTreeSpecies.Lime.getSpecies(), ExtraTreeSpecies.Gooseberry.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Raspberry.getSpecies(), ExtraTreeSpecies.Orange.getSpecies(), ExtraTreeSpecies.GoldenRaspberry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ExtraTreeSpecies.Rosewood.getSpecies(), ExtraTreeSpecies.Cinnamon.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), ExtraTreeSpecies.Brazilnut.getSpecies(), ExtraTreeSpecies.Coconut.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), getVanilla("Oak"), ExtraTreeSpecies.Cashew.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Oak"), ExtraTreeSpecies.Avacado.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ExtraTreeSpecies.Clove.getSpecies(), ExtraTreeSpecies.Nutmeg.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ExtraTreeSpecies.Clove.getSpecies(), ExtraTreeSpecies.Allspice.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Allspice.getSpecies(), ExtraTreeSpecies.Clove.getSpecies(), ExtraTreeSpecies.StarAnise.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Jungle"), ExtraTreeSpecies.Orange.getSpecies(), ExtraTreeSpecies.Mango.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.StarAnise.getSpecies(), ExtraTreeSpecies.Mango.getSpecies(), ExtraTreeSpecies.Starfruit.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Hazel.getSpecies(), ExtraTreeSpecies.Gingko.getSpecies(), ExtraTreeSpecies.Candlenut.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Hazel.getSpecies(), ExtraTreeSpecies.Gingko.getSpecies(), ExtraTreeSpecies.Chilli.getSpecies(), 10);
new ExtraTreeMutation(ExtraTreeSpecies.Hazel.getSpecies(), ExtraTreeSpecies.Alder.getSpecies(), ExtraTreeSpecies.DwarfHazel.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), lemon, ETTreeDefinition.KeyLime.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.KeyLime.getSpecies(), lemon, ETTreeDefinition.FingerLime.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), lemon, ETTreeDefinition.Pomelo.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Pomelo.getSpecies(), getVanilla("Cherry"), ETTreeDefinition.Manderin.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Pomelo.getSpecies(), lemon, ETTreeDefinition.Citron.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Manderin.getSpecies(), getVanilla("Cherry"), ETTreeDefinition.Kumquat.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Pomelo.getSpecies(), ETTreeDefinition.Manderin.getSpecies(), ETTreeDefinition.Orange.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Citron.getSpecies(), ETTreeDefinition.Manderin.getSpecies(), ETTreeDefinition.BuddhaHand.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Kumquat.getSpecies(), ETTreeDefinition.Manderin.getSpecies(), ETTreeDefinition.Tangerine.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Kumquat.getSpecies(), ETTreeDefinition.Manderin.getSpecies(), ETTreeDefinition.Satsuma.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Pomelo.getSpecies(), ETTreeDefinition.Orange.getSpecies(), ETTreeDefinition.Grapefruit.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Pomelo.getSpecies(), ETTreeDefinition.KeyLime.getSpecies(), ETTreeDefinition.Lime.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Oak"), getVanilla("Cherry"), ETTreeDefinition.OrchardApple.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.OrchardApple.getSpecies(), getVanilla("Maple"), ETTreeDefinition.SweetCrabapple.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.OrchardApple.getSpecies(), ETTreeDefinition.SweetCrabapple.getSpecies(), ETTreeDefinition.FloweringCrabapple.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.OrchardApple.getSpecies(), getVanilla("Birch"), ETTreeDefinition.PrairieCrabapple.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), ETTreeDefinition.OrchardApple.getSpecies(), ETTreeDefinition.Blackthorn.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Cherry"), ETTreeDefinition.CherryPlum.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Chestnut"), ETTreeDefinition.Peach.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), ETTreeDefinition.Peach.getSpecies(), ETTreeDefinition.Nectarine.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), ETTreeDefinition.Peach.getSpecies(), ETTreeDefinition.Apricot.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Walnut"), ETTreeDefinition.Almond.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Lime"), getVanilla("Cherry"), ETTreeDefinition.WildCherry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Willow"), getVanilla("Cherry"), ETTreeDefinition.SourCherry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Cherry"), ETTreeDefinition.BlackCherry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Jungle"), ETTreeDefinition.Banana.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Banana.getSpecies(), getVanilla("Kapok"), ETTreeDefinition.RedBanana.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Banana.getSpecies(), getVanilla("Teak"), ETTreeDefinition.Plantain.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Birch"), getVanilla("Oak"), ETTreeDefinition.Beech.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Birch"), ETTreeDefinition.Beech.getSpecies(), ETTreeDefinition.Alder.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.Beech.getSpecies(), ETTreeDefinition.Aspen.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Aspen.getSpecies(), ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.Rowan.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Beech.getSpecies(), ETTreeDefinition.Aspen.getSpecies(), ETTreeDefinition.Hazel.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Beech.getSpecies(), ETTreeDefinition.Rowan.getSpecies(), ETTreeDefinition.Hawthorn.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.Aspen.getSpecies(), ETTreeDefinition.Elder.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.Rowan.getSpecies(), ETTreeDefinition.Holly.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Willow"), ETTreeDefinition.Aspen.getSpecies(), ETTreeDefinition.Sallow.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Beech.getSpecies(), getVanilla("Birch"), ETTreeDefinition.Pecan.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Beech.getSpecies(), getVanilla("Spruce"), ETTreeDefinition.CopperBeech.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Lime"), getVanilla("Spruce"), ETTreeDefinition.Ash.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Ash.getSpecies(), getVanilla("Birch"), ETTreeDefinition.Whitebeam.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Ash.getSpecies(), getVanilla("Pine"), ETTreeDefinition.Elm.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Ash.getSpecies(), getVanilla("Larch"), ETTreeDefinition.Hornbeam.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Ash.getSpecies(), getVanilla("Maple"), ETTreeDefinition.Sycamore.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Larch"), getVanilla("Spruce"), ETTreeDefinition.Yew.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Larch"), ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.BalsamFir.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Pine"), ETTreeDefinition.BalsamFir.getSpecies(), ETTreeDefinition.Fir.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Pine"), ETTreeDefinition.Fir.getSpecies(), ETTreeDefinition.Hemlock.getSpecies(), 10).setHeight(80);
new ExtraTreeMutation(ETTreeDefinition.Fir.getSpecies(), getVanilla("Larch"), ETTreeDefinition.Cedar.getSpecies(), 10).setHeight(60);
new ExtraTreeMutation(ETTreeDefinition.Fir.getSpecies(), getVanilla("Spruce"), ETTreeDefinition.DouglasFir.getSpecies(), 10).setHeight(60);
new ExtraTreeMutation(getVanilla("Pine"), getVanilla("Spruce"), ETTreeDefinition.Cypress.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Pine"), getVanilla("Spruce"), ETTreeDefinition.LoblollyPine.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Walnut"), getVanilla("Cherry"), ETTreeDefinition.Butternut.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Walnut"), getVanilla("Oak"), ETTreeDefinition.AcornOak.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.Olive.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Maple"), getVanilla("Lime"), ETTreeDefinition.RedMaple.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Maple"), getVanilla("Larch"), ETTreeDefinition.Sweetgum.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Lime"), ETTreeDefinition.Locust.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Teak"), ETTreeDefinition.Iroko.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.OrchardApple.getSpecies(), getVanilla("Birch"), ETTreeDefinition.Pear.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ETTreeDefinition.OldFustic.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.OldFustic.getSpecies(), getVanilla("Kapok"), ETTreeDefinition.OsangeOsange.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ETTreeDefinition.Brazilwood.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Brazilwood.getSpecies(), getVanilla("Kapok"), ETTreeDefinition.Purpleheart.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ETTreeDefinition.Rosewood.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Rosewood.getSpecies(), getVanilla("Kapok"), ETTreeDefinition.Logwood.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Lime"), ETTreeDefinition.Gingko.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Beech.getSpecies(), getVanilla("Jungle"), ETTreeDefinition.Brazilnut.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Jungle"), ETTreeDefinition.RoseGum.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.RoseGum.getSpecies(), getVanilla("Mahogony"), ETTreeDefinition.SwampGum.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Coffee.getSpecies(), getVanilla("Teak"), ETTreeDefinition.Clove.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), getVanilla("Jungle"), ETTreeDefinition.Coffee.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Holly.getSpecies(), ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.Box.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Hemlock.getSpecies(), getVanilla("Jungle"), ETTreeDefinition.MonkeyPuzzle.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.RoseGum.getSpecies(), getVanilla("Balsa"), ETTreeDefinition.RainbowGum.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.RoseGum.getSpecies(), ETTreeDefinition.Brazilwood.getSpecies(), ETTreeDefinition.PinkIvory.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), ETTreeDefinition.Elder.getSpecies(), ETTreeDefinition.Raspberry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Cherry"), ETTreeDefinition.Elder.getSpecies(), ETTreeDefinition.Redcurrant.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.BlackCherry.getSpecies(), ETTreeDefinition.Redcurrant.getSpecies(), ETTreeDefinition.Blackcurrant.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.BlackCherry.getSpecies(), ETTreeDefinition.Raspberry.getSpecies(), ETTreeDefinition.Blackberry.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Blackberry.getSpecies(), ETTreeDefinition.Raspberry.getSpecies(), ETTreeDefinition.Blueberry.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Blackberry.getSpecies(), ETTreeDefinition.CherryPlum.getSpecies(), ETTreeDefinition.Cranberry.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Raspberry.getSpecies(), ETTreeDefinition.Fir.getSpecies(), ETTreeDefinition.Juniper.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Raspberry.getSpecies(), ETTreeDefinition.Lime.getSpecies(), ETTreeDefinition.Gooseberry.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Raspberry.getSpecies(), ETTreeDefinition.Orange.getSpecies(), ETTreeDefinition.GoldenRaspberry.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Rosewood.getSpecies(), ETTreeDefinition.Cinnamon.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), ETTreeDefinition.Brazilnut.getSpecies(), ETTreeDefinition.Coconut.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), getVanilla("Oak"), ETTreeDefinition.Cashew.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Oak"), ETTreeDefinition.Avacado.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.Nutmeg.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.Allspice.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Allspice.getSpecies(), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.StarAnise.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Jungle"), ETTreeDefinition.Orange.getSpecies(), ETTreeDefinition.Mango.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.StarAnise.getSpecies(), ETTreeDefinition.Mango.getSpecies(), ETTreeDefinition.Starfruit.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Hazel.getSpecies(), ETTreeDefinition.Gingko.getSpecies(), ETTreeDefinition.Candlenut.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Hazel.getSpecies(), ETTreeDefinition.Gingko.getSpecies(), ETTreeDefinition.Chilli.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Hazel.getSpecies(), ETTreeDefinition.Alder.getSpecies(), ETTreeDefinition.DwarfHazel.getSpecies(), 10);
}
public static IAllele getVanilla(final String uid) {
@@ -27,7 +27,7 @@ public class ModuleGenetics implements IInitializable {
@Override
public void init() {
ExtraTreeFruitGene.init();
ExtraTreeSpecies.initTrees();
ETTreeDefinition.initTrees();
ExtraTreeMutation.init();
}
+102 -100
View File
@@ -12,70 +12,72 @@ import net.minecraftforge.oredict.OreDictionary;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
public enum Food implements IItemMiscProvider {
Crabapple(2),
Orange(4),
Kumquat(2),
Lime(2),
WildCherry(2),
SourCherry(2),
BlackCherry(2),
CRABAPPLE(2),
ORANGE(4),
KUMQUAT(2),
LIME(2),
WILD_CHERRY(2),
SOUR_CHERRY(2),
BLACK_CHERRY(2),
Blackthorn(3),
CherryPlum(3),
Almond(1),
Apricot(4),
Grapefruit(4),
Peach(4),
Satsuma(3),
BuddhaHand(3),
Citron(3),
FingerLime(3),
KeyLime(2),
Manderin(3),
Nectarine(3),
Pomelo(3),
Tangerine(3),
Pear(4),
SandPear(2),
Hazelnut(2),
Butternut(1),
Beechnut(0),
Pecan(0),
Banana(4),
RedBanana(4),
Plantain(2),
BrazilNut(0),
Fig(2),
Acorn(0),
Elderberry(1),
Olive(1),
GingkoNut(1),
Coffee(0),
OsangeOrange(1),
Clove(0),
Papayimar(8),
Blackcurrant(2),
Redcurrant(2),
Blackberry(2),
Raspberry(2),
Blueberry(2),
Cranberry(2),
Juniper(0),
Gooseberry(2),
GoldenRaspberry(2),
Coconut(2),
Cashew(0),
Avacado(2),
Nutmeg(0),
Allspice(0),
Chilli(2),
StarAnise(0),
Mango(4),
Starfruit(2),
Candlenut(0);
CHERRY_PLUM(3),
ALMOND(1),
APRICOT(4),
GRAPEFRUIT(4),
PEACH(4),
SATSUMA(3),
BUDDHA_HAND(3),
CITRON(3),
FINGER_LIME(3),
KEY_LIME(2),
MANDERIN(3),
NECTARINE(3),
POMELO(3),
TANGERINE(3),
PEAR(4),
SAND_PEAR(2),
HAZELNUT(2),
BUTTERNUT(1),
BEECHNUT(0),
PECAN(0),
BANANA(4),
RED_BANANA(4),
PLANTAIN(2),
BRAZIL_NUT(0),
FIG(2),
ACORN(0),
ELDERBERRY(1),
OLIVE(1),
GINGKO_NUT(1),
COFFEE(0),
OSANGE_ORANGE(1),
CLOVE(0),
PAPAYIMAR(8),
BLACKCURRANT(2),
REDCURRANT(2),
BLACKBERRY(2),
RASPBERRY(2),
BLUEBERRY(2),
CRANBERRY(2),
JUNIPER(0),
GOOSEBERRY(2),
GOLDEN_RASPBERRY(2),
COCONUT(2),
CASHEW(0),
AVACADO(2),
NUTMEG(0),
ALLSPICE(0),
CHILLI(2),
STAR_ANISE(0),
MANGO(4),
STARFRUIT(2),
CANDLENUT(0);
// IIcon icon;
public static Food[] VALUES = values();
int hunger;
private List<String> ores;
@@ -113,7 +115,7 @@ public enum Food implements IItemMiscProvider {
@Override
public String getModelPath() {
return toString();
return name().toLowerCase(Locale.ENGLISH);
}
@Override
@@ -133,46 +135,46 @@ public enum Food implements IItemMiscProvider {
}
public static void registerOreDictionary() {
Food.Crabapple.ore("Apple").ore("Crabapple");
Food.Orange.ore("Orange");
Food.Kumquat.ore("Kumquat");
Food.Lime.ore("Lime");
Food.WildCherry.ore("Cherry").ore("WildCherry");
Food.SourCherry.ore("Cherry").ore("SourCherry");
Food.BlackCherry.ore("Cherry").ore("BlackCherry");
Food.CRABAPPLE.ore("Apple").ore("Crabapple");
Food.ORANGE.ore("Orange");
Food.KUMQUAT.ore("Kumquat");
Food.LIME.ore("Lime");
Food.WILD_CHERRY.ore("Cherry").ore("WildCherry");
Food.SOUR_CHERRY.ore("Cherry").ore("SourCherry");
Food.BLACK_CHERRY.ore("Cherry").ore("BlackCherry");
Food.Blackthorn.ore("Blackthorn");
Food.CherryPlum.ore("Plum").ore("CherryPlum");
Food.Almond.ore("Almond");
Food.Apricot.ore("Apricot");
Food.Grapefruit.ore("Grapefruit");
Food.Peach.ore("Peach");
Food.Satsuma.ore("Satsuma").ore("Orange");
Food.BuddhaHand.ore("BuddhaHand").ore("Citron");
Food.Citron.ore("Citron");
Food.FingerLime.ore("Lime").ore("FingerLime");
Food.KeyLime.ore("KeyLime").ore("Lime");
Food.Manderin.ore("Orange").ore("Manderin");
Food.Nectarine.ore("Peach").ore("Nectarine");
Food.Pomelo.ore("Pomelo");
Food.Tangerine.ore("Tangerine").ore("Orange");
Food.Pear.ore("Pear");
Food.SandPear.ore("SandPear");
Food.Hazelnut.ore("Hazelnut");
Food.Butternut.ore("Butternut").ore("Walnut");
Food.Beechnut.ore("Beechnut");
Food.Pecan.ore("Pecan");
Food.Banana.ore("Banana");
Food.RedBanana.ore("RedBanana").ore("Banana");
Food.Plantain.ore("Plantain");
Food.BrazilNut.ore("BrazilNut");
Food.Fig.ore("Fig");
Food.Acorn.ore("Acorn");
Food.Elderberry.ore("Elderberry");
Food.Olive.ore("Olive");
Food.GingkoNut.ore("GingkoNut");
Food.Coffee.ore("Coffee");
Food.OsangeOrange.ore("OsangeOrange");
Food.Clove.ore("Clove");
Food.CHERRY_PLUM.ore("Plum").ore("CherryPlum");
Food.ALMOND.ore("Almond");
Food.APRICOT.ore("Apricot");
Food.GRAPEFRUIT.ore("Grapefruit");
Food.PEACH.ore("Peach");
Food.SATSUMA.ore("Satsuma").ore("Orange");
Food.BUDDHA_HAND.ore("BuddhaHand").ore("Citron");
Food.CITRON.ore("Citron");
Food.FINGER_LIME.ore("Lime").ore("FingerLime");
Food.KEY_LIME.ore("KeyLime").ore("Lime");
Food.MANDERIN.ore("Orange").ore("Manderin");
Food.NECTARINE.ore("Peach").ore("Nectarine");
Food.POMELO.ore("Pomelo");
Food.TANGERINE.ore("Tangerine").ore("Orange");
Food.PEAR.ore("Pear");
Food.SAND_PEAR.ore("SandPear");
Food.HAZELNUT.ore("Hazelnut");
Food.BUTTERNUT.ore("Butternut").ore("Walnut");
Food.BEECHNUT.ore("Beechnut");
Food.PECAN.ore("Pecan");
Food.BANANA.ore("Banana");
Food.RED_BANANA.ore("RedBanana").ore("Banana");
Food.PLANTAIN.ore("Plantain");
Food.BRAZIL_NUT.ore("BrazilNut");
Food.FIG.ore("Fig");
Food.ACORN.ore("Acorn");
Food.ELDERBERRY.ore("Elderberry");
Food.OLIVE.ore("Olive");
Food.GINGKO_NUT.ore("GingkoNut");
Food.COFFEE.ore("Coffee");
Food.OSANGE_ORANGE.ore("OsangeOrange");
Food.CLOVE.ore("Clove");
}
private Food ore(final String string) {
@@ -0,0 +1,86 @@
package binnie.extratrees.item;
import binnie.core.item.IItemMiscProvider;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemETFood extends ItemFood implements IItemModelRegister {
IItemMiscProvider[] items;
public ItemETFood() {
super(0, 0.0f, false);
this.setUnlocalizedName("food");
this.setCreativeTab(Tabs.tabArboriculture);
this.setHasSubtypes(true);
this.items = Food.VALUES;
setRegistryName("food");
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems) {
for (IItemMiscProvider item : this.items) {
if (item.isActive()) {
subItems.add(this.getStack(item, 1));
}
}
}
private IItemMiscProvider getItem(int damage) {
return (damage >= this.items.length) ? this.items[0] : this.items[damage];
}
public ItemStack getStack(IItemMiscProvider type, int size) {
return new ItemStack(this, size, type.ordinal());
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
IItemMiscProvider item = this.getItem(stack.getItemDamage());
if (item != null) {
item.addInformation(tooltip);
}
}
@Override
public String getItemStackDisplayName(final ItemStack stack) {
IItemMiscProvider item = this.getItem(stack.getItemDamage());
if(item != null){
return item.getName(stack);
}
return "null";
}
@SideOnly(Side.CLIENT)
@Override
public void registerModel(Item item, IModelManager manager) {
for(IItemMiscProvider provider : items){
manager.registerItemModel(item, provider.ordinal(), "foods/" + provider.getModelPath());
}
}
private Food getFood(final ItemStack par1ItemStack) {
return Food.VALUES[par1ItemStack.getItemDamage()];
}
@Override
public int getHealAmount(ItemStack stack) {
return getFood(stack).getHealth();
}
@Override
public float getSaturationModifier(ItemStack stack) {
return 3.0f;
}
}
@@ -1,95 +0,0 @@
package binnie.extratrees.item;
import binnie.core.item.IItemMiscProvider;
import forestry.api.core.Tabs;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemFood extends net.minecraft.item.ItemFood {
IItemMiscProvider[] items;
public ItemFood() {
super(0, 0.0f, false);
this.setUnlocalizedName("food");
this.setCreativeTab(Tabs.tabArboriculture);
this.setHasSubtypes(true);
this.items = Food.values();
setRegistryName("food");
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
for (final IItemMiscProvider item : this.items) {
if (item.isActive()) {
par3List.add(this.getStack(item, 1));
}
}
}
private IItemMiscProvider getItem(final int damage) {
return (damage >= this.items.length) ? this.items[0] : this.items[damage];
}
public ItemStack getStack(final IItemMiscProvider type, final int size) {
return new ItemStack(this, size, type.ordinal());
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
final IItemMiscProvider item = this.getItem(stack.getItemDamage());
if (item != null) {
item.addInformation(tooltip);
}
}
@Override
public String getItemStackDisplayName(final ItemStack stack) {
final IItemMiscProvider item = this.getItem(stack.getItemDamage());
return (item != null) ? item.getName(stack) : "null";
}
// @Override
// public IIcon getIcon(final ItemStack stack, final int pass) {
// final IItemMisc item = this.getItem(stack.getItemDamage());
// return (item != null) ? item.getIcon(stack) : null;
// }
//
// @Override
// public IIcon getIconFromDamage(final int damage) {
// final IItemMisc item = this.getItem(damage);
// return (item != null) ? item.getIcon(null) : null;
// }
//
// @Override
// @SideOnly(Side.CLIENT)
// public void registerIcons(final IIconRegister register) {
// for (final IItemMisc item : this.items) {
// if (item.isActive()) {
// item.registerIcons(register);
// }
// }
// }
private Food getFood(final ItemStack par1ItemStack) {
return Food.values()[par1ItemStack.getItemDamage()];
}
// @Override
// public int func_150905_g(final ItemStack p_150905_1_) {
// return this.getFood(p_150905_1_).getHealth();
// }
//
// @Override
// public float func_150906_h(final ItemStack p_150906_1_) {
// return 3.0f;
// }
}
@@ -32,7 +32,7 @@ public class ModuleItems implements IInitializable {
ExtraTrees.itemDictionaryLepi = new ItemMothDatabase();
}
Binnie.Liquid.createLiquids(ExtraTreeLiquid.values(), ItemFluidContainer.LiquidExtraTree);
ExtraTrees.itemFood = new ItemFood();
ExtraTrees.itemFood = new ItemETFood();
ExtraTrees.itemHammer = new ItemHammer(false);
ExtraTrees.itemDurableHammer = new ItemHammer(true);
@@ -55,56 +55,56 @@ public class ModuleItems implements IInitializable {
OreDictionary.registerOre("gearWood", ExtraTreeItems.ProvenGear.get(1));
Food.Crabapple.addJuice(10, 150, 10);
Food.Orange.addJuice(10, 400, 15);
Food.Kumquat.addJuice(10, 300, 10);
Food.Lime.addJuice(10, 300, 10);
Food.WildCherry.addOil(20, 50, 5);
Food.SourCherry.addOil(20, 50, 3);
Food.BlackCherry.addOil(20, 50, 5);
Food.CRABAPPLE.addJuice(10, 150, 10);
Food.ORANGE.addJuice(10, 400, 15);
Food.KUMQUAT.addJuice(10, 300, 10);
Food.LIME.addJuice(10, 300, 10);
Food.WILD_CHERRY.addOil(20, 50, 5);
Food.SOUR_CHERRY.addOil(20, 50, 3);
Food.BLACK_CHERRY.addOil(20, 50, 5);
Food.Blackthorn.addJuice(10, 50, 5);
Food.CherryPlum.addJuice(10, 100, 60);
Food.Almond.addOil(20, 80, 5);
Food.Apricot.addJuice(10, 150, 40);
Food.Grapefruit.addJuice(10, 500, 15);
Food.Peach.addJuice(10, 150, 40);
Food.Satsuma.addJuice(10, 300, 10);
Food.BuddhaHand.addJuice(10, 400, 15);
Food.Citron.addJuice(10, 400, 15);
Food.FingerLime.addJuice(10, 300, 10);
Food.KeyLime.addJuice(10, 300, 10);
Food.Manderin.addJuice(10, 400, 10);
Food.Nectarine.addJuice(10, 150, 40);
Food.Pomelo.addJuice(10, 300, 10);
Food.Tangerine.addJuice(10, 300, 10);
Food.Pear.addJuice(10, 300, 20);
Food.SandPear.addJuice(10, 200, 10);
Food.Hazelnut.addOil(20, 150, 5);
Food.Butternut.addOil(20, 180, 5);
Food.Beechnut.addOil(20, 100, 4);
Food.Pecan.addOil(29, 50, 2);
Food.Banana.addJuice(10, 100, 30);
Food.RedBanana.addJuice(10, 100, 30);
Food.Plantain.addJuice(10, 100, 40);
Food.BrazilNut.addOil(20, 20, 2);
Food.Fig.addOil(20, 50, 3);
Food.Acorn.addOil(20, 50, 3);
Food.Elderberry.addJuice(10, 100, 5);
Food.Olive.addOil(20, 50, 3);
Food.GingkoNut.addOil(20, 50, 5);
Food.Coffee.addOil(15, 20, 2);
Food.OsangeOrange.addJuice(10, 300, 15);
Food.Clove.addOil(10, 25, 2);
Food.Coconut.addOil(20, 300, 25);
Food.Cashew.addJuice(10, 150, 15);
Food.Avacado.addJuice(10, 300, 15);
Food.Nutmeg.addOil(20, 50, 10);
Food.Allspice.addOil(20, 50, 10);
Food.Chilli.addJuice(10, 100, 10);
Food.StarAnise.addOil(20, 100, 10);
Food.Mango.addJuice(10, 400, 20);
Food.Starfruit.addJuice(10, 300, 10);
Food.Candlenut.addJuice(20, 50, 10);
Food.CHERRY_PLUM.addJuice(10, 100, 60);
Food.ALMOND.addOil(20, 80, 5);
Food.APRICOT.addJuice(10, 150, 40);
Food.GRAPEFRUIT.addJuice(10, 500, 15);
Food.PEACH.addJuice(10, 150, 40);
Food.SATSUMA.addJuice(10, 300, 10);
Food.BUDDHA_HAND.addJuice(10, 400, 15);
Food.CITRON.addJuice(10, 400, 15);
Food.FINGER_LIME.addJuice(10, 300, 10);
Food.KEY_LIME.addJuice(10, 300, 10);
Food.MANDERIN.addJuice(10, 400, 10);
Food.NECTARINE.addJuice(10, 150, 40);
Food.POMELO.addJuice(10, 300, 10);
Food.TANGERINE.addJuice(10, 300, 10);
Food.PEAR.addJuice(10, 300, 20);
Food.SAND_PEAR.addJuice(10, 200, 10);
Food.HAZELNUT.addOil(20, 150, 5);
Food.BUTTERNUT.addOil(20, 180, 5);
Food.BEECHNUT.addOil(20, 100, 4);
Food.PECAN.addOil(29, 50, 2);
Food.BANANA.addJuice(10, 100, 30);
Food.RED_BANANA.addJuice(10, 100, 30);
Food.PLANTAIN.addJuice(10, 100, 40);
Food.BRAZIL_NUT.addOil(20, 20, 2);
Food.FIG.addOil(20, 50, 3);
Food.ACORN.addOil(20, 50, 3);
Food.ELDERBERRY.addJuice(10, 100, 5);
Food.OLIVE.addOil(20, 50, 3);
Food.GINGKO_NUT.addOil(20, 50, 5);
Food.COFFEE.addOil(15, 20, 2);
Food.OSANGE_ORANGE.addJuice(10, 300, 15);
Food.CLOVE.addOil(10, 25, 2);
Food.COCONUT.addOil(20, 300, 25);
Food.CASHEW.addJuice(10, 150, 15);
Food.AVACADO.addJuice(10, 300, 15);
Food.NUTMEG.addOil(20, 50, 10);
Food.ALLSPICE.addOil(20, 50, 10);
Food.CHILLI.addJuice(10, 100, 10);
Food.STAR_ANISE.addOil(20, 100, 10);
Food.MANGO.addJuice(10, 400, 20);
Food.STARFRUIT.addJuice(10, 300, 10);
Food.CANDLENUT.addJuice(20, 50, 10);
}
@Override
@@ -126,7 +126,7 @@ public class ModuleItems implements IInitializable {
GameRegistry.addSmelting(ExtraTreeItems.GrainBarley.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f);
try {
final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("miniumShard").get(null);
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.Papayimar.get(1), minium, "cropPapaya"));
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya"));
} catch (Exception ex) {
}
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);
@@ -0,0 +1,95 @@
package binnie.extratrees.models;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import binnie.extratrees.block.BlockETDecorativeLeaves;
import binnie.extratrees.genetics.ETTreeDefinition;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ILeafSpriteProvider;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.core.IModelBaker;
import forestry.core.models.ModelBlockCached;
import forestry.core.models.baker.ModelBaker;
import forestry.core.proxy.Proxies;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
public class ModelETDecorativeLeaves extends ModelBlockCached<BlockETDecorativeLeaves, ETTreeDefinition> {
public ModelETDecorativeLeaves() {
super(BlockETDecorativeLeaves.class);
}
@Override
protected ETTreeDefinition getInventoryKey(@Nonnull ItemStack stack) {
Block block = Block.getBlockFromItem(stack.getItem());
if (!(block instanceof BlockETDecorativeLeaves)) {
return null;
}
BlockETDecorativeLeaves bBlock = (BlockETDecorativeLeaves) block;
return bBlock.getTreeType(stack.getMetadata());
}
@Override
protected ETTreeDefinition getWorldKey(@Nonnull IBlockState state) {
Block block = state.getBlock();
if (!(block instanceof BlockETDecorativeLeaves)) {
return null;
}
BlockETDecorativeLeaves bBlock = (BlockETDecorativeLeaves) block;
return state.getValue(bBlock.getVariant());
}
@Override
protected void bakeBlock(@Nonnull BlockETDecorativeLeaves block, @Nonnull ETTreeDefinition treeDefinition, @Nonnull IModelBaker baker, boolean inventory) {
TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks();
ITreeGenome genome = treeDefinition.getGenome();
IAlleleTreeSpecies species = genome.getPrimary();
ILeafSpriteProvider leafSpriteProvider = species.getLeafSpriteProvider();
ResourceLocation leafSpriteLocation = leafSpriteProvider.getSprite(false, Proxies.render.fancyGraphicsEnabled());
TextureAtlasSprite leafSprite = map.getAtlasSprite(leafSpriteLocation.toString());
// Render the plain leaf block.
baker.addBlockModel(block, Block.FULL_BLOCK_AABB, null, leafSprite, 0);
// Render overlay for fruit leaves.
ResourceLocation fruitSpriteLocation = genome.getFruitProvider().getDecorativeSprite();
if (fruitSpriteLocation != null) {
TextureAtlasSprite fruitSprite = map.getAtlasSprite(fruitSpriteLocation.toString());
baker.addBlockModel(block, Block.FULL_BLOCK_AABB, null, fruitSprite, 1);
}
// Set the particle sprite
baker.setParticleSprite(leafSprite);
}
@Nullable
@Override
protected IBakedModel bakeModel(@Nonnull IBlockState state, @Nonnull ETTreeDefinition key) {
if (key == null) {
return null;
}
IModelBaker baker = new ModelBaker();
Block block = state.getBlock();
if (!blockClass.isInstance(block)) {
return null;
}
BlockETDecorativeLeaves bBlock = blockClass.cast(block);
baker.setRenderBounds(Block.FULL_BLOCK_AABB);
bakeBlock(bBlock, key, baker, false);
blockModel = baker.bakeModel(false);
onCreateModel(blockModel);
return blockModel;
}
}
@@ -1,11 +1,21 @@
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
public void setCustomStateMapper(String name, Block block) {
}
}
@@ -1,7 +1,27 @@
package binnie.extratrees.proxy;
import javax.annotation.Nonnull;
import binnie.Constants;
import binnie.core.models.ModelManager;
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;
@@ -9,6 +29,8 @@ 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);
@@ -17,26 +39,26 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy {
public void init() {
//ForestryAPI.textureManager.registerIconProvider(FruitSprite.Average);
}
@Override
public void registerBlockModel(@Nonnull final BlockModelEntry index) {
getModelManager().registerCustomBlockModel(index);
if(index.addStateMapper){
StateMapperBase ignoreState = new BlockModeStateMapper(index);
ModelLoader.setCustomStateMapper(index.block, ignoreState);
}
}
@Override
public void registerModel(@Nonnull ModelEntry index) {
getModelManager().registerCustomModel(index);
}
@Override
public void setCustomStateMapper(String name, Block block) {
ModelLoader.setCustomStateMapper(block, new CustomMapper(name));
}
class CustomMapper extends StateMapperBase {
ResourceLocation rl;
public CustomMapper(String name) {
rl = new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name);
}
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation(rl, this.getPropertyString(state.getProperties()));
}
}
public static ModelManager getModelManager() {
return modelManager;
}
@@ -55,6 +77,20 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy {
@Override
public void registerModels() {
for (BlockETDecorativeLeaves leaves : ExtraTrees.leavesDecorative) {
String resourceName = leaves.getRegistryName().toString();
ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName);
ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory");
BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModeLocation, new ModelETDecorativeLeaves(), leaves);
registerBlockModel(blockModelIndex);
}
for(BlockETSlab slab : ExtraTrees.slabsDouble){
PluginArboriculture.proxy.registerWoodModel(slab, true);
}
for(BlockETSlab slab : ExtraTrees.slabsDoubleFireproof){
PluginArboriculture.proxy.registerWoodModel(slab, true);
}
getModelManager().registerModels();
}
@@ -62,5 +98,31 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy {
public void registerItemAndBlockColors() {
getModelManager().registerItemAndBlockColors();
}
class CustomMapper extends StateMapperBase {
ResourceLocation rl;
public CustomMapper(String name) {
rl = new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name);
}
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation(rl, this.getPropertyString(state.getProperties()));
}
}
class BlockModeStateMapper extends StateMapperBase {
private final BlockModelEntry index;
public BlockModeStateMapper(BlockModelEntry index) {
this.index = index;
}
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState iBlockState) {
return index.blockModelLocation;
}
}
}