Adding Flower localisation and Clean Up

This commit is contained in:
Nedelosk committed 2016-10-26 22:10:55 +02:00
1 parent df17dccad7
commit 2c8285651f
7 files changed
+50 -13

No files matched your search

@@ -3,7 +3,6 @@ package binnie.botany.core;
import binnie.botany.api.FlowerManager;
import binnie.botany.api.IFlowerRoot;
import binnie.botany.genetics.FlowerRoot;
import forestry.api.genetics.AlleleManager;
public class BotanyCore {
public static final int CHANCE_INTERPOLLINATION = 20;
@@ -7,7 +7,6 @@ import java.util.Random;
import com.mojang.authlib.GameProfile;
import binnie.botany.Botany;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerType;
import binnie.botany.core.BotanyCore;
@@ -16,13 +15,10 @@ import binnie.botany.genetics.EnumFlowerType;
import binnie.botany.genetics.FlowerDefinition;
import binnie.core.BinnieCore;
import binnie.core.util.TileUtil;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.core.blocks.IColoredBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyBool;
@@ -32,7 +28,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
@@ -10,10 +10,6 @@ import binnie.core.BinnieCore;
import binnie.core.genetics.BreedingSystem;
import binnie.core.genetics.ForestryAllele;
import binnie.core.genetics.Tolerance;
import binnie.core.genetics.ForestryAllele.Fertility;
import binnie.core.genetics.ForestryAllele.Lifespan;
import binnie.core.genetics.ForestryAllele.Sappiness;
import binnie.core.genetics.ForestryAllele.Territory;
import binnie.extrabees.ExtraBees;
import forestry.api.genetics.*;
import net.minecraft.entity.player.EntityPlayer;
@@ -7,6 +7,7 @@ import forestry.api.core.EnumTemperature;
import forestry.api.genetics.*;
import forestry.core.genetics.alleles.AlleleHelper;
import forestry.core.genetics.alleles.EnumAllele;
import jline.internal.Log;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
@@ -983,6 +984,7 @@ public enum FlowerDefinition implements IFlowerDefinition {
if(branch != null){
this.branch.addMemberSpecies(species);
}
Log.error(unlocalizedName + "=" + name());
}
protected abstract void setSpeciesProperties(IAlleleFlowerSpeciesBuilder flowerSpecies);
@@ -12,7 +12,6 @@ import forestry.api.genetics.AlleleManager;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
@@ -159,4 +159,4 @@ botany.gui.database.tab.branches.species=Species
botany.gui.database.tab.breeder=Breeder
botany.gui.database.tab.colour.resultant=Resultant Mixes
botany.gui.database.tab.colour.further=Further Mixes
botany.gui.database.tab.colour.further=Further Mixes
@@ -167,7 +167,6 @@ for.binnie.circuit.garden.damp.acid=Garden (Damp, Acidic)
for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral)
for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline)
botany.gui.database.tab.species.overview=Overview
botany.gui.database.tab.species.genome=Genome
botany.gui.database.tab.species.classification=Classification
@@ -180,3 +179,50 @@ botany.gui.database.tab.breeder=Breeder
botany.gui.database.tab.colour.resultant=Resultant Mixes
botany.gui.database.tab.colour.further=Further Mixes
botany.flowers.species.Dandelion=Dandelion
botany.flowers.species.Poppy=Poppy
botany.flowers.species.Orchid=Orchid
botany.flowers.species.Allium=Allium
botany.flowers.species.Bluet=Bluet
botany.flowers.species.Tulip=Tulip
botany.flowers.species.Daisy=Daisy
botany.flowers.species.Cornflower=Cornflower
botany.flowers.species.Pansy=Pansy
botany.flowers.species.Iris=Iris
botany.flowers.species.Lavender=Lavender
botany.flowers.species.Viola=Viola
botany.flowers.species.Daffodil=Daffodil
botany.flowers.species.Dahlia=Dahlia
botany.flowers.species.Peony=Peony
botany.flowers.species.Rose=Rose
botany.flowers.species.Lilac=Lilac
botany.flowers.species.Hydrangea=Hydrangea
botany.flowers.species.Foxglove=Foxglove
botany.flowers.species.Zinnia=Zinnia
botany.flowers.species.Chrysanthemum=Chrysanthemum
botany.flowers.species.Marigold=Marigold
botany.flowers.species.Geranium=Geranium
botany.flowers.species.Azalea=Azalea
botany.flowers.species.Primrose=Primrose
botany.flowers.species.Aster=Aster
botany.flowers.species.Carnation=Carnation
botany.flowers.species.Lily=Lily
botany.flowers.species.Yarrow=Yarrow
botany.flowers.species.Petunia=Petunia
botany.flowers.species.Agapanthus=Agapanthus
botany.flowers.species.Fuchsia=Fuchsia
botany.flowers.species.Dianthus=Dianthus
botany.flowers.species.Forget-me-nots=Forget
botany.flowers.species.Anemone=Anemone
botany.flowers.species.Aquilegia=Aquilegia
botany.flowers.species.Edelweiss=Edelweiss
botany.flowers.species.Scabious=Scabious
botany.flowers.species.Coneflower=Coneflower
botany.flowers.species.Gaillardia=Gaillardia
botany.flowers.species.Auricula=Auricula
botany.flowers.species.Camellia=Camellia
botany.flowers.species.Goldenrod=Goldenrod
botany.flowers.species.Althea=Althea
botany.flowers.species.Penstemon=Penstemon
botany.flowers.species.Delphinium=Delphinium
botany.flowers.species.Hollyhock=Hollyhock