fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uses storage knowledge to simulate the entry of RF energy, should fix #524 for BC kinesis pipe

Browse Source
This commit is contained in:
thatsIch
2014-12-02 07:47:08 +01:00
parent 00b6335a9e
commit b318041715
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/powersink/RedstoneFlux.java
+12 -12
View File
@@ -26,20 +26,21 @@ import cofh.api.energy.IEnergyHandler;
@Interface(iname = "RF", iface = "cofh.api.energy.IEnergyHandler") @Interface(iname = "RF", iface = "cofh.api.energy.IEnergyHandler")
public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
{ {
@Override @Override
final public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) final public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
{ {
if ( simulate ) if ( simulate )
{ {
double demand = getExternalPowerDemand( PowerUnits.RF, maxReceive ); final int networkEnergyDemand = (int) Math.floor( this.getExternalPowerDemand( PowerUnits.RF, maxReceive ) );
if ( demand > maxReceive ) final int maxEnergyStorage = this.getMaxEnergyStored( from );
return maxReceive; final int currentEnergyStorage = this.getEnergyStored( from );
return (int) Math.floor( maxReceive - demand ); final int energyStorageBalance = maxEnergyStorage - currentEnergyStorage + networkEnergyDemand - maxReceive;
return Math.max( 0, energyStorageBalance );
} }
else else
{ {
int demand = (int) Math.floor( getExternalPowerDemand( PowerUnits.RF, maxReceive ) ); int demand = (int) Math.floor( this.getExternalPowerDemand( PowerUnits.RF, maxReceive ) );
int ignored = 0; int ignored = 0;
int insertAmt = maxReceive; int insertAmt = maxReceive;
@@ -50,9 +51,9 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
insertAmt = demand; insertAmt = demand;
} }
double overFlow = injectExternalPower( PowerUnits.RF, insertAmt ); double overFlow = this.injectExternalPower( PowerUnits.RF, insertAmt );
double ox = Math.floor( overFlow ); double ox = Math.floor( overFlow );
internalCurrentPower += PowerUnits.RF.convertTo( PowerUnits.AE, overFlow - ox ); this.internalCurrentPower += PowerUnits.RF.convertTo( PowerUnits.AE, overFlow - ox );
return maxReceive - ((int) ox + ignored); return maxReceive - ((int) ox + ignored);
} }
} }
@@ -66,19 +67,18 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler
@Override @Override
final public boolean canConnectEnergy(ForgeDirection from) final public boolean canConnectEnergy(ForgeDirection from)
{ {
return getPowerSides().contains( from ); return this.getPowerSides().contains( from );
} }
@Override @Override
final public int getEnergyStored(ForgeDirection from) final public int getEnergyStored(ForgeDirection from)
{ {
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, getAECurrentPower() ) ); return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAECurrentPower() ) );
} }
@Override @Override
final public int getMaxEnergyStored(ForgeDirection from) final public int getMaxEnergyStored(ForgeDirection from)
{ {
return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, getAEMaxPower() ) ); return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAEMaxPower() ) );
} }
} }