Updated powered items to match RC changes
This commit is contained in:
parent
712136914a
commit
523d0284b7
25 changed files with 188 additions and 274 deletions
|
@ -34,13 +34,11 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
|
@ -51,7 +49,7 @@ import javax.annotation.Nullable;
|
||||||
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
||||||
|
|
||||||
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;
|
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;
|
||||||
public double transferLimit = 100_000;
|
public int transferLimit = 100_000;
|
||||||
|
|
||||||
public ItemLapotronPack() {
|
public ItemLapotronPack() {
|
||||||
super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST);
|
super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST);
|
||||||
|
@ -68,11 +66,11 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack uncharged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK);
|
ItemStack uncharged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK);
|
||||||
ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK);
|
// ItemStack charged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK);
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
itemList.add(uncharged);
|
itemList.add(uncharged);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -98,7 +96,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -109,22 +107,17 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ItemStack itemStack) {
|
public int getMaxOutput() {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return transferLimit;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
|
@ -52,7 +51,7 @@ import javax.annotation.Nullable;
|
||||||
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
||||||
|
|
||||||
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
|
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
|
||||||
public double transferLimit = 10_000;
|
public int transferLimit = 10_000;
|
||||||
|
|
||||||
public ItemLithiumBatpack() {
|
public ItemLithiumBatpack() {
|
||||||
super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST);
|
super(ItemArmor.ArmorMaterial.DIAMOND, 7, EntityEquipmentSlot.CHEST);
|
||||||
|
@ -106,7 +105,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -122,31 +121,26 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
||||||
ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
// ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
itemList.add(uncharged);
|
itemList.add(uncharged);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
public int getMaxOutput() {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return transferLimit;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.items.ItemTR;
|
import techreborn.items.ItemTR;
|
||||||
|
|
||||||
|
@ -87,27 +87,22 @@ public class ItemBattery extends ItemTR implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxEnergy;
|
return maxEnergy;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
return maxTransfer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
public int getMaxOutput() {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return maxTransfer;
|
return maxTransfer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,11 +48,11 @@ public class ItemEnergyCrystal extends ItemBattery {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL);
|
ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,11 +48,11 @@ public class ItemLapotronCrystal extends ItemBattery {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL);
|
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,11 +48,11 @@ public class ItemLapotronicOrb extends ItemBattery {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB);
|
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,12 +47,12 @@ public class ItemLithiumBattery extends ItemBattery {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY);
|
ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
//itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
import net.minecraftforge.energy.CapabilityEnergy;
|
||||||
|
import net.minecraftforge.energy.IEnergyStorage;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
||||||
|
@ -47,11 +48,11 @@ public class ItemReBattery extends ItemBattery {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.RE_BATTERY);
|
ItemStack stack = new ItemStack(ModItems.RE_BATTERY);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
//IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
//itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,6 @@ import net.minecraftforge.energy.CapabilityEnergy;
|
||||||
import net.minecraftforge.energy.IEnergyStorage;
|
import net.minecraftforge.energy.IEnergyStorage;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -57,12 +56,12 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW);
|
ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -39,7 +39,6 @@ import net.minecraft.world.World;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
import net.minecraftforge.energy.CapabilityEnergy;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -152,11 +151,11 @@ public class ItemAdvancedDrill extends ItemDrill {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL);
|
ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,10 +27,8 @@ package techreborn.items.tools;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -51,11 +49,11 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER);
|
ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
|
||||||
public int cost = 250;
|
public int cost = 250;
|
||||||
public float poweredSpeed = 20F;
|
public float poweredSpeed = 20F;
|
||||||
public float unpoweredSpeed = 2.0F;
|
public float unpoweredSpeed = 2.0F;
|
||||||
public double transferLimit = 100;
|
public int transferLimit = 100;
|
||||||
public boolean isBreaking = false;
|
public boolean isBreaking = false;
|
||||||
|
|
||||||
public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed) {
|
public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed) {
|
||||||
|
@ -130,7 +130,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -145,23 +145,18 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return transferLimit;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxOutput() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegistry;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import reborncore.common.util.ItemUtils;
|
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)")
|
@ConfigRegistry(config = "items", category = "cloacking_device", key = "ClockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (Value in FE)")
|
||||||
public static int usage = 10;
|
public static int usage = 10;
|
||||||
|
|
||||||
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
|
public static int maxCharge = ConfigTechReborn.CloakingDeviceCharge;
|
||||||
public static int Limit = 100;
|
public static int transferLimit = 100;
|
||||||
public static boolean isActive;
|
public static boolean isActive;
|
||||||
|
|
||||||
public ItemCloakingDevice() {
|
public ItemCloakingDevice() {
|
||||||
|
@ -98,11 +97,11 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
||||||
ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
// ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
itemList.add(uncharged);
|
itemList.add(uncharged);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -123,27 +122,22 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return MaxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ItemStack itemStack) {
|
public int getMaxOutput() {
|
||||||
return false;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return Limit;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -51,12 +49,12 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW);
|
ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -51,12 +49,12 @@ public class ItemDiamondDrill extends ItemDrill {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL);
|
ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -27,10 +27,8 @@ package techreborn.items.tools;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -50,11 +48,11 @@ public class ItemDiamondJackhammer extends ItemJackhammer {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER);
|
ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
import net.minecraftforge.energy.CapabilityEnergy;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
public int maxCharge = 1;
|
public int maxCharge = 1;
|
||||||
public int cost = 250;
|
public int cost = 250;
|
||||||
public float unpoweredSpeed = 2.0F;
|
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) {
|
public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) {
|
||||||
super(material);
|
super(material);
|
||||||
|
@ -115,7 +115,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -125,22 +125,17 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return transferLimit;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxOutput() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,23 +25,15 @@
|
||||||
package techreborn.items.tools;
|
package techreborn.items.tools;
|
||||||
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
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.NonNullList;
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
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.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
@ -55,7 +47,6 @@ import javax.annotation.Nullable;
|
||||||
public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
|
public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
|
||||||
|
|
||||||
public static final int maxCharge = 10_000;
|
public static final int maxCharge = 10_000;
|
||||||
public static final int tier = 1;
|
|
||||||
public int cost = 20;
|
public int cost = 20;
|
||||||
|
|
||||||
public ItemElectricTreetap() {
|
public ItemElectricTreetap() {
|
||||||
|
@ -82,7 +73,7 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
|
@ -92,32 +83,27 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
|
ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
|
||||||
ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
|
// ItemStack charged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(uncharged);
|
itemList.add(uncharged);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return 200;
|
return 200;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxOutput() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
import net.minecraftforge.energy.CapabilityEnergy;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.utils.OreDictUtils;
|
import techreborn.utils.OreDictUtils;
|
||||||
|
@ -51,7 +51,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
|
|
||||||
public int maxCharge = 1;
|
public int maxCharge = 1;
|
||||||
public int cost = 250;
|
public int cost = 250;
|
||||||
public double transferLimit = 100;
|
public int transferLimit = 100;
|
||||||
|
|
||||||
public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) {
|
public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) {
|
||||||
super(material);
|
super(material);
|
||||||
|
@ -119,7 +119,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -129,22 +129,17 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return transferLimit;
|
return transferLimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxOutput() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,8 +50,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import reborncore.common.util.ChatUtils;
|
import reborncore.common.util.ChatUtils;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
@ -77,7 +76,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
|
public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
|
||||||
if (ItemUtils.isActive(stack)) {
|
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()) {
|
if (capEnergy.getMaxEnergyStored() - capEnergy.getEnergyStored() >= 0.9 * capEnergy.getMaxEnergyStored()) {
|
||||||
return 0.5F;
|
return 0.5F;
|
||||||
}
|
}
|
||||||
|
@ -189,7 +188,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
|
@ -203,21 +202,21 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
||||||
inactiveUncharged.setTagCompound(new NBTTagCompound());
|
inactiveUncharged.setTagCompound(new NBTTagCompound());
|
||||||
inactiveUncharged.getTagCompound().setBoolean("isActive", false);
|
inactiveUncharged.getTagCompound().setBoolean("isActive", false);
|
||||||
|
|
||||||
ItemStack inactiveCharged = new ItemStack(ModItems.NANOSABER);
|
// ItemStack inactiveCharged = new ItemStack(ModItems.NANOSABER);
|
||||||
inactiveCharged.setTagCompound(new NBTTagCompound());
|
// inactiveCharged.setTagCompound(new NBTTagCompound());
|
||||||
inactiveCharged.getTagCompound().setBoolean("isActive", false);
|
// inactiveCharged.getTagCompound().setBoolean("isActive", false);
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) inactiveCharged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) inactiveCharged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
ItemStack activeCharged = new ItemStack(ModItems.NANOSABER);
|
// ItemStack activeCharged = new ItemStack(ModItems.NANOSABER);
|
||||||
activeCharged.setTagCompound(new NBTTagCompound());
|
// activeCharged.setTagCompound(new NBTTagCompound());
|
||||||
activeCharged.getTagCompound().setBoolean("isActive", true);
|
// activeCharged.getTagCompound().setBoolean("isActive", true);
|
||||||
ForgePowerItemManager capEnergy2 = (ForgePowerItemManager) activeCharged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy2 = (ForgePowerItemManager) activeCharged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy2.setEnergyStored(capEnergy2.getMaxEnergyStored());
|
// capEnergy2.setEnergyStored(capEnergy2.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(inactiveUncharged);
|
itemList.add(inactiveUncharged);
|
||||||
itemList.add(inactiveCharged);
|
// itemList.add(inactiveCharged);
|
||||||
itemList.add(activeCharged);
|
// itemList.add(activeCharged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
|
@ -232,22 +231,17 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
return 1_000;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
public int getMaxOutput() {
|
||||||
return false;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return 1000;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,8 +44,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import reborncore.common.util.TorchHelper;
|
import reborncore.common.util.TorchHelper;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
@ -151,7 +150,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
|
@ -162,32 +161,27 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL);
|
ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL);
|
||||||
ItemStack charged = new ItemStack(ModItems.OMNI_TOOL);
|
// ItemStack charged = new ItemStack(ModItems.OMNI_TOOL);
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(uncharged);
|
itemList.add(uncharged);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
return 1_000;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ItemStack itemStack) {
|
public int getMaxOutput() {
|
||||||
return false;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return 1000;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,8 +43,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.PoweredItemContainerProvider;
|
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
@ -131,7 +130,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||||
return new PoweredItemContainerProvider(stack);
|
return new PoweredItemCapabilityProvider(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -147,33 +146,28 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
||||||
}
|
}
|
||||||
ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER);
|
ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||||
uncharged.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
uncharged.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||||
ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER);
|
// ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||||
charged.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
// charged.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(uncharged);
|
itemList.add(uncharged);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
// IEnergyItemInfo
|
// IEnergyItemInfo
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower(ItemStack stack) {
|
public int getCapacity() {
|
||||||
return maxCharge;
|
return maxCharge;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ItemStack stack) {
|
public int getMaxInput() {
|
||||||
return true;
|
return 1_000;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ItemStack stack) {
|
public int getMaxOutput() {
|
||||||
return false;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getMaxTransfer(ItemStack stack) {
|
|
||||||
return 1000;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -51,12 +49,12 @@ public class ItemSteelChainsaw extends ItemChainsaw {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW);
|
ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -29,10 +29,8 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -51,12 +49,12 @@ public class ItemSteelDrill extends ItemDrill {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.STEEL_DRILL);
|
ItemStack stack = new ItemStack(ModItems.STEEL_DRILL);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -27,10 +27,8 @@ package techreborn.items.tools;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.NonNullList;
|
import net.minecraft.util.NonNullList;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.common.powerSystem.forge.ForgePowerItemManager;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
|
|
||||||
|
@ -49,11 +47,11 @@ public class ItemSteelJackhammer extends ItemJackhammer {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER);
|
ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER);
|
||||||
ItemStack charged = stack.copy();
|
// ItemStack charged = stack.copy();
|
||||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||||
|
|
||||||
itemList.add(stack);
|
itemList.add(stack);
|
||||||
itemList.add(charged);
|
// itemList.add(charged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue