diff --git a/src/main/java/forestry/api/apiculture/IBeeGenome.java b/src/main/java/forestry/api/apiculture/IBeeGenome.java index 05a0dc97f..03140c71e 100644 --- a/src/main/java/forestry/api/apiculture/IBeeGenome.java +++ b/src/main/java/forestry/api/apiculture/IBeeGenome.java @@ -5,6 +5,8 @@ ******************************************************************************/ package forestry.api.apiculture; +import javax.annotation.Nonnull; + import net.minecraft.util.math.Vec3i; import forestry.api.genetics.EnumTolerance; @@ -20,9 +22,11 @@ import forestry.api.genetics.IGenome; public interface IBeeGenome extends IGenome { @Override + @Nonnull IAlleleBeeSpecies getPrimary(); @Override + @Nonnull IAlleleBeeSpecies getSecondary(); float getSpeed(); diff --git a/src/main/java/forestry/api/arboriculture/ITreeGenome.java b/src/main/java/forestry/api/arboriculture/ITreeGenome.java index 2dacfe15a..a6eff24a7 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeGenome.java +++ b/src/main/java/forestry/api/arboriculture/ITreeGenome.java @@ -12,9 +12,11 @@ import forestry.api.genetics.IGenome; public interface ITreeGenome extends IGenome { @Override + @Nonnull IAlleleTreeSpecies getPrimary(); @Override + @Nonnull IAlleleTreeSpecies getSecondary(); @Nonnull diff --git a/src/main/java/forestry/api/arboriculture/ITreeRoot.java b/src/main/java/forestry/api/arboriculture/ITreeRoot.java index 3eb73c57b..a5a07298a 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeRoot.java +++ b/src/main/java/forestry/api/arboriculture/ITreeRoot.java @@ -5,6 +5,7 @@ ******************************************************************************/ package forestry.api.arboriculture; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -78,7 +79,7 @@ public interface ITreeRoot extends ISpeciesRootPollinatable { @Override IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive); - boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, BlockPos pos); + boolean setFruitBlock(@Nonnull World world, @Nonnull IAlleleFruit allele, float sappiness, BlockPos pos); /* GAME MODE */ List getTreekeepingModes(); diff --git a/src/main/java/forestry/api/genetics/IGenome.java b/src/main/java/forestry/api/genetics/IGenome.java index 3ac8bcefb..a74bad3ac 100644 --- a/src/main/java/forestry/api/genetics/IGenome.java +++ b/src/main/java/forestry/api/genetics/IGenome.java @@ -5,6 +5,8 @@ ******************************************************************************/ package forestry.api.genetics; +import javax.annotation.Nonnull; + import forestry.api.core.INbtWritable; /** @@ -14,17 +16,23 @@ import forestry.api.core.INbtWritable; */ public interface IGenome extends INbtWritable { + @Nonnull IAlleleSpecies getPrimary(); + @Nonnull IAlleleSpecies getSecondary(); + @Nonnull IChromosome[] getChromosomes(); + @Nonnull IAllele getActiveAllele(IChromosomeType chromosomeType); + @Nonnull IAllele getInactiveAllele(IChromosomeType chromosomeType); boolean isGeneticEqual(IGenome other); - + + @Nonnull ISpeciesRoot getSpeciesRoot(); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java b/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java index 0d5caf615..03c4e75ac 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java @@ -5,6 +5,8 @@ ******************************************************************************/ package forestry.api.lepidopterology; +import javax.annotation.Nonnull; + import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IGenome; @@ -12,9 +14,11 @@ import forestry.api.genetics.IGenome; public interface IButterflyGenome extends IGenome { @Override + @Nonnull IAlleleButterflySpecies getPrimary(); @Override + @Nonnull IAlleleButterflySpecies getSecondary(); float getSize(); diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index 46c002e65..5311d3c30 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -98,11 +98,13 @@ public class BeeGenome extends Genome implements IBeeGenome { // / INFORMATION RETRIEVAL @Override + @Nonnull public IAlleleBeeSpecies getPrimary() { return (IAlleleBeeSpecies) getActiveAllele(EnumBeeChromosome.SPECIES); } @Override + @Nonnull public IAlleleBeeSpecies getSecondary() { return (IAlleleBeeSpecies) getInactiveAllele(EnumBeeChromosome.SPECIES); } @@ -168,6 +170,7 @@ public class BeeGenome extends Genome implements IBeeGenome { } @Override + @Nonnull public ISpeciesRoot getSpeciesRoot() { return BeeManager.beeRoot; } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index a1b2fc257..77ef0c09c 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -53,11 +53,13 @@ public class TreeGenome extends Genome implements ITreeGenome { } @Override + @Nonnull public IAlleleTreeSpecies getPrimary() { return (IAlleleTreeSpecies) getActiveAllele(EnumTreeChromosome.SPECIES); } @Override + @Nonnull public IAlleleTreeSpecies getSecondary() { return (IAlleleTreeSpecies) getInactiveAllele(EnumTreeChromosome.SPECIES); } @@ -104,6 +106,7 @@ public class TreeGenome extends Genome implements ITreeGenome { } @Override + @Nonnull public ISpeciesRoot getSpeciesRoot() { return TreeManager.treeRoot; } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index 6022506fd..4a6e7fbd4 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -239,7 +240,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } @Override - public boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, BlockPos pos) { + public boolean setFruitBlock(@Nonnull World world, @Nonnull IAlleleFruit allele, float sappiness, BlockPos pos) { EnumFacing facing = BlockUtil.getValidPodFacing(world, pos); if (facing == null) { diff --git a/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java b/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java index fd680bc12..c613ae831 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java +++ b/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java @@ -53,7 +53,7 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl Log.debug("Made a fruit pod"); } - public void setProperties(IAlleleFruit allele, float sappiness) { + public void setProperties(@Nonnull IAlleleFruit allele, float sappiness) { this.allele = allele; this.sappiness = sappiness; } @@ -74,6 +74,7 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl sappiness = nbttagcompound.getFloat("SP"); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound = super.writeToNBT(nbttagcompound); diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 75c6bcd87..9a3e97634 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -120,12 +120,12 @@ public abstract class Genome implements IGenome { } NBTTagCompound genomeNBT = nbtTagCompound.getCompoundTag("Genome"); - if (genomeNBT == null) { + if (genomeNBT.hasNoTags()) { return null; } NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10); - if (chromosomesNBT == null) { + if (chromosomesNBT.hasNoTags()) { return null; } @@ -147,7 +147,7 @@ public abstract class Genome implements IGenome { } NBTTagCompound genome = nbtTagCompound.getCompoundTag("Genome"); - if (genome == null) { + if (genome.hasNoTags()) { return null; } @@ -212,16 +212,19 @@ public abstract class Genome implements IGenome { // / INFORMATION RETRIEVAL @Override + @Nonnull public IChromosome[] getChromosomes() { return Arrays.copyOf(chromosomes, chromosomes.length); } @Override + @Nonnull public IAllele getActiveAllele(IChromosomeType chromosomeType) { return chromosomes[chromosomeType.ordinal()].getActiveAllele(); } @Override + @Nonnull public IAllele getInactiveAllele(IChromosomeType chromosomeType) { return chromosomes[chromosomeType.ordinal()].getInactiveAllele(); } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java index 80cac16b8..e19b3583d 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; +import javax.annotation.Nonnull; + import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleFlowers; @@ -57,11 +59,13 @@ public class ButterflyGenome extends Genome implements IButterflyGenome { /* SPECIES */ @Override + @Nonnull public IAlleleButterflySpecies getPrimary() { return (IAlleleButterflySpecies) getActiveAllele(EnumButterflyChromosome.SPECIES); } @Override + @Nonnull public IAlleleButterflySpecies getSecondary() { return (IAlleleButterflySpecies) getInactiveAllele(EnumButterflyChromosome.SPECIES); } @@ -132,6 +136,7 @@ public class ButterflyGenome extends Genome implements IButterflyGenome { } @Override + @Nonnull public ISpeciesRoot getSpeciesRoot() { return ButterflyManager.butterflyRoot; }