Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pipes won't connect to a receptor with no provider

Browse source 
And a tweak to powerRequest()
This commit is contained in:
CovertJaguar 2013-06-25 01:29:11 -07:00
parent 1f8c9f78ee
commit 8d1b33b268
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/buildcraft/api/power/PowerProvider.java
View file

@ -130,9 +130,8 @@ public final class PowerProvider {
data.setCompoundTag(tag, nbt);
}
public int powerRequest() {
float needed = maxEnergyStored - energyStored;
return (int) Math.ceil(Math.min(maxEnergyReceived, needed));
public float powerRequest() {
return Math.min(maxEnergyReceived, maxEnergyStored - energyStored);
}
public float receiveEnergy(float quantity, ForgeDirection from) {

2
common/buildcraft/transport/IPipeTransportPowerHook.java
View file

@ -15,5 +15,5 @@ public interface IPipeTransportPowerHook {
public double receiveEnergy(ForgeDirection from, double val);
public void requestEnergy(ForgeDirection from, int i);
public void requestEnergy(ForgeDirection from, float amount);
}

7
common/buildcraft/transport/PipeTransportPower.java
View file

@ -70,9 +70,10 @@ public class PipeTransportPower extends PipeTransport {
Pipe pipe2 = ((TileGenericPipe) tile).pipe;
if (BlockGenericPipe.isValid(pipe2) && !(pipe2.transport instanceof PipeTransportPower))
return false;
return true;
}
return tile instanceof TileGenericPipe || tile instanceof IMachine || tile instanceof IPowerReceptor;
return tile instanceof IPowerReceptor && ((IPowerReceptor)tile).getPowerProvider(side) != null;
}
@Override
@ -180,7 +181,7 @@ public class PipeTransportPower extends PipeTransport {
IPowerReceptor receptor = (IPowerReceptor) tiles[i];
PowerProvider prov = receptor.getPowerProvider(ForgeDirection.VALID_DIRECTIONS[i].getOpposite());
if (prov != null && prov.canAcceptPowerFromPipes) {
int request = prov.powerRequest();
float request = prov.powerRequest();
if (request > 0) {
requestEnergy(ForgeDirection.VALID_DIRECTIONS[i], request);
@ -284,7 +285,7 @@ public class PipeTransportPower extends PipeTransport {
return val;
}
public void requestEnergy(ForgeDirection from, int amount) {
public void requestEnergy(ForgeDirection from, float amount) {
step();
if (this.container.pipe instanceof IPipeTransportPowerHook) {
((IPipeTransportPowerHook) this.container.pipe).requestEnergy(from, amount);