diff --git a/api b/api index b1e43bbc8..4f7ca8219 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit b1e43bbc8b9892841849a0cd96f74bdea44c53f7 +Subproject commit 4f7ca8219091e9c453c715915f296de13aa9a9e1 diff --git a/lang b/lang index c37b50751..8812057c8 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit c37b50751a1457d194f8f017661a99cbb896d86a +Subproject commit 8812057c81797062a6194f1a270a7e518290c97b diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 6ee123b45..351169bab 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -10,24 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import java.util.ArrayList; -import java.util.Collection; -import java.util.EnumSet; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; - import com.mojang.authlib.GameProfile; - import forestry.api.arboriculture.EnumGrowthConditions; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleLeafEffect; @@ -37,6 +20,7 @@ import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutation; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IFruitFamily; @@ -47,6 +31,21 @@ import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; import forestry.core.utils.StringUtil; import forestry.plugins.PluginArboriculture; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.List; public class Tree extends Individual implements ITree, ITreeGenData, IPlantable { @@ -285,6 +284,10 @@ public class Tree extends Individual implements ITree, ITreeGenData, IPlantable list.add(String.format("\u00A7eS: %s, \u00A7fY: %s", genome.getActiveAllele(EnumTreeChromosome.FERTILITY.ordinal()).getName(), genome.getActiveAllele(EnumTreeChromosome.YIELD.ordinal()).getName())); + IAlleleBoolean primaryFireproof = (IAlleleBoolean)genome.getActiveAllele(EnumTreeChromosome.FIREPROOF.ordinal()); + if (primaryFireproof.getValue()) + list.add(String.format("\u00A7c%s", StatCollector.translateToLocal("for.gui.fireresist"))); + IAllele fruit = getGenome().getActiveAllele(EnumTreeChromosome.FRUITS.ordinal()); if(fruit != Allele.fruitNone) { String strike = ""; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java b/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java index 917388352..bc66caaa2 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java @@ -80,6 +80,7 @@ public class TreeTemplates { alleles[EnumTreeChromosome.EFFECT.ordinal()] = Allele.leavesNone; alleles[EnumTreeChromosome.MATURATION.ordinal()] = Allele.maturationAverage; alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int1; + alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.boolFalse; return alleles; } @@ -149,6 +150,7 @@ public class TreeTemplates { alleles[EnumTreeChromosome.SAPPINESS.ordinal()] = Allele.sappinessLower; alleles[EnumTreeChromosome.MATURATION.ordinal()] = Allele.maturationSlower; alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int3; + alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.boolTrue; return alleles; } @@ -159,6 +161,7 @@ public class TreeTemplates { alleles[EnumTreeChromosome.SAPPINESS.ordinal()] = Allele.sappinessLowest; alleles[EnumTreeChromosome.MATURATION.ordinal()] = Allele.maturationSlowest; alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int4; + alleles[EnumTreeChromosome.FIREPROOF.ordinal()] = Allele.boolTrue; return alleles; } diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 6d55ed488..2fc4f27f1 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -13,6 +13,7 @@ package forestry.arboriculture.gui; import java.util.ArrayList; import java.util.Locale; +import forestry.core.genetics.AlleleBoolean; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -174,6 +175,18 @@ public class GuiTreealyzer extends GuiAlyzer { newLine(); + String yes = StringUtil.localize("yes"); + String no = StringUtil.localize("no"); + + AlleleBoolean primaryFireproof = (AlleleBoolean)tree.getGenome().getActiveAllele(EnumTreeChromosome.FIREPROOF.ordinal()); + AlleleBoolean secondaryFireproof = (AlleleBoolean)tree.getGenome().getInactiveAllele(EnumTreeChromosome.FIREPROOF.ordinal()); + + drawLine(StringUtil.localize("gui.fireproof"), COLUMN_0); + drawLine(StringUtil.readableBoolean(primaryFireproof.getValue(), yes, no), COLUMN_1, tree, EnumTreeChromosome.FIREPROOF, false); + drawLine(StringUtil.readableBoolean(secondaryFireproof.getValue(), yes, no), COLUMN_2, tree, EnumTreeChromosome.FIREPROOF, false); + + newLine(); + drawRow(StringUtil.localize("gui.effect"), tree.getGenome().getEffect().getName(), ((IAlleleEffect) tree.getGenome().getInactiveAllele(EnumTreeChromosome.EFFECT.ordinal())).getName(), tree, EnumTreeChromosome.EFFECT); diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index e57f468c8..2526f5e8b 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.core.genetics; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IGenome; import forestry.core.config.Config; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; public abstract class Genome implements IGenome { @@ -61,6 +62,16 @@ public abstract class Genome implements IGenome { throw new RuntimeException("Found Chromosome with invalid Alleles. See config option \"genetics.clear.invalid.chromosomes\"."); } } + + // handle old saves that have missing chromosomes + IAlleleSpecies species = (IAlleleSpecies)chromosomes[EnumTreeChromosome.SPECIES.ordinal()].getActiveAllele(); + if (species != null) { + IAllele[] template = getSpeciesRoot().getTemplate(species.getUID()); + for (int i = 0; i < chromosomes.length; i++) { + if (chromosomes[i] == null) + chromosomes[i] = new Chromosome(template[i]); + } + } } @Override