diff --git a/src/main/java/techreborn/blockentity/ChargeOMatBlockEntity.java b/src/main/java/techreborn/blockentity/ChargeOMatBlockEntity.java index fca703aaa..9d3cb7e95 100644 --- a/src/main/java/techreborn/blockentity/ChargeOMatBlockEntity.java +++ b/src/main/java/techreborn/blockentity/ChargeOMatBlockEntity.java @@ -32,9 +32,9 @@ import reborncore.api.blockentity.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; +import team.reborn.energy.Energy; import techreborn.config.TechRebornConfig; import techreborn.init.TRContent; import techreborn.init.TRBlockEntities; @@ -59,8 +59,13 @@ public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity for (int i = 0; i < 6; i++) { ItemStack stack = inventory.getInvStack(i); - if (!stack.isEmpty()) { - ExternalPowerSystems.chargeItem(this, stack); + if (Energy.valid(stack)) { + Energy.of(this) + .into( + Energy + .of(stack) + ) + .move(); } } } diff --git a/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java b/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java index 82edcf1a8..2ffe98efb 100644 --- a/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java @@ -31,9 +31,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; +import team.reborn.energy.Energy; import team.reborn.energy.EnergyTier; import techreborn.blocks.storage.BlockEnergyStorage; @@ -72,8 +72,13 @@ public class EnergyStorageBlockEntity extends PowerAcceptorBlockEntity if (!inventory.getInvStack(0).isEmpty()) { ItemStack stack = inventory.getInvStack(0); - if (ExternalPowerSystems.isPoweredItem(stack)) { - ExternalPowerSystems.chargeItem(this, stack); + if (Energy.valid(stack)) { + Energy.of(this) + .into( + Energy + .of(stack) + ) + .move(); } } if (!inventory.getInvStack(1).isEmpty()) { diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java index 9cf5afabe..f99d6b231 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java @@ -42,7 +42,6 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.util.WorldUtils; import team.reborn.energy.Energy; import techreborn.events.TRRecipeHandler; @@ -127,7 +126,6 @@ public class BlockRubberLog extends LogBlock { if (!worldIn.isClient) { if (Energy.valid(stack)) { Energy.of(stack).use(20); - ExternalPowerSystems.requestEnergyFromArmor(stack, playerIn); } else { playerIn.getStackInHand(Hand.MAIN_HAND).damage(1, playerIn, playerEntity -> {}); } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java index 405a04661..f5b91747c 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java @@ -35,10 +35,10 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.DefaultedList; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; +import team.reborn.energy.Energy; import team.reborn.energy.EnergyHolder; import team.reborn.energy.EnergyTier; import techreborn.TechReborn; @@ -62,9 +62,18 @@ public class ItemLithiumIonBatpack extends ArmorItem implements EnergyHolder, It return; } + if(!Energy.valid(itemStack)){ + return; + } + for (int i = 0; i < player.inventory.getInvSize(); i++) { - if (!player.inventory.getInvStack(i).isEmpty()) { - ExternalPowerSystems.chargeItem(itemStack, player.inventory.getInvStack(i)); + if (Energy.valid(player.inventory.getInvStack(i))) { + Energy.of(itemStack) + .into( + Energy + .of(player.inventory.getInvStack(i)) + ) + .move(); } } } diff --git a/src/main/java/techreborn/items/tool/ItemChainsaw.java b/src/main/java/techreborn/items/tool/ItemChainsaw.java index 94a1e007e..0d751ef27 100644 --- a/src/main/java/techreborn/items/tool/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tool/ItemChainsaw.java @@ -35,7 +35,6 @@ import net.minecraft.item.*; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; @@ -91,7 +90,6 @@ public class ItemChainsaw extends AxeItem implements EnergyHolder, ItemDurabilit Random rand = new Random(); if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { Energy.of(stack).use(cost); - ExternalPowerSystems.requestEnergyFromArmor(stack, entityLiving); } return true; } diff --git a/src/main/java/techreborn/items/tool/ItemDrill.java b/src/main/java/techreborn/items/tool/ItemDrill.java index 706a30140..66ed08fe1 100644 --- a/src/main/java/techreborn/items/tool/ItemDrill.java +++ b/src/main/java/techreborn/items/tool/ItemDrill.java @@ -31,7 +31,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.item.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; @@ -76,7 +75,6 @@ public class ItemDrill extends PickaxeItem implements EnergyHolder, ItemDurabili Random rand = new Random(); if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { Energy.of(stack).use(cost); - ExternalPowerSystems.requestEnergyFromArmor(stack, entityLiving); } return true; } diff --git a/src/main/java/techreborn/items/tool/ItemJackhammer.java b/src/main/java/techreborn/items/tool/ItemJackhammer.java index b948a28c2..d816cdf2b 100644 --- a/src/main/java/techreborn/items/tool/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tool/ItemJackhammer.java @@ -35,7 +35,6 @@ import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterials; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; @@ -74,7 +73,6 @@ public class ItemJackhammer extends PickaxeItem implements EnergyHolder, ItemDur Random rand = new Random(); if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { Energy.of(stack).use(cost); - ExternalPowerSystems.requestEnergyFromArmor(stack, 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 f2666f79a..e499efee5 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java @@ -35,7 +35,6 @@ import net.minecraft.item.*; import net.minecraft.util.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; @@ -84,7 +83,6 @@ public class ItemRockCutter extends PickaxeItem implements EnergyHolder, ItemDur Random rand = new Random(); if (rand.nextInt(EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack) + 1) == 0) { Energy.of(stack).use(cost); - ExternalPowerSystems.requestEnergyFromArmor(stack, entityLiving); } return true; } diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java index 9058618b7..f26ff16b6 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java @@ -44,7 +44,6 @@ import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; import team.reborn.energy.Energy; @@ -187,8 +186,6 @@ public class ItemIndustrialChainsaw extends ItemChainsaw { return; } - ExternalPowerSystems.requestEnergyFromArmor(stack, entityLiving); - blockState.getBlock().afterBreak(world, (PlayerEntity) entityLiving, pos, blockState, world.getBlockEntity(pos), stack); world.setBlockState(pos, Blocks.AIR.getDefaultState()); world.removeBlockEntity(pos); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java index 692e0065a..6a0a8b37a 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java @@ -47,7 +47,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; import team.reborn.energy.Energy; @@ -122,8 +121,6 @@ public class ItemIndustrialDrill extends ItemDrill { BlockState blockState = world.getBlockState(pos); if(Energy.of(drill).use(cost)){ - ExternalPowerSystems.requestEnergyFromArmor(drill, playerIn); - blockState.getBlock().onBlockRemoved(blockState, world, pos, blockState, true); blockState.getBlock().afterBreak(world, playerIn, pos, blockState, world.getBlockEntity(pos), drill); world.setBlockState(pos, Blocks.AIR.getDefaultState()); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java index f65b29b0b..01eb1c214 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java @@ -42,7 +42,6 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.*; import net.minecraft.world.World; import reborncore.api.items.ItemStackModifiers; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemDurabilityExtensions; @@ -90,9 +89,7 @@ public class ItemNanosaber extends SwordItem implements EnergyHolder, ItemDurabi // ItemSword @Override public boolean postHit(ItemStack stack, LivingEntity entityHit, LivingEntity entityHitter) { - boolean used = Energy.of(stack).use(cost); - ExternalPowerSystems.requestEnergyFromArmor(stack, entityHitter); - return used; + return Energy.of(stack).use(cost); } @Override diff --git a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java index 7cc7ba414..683b553b1 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java @@ -39,7 +39,6 @@ import net.minecraft.util.DefaultedList; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ItemDurabilityExtensions; import reborncore.common.util.ItemUtils; @@ -80,7 +79,6 @@ public class ItemOmniTool extends PickaxeItem implements EnergyHolder, ItemDurab @Override public boolean postMine(ItemStack stack, World worldIn, BlockState blockIn, BlockPos pos, LivingEntity entityLiving) { Energy.of(stack).use(cost); - ExternalPowerSystems.requestEnergyFromArmor(stack, entityLiving); return true; } @@ -110,7 +108,6 @@ public class ItemOmniTool extends PickaxeItem implements EnergyHolder, ItemDurab if(Energy.of(stack).use(hitCost)) { entityliving.damage(DamageSource.player((PlayerEntity) attacker), 8F); } - ExternalPowerSystems.requestEnergyFromArmor(stack, entityliving); return false; }