From 3258f78bf53da00d907bba3b91c34541edc09d06 Mon Sep 17 00:00:00 2001 From: tcooc Date: Sat, 22 Jun 2013 19:18:51 -0400 Subject: [PATCH] Update to new power logic. --- additionalpipes/pipes/PipePowerTeleport.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/additionalpipes/pipes/PipePowerTeleport.java b/additionalpipes/pipes/PipePowerTeleport.java index bec9940..10e1b73 100644 --- a/additionalpipes/pipes/PipePowerTeleport.java +++ b/additionalpipes/pipes/PipePowerTeleport.java @@ -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 connectedPipes = TeleportManager.instance.getConnectedPipes(this, false); List sendingToList = new LinkedList(); // no connected pipes, leave! if(connectedPipes.size() <= 0 || (logic.state & 0x1) == 0) { - return; + return 0; } for(PipeTeleport pipe : connectedPipes) { @@ -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 needsPower = getPipesNeedsPower(receiver); @@ -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 getPipesNeedsPower(PipeTeleport pipe) {