Skip to content

Commit

Permalink
Update to new power logic.
Browse files Browse the repository at this point in the history
  • Loading branch information
tcooc committed Jun 22, 2013
1 parent 7869d27 commit 3258f78
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions additionalpipes/pipes/PipePowerTeleport.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ public void requestEnergy(ForgeDirection from, int is) {
}

@Override
public void receiveEnergy(ForgeDirection from, double val) {
public double receiveEnergy(ForgeDirection from, double energy) {
((PipeTransportPower) transport).step();
List<PipeTeleport> connectedPipes = TeleportManager.instance.getConnectedPipes(this, false);
List<PipeTeleport> sendingToList = new LinkedList<PipeTeleport>();

// no connected pipes, leave!
if(connectedPipes.size() <= 0 || (logic.state & 0x1) == 0) {
return;
return 0;
}

for(PipeTeleport pipe : connectedPipes) {
Expand All @@ -82,11 +82,11 @@ public void receiveEnergy(ForgeDirection from, double val) {

// no pipes need energy, leave!
if(sendingToList.size() <= 0) {
return;
return 0;
}

// TODO proportional power relay
double powerToSend = AdditionalPipes.instance.powerLossCfg * val / sendingToList.size();
double powerToSend = AdditionalPipes.instance.powerLossCfg * energy / sendingToList.size();

for(PipeTeleport receiver : sendingToList) {
List<PowerRequest> needsPower = getPipesNeedsPower(receiver);
Expand All @@ -101,8 +101,8 @@ public void receiveEnergy(ForgeDirection from, double val) {
PipeTransportPower nearbyTransport = (PipeTransportPower) powerEntry.tile.pipe.transport;
nearbyTransport.receiveEnergy(powerEntry.orientation, dividedPowerToSend);
}

}
return energy;
}

private List<PowerRequest> getPipesNeedsPower(PipeTeleport pipe) {
Expand Down

0 comments on commit 3258f78

Please sign in to comment.