Final changes to the item power storage

This commit is contained in:
modmuss50 2018-05-23 14:49:14 +01:00
parent 682670ca51
commit 02c708cd21
2 changed files with 5 additions and 5 deletions

View file

@ -37,10 +37,10 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
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 org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.RebornCoreConfig;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import techreborn.Core; import techreborn.Core;
@ -58,8 +58,8 @@ public class StackToolTipEvent {
} else if (event.getItemStack().getItem() instanceof IEnergyItemInfo) { } else if (event.getItemStack().getItem() instanceof IEnergyItemInfo) {
IEnergyStorage capEnergy = event.getItemStack().getCapability(CapabilityEnergy.ENERGY, null); IEnergyStorage capEnergy = event.getItemStack().getCapability(CapabilityEnergy.ENERGY, null);
event.getToolTip().add(1, event.getToolTip().add(1,
TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getEnergyStored()) TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getEnergyStored() / RebornCoreConfig.euPerFU)
+ "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getMaxEnergyStored()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix(capEnergy.getMaxEnergyStored() / RebornCoreConfig.euPerFU)
+ " " + PowerSystem.getDisplayPower().abbreviation); + " " + PowerSystem.getDisplayPower().abbreviation);
if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
int percentage = percentage(capEnergy.getMaxEnergyStored(), capEnergy.getEnergyStored()); int percentage = percentage(capEnergy.getMaxEnergyStored(), capEnergy.getEnergyStored());

View file

@ -74,7 +74,7 @@ public class TileEnergyStorage extends TilePowerAcceptor
if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){ if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){
IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null); IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null);
if(getEnergy() > 0 && energyStorage.getEnergyStored() < energyStorage.getMaxEnergyStored()){ 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){ if(CompatManager.isIC2Loaded){
@ -86,7 +86,7 @@ public class TileEnergyStorage extends TilePowerAcceptor
if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){ if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){
IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null); IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null);
if(getEnergy() != getMaxPower() && energyStorage.getEnergyStored() > 0){ 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){ if(CompatManager.isIC2Loaded){