mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 04:10:07 +00:00
Fix #238
This commit is contained in:
1 parent
008d290136
commit
c0bba17d08
3 files changed
+49
-34
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user