diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index ba9bc662c..011b5fdcb 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -34,13 +34,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.utils.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; @@ -51,7 +49,7 @@ import javax.annotation.Nullable; public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { public static final int maxCharge = ConfigTechReborn.LapotronPackCharge; - public double transferLimit = 100_000; + public int transferLimit = 100_000; public ItemLapotronPack() { super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST); @@ -68,11 +66,11 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { return; } ItemStack uncharged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK); - ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(uncharged); - itemList.add(charged); + // itemList.add(charged); } @Override @@ -98,7 +96,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @Override @@ -109,22 +107,17 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; - } - - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return true; - } - - @Override - public double getMaxTransfer(ItemStack stack) { + public int getMaxInput() { return transferLimit; } + + @Override + public int getMaxOutput() { + return transferLimit; + } } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 075c37fb7..9b740beea 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -40,8 +40,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.utils.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; @@ -52,7 +51,7 @@ import javax.annotation.Nullable; public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; - public double transferLimit = 10_000; + public int transferLimit = 10_000; public ItemLithiumBatpack() { super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST); @@ -106,7 +105,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @Override @@ -122,31 +121,26 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { return; } ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); - ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(uncharged); - itemList.add(charged); + // itemList.add(charged); } // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; + public int getMaxInput() { + return transferLimit; } @Override - public boolean canProvideEnergy(ItemStack stack) { - return true; - } - - @Override - public double getMaxTransfer(ItemStack stack) { + public int getMaxOutput() { return transferLimit; } } diff --git a/src/main/java/techreborn/items/battery/ItemBattery.java b/src/main/java/techreborn/items/battery/ItemBattery.java index bba64af81..be302c021 100644 --- a/src/main/java/techreborn/items/battery/ItemBattery.java +++ b/src/main/java/techreborn/items/battery/ItemBattery.java @@ -36,7 +36,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.items.ItemTR; @@ -87,27 +87,22 @@ public class ItemBattery extends ItemTR implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxEnergy; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; + public int getMaxInput() { + return maxTransfer; } @Override - public boolean canProvideEnergy(ItemStack stack) { - return true; - } - - @Override - public double getMaxTransfer(ItemStack stack) { + public int getMaxOutput() { return maxTransfer; } } diff --git a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java index d0e4ed795..bbbfcf09d 100644 --- a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java @@ -48,11 +48,11 @@ public class ItemEnergyCrystal extends ItemBattery { return; } ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java index cc24063d0..c95029ea1 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java @@ -48,11 +48,11 @@ public class ItemLapotronCrystal extends ItemBattery { return; } ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java index 2f8590059..a261bd95f 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java @@ -48,11 +48,11 @@ public class ItemLapotronicOrb extends ItemBattery { return; } ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/battery/ItemLithiumBattery.java b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java index 26f6fea0e..03cc51e43 100644 --- a/src/main/java/techreborn/items/battery/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java @@ -47,12 +47,12 @@ public class ItemLithiumBattery extends ItemBattery { return; } ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + //capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + //itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/battery/ItemReBattery.java b/src/main/java/techreborn/items/battery/ItemReBattery.java index daa546712..57ac0dcf8 100644 --- a/src/main/java/techreborn/items/battery/ItemReBattery.java +++ b/src/main/java/techreborn/items/battery/ItemReBattery.java @@ -28,6 +28,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.powerSystem.forge.ForgePowerItemManager; @@ -47,11 +48,11 @@ public class ItemReBattery extends ItemBattery { return; } ItemStack stack = new ItemStack(ModItems.RE_BATTERY); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + //IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null); + //capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + //itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index 50ae0d16f..4dafd0146 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -37,7 +37,6 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -57,12 +56,12 @@ public class ItemAdvancedChainsaw extends ItemChainsaw { return; } ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 5d298696d..790d66119 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -39,7 +39,6 @@ import net.minecraft.world.World; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -152,11 +151,11 @@ public class ItemAdvancedDrill extends ItemDrill { return; } ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index 9821df6b3..14e1c28d5 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -27,10 +27,8 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -51,11 +49,11 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { return; } ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack charged = stack.copy(); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); +// itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index f18d39efd..c1bd9c7a2 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -43,7 +43,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.utils.TechRebornCreativeTab; @@ -56,7 +56,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { public int cost = 250; public float poweredSpeed = 20F; public float unpoweredSpeed = 2.0F; - public double transferLimit = 100; + public int transferLimit = 100; public boolean isBreaking = false; public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed) { @@ -130,7 +130,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @Override @@ -145,23 +145,18 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; - } - - @Override - public boolean canProvideEnergy(ItemStack stack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { + public int getMaxInput() { return transferLimit; } + @Override + public int getMaxOutput() { + return 0; + } + } diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index 26247a3e0..febdefd04 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -40,8 +40,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.ItemUtils; @@ -60,8 +59,8 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo @ConfigRegistry(config = "items", category = "cloacking_device", key = "ClockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (Value in FE)") public static int usage = 10; - public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge; - public static int Limit = 100; + public static int maxCharge = ConfigTechReborn.CloakingDeviceCharge; + public static int transferLimit = 100; public static boolean isActive; public ItemCloakingDevice() { @@ -98,11 +97,11 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo return; } ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE); - ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(uncharged); - itemList.add(charged); +// itemList.add(charged); } @Override @@ -123,27 +122,22 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { - return MaxCharge; + public int getCapacity() { + return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; + public int getMaxInput() { + return transferLimit; } @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { - return Limit; + public int getMaxOutput() { + return 0; } } diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index 5cc9fce6a..e9fc0ef03 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -51,12 +49,12 @@ public class ItemDiamondChainsaw extends ItemChainsaw { return; } ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 6f251a74e..dffcd74e7 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -51,12 +49,12 @@ public class ItemDiamondDrill extends ItemDrill { return; } ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index d362d64f2..10857cf5e 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -27,10 +27,8 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -50,11 +48,11 @@ public class ItemDiamondJackhammer extends ItemJackhammer { return; } ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack charged = stack.copy(); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); +// itemList.add(charged); } } diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index f6c65d663..82509f78c 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -38,7 +38,7 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.utils.TechRebornCreativeTab; @@ -50,7 +50,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { public int maxCharge = 1; public int cost = 250; public float unpoweredSpeed = 2.0F; - public double transferLimit = 100; + public int transferLimit = 100; public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) { super(material); @@ -115,7 +115,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @Override @@ -125,22 +125,17 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; - } - - @Override - public boolean canProvideEnergy(ItemStack stack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { + public int getMaxInput() { return transferLimit; } + + @Override + public int getMaxOutput() { + return 0; + } } diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index 9ea87ee22..cdd4562dc 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -25,23 +25,15 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModItems; @@ -55,7 +47,6 @@ import javax.annotation.Nullable; public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo { public static final int maxCharge = 10_000; - public static final int tier = 1; public int cost = 20; public ItemElectricTreetap() { @@ -82,7 +73,7 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @SideOnly(Side.CLIENT) @@ -92,32 +83,27 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo { return; } ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP); - ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(uncharged); - itemList.add(charged); +// itemList.add(charged); } // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; - } - - @Override - public boolean canProvideEnergy(ItemStack stack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { + public int getMaxInput() { return 200; } + + @Override + public int getMaxOutput() { + return 0; + } } diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 2c87e1ef7..39e02477f 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -39,7 +39,7 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.OreDictUtils; @@ -51,7 +51,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { public int maxCharge = 1; public int cost = 250; - public double transferLimit = 100; + public int transferLimit = 100; public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) { super(material); @@ -119,7 +119,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @Override @@ -129,22 +129,17 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; - } - - @Override - public boolean canProvideEnergy(ItemStack stack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { + public int getMaxInput() { return transferLimit; } + + @Override + public int getMaxOutput() { + return 0; + } } diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 63f93eb9f..0bab5130a 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -50,8 +50,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; import techreborn.utils.TechRebornCreativeTab; @@ -77,7 +76,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { @SideOnly(Side.CLIENT) public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { if (ItemUtils.isActive(stack)) { - ForgePowerItemManager capEnergy = (ForgePowerItemManager) stack.getCapability(CapabilityEnergy.ENERGY, null); + IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); if (capEnergy.getMaxEnergyStored() - capEnergy.getEnergyStored() >= 0.9 * capEnergy.getMaxEnergyStored()) { return 0.5F; } @@ -189,7 +188,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @SideOnly(Side.CLIENT) @@ -203,21 +202,21 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { inactiveUncharged.setTagCompound(new NBTTagCompound()); inactiveUncharged.getTagCompound().setBoolean("isActive", false); - ItemStack inactiveCharged = new ItemStack(ModItems.NANOSABER); - inactiveCharged.setTagCompound(new NBTTagCompound()); - inactiveCharged.getTagCompound().setBoolean("isActive", false); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) inactiveCharged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack inactiveCharged = new ItemStack(ModItems.NANOSABER); +// inactiveCharged.setTagCompound(new NBTTagCompound()); +// inactiveCharged.getTagCompound().setBoolean("isActive", false); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) inactiveCharged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); - ItemStack activeCharged = new ItemStack(ModItems.NANOSABER); - activeCharged.setTagCompound(new NBTTagCompound()); - activeCharged.getTagCompound().setBoolean("isActive", true); - ForgePowerItemManager capEnergy2 = (ForgePowerItemManager) activeCharged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy2.setEnergyStored(capEnergy2.getMaxEnergyStored()); +// ItemStack activeCharged = new ItemStack(ModItems.NANOSABER); +// activeCharged.setTagCompound(new NBTTagCompound()); +// activeCharged.getTagCompound().setBoolean("isActive", true); +// ForgePowerItemManager capEnergy2 = (ForgePowerItemManager) activeCharged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy2.setEnergyStored(capEnergy2.getMaxEnergyStored()); itemList.add(inactiveUncharged); - itemList.add(inactiveCharged); - itemList.add(activeCharged); +// itemList.add(inactiveCharged); +// itemList.add(activeCharged); } @SideOnly(Side.CLIENT) @@ -232,22 +231,17 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; + public int getMaxInput() { + return 1_000; } @Override - public boolean canProvideEnergy(ItemStack stack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { - return 1000; + public int getMaxOutput() { + return 0; } } diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 78f9e812b..753e90aa0 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -44,8 +44,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import reborncore.common.util.TorchHelper; import techreborn.utils.TechRebornCreativeTab; @@ -151,7 +150,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @SideOnly(Side.CLIENT) @@ -162,32 +161,27 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { return; } ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL); - ItemStack charged = new ItemStack(ModItems.OMNI_TOOL); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack charged = new ItemStack(ModItems.OMNI_TOOL); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(uncharged); - itemList.add(charged); +// itemList.add(charged); } // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; + public int getMaxInput() { + return 1_000; } @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { - return 1000; + public int getMaxOutput() { + return 0; } } diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 83923924d..0cecfde6b 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -43,8 +43,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.powerSystem.PoweredItemContainerProvider; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -131,7 +130,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { @Override @Nullable public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) { - return new PoweredItemContainerProvider(stack); + return new PoweredItemCapabilityProvider(stack); } @Override @@ -147,33 +146,28 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { } ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER); uncharged.addEnchantment(Enchantments.SILK_TOUCH, 1); - ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER); - charged.addEnchantment(Enchantments.SILK_TOUCH, 1); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER); +// charged.addEnchantment(Enchantments.SILK_TOUCH, 1); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(uncharged); - itemList.add(charged); +// itemList.add(charged); } // IEnergyItemInfo @Override - public double getMaxPower(ItemStack stack) { + public int getCapacity() { return maxCharge; } @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; + public int getMaxInput() { + return 1_000; } @Override - public boolean canProvideEnergy(ItemStack stack) { - return false; - } - - @Override - public double getMaxTransfer(ItemStack stack) { - return 1000; + public int getMaxOutput() { + return 0; } } diff --git a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java index d8103aa8c..4155acc3a 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java @@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -51,12 +49,12 @@ public class ItemSteelChainsaw extends ItemChainsaw { return; } ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemSteelDrill.java b/src/main/java/techreborn/items/tools/ItemSteelDrill.java index eacfc195d..f73201195 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelDrill.java +++ b/src/main/java/techreborn/items/tools/ItemSteelDrill.java @@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -51,12 +49,12 @@ public class ItemSteelDrill extends ItemDrill { return; } ItemStack stack = new ItemStack(ModItems.STEEL_DRILL); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + // ItemStack charged = stack.copy(); + // ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); + // capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); + // itemList.add(charged); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index 74b175c21..b8bf06768 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -27,10 +27,8 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -49,11 +47,11 @@ public class ItemSteelJackhammer extends ItemJackhammer { return; } ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER); - ItemStack charged = stack.copy(); - ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); - capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); +// ItemStack charged = stack.copy(); +// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null); +// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); itemList.add(stack); - itemList.add(charged); +// itemList.add(charged); } }