From a7f9244f7769ffe4957d916c54b02630028eb5d3 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Tue, 19 Aug 2014 18:48:55 +0200 Subject: [PATCH] Fixed all the x-alyzer GUIs --- .../forestry/apiculture/genetics/AlleleEffectNone.java | 3 ++- .../java/forestry/apiculture/gui/GuiBeealyzer.java | 10 +++++----- .../arboriculture/genetics/AlleleLeafEffectNone.java | 3 ++- .../java/forestry/arboriculture/gui/GuiTreealyzer.java | 4 ++-- .../lepidopterology/genetics/AlleleEffectNone.java | 3 ++- .../forestry/lepidopterology/gui/GuiFlutterlyzer.java | 10 +++++----- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java index 0fadcdfd1..8ed69f09a 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.genetics; +import forestry.core.utils.StringUtil; import net.minecraft.world.World; import forestry.api.apiculture.IAlleleBeeEffect; @@ -46,7 +47,7 @@ public class AlleleEffectNone extends Allele implements IAlleleBeeEffect { @Override public String getName() { - return "None"; + return StringUtil.localize("apiculture.effect.none"); } @Override diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 18cf8f038..b5b80557e 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -158,9 +158,9 @@ public class GuiBeealyzer extends GuiAlyzer { bee.getGenome().getInactiveAllele(EnumBeeChromosome.FLOWERING.ordinal()).getName(), bee, EnumBeeChromosome.FLOWERING); - drawRow(StringUtil.localize("gui.flowers"), StringUtil.localize(bee.getGenome().getFlowerProvider().getDescription()), - StringUtil.localize(((IAlleleFlowers) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FLOWER_PROVIDER.ordinal())).getProvider() - .getDescription()), bee, EnumBeeChromosome.FLOWER_PROVIDER); + drawRow(StringUtil.localize("gui.flowers"), bee.getGenome().getFlowerProvider().getDescription(), + ((IAlleleFlowers) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FLOWER_PROVIDER.ordinal())).getProvider() + .getDescription(), bee, EnumBeeChromosome.FLOWER_PROVIDER); drawLine(StringUtil.localize("gui.fertility"), COLUMN_0); drawFertilityInfo(bee.getGenome().getFertility(), COLUMN_1, getColorCoding(bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY.ordinal()) @@ -175,8 +175,8 @@ public class GuiBeealyzer extends GuiAlyzer { drawRow(StringUtil.localize("gui.area"), area.toString(), ((AlleleArea) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TERRITORY.ordinal())) .getArea().toString(), bee, EnumBeeChromosome.TERRITORY); - drawRow(StringUtil.localize("gui.effect"), StringUtil.localize(bee.getGenome().getEffect().getName()), - StringUtil.localize(((IAlleleBeeEffect) bee.getGenome().getInactiveAllele(EnumBeeChromosome.EFFECT.ordinal())).getName()), bee, + drawRow(StringUtil.localize("gui.effect"), bee.getGenome().getEffect().getName(), + ((IAlleleBeeEffect) bee.getGenome().getInactiveAllele(EnumBeeChromosome.EFFECT.ordinal())).getName(), bee, EnumBeeChromosome.EFFECT); newLine(); diff --git a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java b/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java index f72bbfdf0..4caca49c0 100755 --- a/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java +++ b/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import forestry.core.utils.StringUtil; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; @@ -39,7 +40,7 @@ public class AlleleLeafEffectNone extends Allele implements IAlleleLeafEffect { @Override public String getName() { - return "None"; + return StringUtil.localize("arboriculture.effect.none"); } @Override diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 68d112f0b..dabb33284 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -196,8 +196,8 @@ public class GuiTreealyzer extends GuiAlyzer { newLine(); - drawRow(StringUtil.localize("gui.effect"), StringUtil.localize(tree.getGenome().getEffect().getName()), - StringUtil.localize(((IAlleleEffect) tree.getGenome().getInactiveAllele(EnumTreeChromosome.EFFECT.ordinal())).getName()), tree, + drawRow(StringUtil.localize("gui.effect"), tree.getGenome().getEffect().getName(), + ((IAlleleEffect) tree.getGenome().getInactiveAllele(EnumTreeChromosome.EFFECT.ordinal())).getName(), tree, EnumTreeChromosome.EFFECT); newLine(); diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java b/src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java index e3192b9c4..913c6ec7e 100755 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java @@ -14,6 +14,7 @@ import forestry.api.genetics.IEffectData; import forestry.api.lepidopterology.IAlleleButterflyEffect; import forestry.api.lepidopterology.IEntityButterfly; import forestry.core.genetics.Allele; +import forestry.core.utils.StringUtil; public class AlleleEffectNone extends Allele implements IAlleleButterflyEffect { @@ -33,7 +34,7 @@ public class AlleleEffectNone extends Allele implements IAlleleButterflyEffect { @Override public String getName() { - return "None"; + return StringUtil.localize("lepidopterology.effect.none"); } @Override diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index 11afc7de4..89eed4d6a 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -159,12 +159,12 @@ public class GuiFlutterlyzer extends GuiAlyzer { newLine(); - drawRow(StringUtil.localize("gui.flowers"), StringUtil.localize(butterfly.getGenome().getFlowerProvider().getDescription()), - StringUtil.localize(((IAlleleFlowers) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FLOWER_PROVIDER.ordinal())).getProvider() - .getDescription()), butterfly, EnumButterflyChromosome.FLOWER_PROVIDER); + drawRow(StringUtil.localize("gui.flowers"), butterfly.getGenome().getFlowerProvider().getDescription(), + ((IAlleleFlowers) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FLOWER_PROVIDER.ordinal())).getProvider() + .getDescription(), butterfly, EnumButterflyChromosome.FLOWER_PROVIDER); - drawRow(StringUtil.localize("gui.effect"), StringUtil.localize(butterfly.getGenome().getEffect().getName()), - StringUtil.localize(((IAlleleEffect) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.EFFECT.ordinal())).getName()), butterfly, + drawRow(StringUtil.localize("gui.effect"), butterfly.getGenome().getEffect().getName(), + ((IAlleleEffect) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.EFFECT.ordinal())).getName(), butterfly, EnumButterflyChromosome.EFFECT); newLine();