From 2c8285651ff0fe813c4f5bd0a411dd0028fc6bdd Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 26 Oct 2016 22:10:55 +0200 Subject: [PATCH] Adding Flower localisation and Clean Up --- .../java/binnie/botany/core/BotanyCore.java | 1 - .../binnie/botany/flower/BlockFlower.java | 5 -- .../botany/genetics/FlowerBreedingSystem.java | 4 -- .../botany/genetics/FlowerDefinition.java | 2 + .../botany/genetics/ModuleGenetics.java | 1 - .../resources/assets/botany/lang/en_GB.lang | 2 +- .../resources/assets/botany/lang/en_US.lang | 48 ++++++++++++++++++- 7 files changed, 50 insertions(+), 13 deletions(-) diff --git a/src/main/java/binnie/botany/core/BotanyCore.java b/src/main/java/binnie/botany/core/BotanyCore.java index a89b2029..58c5e2d9 100644 --- a/src/main/java/binnie/botany/core/BotanyCore.java +++ b/src/main/java/binnie/botany/core/BotanyCore.java @@ -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; diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 4c365e4d..c67e31ec 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -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; diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 0fbdaae1..c2de15ff 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -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; diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 47cd4cf0..6e0a57b2 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -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); diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index fef49082..420cc403 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -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; diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/src/main/resources/assets/botany/lang/en_GB.lang index 4cad51a6..8375da40 100644 --- a/src/main/resources/assets/botany/lang/en_GB.lang +++ b/src/main/resources/assets/botany/lang/en_GB.lang @@ -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 \ No newline at end of file diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index b612a949..4e4904bc 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -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 \ No newline at end of file