Large improvement to power system, fixes #204

This commit is contained in:
modmuss50 2015-10-25 09:58:57 +00:00
parent 3f47e89f85
commit cf34fe1f1f
10 changed files with 128 additions and 97 deletions

View file

@ -41,23 +41,6 @@ public class ItemLithiumBatpack extends PoweredArmor {
return "techreborn:" + "textures/models/lithiumbatpack.png";
}
@SuppressWarnings(
{"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this && ElectricItem.manager != null) {
ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true,
false);
itemList.add(charged);
}
if (getEmptyItem(itemStack) == this) {
itemList.add(new ItemStack(this, 1, getMaxDamage()));
}
}
@Override
public double getMaxPower(ItemStack stack) {
return maxCharge;

View file

@ -72,26 +72,6 @@ public class ItemCloakingDevice extends PoweredItem {
return Teir;
}
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) {
ItemStack charged = new ItemStack(this, 1);
setEnergy(MaxCharge, charged);
itemList.add(charged);
}
if (getEmptyItem(itemStack) == this) {
itemList.add(new ItemStack(this, 1, getMaxDamage()));
}
}
@Override
public double getDurabilityForDisplay(ItemStack stack) {
double charge = (getEnergy(stack) / getMaxCharge(stack));
return 1 - charge;
}
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
ItemStack itemstack1 = player.getCurrentArmor(3);

View file

@ -42,22 +42,6 @@ public class ItemOmniTool extends PoweredPickaxe{
this.itemIcon = iconRegister.registerIcon("techreborn:" + "tool/omnitool");
}
@SuppressWarnings(
{"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) {
ItemStack charged = new ItemStack(this, 1);
setEnergy(maxCharge, charged);
itemList.add(charged);
}
if (getEmptyItem(itemStack) == this) {
itemList.add(new ItemStack(this, 1, getMaxDamage()));
}
}
@Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block,
int par4, int par5, int par6, EntityLivingBase entityLiving) {

View file

@ -51,22 +51,6 @@ public class ItemRockCutter extends PoweredPickaxe {
}
}
@SuppressWarnings(
{"rawtypes", "unchecked"})
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this) {
ItemStack charged = new ItemStack(this, 1);
setEnergy(maxCharge, charged);
itemList.add(charged);
}
if (getEmptyItem(itemStack) == this) {
itemList.add(new ItemStack(this, 1, getMaxDamage()));
}
}
@Override
public boolean canHarvestBlock(Block block, ItemStack stack) {
if(Items.diamond_pickaxe.canHarvestBlock(block, stack)) {