From 63b3b0836ffb4431b6778596bbb23ce35a2b7473 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 28 Apr 2018 11:53:59 +0100 Subject: [PATCH] Fix #1497 --- .../techreborn/tiles/storage/TileEnergyStorage.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index d99bb08d7..9c43b3894 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -73,22 +73,13 @@ public class TileEnergyStorage extends TilePowerAcceptor super.update(); if (!inventory.getStackInSlot(0).isEmpty()) { ItemStack stack = inventory.getStackInSlot(0); - if (stack.getItem() instanceof IEnergyItemInfo) { - IEnergyItemInfo item = (IEnergyItemInfo) inventory.getStackInSlot(0).getItem(); - if (PoweredItem.getEnergy(stack) != PoweredItem.getMaxPower(stack)) { - if (canUseEnergy(item.getMaxTransfer(stack))) { - useEnergy(item.getMaxTransfer(stack)); - PoweredItem.setEnergy(PoweredItem.getEnergy(stack) + item.getMaxTransfer(stack), stack); - } - } - } if(CompatManager.isIC2Loaded){ IC2ItemCharger.chargeIc2Item(this, stack); } if(stack.hasCapability(CapabilityEnergy.ENERGY, null)){ IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY, null); - int max = Math.min(maxInput, (int) getEnergy()) * RebornCoreConfig.euPerFU; - useEnergy(energyStorage.receiveEnergy(max, false) / RebornCoreConfig.euPerFU); + int max = Math.min(maxOutput, (int) getEnergy()) * RebornCoreConfig.euPerFU; + useEnergy(energyStorage.receiveEnergy(max, false) * RebornCoreConfig.euPerFU); } } if (!inventory.getStackInSlot(1).isEmpty()) {