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 @@ 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;
}
}