From 56d1d196f0c008449dea42ca4a3d33f2f81c9498 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 12 Aug 2019 00:41:44 +0300 Subject: [PATCH] Items use energy to do work. Closes #1770 --- src/main/java/techreborn/blocks/misc/BlockRubberLog.java | 4 +++- src/main/java/techreborn/items/armor/ItemCloakingDevice.java | 2 +- src/main/java/techreborn/items/tool/ItemChainsaw.java | 2 +- src/main/java/techreborn/items/tool/ItemDrill.java | 2 +- src/main/java/techreborn/items/tool/ItemJackhammer.java | 2 +- .../java/techreborn/items/tool/advanced/ItemRockCutter.java | 2 +- .../java/techreborn/items/tool/basic/ItemElectricTreetap.java | 2 +- .../items/tool/industrial/ItemIndustrialChainsaw.java | 2 +- .../techreborn/items/tool/industrial/ItemIndustrialDrill.java | 2 +- .../java/techreborn/items/tool/industrial/ItemNanosaber.java | 2 +- .../java/techreborn/items/tool/industrial/ItemOmniTool.java | 4 ++-- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java index c8a4e5ea8..eb310b6bb 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java @@ -119,6 +119,8 @@ public class BlockRubberLog extends LogBlock { if (stack.isEmpty()) { return false; } + + //TODO: Should it be here?? ItemPowerManager capEnergy = null; if (stack.getItem() instanceof ItemElectricTreetap) { capEnergy = new ItemPowerManager(stack); @@ -130,7 +132,7 @@ public class BlockRubberLog extends LogBlock { 0.6F, 1F); if (!worldIn.isClient) { if (capEnergy != null) { - capEnergy.extractEnergy(20, false); + capEnergy.useEnergy(20, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, playerIn); } else { diff --git a/src/main/java/techreborn/items/armor/ItemCloakingDevice.java b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java index 37578f11c..45f65fae2 100644 --- a/src/main/java/techreborn/items/armor/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java @@ -63,7 +63,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo PlayerEntity player = (PlayerEntity) entityIn; ItemPowerManager capEnergy = new ItemPowerManager(stack); if (capEnergy != null && capEnergy.getEnergyStored() >= usage) { - capEnergy.extractEnergy(usage, false); + capEnergy.useEnergy(usage, false); player.setInvisible(true); } else { if (!player.hasStatusEffect(StatusEffects.INVISIBILITY)) { diff --git a/src/main/java/techreborn/items/tool/ItemChainsaw.java b/src/main/java/techreborn/items/tool/ItemChainsaw.java index c9b09fe47..f521f0b8b 100644 --- a/src/main/java/techreborn/items/tool/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tool/ItemChainsaw.java @@ -90,7 +90,7 @@ public class ItemChainsaw extends AxeItem implements IEnergyItemInfo, ItemDurabi if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { ItemPowerManager capEnergy = new ItemPowerManager(stack); - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityLiving); } return true; diff --git a/src/main/java/techreborn/items/tool/ItemDrill.java b/src/main/java/techreborn/items/tool/ItemDrill.java index c4577a1f7..459901316 100644 --- a/src/main/java/techreborn/items/tool/ItemDrill.java +++ b/src/main/java/techreborn/items/tool/ItemDrill.java @@ -75,7 +75,7 @@ public class ItemDrill extends PickaxeItem implements IEnergyItemInfo, ItemDurab if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { ItemPowerManager capEnergy = new ItemPowerManager(stack); - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityLiving); } return true; diff --git a/src/main/java/techreborn/items/tool/ItemJackhammer.java b/src/main/java/techreborn/items/tool/ItemJackhammer.java index df79d9440..92d98285a 100644 --- a/src/main/java/techreborn/items/tool/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tool/ItemJackhammer.java @@ -75,7 +75,7 @@ public class ItemJackhammer extends PickaxeItem implements IEnergyItemInfo, Item if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { ItemPowerManager capEnergy = new ItemPowerManager(stack); - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityLiving); } return true; diff --git a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java index f6d4d0821..eb494b848 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java @@ -83,7 +83,7 @@ public class ItemRockCutter extends PickaxeItem implements IEnergyItemInfo, Item if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { ItemPowerManager capEnergy = new ItemPowerManager(stack); - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityLiving); } return true; diff --git a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java index db5c92bcb..9fbe3c649 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java @@ -60,7 +60,7 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo, ItemDu ItemPowerManager capEnergy = new ItemPowerManager(context.getStack()); if(TechRebornAPI.ic2Helper != null && capEnergy.getEnergyStored() >= cost){ if(TechRebornAPI.ic2Helper.extractSap(context, null) && !context.getWorld().isClient){ - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, context.getPlayer()); return ActionResult.SUCCESS; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java index fa9b12803..421b1e066 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java @@ -200,7 +200,7 @@ public class ItemIndustrialChainsaw extends ItemChainsaw { return; } - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityLiving); blockState.getBlock().afterBreak(world, (PlayerEntity) entityLiving, pos, blockState, world.getBlockEntity(pos), stack); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java index 69d1a874b..deb97bbd4 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java @@ -123,7 +123,7 @@ public class ItemIndustrialDrill extends ItemDrill { ItemPowerManager capEnergy = new ItemPowerManager(drill); if(capEnergy.getEnergyStored() > cost){ - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, playerIn); blockState.getBlock().onBlockRemoved(blockState, world, pos, blockState, true); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java index 1577bf21b..29f4a293d 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java @@ -86,7 +86,7 @@ public class ItemNanosaber extends SwordItem implements IEnergyItemInfo, ItemDur public boolean postHit(ItemStack stack, LivingEntity entityHit, LivingEntity entityHitter) { ItemPowerManager capEnergy = new ItemPowerManager(stack); if (capEnergy.getEnergyStored() >= cost) { - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityHitter); return true; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java index de4249e4e..d35b31489 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java @@ -78,7 +78,7 @@ public class ItemOmniTool extends PickaxeItem implements IEnergyItemInfo, ItemDu public boolean postMine(ItemStack stack, World worldIn, BlockState blockIn, BlockPos pos, LivingEntity entityLiving) { ItemPowerManager capEnergy = new ItemPowerManager(stack); - capEnergy.extractEnergy(cost, false); + capEnergy.useEnergy(cost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityLiving); return true; @@ -109,7 +109,7 @@ public class ItemOmniTool extends PickaxeItem implements IEnergyItemInfo, ItemDu public boolean postHit(ItemStack stack, LivingEntity entityliving, LivingEntity attacker) { ItemPowerManager capEnergy = new ItemPowerManager(stack); if (capEnergy.getEnergyStored() >= hitCost) { - capEnergy.extractEnergy(hitCost, false); + capEnergy.useEnergy(hitCost, false); ExternalPowerSystems.requestEnergyFromArmor(capEnergy, entityliving); entityliving.damage(DamageSource.player((PlayerEntity) attacker), 8F);