Updated powered items to match RC changes

This commit is contained in:
drcrazy 2018-07-19 18:30:47 +03:00
parent 712136914a
commit 523d0284b7
25 changed files with 188 additions and 274 deletions

View file

@ -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;
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}