mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 05:02:34 +00:00
Clean up some Items
This commit is contained in:
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,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;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user