From 14deee0df78e30c34996298d1d307bbe1cec340f Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 22 Mar 2017 16:21:29 +0100 Subject: [PATCH] Clean up some Items --- src/main/java/binnie/core/item/ItemCore.java | 1 + .../extratrees/item/ItemArboristDatabase.java | 66 ++++++++------- .../binnie/extratrees/item/ItemETFood.java | 25 +++--- .../binnie/extratrees/item/ItemHammer.java | 25 +++--- .../extratrees/item/ItemMothDatabase.java | 42 +++++----- .../genetics/genetics/GeneArrayItem.java | 3 +- .../binnie/genetics/item/ItemDatabase.java | 26 ++++-- .../java/binnie/genetics/item/ItemGene.java | 82 +++++++++---------- .../binnie/genetics/item/ItemSequence.java | 39 ++++----- .../java/binnie/genetics/item/ItemSerum.java | 52 ++++++------ .../binnie/genetics/item/ItemSerumArray.java | 46 ++++------- .../assets/extratrees/lang/en_US.lang | 8 ++ .../resources/assets/genetics/lang/en_US.lang | 23 ++++-- 13 files changed, 222 insertions(+), 216 deletions(-) diff --git a/src/main/java/binnie/core/item/ItemCore.java b/src/main/java/binnie/core/item/ItemCore.java index 575f3ae6..3faffdab 100644 --- a/src/main/java/binnie/core/item/ItemCore.java +++ b/src/main/java/binnie/core/item/ItemCore.java @@ -10,6 +10,7 @@ public class ItemCore extends Item implements IItemModelRegister { public ItemCore(String registryName) { setRegistryName(registryName); + setUnlocalizedName(registryName); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index fb028bc2..3ad88c1a 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -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 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 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 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 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 subItems) { + super.getSubItems(item, tab, subItems); + subItems.add(new ItemStack(item, 1, 1)); + } + + @Override + public ActionResult 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; } } diff --git a/src/main/java/binnie/extratrees/item/ItemETFood.java b/src/main/java/binnie/extratrees/item/ItemETFood.java index 0fca2fd0..749c95a2 100644 --- a/src/main/java/binnie/extratrees/item/ItemETFood.java +++ b/src/main/java/binnie/extratrees/item/ItemETFood.java @@ -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 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 tooltip, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List 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; } } diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 55355a69..a13b696e 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -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); } } diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 3c26c76a..3fe69d59 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -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 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 par3List) { - super.getSubItems(par1, par2CreativeTabs, par3List); - par3List.add(new ItemStack(par1, 1, 1)); + public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + super.getSubItems(item, tab, subItems); + subItems.add(new ItemStack(item, 1, 1)); } @Override - public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) { - final ItemStack itemStack = playerIn.getHeldItem(handIn); + public ActionResult 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; } } diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index f115bd97..535a0d50 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -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")); } } diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index e7fc4eb1..d2330721 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -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 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 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; } } diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 9101c388..5f4a7720 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -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 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 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 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 itemList) { - } - - @Nullable - public abstract IGeneItem getGeneItem(final ItemStack itemStack); } diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index f786a815..457204fe 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -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 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 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(""); + 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 itemList) { + public void getSubItems(Item item, CreativeTabs tab, NonNullList 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 diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 3a135f88..7f28cc58 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -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 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 itemList) { - for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - final Map> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root); - for (final Map.Entry> entry : chromosomeMap.entrySet()) { - final IChromosomeType chromosome = entry.getKey(); + public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + for (ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { + Map> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root); + for (Map.Entry> 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); diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 513635d2..310b58dc 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -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 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 itemList) { - for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - for (final IIndividual template : root.getIndividualTemplates()) { + public void getSubItems(Item item, CreativeTabs tab, NonNullList 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 diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/src/main/resources/assets/extratrees/lang/en_US.lang index d23771d3..35b7bb30 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/src/main/resources/assets/extratrees/lang/en_US.lang @@ -341,6 +341,14 @@ extratrees.species.candlenut.name=Candlenut extratrees.species.dwarfhazel.name=Dwarf Hazel +extratrees.item.database.arborist.name=Arborist Database +extratrees.item.database.arborist.master.tooltip=Sengir-in-a-can +extratrees.item.database.arborist.master.name=Master Arborist Database +extratrees.item.database.lepi.name=Lepidopterist Database +extratrees.item.database.lepi.master.tooltip=Binnie's Emporium of Lepidopterans +extratrees.item.database.lepi.master.name=Master Lepidopterist Database +extratrees.item.hammer.name=Carpentry Hammer +extratrees.item.hammer.master.name=Master Carpentry Hammer extratrees.item.food.apple=Apple extratrees.item.food.crabapple=Crabapple diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 6dab9b9d..33a8f154 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -99,15 +99,20 @@ genetics.gui.analyst.products.centrifuges=Centrifuges to give genetics.gui.analyst.products.squeezes=Squeezes to give genetics.gui.analyst.products.every=Every -genetic.item.gene.empty=Empty -genetic.item.gene.charge=Charge -genetic.item.gene.charges=Charges -genetic.item.gene.serum=Serum -genetic.item.gene.serum.corrupted=Corrupted Serum -genetic.item.gene.more.genes=more genes. Hold shift to display. +genetics.item.gene.empty=Empty +genetics.item.gene.charge=Charge +genetics.item.gene.charges=Charges +genetics.item.gene.serum=Serum +genetics.item.gene.serum.corrupted=Corrupted Serum +genetics.item.gene.serum.array=Serum Array +genetics.item.gene.serum.array.corrupted=Corrupted Serum Array +genetics.item.gene.more.genes=more genes. Hold shift to display. +genetics.item.database.name=Gene Database +genetics.item.database.master.name=Master Gene Database -genetics.item.sequence=DNA Sequence +genetics.item.sequence.corrupted.name=Corrupted Sequence +genetics.item.sequence.name=DNA Sequence genetics.item.sequence.0=Very Faint genetics.item.sequence.1=Faint @@ -115,6 +120,10 @@ genetics.item.sequence.2=Weak genetics.item.sequence.3=Average genetics.item.sequence.4=Strong genetics.item.sequence.5=Very Strong +genetics.item.sequence.unknown=Unknown +genetics.item.sequence.unsequenced=Unsequenced +genetics.item.sequence.partially=Partially Sequenced (%s%) +genetics.item.sequence.sequenced=Fully Sequenced bee.modifier.format.max=%.2fx (Max: %.2fx) bee.modifier.format.min=%.2fx (Min: %.2fx)