Final changes to the item power storage
This commit is contained in:
parent
682670ca51
commit
02c708cd21
2 changed files with 5 additions and 5 deletions
|
@ -37,10 +37,10 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
|
|||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import reborncore.api.IListInfoProvider;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import techreborn.Core;
|
||||
|
||||
|
@ -58,8 +58,8 @@ public class StackToolTipEvent {
|
|||
} else if (event.getItemStack().getItem() instanceof IEnergyItemInfo) {
|
||||
IEnergyStorage capEnergy = event.getItemStack().getCapability(CapabilityEnergy.ENERGY, null);
|
||||
event.getToolTip().add(1,
|
||||
TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getEnergyStored())
|
||||
+ "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getMaxEnergyStored())
|
||||
TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getEnergyStored() / RebornCoreConfig.euPerFU)
|
||||
+ "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getMaxEnergyStored() / RebornCoreConfig.euPerFU)
|
||||
+ " " + PowerSystem.getDisplayPower().abbreviation);
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
|
||||
int percentage = percentage(capEnergy.getMaxEnergyStored(), capEnergy.getEnergyStored());
|
||||
|
|
|
@ -74,7 +74,7 @@ public class TileEnergyStorage extends TilePowerAcceptor
|
|||
if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){
|
||||
IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
if(getEnergy() > 0 && energyStorage.getEnergyStored() < energyStorage.getMaxEnergyStored()){
|
||||
energyStorage.receiveEnergy((int) useEnergy(getMaxOutput() / RebornCoreConfig.euPerFU), false);
|
||||
energyStorage.receiveEnergy((int) useEnergy(getMaxOutput() / RebornCoreConfig.euPerFU) * RebornCoreConfig.euPerFU, false);
|
||||
}
|
||||
}
|
||||
if(CompatManager.isIC2Loaded){
|
||||
|
@ -86,7 +86,7 @@ public class TileEnergyStorage extends TilePowerAcceptor
|
|||
if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){
|
||||
IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
if(getEnergy() != getMaxPower() && energyStorage.getEnergyStored() > 0){
|
||||
addEnergy(energyStorage.extractEnergy((int) (getMaxInput() * RebornCoreConfig.euPerFU), false));
|
||||
addEnergy(energyStorage.extractEnergy((int) (getMaxInput() * RebornCoreConfig.euPerFU), false) / RebornCoreConfig.euPerFU);
|
||||
}
|
||||
}
|
||||
if(CompatManager.isIC2Loaded){
|
||||
|
|
Loading…
Reference in a new issue