From 767ec08795cc5db8acdbf85c05d7f50688532c36 Mon Sep 17 00:00:00 2001 From: kordum Date: Mon, 26 Jun 2017 18:26:16 +0300 Subject: [PATCH] Added missed localization --- .../binnie/genetics/gui/AnalystPageFruit.java | 69 ++++++++++--------- .../genetics/gui/AnalystPageGrowth.java | 40 +++++++---- .../resources/assets/genetics/lang/en_US.lang | 15 +++- 3 files changed, 78 insertions(+), 46 deletions(-) diff --git a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java index e7035a5b..10efc6db 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java @@ -6,11 +6,11 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IAllele; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderPod; @@ -20,40 +20,42 @@ import net.minecraft.util.EnumChatFormatting; import java.lang.reflect.Field; import java.util.Collection; +import java.util.Collections; public class AnalystPageFruit extends AnalystPageProduce { public AnalystPageFruit(IWidget parent, IArea area, ITree ind) { super(parent, area); setColor(0xcc3300); - ITreeGenome genome = ind.getGenome(); int y = 4; - new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + "Fruit").setColor(getColor()); + new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + getTitle()) + .setColor(getColor()); + y += 12; - new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + "Yield: " + Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColor(getColor()); + String alleleName = Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD)); + new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.fruit.yield", alleleName)) + .setColor(getColor()); + y += 20; Collection products = new UniqueItemStackSet(); Collection specialties = new UniqueItemStackSet(); - Collection wiid = new UniqueItemStackSet(); - for (ItemStack stack : ind.getProduceList()) { - products.add(stack); - } - for (ItemStack stack : ind.getSpecialtyList()) { - specialties.add(stack); - } + Collections.addAll(products, ind.getProduceList()); + Collections.addAll(specialties, ind.getSpecialtyList()); + try { if (ind.getGenome().getFruitProvider() instanceof FruitProviderPod) { FruitProviderPod pod = (FruitProviderPod) ind.getGenome().getFruitProvider(); Field f = FruitProviderPod.class.getDeclaredField("drop"); f.setAccessible(true); - for (ItemStack stack2 : (ItemStack[]) f.get(pod)) { - products.add(stack2); - } + Collections.addAll(products, (ItemStack[]) f.get(pod)); } } catch (Exception e) { e.printStackTrace(); } + if (products.size() > 0) { - new ControlTextCentered(this, y, "Natural Fruit").setColor(getColor()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.natural")) + .setColor(getColor()); + y += 10; int w = products.size() * 18 - 2; int i = 0; @@ -64,8 +66,11 @@ public class AnalystPageFruit extends AnalystPageProduce { } y += 26; } + if (specialties.size() > 0) { - new ControlTextCentered(this, y, "Specialty Fruit").setColor(getColor()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.speciality")) + .setColor(getColor()); + y += 10; int w = products.size() * 18 - 2; int i = 0; @@ -76,36 +81,40 @@ public class AnalystPageFruit extends AnalystPageProduce { } y += 26; } + Collection allProducts = new UniqueItemStackSet(); for (ItemStack stack3 : products) { allProducts.add(stack3); } + for (ItemStack stack3 : specialties) { allProducts.add(stack3); } + Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(getAllProductsAndFluids(allProducts)); if (refinedProducts.size() > 0) { - y = getRefined("Refined Products", y, refinedProducts); + y = getRefined(I18N.localise("genetics.gui.analyst.fruit.refined"), y, refinedProducts); y += 8; } + if (products.size() == 0 && specialties.size() == 0) { - new ControlTextCentered(this, y, "This tree has no \nfruits or nuts").setColor(getColor()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.none")) + .setColor(getColor()); y += 28; } - new ControlTextCentered(this, y, "Possible Fruits").setColor(getColor()); + + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.possible")) + .setColor(getColor()); + y += 12; Collection fruitAlleles = Binnie.Genetics.getChromosomeMap(Binnie.Genetics.getTreeRoot()).get(EnumTreeChromosome.FRUITS); for (IFruitFamily fam : ind.getGenome().getPrimary().getSuitableFruit()) { Collection stacks = new UniqueItemStackSet(); for (IAllele a : fruitAlleles) { if (((IAlleleFruit) a).getProvider().getFamily() == fam) { - for (ItemStack p : ((IAlleleFruit) a).getProvider().getProducts()) { - stacks.add(p); - } - for (ItemStack p : ((IAlleleFruit) a).getProvider().getSpecialty()) { - stacks.add(p); - } + Collections.addAll(stacks, ((IAlleleFruit) a).getProvider().getProducts()); + Collections.addAll(stacks, ((IAlleleFruit) a).getProvider().getSpecialty()); try { if (a.getUID().contains("fruitCocoa")) { stacks.add(new ItemStack(Items.dye, 1, 3)); @@ -116,22 +125,20 @@ public class AnalystPageFruit extends AnalystPageProduce { FruitProviderPod pod2 = (FruitProviderPod) ((IAlleleFruit) a).getProvider(); Field field = FruitProviderPod.class.getDeclaredField("drop"); field.setAccessible(true); - for (ItemStack stack4 : (ItemStack[]) field.get(pod2)) { - stacks.add(stack4); - } + Collections.addAll(stacks, (ItemStack[]) field.get(pod2)); } } catch (Exception ex) { + // ignored } } } - y = getRefined(EnumChatFormatting.ITALIC + fam.getName(), y, stacks); - y += 2; + y = getRefined(EnumChatFormatting.ITALIC + fam.getName(), y, stacks) + 2; } setSize(new IPoint(w(), y + 8)); } @Override public String getTitle() { - return "Fruit"; + return I18N.localise("genetics.gui.analyst.fruit"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java index c2353132..a281c9cf 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java @@ -4,37 +4,53 @@ import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.IArea; +import binnie.core.util.I18N; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.ITree; -import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import net.minecraft.util.EnumChatFormatting; public class AnalystPageGrowth extends ControlAnalystPage { public AnalystPageGrowth(IWidget parent, IArea area, IIndividual ind) { super(parent, area); - setColor(3355443); + setColor(0x333333); int y = 4; - IAlleleSpecies species = ind.getGenome().getPrimary(); - new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + "Growth").setColor(getColor()); + new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + getTitle()) + .setColor(getColor()); + y += 12; if (ind instanceof ITree) { ITree tree = (ITree) ind; int mat = tree.getGenome().getMaturationTime(); - new ControlTextCentered(this, y, "Saplings mature in").setColor(getColor()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.growth.mature")) + .setColor(getColor()); + y += 12; - new ControlTextCentered(this, y, EnumChatFormatting.BOLD + getTimeString(1373.3999f * mat)).setColor(getColor()); + new ControlTextCentered(this, y, EnumChatFormatting.BOLD + getTimeString(1373.3999f * mat)) + .setColor(getColor()); + y += 22; - new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + "Height: " + Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor()); + String alleleName = Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT)); + new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.height", alleleName)) + .setColor(getColor()); + y += 12; - new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + "Girth: " + Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColor(getColor()); + alleleName = Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH)); + new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.girth", alleleName)) + .setColor(getColor()); + y += 20; - new ControlTextCentered(this, y, "Growth Conditions").setColor(getColor()); + new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.growth.conditions")) + .setColor(getColor()); + y += 12; - new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + tree.getGenome().getGrowthProvider().getDescription()).setColor(getColor()); + new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + tree.getGenome().getGrowthProvider().getDescription()) + .setColor(getColor()); + y += 12; for (String s : tree.getGenome().getGrowthProvider().getInfo()) { - new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + s).setColor(getColor()); + new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + s) + .setColor(getColor()); y += 12; } } @@ -42,6 +58,6 @@ public class AnalystPageGrowth extends ControlAnalystPage { @Override public String getTitle() { - return "Growth"; + return I18N.localise("genetics.gui.analyst.growth"); } } diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index ca8592fb..e37f2573 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -161,6 +161,8 @@ genetics.gui.analyst.page.minutes=%s min. genetics.gui.analyst.page.seconds=%s sec. genetics.gui.analyst.chromosome.active=Active: %s genetics.gui.analyst.chromosome.inactive=Inactive: %s +genetics.gui.analyst.karyogram=Karyogram +genetics.gui.analyst.specimen=Specimen genetics.gui.analyst.appearance=Appearance genetics.gui.analyst.appearance.primaryColor=Primary Petal Color @@ -192,9 +194,10 @@ genetics.gui.analyst.genome.active=Active Genome genetics.gui.analyst.genome.inactive=Inactive Genome genetics.gui.analyst.growth=Growth - -genetics.gui.analyst.karyogram=Karyogram -genetics.gui.analyst.specimen=Specimen +genetics.gui.analyst.growth.mature=Saplings mature in +genetics.gui.analyst.growth.height=Height: %s +genetics.gui.analyst.growth.girth=Girth: %s +genetics.gui.analyst.growth.conditions=Growth Conditions genetics.gui.analyst.mutations=Mutations genetics.gui.analyst.mutations.habitat=Natural Habitat @@ -223,6 +226,12 @@ genetics.gui.analyst.produce.squeezes=Squeezes to give: genetics.gui.analyst.produce.everyTime=Every %s genetics.gui.analyst.fruit=Fruit +genetics.gui.analyst.fruit.yield=Yield: %s +genetics.gui.analyst.fruit.natural=Natural Fruit +genetics.gui.analyst.fruit.speciality=Speciality Fruit +genetics.gui.analyst.fruit.refined=Refined Products +genetics.gui.analyst.fruit.possible=Possible Fruits +genetics.gui.analyst.fruit.none=This tree has no\nfruits or nuts genetics.gui.analyst.wood=Wood genetics.gui.analyst.wood.fireproof=Fireproof