tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed pipe connecting through covers

Browse source
This commit is contained in:
Calclavia 2014-03-17 20:48:07 +08:00
parent dc7474704f
commit 3e8345485d
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/EnumPipeMaterial.java
View file

@ -11,7 +11,7 @@ public enum EnumPipeMaterial
{
CERAMIC(5, 5, new Color(0xB3866F)), BRONZE(25, 25, new Color(0xD49568)),
PLASTIC(50, 30, new Color(0xDAF4F7)), IRON(100, 50, new Color(0x5C6362)),
STEEL(1000, 100, new Color(0x888888)), FIBERGLASS(10000, 200, new Color(0x9F9691));
STEEL(100, 100, new Color(0x888888)), FIBERGLASS(1000, 200, new Color(0x9F9691));
public final int maxPressure;

4
mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
View file

@ -75,7 +75,7 @@ public class PartPipe extends PartFramedNode<EnumPipeMaterial, FluidPressureNode
}
}
else
else if (canConnect(dir, tile))
{
currentConnections = WorldUtility.setEnableSide(currentConnections, dir, true);
connections.put(tile, dir);
@ -114,7 +114,7 @@ public class PartPipe extends PartFramedNode<EnumPipeMaterial, FluidPressureNode
}
}
return super.canConnect(from, source);
return super.canConnect(from, source) || source instanceof IFluidHandler;
}
return false;

2
mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/RenderPipe.java
View file

@ -43,7 +43,7 @@ public class RenderPipe implements ISimpleItemRenderer
if (fluid != null && fluid.amount > 0)
{
double filledPercentage = (double) fluid.amount / (double) capacity;
double filledPercentage = Math.min((double) fluid.amount / (double) capacity, 1);
double renderPercentage = fluid.getFluid().isGaseous() ? 1 : filledPercentage;
int[] displayList = FluidRenderUtility.getFluidDisplayLists(fluid, part.world(), false);

2
mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
View file

@ -46,7 +46,7 @@ public class TilePump extends TileMechanical implements IPressureNodeProvider, I
@Override
public int getMaxFlowRate()
{
return (int) Math.abs(mechanicalNode.getAngularVelocity() * 20);
return (int) Math.abs(mechanicalNode.getAngularVelocity() * 1000);
}
@Override