diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index 4912cc2ef..9601a7fc6 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -72,7 +72,7 @@ public class BeeGenome extends Genome implements IBeeGenome { // NBT RETRIEVAL public static IAlleleBeeSpecies getSpecies(ItemStack itemStack) { - IAllele speciesAllele = Genome.getPrimaryAllele(itemStack, EnumBeeChromosome.SPECIES); + IAllele speciesAllele = Genome.getActiveAllele(itemStack, EnumBeeChromosome.SPECIES); if (speciesAllele instanceof IAlleleBeeSpecies) return (IAlleleBeeSpecies)speciesAllele; else diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 4e9d06193..8f2babe5c 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -14,15 +14,20 @@ import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleArea; import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IChromosome; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBeealyzer.BeealyzerInventory; import forestry.core.config.ForestryItem; import forestry.core.genetics.AlleleArea; import forestry.core.genetics.AlleleBoolean; +import forestry.core.genetics.Chromosome; +import forestry.core.genetics.Genome; import forestry.core.gui.GuiAlyzer; import forestry.core.utils.StringUtil; import forestry.core.vect.Vect; @@ -102,37 +107,30 @@ public class GuiBeealyzer extends GuiAlyzer { drawSpeciesRow(StringUtil.localize("gui.species"), bee, EnumBeeChromosome.SPECIES, checkCustomName(customPrimaryBeeKey), checkCustomName(customSecondaryBeeKey)); } - drawRow(StringUtil.localize("gui.lifespan"), bee.getGenome().getActiveAllele(EnumBeeChromosome.LIFESPAN).getName(), - bee.getGenome().getInactiveAllele(EnumBeeChromosome.LIFESPAN).getName(), bee, - EnumBeeChromosome.LIFESPAN); + drawChromosomeRow(StringUtil.localize("gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN); - drawRow(StringUtil.localize("gui.speed"), bee.getGenome().getActiveAllele(EnumBeeChromosome.SPEED).getName(), - bee.getGenome().getInactiveAllele(EnumBeeChromosome.SPEED).getName(), bee, EnumBeeChromosome.SPEED); + drawChromosomeRow(StringUtil.localize("gui.speed"), bee, EnumBeeChromosome.SPEED); - drawRow(StringUtil.localize("gui.pollination"), bee.getGenome().getActiveAllele(EnumBeeChromosome.FLOWERING).getName(), - bee.getGenome().getInactiveAllele(EnumBeeChromosome.FLOWERING).getName(), bee, - EnumBeeChromosome.FLOWERING); + drawChromosomeRow(StringUtil.localize("gui.pollination"), bee, EnumBeeChromosome.FLOWERING); - drawRow(StringUtil.localize("gui.flowers"), bee.getGenome().getFlowerProvider().getDescription(), - ((IAlleleFlowers) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FLOWER_PROVIDER)).getProvider() - .getDescription(), bee, EnumBeeChromosome.FLOWER_PROVIDER); + drawChromosomeRow(StringUtil.localize("gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER); drawLine(StringUtil.localize("gui.fertility"), COLUMN_0); - drawFertilityInfo(bee.getGenome().getFertility(), COLUMN_1, getColorCoding(bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY) - .isDominant()), 0); - drawFertilityInfo(((IAlleleInteger) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY)).getValue(), COLUMN_2, getColorCoding(bee - .getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY).isDominant()), 0); + IAlleleInteger primaryFertility = (IAlleleInteger)bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY); + IAlleleInteger secondaryFertility = (IAlleleInteger)bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY); + drawFertilityInfo(primaryFertility.getValue(), COLUMN_1, getColorCoding(primaryFertility.isDominant()), 0); + drawFertilityInfo(secondaryFertility.getValue(), COLUMN_2, getColorCoding(secondaryFertility.isDominant()), 0); newLine(); - int[] areaAr = bee.getGenome().getTerritory(); - Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]); - drawRow(StringUtil.localize("gui.area"), area.toString(), ((AlleleArea) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TERRITORY)) - .getArea().toString(), bee, EnumBeeChromosome.TERRITORY); + IAlleleArea activeTerritory = (IAlleleArea)bee.getGenome().getActiveAllele(EnumBeeChromosome.TERRITORY); + IAlleleArea inactiveTerritory = (IAlleleArea)bee.getGenome().getInactiveAllele(EnumBeeChromosome.TERRITORY); + drawRow(StringUtil.localize("gui.area"), + new Vect(activeTerritory.getValue()).toString(), + new Vect(inactiveTerritory.getValue()).toString(), + bee, EnumBeeChromosome.TERRITORY); - drawRow(StringUtil.localize("gui.effect"), bee.getGenome().getEffect().getName(), - bee.getGenome().getInactiveAllele(EnumBeeChromosome.EFFECT).getName(), bee, - EnumBeeChromosome.EFFECT); + drawChromosomeRow(StringUtil.localize("gui.effect"), bee, EnumBeeChromosome.EFFECT); newLine(); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index fd8468608..73f571436 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -45,7 +45,7 @@ public class TreeGenome extends Genome implements ITreeGenome { // NBT RETRIEVAL public static IAlleleTreeSpecies getSpecies(ItemStack itemStack) { - IAllele speciesAllele = Genome.getPrimaryAllele(itemStack, EnumTreeChromosome.SPECIES); + IAllele speciesAllele = Genome.getActiveAllele(itemStack, EnumTreeChromosome.SPECIES); if (speciesAllele instanceof IAlleleTreeSpecies) return (IAlleleTreeSpecies)speciesAllele; else diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index e15442e58..ea0a4d24b 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -4,7 +4,7 @@ * are made available under the terms of the GNU Lesser Public License v3 * which accompanies this distribution, and is available at * http://www.gnu.org/licenses/lgpl-3.0.txt - * + * * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ @@ -71,23 +71,23 @@ public class GuiTreealyzer extends GuiAlyzer { } switch (page) { - case 1: - drawAnalyticsPage1(tree, treeType); - break; - case 2: - drawAnalyticsPage2(tree); - break; - case 3: - drawAnalyticsPage3(tree); - break; - case 4: - drawAnalyticsPage4(tree); - break; - case 6: - drawAnalyticsPageClassification(tree); - break; - default: - drawAnalyticsOverview(); + case 1: + drawAnalyticsPage1(tree, treeType); + break; + case 2: + drawAnalyticsPage2(tree); + break; + case 3: + drawAnalyticsPage3(tree); + break; + case 4: + drawAnalyticsPage4(tree); + break; + case 6: + drawAnalyticsPageClassification(tree); + break; + default: + drawAnalyticsOverview(); } } @@ -121,52 +121,20 @@ public class GuiTreealyzer extends GuiAlyzer { } newLine(); - drawLine(StringUtil.localize("gui.saplings"), COLUMN_0); - drawLine(tree.getGenome().getActiveAllele(EnumTreeChromosome.FERTILITY).getName(), COLUMN_1, tree, EnumTreeChromosome.FERTILITY, false); - drawLine(tree.getGenome().getInactiveAllele(EnumTreeChromosome.FERTILITY).getName(), COLUMN_2, tree, - EnumTreeChromosome.FERTILITY, true); - - newLine(); - - drawRow(StringUtil.localize("gui.maturity"), tree.getGenome().getActiveAllele(EnumTreeChromosome.MATURATION).getName(), - tree.getGenome().getInactiveAllele(EnumTreeChromosome.MATURATION).getName(), tree, - EnumTreeChromosome.MATURATION); - - drawLine(StringUtil.localize("gui.height"), COLUMN_0); - drawLine(tree.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT).getName(), COLUMN_1, tree, EnumTreeChromosome.HEIGHT, false); - drawLine(tree.getGenome().getInactiveAllele(EnumTreeChromosome.HEIGHT).getName(), COLUMN_2, tree, - EnumTreeChromosome.HEIGHT, true); - - newLine(); + drawChromosomeRow(StringUtil.localize("gui.saplings"), tree, EnumTreeChromosome.FERTILITY); + drawChromosomeRow(StringUtil.localize("gui.maturity"), tree, EnumTreeChromosome.MATURATION); + drawChromosomeRow(StringUtil.localize("gui.height"), tree, EnumTreeChromosome.HEIGHT); + IAlleleInteger activeGirth = (IAlleleInteger) tree.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH); + IAlleleInteger inactiveGirth = (IAlleleInteger) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GIRTH); drawLine(StringUtil.localize("gui.girth"), COLUMN_0); - drawLine(String.format("%sx%s", tree.getGenome().getGirth(), tree.getGenome().getGirth()), COLUMN_1, tree, EnumTreeChromosome.FERTILITY, false); - int secondGirth = ((IAlleleInteger) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GIRTH)).getValue(); - drawLine(String.format("%sx%s", secondGirth, secondGirth), COLUMN_2, tree, EnumTreeChromosome.FERTILITY, true); + drawLine(String.format("%sx%s", activeGirth.getValue(), activeGirth.getValue()), COLUMN_1, tree, EnumTreeChromosome.GIRTH, false); + drawLine(String.format("%sx%s", inactiveGirth.getValue(), inactiveGirth.getValue()), COLUMN_2, tree, EnumTreeChromosome.GIRTH, true); newLine(); - drawLine(StringUtil.localize("gui.yield"), COLUMN_0); - drawLine(tree.getGenome().getActiveAllele(EnumTreeChromosome.YIELD).getName(), COLUMN_1, tree, EnumTreeChromosome.YIELD, false); - drawLine(tree.getGenome().getInactiveAllele(EnumTreeChromosome.YIELD).getName(), COLUMN_2, tree, - EnumTreeChromosome.YIELD, true); - - newLine(); - - drawLine(StringUtil.localize("gui.sappiness"), COLUMN_0); - drawLine(tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS).getName(), COLUMN_1, tree, EnumTreeChromosome.SAPPINESS, false); - - // FIXME: Legacy handling - IAllele sappiness = tree.getGenome().getInactiveAllele(EnumTreeChromosome.SAPPINESS); - String sap; - if (sappiness instanceof IAlleleFloat) - sap = sappiness.getName(); - else - sap = Allele.saplingsLowest.getName(); - - drawLine(sap, COLUMN_2, tree, EnumTreeChromosome.SAPPINESS, true); - - newLine(); + drawChromosomeRow(StringUtil.localize("gui.yield"), tree, EnumTreeChromosome.YIELD); + drawChromosomeRow(StringUtil.localize("gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS); String yes = StringUtil.localize("yes"); String no = StringUtil.localize("no"); @@ -180,12 +148,7 @@ public class GuiTreealyzer extends GuiAlyzer { newLine(); - drawRow(StringUtil.localize("gui.effect"), tree.getGenome().getEffect().getName(), - tree.getGenome().getInactiveAllele(EnumTreeChromosome.EFFECT).getName(), tree, - EnumTreeChromosome.EFFECT); - - newLine(); - newLine(); + drawChromosomeRow(StringUtil.localize("gui.effect"), tree, EnumTreeChromosome.EFFECT); endPage(); } @@ -220,22 +183,22 @@ public class GuiTreealyzer extends GuiAlyzer { drawLine(StringUtil.localize("gui.tolerated"), COLUMN_0); - List tolerated0 = new ArrayList(tree.getGenome().getPlantTypes()); - List tolerated1 = Collections.emptyList(); + List activeTolerated = new ArrayList(tree.getGenome().getPlantTypes()); + List inactiveTolerated = Collections.emptyList(); - IAllele allele1 = tree.getGenome().getInactiveAllele(EnumTreeChromosome.PLANT); - if (allele1 instanceof AllelePlantType) { - tolerated1 = new ArrayList(((AllelePlantType) allele1).getPlantTypes()); + IAllele inactiveAllelePlant = tree.getGenome().getInactiveAllele(EnumTreeChromosome.PLANT); + if (inactiveAllelePlant instanceof AllelePlantType) { + inactiveTolerated = new ArrayList(((AllelePlantType) inactiveAllelePlant).getPlantTypes()); } - int max = Math.max(tolerated0.size(), tolerated1.size()); + int max = Math.max(activeTolerated.size(), inactiveTolerated.size()); for (int i = 0; i < max; i++) { if (i > 0) newLine(); - if(tolerated0.size() > i) - drawLine(StringUtil.localize("gui." + tolerated0.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, tree, EnumTreeChromosome.PLANT, false); - if(tolerated1.size() > i) - drawLine(StringUtil.localize("gui." + tolerated1.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, tree, EnumTreeChromosome.PLANT, true); + if(activeTolerated.size() > i) + drawLine(StringUtil.localize("gui." + activeTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, tree, EnumTreeChromosome.PLANT, false); + if(inactiveTolerated.size() > i) + drawLine(StringUtil.localize("gui." + inactiveTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, tree, EnumTreeChromosome.PLANT, true); } newLine(); diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 51b49cdda..275eb6ee6 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -72,11 +72,11 @@ public abstract class Genome implements IGenome { return null; } - public static IAllele getPrimaryAllele(ItemStack itemStack, IChromosomeType chromosomeType) { + public static IAllele getActiveAllele(ItemStack itemStack, IChromosomeType chromosomeType) { Chromosome chromosome = getChromosome(itemStack, chromosomeType); if (chromosome == null) return null; - return chromosome.getPrimaryAllele(); + return chromosome.getActiveAllele(); } // / SAVING & LOADING diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 6c11ff0c8..5cc02a966 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -26,6 +26,7 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.core.config.Defaults; import forestry.core.gadgets.TileForestry; import forestry.core.genetics.EnumMutateChance; +import forestry.core.genetics.Genome; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; import java.util.HashMap; @@ -92,6 +93,14 @@ public abstract class GuiAlyzer extends GuiForestry { getColorCoding(individual.getGenome().getInactiveAllele(chromosome).isDominant())); } + protected final void drawChromosomeRow(String chromosomeName, IIndividual individual, IChromosomeType chromosome) { + IAllele active = individual.getGenome().getActiveAllele(chromosome); + IAllele inactive = individual.getGenome().getInactiveAllele(chromosome); + drawRow(chromosomeName, active.getName(), inactive.getName(), + fontColor.get("gui.screen"), getColorCoding(active.isDominant()), + getColorCoding(inactive.isDominant())); + } + protected final void drawSpeciesRow(String text0, IIndividual individual, IChromosomeType chromosome, String customPrimaryName, String customSecondaryName) { IAlleleSpecies primary = individual.getGenome().getPrimary(); IAlleleSpecies secondary = individual.getGenome().getSecondary(); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java index b30d9fac6..b14ef54e1 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java @@ -42,7 +42,7 @@ public class ButterflyGenome extends Genome implements IButterflyGenome { // NBT RETRIEVAL public static IAlleleButterflySpecies getSpecies(ItemStack itemStack) { - IAllele speciesAllele = Genome.getPrimaryAllele(itemStack, EnumButterflyChromosome.SPECIES); + IAllele speciesAllele = Genome.getActiveAllele(itemStack, EnumButterflyChromosome.SPECIES); if (speciesAllele instanceof IAlleleButterflySpecies) return (IAlleleButterflySpecies)speciesAllele; else