Most of the stuff uses the new item power net now

This commit is contained in:
Modmuss50 2015-10-14 21:37:21 +01:00
parent 531315e55f
commit 9d824e76ca
9 changed files with 333 additions and 188 deletions

View file

@ -2,18 +2,14 @@ package techreborn.items;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.powerSystem.PoweredItem;
import java.util.List;
public class ItemLapotronicOrb extends Item implements IElectricItem {
public class ItemLapotronicOrb extends PoweredItem {
public static final int maxCharge = ConfigTechReborn.LapotronicOrbMaxCharge;
public static final int tier = ConfigTechReborn.LithiumBatpackTier;
@ -33,50 +29,29 @@ public class ItemLapotronicOrb extends Item implements IElectricItem {
this.itemIcon = iconRegister.registerIcon("techreborn:" + "lapotronicEnergyOrb");
}
@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 boolean canProvideEnergy(ItemStack itemStack) {
return true;
}
@Override
public Item getChargedItem(ItemStack itemStack) {
return this;
}
@Override
public Item getEmptyItem(ItemStack itemStack) {
return this;
}
@Override
public double getMaxCharge(ItemStack itemStack) {
public double getMaxPower(ItemStack stack) {
return maxCharge;
}
@Override
public int getTier(ItemStack itemStack) {
return tier;
public boolean canAcceptEnergy(ItemStack stack) {
return true;
}
@Override
public double getTransferLimit(ItemStack itemStack) {
public boolean canProvideEnergy(ItemStack stack) {
return true;
}
@Override
public double getMaxTransfer(ItemStack stack) {
return transferLimit;
}
@Override
public int getStackTeir(ItemStack stack) {
return tier;
}
}

View file

@ -12,10 +12,11 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.powerSystem.PoweredArmor;
import java.util.List;
public class ItemLapotronPack extends ItemArmor implements IElectricItem {
public class ItemLapotronPack extends PoweredArmor {
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;
public static final int tier = ConfigTechReborn.LapotronPackTier;
@ -40,19 +41,14 @@ public class ItemLapotronPack extends ItemArmor implements IElectricItem {
return "techreborn:" + "textures/models/lapotronpack.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;
}
@Override
public boolean canAcceptEnergy(ItemStack stack) {
return true;
}
@Override
@ -61,28 +57,14 @@ public class ItemLapotronPack extends ItemArmor implements IElectricItem {
}
@Override
public Item getChargedItem(ItemStack itemStack) {
return this;
}
@Override
public Item getEmptyItem(ItemStack itemStack) {
return this;
}
@Override
public double getMaxCharge(ItemStack itemStack) {
return maxCharge;
}
@Override
public int getTier(ItemStack itemStack) {
return tier;
}
@Override
public double getTransferLimit(ItemStack itemStack) {
public double getMaxTransfer(ItemStack stack) {
return transferLimit;
}
@Override
public int getStackTeir(ItemStack stack) {
return tier;
}
}

View file

@ -12,10 +12,11 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.powerSystem.PoweredArmor;
import java.util.List;
public class ItemLithiumBatpack extends ItemArmor implements IElectricItem {
public class ItemLithiumBatpack extends PoweredArmor {
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
public static final int tier = ConfigTechReborn.LithiumBatpackTier;
@ -56,34 +57,29 @@ public class ItemLithiumBatpack extends ItemArmor implements IElectricItem {
}
}
@Override
public boolean canProvideEnergy(ItemStack itemStack) {
return true;
}
@Override
public Item getChargedItem(ItemStack itemStack) {
return this;
}
@Override
public Item getEmptyItem(ItemStack itemStack) {
return this;
}
@Override
public double getMaxCharge(ItemStack itemStack) {
public double getMaxPower(ItemStack stack) {
return maxCharge;
}
@Override
public int getTier(ItemStack itemStack) {
return tier;
public boolean canAcceptEnergy(ItemStack stack) {
return true;
}
@Override
public double getTransferLimit(ItemStack itemStack) {
public boolean canProvideEnergy(ItemStack stack) {
return true;
}
@Override
public double getMaxTransfer(ItemStack stack) {
return transferLimit;
}
@Override
public int getStackTeir(ItemStack stack) {
return tier;
}
}

View file

@ -16,11 +16,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.powerSystem.PoweredPickaxe;
import techreborn.util.TorchHelper;
import java.util.List;
public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem {
public class ItemAdvancedDrill extends PoweredPickaxe {
public static final int maxCharge = ConfigTechReborn.AdvancedDrillCharge;
public int cost = 250;
@ -43,21 +44,6 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem {
+ "tool/advancedDrill");
}
@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 boolean onBlockDestroyed(ItemStack stack, World world, Block block,
int par4, int par5, int par6, EntityLivingBase entityLiving) {
@ -99,33 +85,29 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem {
return false;
}
@Override
public boolean canProvideEnergy(ItemStack itemStack) {
return false;
}
@Override
public double getMaxCharge(ItemStack itemStack) {
public double getMaxPower(ItemStack stack) {
return maxCharge;
}
@Override
public int getTier(ItemStack itemStack) {
return tier;
public boolean canAcceptEnergy(ItemStack stack) {
return true;
}
@Override
public double getTransferLimit(ItemStack itemStack) {
public boolean canProvideEnergy(ItemStack stack) {
return false;
}
@Override
public double getMaxTransfer(ItemStack stack) {
return transferLimit;
}
@Override
public Item getChargedItem(ItemStack itemStack) {
return this;
}
@Override
public Item getEmptyItem(ItemStack itemStack) {
return this;
public int getStackTeir(ItemStack stack) {
return tier;
}
}

View file

@ -2,8 +2,6 @@ package techreborn.items.tools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -17,11 +15,12 @@ import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.powerSystem.PoweredPickaxe;
import techreborn.util.TorchHelper;
import java.util.List;
public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
public class ItemOmniTool extends PoweredPickaxe{
public static final int maxCharge = ConfigTechReborn.OmniToolCharge;
public static final int tier = ConfigTechReborn.OmniToolTier;
@ -49,10 +48,9 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this && ElectricItem.manager != null) {
if (getChargedItem(itemStack) == this) {
ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true,
false);
setEnergy(maxCharge, charged);
itemList.add(charged);
}
if (getEmptyItem(itemStack) == this) {
@ -63,8 +61,7 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
@Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block,
int par4, int par5, int par6, EntityLivingBase entityLiving) {
ElectricItem.manager.use(stack, cost, entityLiving);
useEnergy(cost, stack);
return true;
}
@ -80,7 +77,8 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
@Override
public float getDigSpeed(ItemStack stack, Block block, int meta) {
if (!ElectricItem.manager.canUse(stack, cost)) {
if (canUseEnergy(cost, stack)) {
useEnergy(cost, stack);
return 5.0F;
}
@ -97,7 +95,8 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
@Override
public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) {
if (ElectricItem.manager.use(itemstack, hitCost, attacker)) {
if (canUseEnergy(hitCost, itemstack)) {
useEnergy(hitCost, itemstack);
entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 8F);
}
return false;
@ -114,14 +113,16 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
return false;
}
@Override
public Item getChargedItem(ItemStack itemStack) {
return this;
public double getMaxPower(ItemStack stack) {
return maxCharge;
}
@Override
public Item getEmptyItem(ItemStack itemStack) {
return this;
public boolean canAcceptEnergy(ItemStack stack) {
return true;
}
@Override
@ -130,18 +131,13 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem {
}
@Override
public double getMaxCharge(ItemStack itemStack) {
return maxCharge;
}
@Override
public int getTier(ItemStack itemStack) {
return 2;
}
@Override
public double getTransferLimit(ItemStack itemStack) {
public double getMaxTransfer(ItemStack stack) {
return 200;
}
@Override
public int getStackTeir(ItemStack stack) {
return 2;
}
}

View file

@ -2,8 +2,6 @@ package techreborn.items.tools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -11,16 +9,16 @@ import net.minecraft.enchantment.Enchantment;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.powerSystem.PoweredPickaxe;
import techreborn.util.Color;
import java.util.List;
public class ItemRockCutter extends ItemPickaxe implements IElectricItem {
public class ItemRockCutter extends PoweredPickaxe {
public static final int maxCharge = ConfigTechReborn.RockCutterCharge;
public int cost = 500;
@ -58,10 +56,9 @@ public class ItemRockCutter extends ItemPickaxe implements IElectricItem {
@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) {
if (getChargedItem(itemStack) == this) {
ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true,
false);
setEnergy(maxCharge, charged);
itemList.add(charged);
}
@ -72,7 +69,13 @@ public class ItemRockCutter extends ItemPickaxe implements IElectricItem {
@Override
public boolean canHarvestBlock(Block block, ItemStack stack) {
return Items.diamond_pickaxe.canHarvestBlock(block, stack);
if(Items.diamond_pickaxe.canHarvestBlock(block, stack)) {
if (canUseEnergy(cost, stack)) {
useEnergy(cost, stack);
return true;
}
}
return false;
}
@Override
@ -100,34 +103,29 @@ public class ItemRockCutter extends ItemPickaxe implements IElectricItem {
par1ItemStack.addEnchantment(Enchantment.silkTouch, 1);
}
@Override
public boolean canProvideEnergy(ItemStack itemStack) {
return false;
}
@Override
public Item getChargedItem(ItemStack itemStack) {
return this;
}
@Override
public Item getEmptyItem(ItemStack itemStack) {
return this;
}
@Override
public double getMaxCharge(ItemStack itemStack) {
public double getMaxPower(ItemStack stack) {
return maxCharge;
}
@Override
public int getTier(ItemStack itemStack) {
return tier;
public boolean canAcceptEnergy(ItemStack stack) {
return true;
}
@Override
public double getTransferLimit(ItemStack itemStack) {
return 300;
public boolean canProvideEnergy(ItemStack stack) {
return false;
}
@Override
public double getMaxTransfer(ItemStack stack) {
return 200;
}
@Override
public int getStackTeir(ItemStack stack) {
return 2;
}
}