mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 04:32:18 +00:00
#455 incorrect implementation of RF getMaxEnergyStored
This commit is contained in:
1 parent
dcc41c398a
commit
f46d727004
2 files changed
+6
-7
No files matched your search
@@ -383,7 +383,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
|
||||
|
||||
@Override
|
||||
public int getMaxEnergyStored(ForgeDirection from) {
|
||||
return getCapacitor().getMaxEnergyStored();
|
||||
return getCapacitor().getMaxEnergyStored() * 10;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -501,12 +501,12 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep
|
||||
|
||||
@Override
|
||||
public int getEnergyStored(ForgeDirection from) {
|
||||
return getController().doGetEnergyStored(from);
|
||||
return (int) (getController().doGetEnergyStored(from) * 10);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxEnergyStored(ForgeDirection from) {
|
||||
return getController().doGetMaxEnergyStored();
|
||||
return getController().doGetMaxEnergyStored() * 10;
|
||||
}
|
||||
|
||||
public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
|
||||
@@ -518,12 +518,12 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep
|
||||
return result * 10;
|
||||
}
|
||||
|
||||
public int doGetEnergyStored(ForgeDirection from) {
|
||||
return (int) (storedEnergy * 10);
|
||||
public float doGetEnergyStored(ForgeDirection from) {
|
||||
return storedEnergy;
|
||||
}
|
||||
|
||||
public int doGetMaxEnergyStored(ForgeDirection from) {
|
||||
return maxStoredEnergy * 10;
|
||||
return maxStoredEnergy;
|
||||
}
|
||||
|
||||
// end rf power
|
||||
@@ -677,7 +677,6 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep
|
||||
}
|
||||
|
||||
private void updatePowerHandler() {
|
||||
//powerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(maxInput, maxStoredEnergy, maxOutput), this, Type.STORAGE);
|
||||
if(storedEnergy > maxStoredEnergy) {
|
||||
storedEnergy = maxStoredEnergy;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user