From c0bba17d08cd56b50f13e0d3e3c73a9714cd0980 Mon Sep 17 00:00:00 2001 From: SeraphJACK Date: Fri, 4 Aug 2017 14:58:05 +0800 Subject: [PATCH] Fix #238 --- .../binnie/genetics/genetics/GeneItem.java | 21 +++++++----- .../java/binnie/genetics/item/ItemSerum.java | 29 +++++++++------- .../binnie/genetics/item/ItemSerumArray.java | 33 +++++++++++-------- 3 files changed, 49 insertions(+), 34 deletions(-) diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index c5946ff2..ae0502a0 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -1,16 +1,18 @@ package binnie.genetics.genetics; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + +import forestry.api.core.INBTTagable; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; -import forestry.api.core.INBTTagable; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; - -import java.util.List; public class GeneItem implements INBTTagable, IGeneItem { protected IGene gene; @@ -85,7 +87,10 @@ public class GeneItem implements INBTTagable, IGeneItem { @Override public ISpeciesRoot getSpeciesRoot() { - return gene.getSpeciesRoot(); + if (gene != null) { + return gene.getSpeciesRoot(); + } + return null; } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index dec903d9..ce1045c1 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,5 +1,18 @@ package binnie.genetics.item; +import java.util.List; +import java.util.Map; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -11,17 +24,6 @@ import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.IGeneItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import java.util.List; -import java.util.Map; public class ItemSerum extends ItemGene implements IItemSerum { public ItemSerum() { @@ -93,7 +95,10 @@ public class ItemSerum extends ItemGene implements IItemSerum { public String getItemStackDisplayName(ItemStack stack) { IGeneItem gene = getGeneItem(stack); BreedingSystem breedingSystem = Binnie.Genetics.getSystem(gene.getSpeciesRoot()); - return I18N.localise("genetics.item.serum.name", breedingSystem.getDescriptor()); + if (breedingSystem != null) { + return I18N.localise("genetics.item.serum.name", breedingSystem.getDescriptor()); + } + return I18N.localise("genetics.item.serum.name"); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 1927c6a2..9b148051 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,5 +1,20 @@ package binnie.genetics.item; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -11,19 +26,6 @@ import binnie.genetics.genetics.GeneArrayItem; import binnie.genetics.genetics.IGeneItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import java.util.List; public class ItemSerumArray extends ItemGene implements IItemSerum { public ItemSerumArray() { @@ -111,7 +113,10 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { public String getItemStackDisplayName(ItemStack stack) { IGeneItem gene = getGeneItem(stack); BreedingSystem breedingSystem = Binnie.Genetics.getSystem(gene.getSpeciesRoot()); - return I18N.localise("genetics.item.serumArray.name", breedingSystem.getDescriptor()); + if (breedingSystem != null) { + return I18N.localise("genetics.item.serumArray.name", breedingSystem.getDescriptor()); + } + return I18N.localise("genetics.item.serumArray.name"); } @Override