mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-17 10:55:06 +00:00
Add more null annotations
This commit is contained in:
1 parent
60d2820ed6
commit
4dfa29b1ad
11 files changed
+42
-7
No files matched your search
@@ -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();
|
||||
|
||||
@@ -12,9 +12,11 @@ import forestry.api.genetics.IGenome;
|
||||
public interface ITreeGenome extends IGenome {
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
IAlleleTreeSpecies getPrimary();
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
IAlleleTreeSpecies getSecondary();
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -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<ITreekeepingMode> getTreekeepingModes();
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user