Clean up some Items

This commit is contained in:
Nedelosk committed 2017-03-22 16:21:29 +01:00
1 parent 8f77efae6e
commit 14deee0df7
13 files changed
+222 -216

No files matched your search

@@ -10,6 +10,7 @@ public class ItemCore extends Item implements IItemModelRegister {
public ItemCore(String registryName) {
setRegistryName(registryName);
setUnlocalizedName(registryName);
}
@SideOnly(Side.CLIENT)
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.TextFormatting;
@@ -22,26 +23,10 @@ import java.util.List;
public class ItemArboristDatabase extends Item implements IItemModelRegister {
public ItemArboristDatabase() {
this.setCreativeTab(Tabs.tabArboriculture);
this.setUnlocalizedName("database");
this.setMaxStackSize(1);
setCreativeTab(Tabs.tabArboriculture);
setUnlocalizedName("databaseTree");
setRegistryName("databaseTree");
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add(TextFormatting.DARK_PURPLE + "Sengir-in-a-can");
}
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> par3List) {
super.getSubItems(par1, par2CreativeTabs, par3List);
par3List.add(new ItemStack(par1, 1, 1));
setMaxStackSize(1);
}
@Override
@@ -52,20 +37,41 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister {
}
@Override
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
final ItemStack itemStack = playerIn.getHeldItem(handIn);
final ExtraTreesGUID id;
if (itemStack.getItemDamage() == 0) {
id = ExtraTreesGUID.Database;
} else {
id = ExtraTreesGUID.DatabaseNEI;
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
if (isMaster(stack)) {
tooltip.add(TextFormatting.DARK_PURPLE + ExtraTrees.proxy.localise("item.database.arborist.master.tooltip"));
}
ExtraTrees.proxy.openGui(id, playerIn, playerIn.getPosition());
return super.onItemRightClick(worldIn, playerIn, handIn);
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
return (i.getItemDamage() == 0) ? "Arborist Database" : "Master Arborist Database";
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
super.getSubItems(item, tab, subItems);
subItems.add(new ItemStack(item, 1, 1));
}
@Override
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
ItemStack itemStack = player.getHeldItem(hand);
final ExtraTreesGUID id;
if (isMaster(itemStack)) {
id = ExtraTreesGUID.DatabaseNEI;
} else {
id = ExtraTreesGUID.Database;
}
ExtraTrees.proxy.openGui(id, player, player.getPosition());
return new ActionResult(EnumActionResult.PASS, itemStack);
}
@Override
public String getItemStackDisplayName(ItemStack itemStack) {
return ExtraTrees.proxy.localise(isMaster(itemStack) ? "item.database.arborist.master.name" : "item.database.arborist.name");
}
protected boolean isMaster(ItemStack itemStack){
return itemStack.getMetadata() > 0;
}
}
@@ -16,21 +16,20 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemETFood extends ItemFood implements IItemModelRegister {
IItemMiscProvider[] items;
static final IItemMiscProvider[] items = Food.VALUES;
public ItemETFood() {
super(0, 0.0f, false);
this.setUnlocalizedName("food");
this.setCreativeTab(Tabs.tabArboriculture);
this.setHasSubtypes(true);
this.items = Food.VALUES;
setRegistryName("food");
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> subItems) {
for (IItemMiscProvider item : this.items) {
for (IItemMiscProvider item : ItemETFood.items) {
if (item.isActive()) {
subItems.add(this.getStack(item, 1));
}
@@ -38,7 +37,7 @@ public class ItemETFood extends ItemFood implements IItemModelRegister {
}
private IItemMiscProvider getItem(int damage) {
return (damage >= this.items.length) ? this.items[0] : this.items[damage];
return (damage >= ItemETFood.items.length) ? ItemETFood.items[0] : ItemETFood.items[damage];
}
public ItemStack getStack(IItemMiscProvider type, int size) {
@@ -47,15 +46,15 @@ public class ItemETFood extends ItemFood implements IItemModelRegister {
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
IItemMiscProvider item = this.getItem(stack.getItemDamage());
item.addInformation(tooltip);
}
@Override
public String getItemStackDisplayName(final ItemStack stack) {
IItemMiscProvider item = this.getItem(stack.getItemDamage());
return item.getName(stack);
public String getItemStackDisplayName(ItemStack itemStack) {
IItemMiscProvider item = this.getItem(itemStack.getItemDamage());
return item.getName(itemStack);
}
@SideOnly(Side.CLIENT)
@@ -66,17 +65,17 @@ public class ItemETFood extends ItemFood implements IItemModelRegister {
}
}
private Food getFood(final ItemStack par1ItemStack) {
return Food.VALUES[par1ItemStack.getItemDamage()];
private Food getFood(ItemStack itemStack) {
return Food.VALUES[itemStack.getItemDamage()];
}
@Override
public int getHealAmount(ItemStack stack) {
return getFood(stack).getHealth();
public int getHealAmount(ItemStack itemStack) {
return getFood(itemStack).getHealth();
}
@Override
public float getSaturationModifier(ItemStack stack) {
public float getSaturationModifier(ItemStack itemStack) {
return 3.0f;
}
}
@@ -1,5 +1,6 @@
package binnie.extratrees.item;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IToolHammer;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
@@ -13,14 +14,14 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemHammer extends Item implements IToolHammer, IItemModelRegister {
private boolean isDurableHammer;
public ItemHammer(final boolean durable) {
this.isDurableHammer = false;
public ItemHammer(boolean durable) {
this.isDurableHammer = durable;
this.setCreativeTab(CreativeTabs.TOOLS);
this.setUnlocalizedName(durable ? "durable_hammer" : "hammer");
this.setMaxStackSize(1);
this.setMaxDamage(durable ? 1562 : 251);
setRegistryName(durable ? "durable_hammer" : "hammer");
setCreativeTab(CreativeTabs.TOOLS);
setMaxStackSize(1);
setMaxDamage(durable ? 1562 : 251);
String name = durable ? "durable_hammer" : "hammer";
setUnlocalizedName(name);
setRegistryName(name);
}
@Override
@@ -30,17 +31,17 @@ public class ItemHammer extends Item implements IToolHammer, IItemModelRegister
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
return this.isDurableHammer ? "Master Carpentry Hammer" : "Carpentry Hammer";
public String getItemStackDisplayName(ItemStack itemStack) {
return ExtraTrees.proxy.localise(isDurableHammer ? "item.hammer.master.name" : "item.hammer.name");
}
@Override
public boolean isActive(final ItemStack item) {
public boolean isActive(ItemStack itemStack) {
return true;
}
@Override
public void onHammerUsed(final ItemStack item, final EntityPlayer player) {
item.damageItem(1, player);
public void onHammerUsed(ItemStack itemStack, EntityPlayer player) {
itemStack.damageItem(1, player);
}
}
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.TextFormatting;
@@ -22,10 +23,10 @@ import java.util.List;
public class ItemMothDatabase extends Item implements IItemModelRegister {
public ItemMothDatabase() {
this.setCreativeTab(Tabs.tabLepidopterology);
this.setUnlocalizedName("databaseMoth");
this.setMaxStackSize(1);
setRegistryName("databaseMoth");
setCreativeTab(Tabs.tabLepidopterology);
setUnlocalizedName("databaseLepi");
setRegistryName("databaseLepi");
setMaxStackSize(1);
}
@Override
@@ -38,36 +39,39 @@ public class ItemMothDatabase extends Item implements IItemModelRegister {
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
if (stack.getItemDamage() > 0) {
tooltip.add(TextFormatting.DARK_PURPLE + "Binnie's Emporium of Lepidopterans");
if (isMaster(stack)) {
tooltip.add(TextFormatting.DARK_PURPLE + ExtraTrees.proxy.localise("item.database.lepi.master.tooltip"));
}
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> par3List) {
super.getSubItems(par1, par2CreativeTabs, par3List);
par3List.add(new ItemStack(par1, 1, 1));
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
super.getSubItems(item, tab, subItems);
subItems.add(new ItemStack(item, 1, 1));
}
@Override
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
final ItemStack itemStack = playerIn.getHeldItem(handIn);
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
ItemStack itemStack = player.getHeldItem(hand);
final ExtraTreesGUID id;
if (itemStack.getMetadata() == 0) {
id = ExtraTreesGUID.MothDatabase;
} else {
if (isMaster(itemStack)) {
id = ExtraTreesGUID.MothDatabaseNEI;
} else {
id = ExtraTreesGUID.MothDatabase;
}
ExtraTrees.proxy.openGui(id, playerIn, playerIn.getPosition());
ExtraTrees.proxy.openGui(id, player, player.getPosition());
return super.onItemRightClick(worldIn, playerIn, handIn);
return new ActionResult(EnumActionResult.PASS, itemStack);
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
return (i.getItemDamage() == 0) ? "Lepidopterist Database" : "Master Lepidopterist Database";
public String getItemStackDisplayName(ItemStack itemStack) {
return ExtraTrees.proxy.localise(isMaster(itemStack) ? "item.database.lepi.master.name" : "item.database.lepi.name");
}
protected boolean isMaster(ItemStack itemStack){
return itemStack.getMetadata() > 0;
}
}
@@ -3,6 +3,7 @@ package binnie.genetics.genetics;
import binnie.Binnie;
import binnie.core.genetics.BreedingSystem;
import binnie.core.genetics.Gene;
import binnie.genetics.Genetics;
import binnie.genetics.api.IGene;
import forestry.api.core.INbtReadable;
import forestry.api.core.INbtWritable;
@@ -64,7 +65,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem {
} else {
list.add(totalList.get(0));
list.add(totalList.get(1));
list.add(totalList.size() - 2 + " " + Binnie.LANGUAGE.localise("genetic.item.gene.more.genes"));
list.add(totalList.size() - 2 + " " + Genetics.proxy.localise("item.gene.more.genes"));
}
}
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
@@ -21,7 +22,6 @@ public class ItemDatabase extends ItemCore {
public ItemDatabase() {
super("geneticdatabase");
this.setCreativeTab(CreativeTabGenetics.instance);
this.setUnlocalizedName("database");
this.setMaxStackSize(1);
}
@@ -40,18 +40,26 @@ public class ItemDatabase extends ItemCore {
}
@Override
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
final ItemStack itemStack = playerIn.getHeldItem(handIn);
if (itemStack.getItemDamage() == 0) {
Genetics.proxy.openGui(GeneticsGUI.Database, playerIn, playerIn.getPosition());
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
ItemStack itemStack = player.getHeldItem(hand);
final GeneticsGUI id;
if (isMaster(itemStack)) {
id = GeneticsGUI.Database;
} else {
Genetics.proxy.openGui(GeneticsGUI.DatabaseNEI, playerIn, playerIn.getPosition());
id = GeneticsGUI.DatabaseNEI;
}
return super.onItemRightClick(worldIn, playerIn, handIn);
Genetics.proxy.openGui(id, player, player.getPosition());
return new ActionResult(EnumActionResult.PASS, itemStack);
}
@Override
public String getItemStackDisplayName(final ItemStack i) {
return (i.getItemDamage() == 0) ? "Gene Database" : "Master Gene Database";
public String getItemStackDisplayName(ItemStack itemStack) {
return Genetics.proxy.localise(isMaster(itemStack) ? "item.database.master.name" : "item.database.name");
}
protected boolean isMaster(ItemStack itemStack){
return itemStack.getItemDamage() > 0;
}
}
@@ -1,8 +1,8 @@
package binnie.genetics.item;
import binnie.Binnie;
import binnie.core.item.ItemCore;
import binnie.genetics.CreativeTabGenetics;
import binnie.genetics.Genetics;
import binnie.genetics.genetics.IGeneItem;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -17,6 +17,45 @@ import java.util.List;
public abstract class ItemGene extends ItemCore {
public ItemGene(String unlocName) {
super(unlocName);
this.setMaxStackSize(1);
this.setMaxDamage(16);
this.setUnlocalizedName(unlocName);
this.setCreativeTab(CreativeTabGenetics.instance);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List<String> list, final boolean advanced) {
int damage = itemstack.getMaxDamage() - itemstack.getItemDamage();
if (damage == 0) {
list.add(Genetics.proxy.localise("item.gene.empty"));
} else if (damage == 1) {
list.add("1 " + Genetics.proxy.localise("item.gene.charge"));
} else {
list.add(damage + " " + Genetics.proxy.localise("item.gene.charges"));
}
IGeneItem gene = this.getGeneItem(itemstack);
if (gene != null) {
gene.getInfo(list);
}
}
public int getCharges(final ItemStack stack) {
return stack.getMaxDamage() - stack.getItemDamage();
}
@Override
public abstract String getItemStackDisplayName(final ItemStack itemStack);
@SideOnly(Side.CLIENT)
@Override
public abstract void getSubItems(Item item, final CreativeTabs tab, final NonNullList<ItemStack> subItems);
@Nullable
public abstract IGeneItem getGeneItem(ItemStack itemStack);
@Override
public boolean getShareTag() {
return true;
@@ -26,45 +65,4 @@ public abstract class ItemGene extends ItemCore {
public boolean isRepairable() {
return false;
}
public ItemGene(final String unlocName) {
super(unlocName);
this.setMaxStackSize(1);
this.setMaxDamage(16);
this.setUnlocalizedName(unlocName);
this.setCreativeTab(CreativeTabGenetics.instance);
}
public int getCharges(final ItemStack stack) {
return stack.getMaxDamage() - stack.getItemDamage();
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List<String> list, final boolean advanced) {
super.addInformation(itemstack, entityPlayer, list, advanced);
final int damage = itemstack.getMaxDamage() - itemstack.getItemDamage();
if (damage == 0) {
list.add(Binnie.LANGUAGE.localise("genetic.item.gene.empty"));
} else if (damage == 1) {
list.add("1 " + Binnie.LANGUAGE.localise("genetic.item.gene.charge"));
} else {
list.add(damage + " " + Binnie.LANGUAGE.localise("genetic.item.gene.charges"));
}
final IGeneItem gene = this.getGeneItem(itemstack);
if (gene != null) {
gene.getInfo(list);
}
}
@Override
public abstract String getItemStackDisplayName(final ItemStack p0);
@Override
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
}
@Nullable
public abstract IGeneItem getGeneItem(final ItemStack itemStack);
}
@@ -30,54 +30,47 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar
super("sequence");
this.setMaxStackSize(1);
this.setMaxDamage(5);
this.setUnlocalizedName("sequence");
this.setCreativeTab(CreativeTabGenetics.instance);
}
@Override
public String getItemStackDisplayName(final ItemStack itemstack) {
final GeneItem gene = GeneItem.create(itemstack);
public String getItemStackDisplayName(ItemStack itemstack) {
GeneItem gene = GeneItem.create(itemstack);
if (gene == null) {
return "Corrupted Sequence";
return Genetics.proxy.localise("item.sequence.corrupted");
} else {
return gene.getBreedingSystem().getDescriptor() + " DNA Sequence";
return gene.getBreedingSystem().getDescriptor() + " " + Genetics.proxy.localise("item.sequence.name");
}
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List<String> list, final boolean par4) {
super.addInformation(itemstack, entityPlayer, list, par4);
list.add(Genetics.proxy.localise("item.sequence." + (5 - itemstack.getItemDamage() % 6)));
final SequencerItem gene = SequencerItem.create(itemstack);
public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> subItems, boolean advanced) {
subItems.add(Genetics.proxy.localise("item.sequence." + (5 - itemStack.getItemDamage() % 6)));
SequencerItem gene = SequencerItem.create(itemStack);
if (gene != null) {
if (gene.analysed) {
gene.getInfo(list);
gene.getInfo(subItems);
} else {
list.add("<Unknown>");
subItems.add("<" + Genetics.proxy.localise("item.sequence.unknown") + ">");
}
final int seq = gene.sequenced;
int seq = gene.sequenced;
if (seq == 0) {
list.add("Unsequenced");
subItems.add(Genetics.proxy.localise("item.sequence.unsequenced"));
} else if (seq < 100) {
list.add("Partially Sequenced (" + seq + "%)");
subItems.add(String.format(Genetics.proxy.localise("genetics.item.sequence.partially"), seq));
} else {
list.add("Fully Sequenced");
subItems.add(Genetics.proxy.localise("item.sequence.sequenced"));
}
}
}
// @Override
// @SideOnly(Side.CLIENT)
// public void registerIcons(final IIconRegister register) {
// this.itemIcon = Genetics.proxy.getIcon(register, "sequencer");
// }
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows");
Preconditions.checkNotNull(species);
itemList.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false));
subItems.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false));
}
@Override
@@ -14,7 +14,6 @@ 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 net.minecraft.util.NonNullList;
@@ -31,14 +30,8 @@ public class ItemSerum extends ItemGene implements IItemSerum {
this.setMaxDamage(16);
}
@SideOnly(Side.CLIENT)
@Override
public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List<String> list, final boolean par4) {
super.addInformation(itemstack, entityPlayer, list, par4);
}
@Override
public int getCharges(final ItemStack itemStack) {
public int getCharges(ItemStack itemStack) {
return itemStack.getMaxDamage() - itemStack.getItemDamage();
}
@@ -47,39 +40,40 @@ public class ItemSerum extends ItemGene implements IItemSerum {
return itemStack.getMaxDamage();
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
final Map<IChromosomeType, List<IAllele>> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root);
for (final Map.Entry<IChromosomeType, List<IAllele>> entry : chromosomeMap.entrySet()) {
final IChromosomeType chromosome = entry.getKey();
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
Map<IChromosomeType, List<IAllele>> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root);
for (Map.Entry<IChromosomeType, List<IAllele>> entry : chromosomeMap.entrySet()) {
IChromosomeType chromosome = entry.getKey();
for (final IAllele allele : entry.getValue()) {
final Gene gene = Gene.create(allele, chromosome, root);
final IGeneItem item = new GeneItem(gene);
final ItemStack stack = new ItemStack(this);
item.writeToItem(stack);
itemList.add(stack);
Gene gene = Gene.create(allele, chromosome, root);
IGeneItem geneItem = new GeneItem(gene);
ItemStack stack = new ItemStack(item);
geneItem.writeToItem(stack);
subItems.add(stack);
}
}
}
}
@Override
public IGene[] getGenes(final ItemStack stack) {
GeneItem geneItem = this.getGeneItem(stack);
public IGene[] getGenes(ItemStack itemStack) {
GeneItem geneItem = this.getGeneItem(itemStack);
Preconditions.checkNotNull(geneItem, "Cannot get genes from itemStack that is not a valid serum.");
return new IGene[]{geneItem.getGene()};
}
@Override
public ISpeciesRoot getSpeciesRoot(final ItemStack stack) {
GeneItem geneItem = this.getGeneItem(stack);
public ISpeciesRoot getSpeciesRoot(ItemStack itemStack) {
GeneItem geneItem = this.getGeneItem(itemStack);
Preconditions.checkNotNull(geneItem, "Cannot get species root from itemStack that is not a valid serum.");
return geneItem.getSpeciesRoot();
}
@Override
public IGene getGene(final ItemStack stack, final int chromosome) {
public IGene getGene(ItemStack stack, int chromosome) {
GeneItem geneItem = this.getGeneItem(stack);
Preconditions.checkNotNull(geneItem, "Cannot get gene from itemStack that is not a valid serum.");
return geneItem.getGene();
@@ -87,23 +81,23 @@ public class ItemSerum extends ItemGene implements IItemSerum {
@Override
@Nullable
public GeneItem getGeneItem(final ItemStack itemStack) {
public GeneItem getGeneItem(ItemStack itemStack) {
return GeneItem.create(itemStack);
}
@Override
public String getItemStackDisplayName(final ItemStack itemstack) {
final GeneItem gene = this.getGeneItem(itemstack);
public String getItemStackDisplayName(ItemStack itemstack) {
GeneItem gene = this.getGeneItem(itemstack);
if (gene != null && gene.getSpeciesRoot() != null) {
BreedingSystem system = Binnie.GENETICS.getSystem(gene.getSpeciesRoot());
return system.getDescriptor() + " " + Binnie.LANGUAGE.localise("genetic.item.gene.serum");
return system.getDescriptor() + " " + Genetics.proxy.localise("item.gene.serum");
} else {
return Binnie.LANGUAGE.localise("genetic.item.gene.corrupted.serum");
return Genetics.proxy.localise("item.gene.corrupted.serum");
}
}
@Override
public ItemStack addGene(final ItemStack stack, final IGene gene) {
public ItemStack addGene(ItemStack stack, IGene gene) {
final IGeneItem geneI = this.getGeneItem(stack);
Preconditions.checkNotNull(geneI, "Cannot add gene to itemStack that is not a valid serum.");
geneI.addGene(gene);
@@ -16,7 +16,6 @@ import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IIndividual;
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 net.minecraft.util.NonNullList;
@@ -24,7 +23,6 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.List;
public class ItemSerumArray extends ItemGene implements IItemSerum {
public ItemSerumArray() {
@@ -32,12 +30,6 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
this.setMaxDamage(16);
}
@SideOnly(Side.CLIENT)
@Override
public void addInformation(final ItemStack itemstack, final EntityPlayer entityPlayer, final List<String> list, final boolean par4) {
super.addInformation(itemstack, entityPlayer, list, par4);
}
@Override
public int getCharges(final ItemStack itemStack) {
return itemStack.getMaxDamage() - itemStack.getItemDamage();
@@ -83,37 +75,29 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
return new GeneArrayItem(itemStack);
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
for (final IIndividual template : root.getIndividualTemplates()) {
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) {
for (IIndividual template : root.getIndividualTemplates()) {
if (template.getGenome().getPrimary().isSecret()) {
continue;
}
final IGeneItem item = new GeneArrayItem();
for (final IChromosomeType type : root.getKaryotype()) {
final IChromosome c = template.getGenome().getChromosomes()[type.ordinal()];
if (c != null) {
final IAllele active = c.getActiveAllele();
item.addGene(new Gene(active, type, root));
IGeneItem geneItem = new GeneArrayItem();
for (IChromosomeType type : root.getKaryotype()) {
IChromosome chromosome = template.getGenome().getChromosomes()[type.ordinal()];
if (chromosome != null) {
IAllele active = chromosome.getActiveAllele();
geneItem.addGene(new Gene(active, type, root));
}
}
final ItemStack array = new ItemStack(this);
item.writeToItem(array);
itemList.add(array);
ItemStack array = new ItemStack(item);
geneItem.writeToItem(array);
subItems.add(array);
}
}
}
// @SideOnly(Side.CLIENT)
// @Override
// public void registerIcons(final IIconRegister register) {
// this.icons[0] = Genetics.proxy.getIcon(register, "machines/genome.glass");
// this.icons[1] = Genetics.proxy.getIcon(register, "machines/genome.cap");
// this.icons[2] = Genetics.proxy.getIcon(register, "machines/genome.edges");
// this.icons[3] = Genetics.proxy.getIcon(register, "machines/genome.dna");
// }
@Override
public String getItemStackDisplayName(final ItemStack itemstack) {
GeneArrayItem geneItem = getGeneItem(itemstack);
@@ -121,10 +105,10 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
ISpeciesRoot speciesRoot = geneItem.getSpeciesRoot();
if (speciesRoot != null) {
BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot);
return system.getDescriptor() + " Serum Array";
return system.getDescriptor() + " " + Genetics.proxy.localise("item.gene.serum.array");
}
}
return "Corrupted Serum Array";
return Genetics.proxy.localise("item.gene.serum.array.corrupted");
}
@Override