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

fixed an issue with the pump filling network

Browse source 
not sure the cause but its fixed now. Also fixed a NPE with some debug
code but that is not important.
This commit is contained in:
Rseifert 2013-03-30 03:08:18 -04:00
parent 6b72ce462b
commit 8b4bdfb276
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java
View file

@ -174,7 +174,7 @@ public class TileEntityMinorPump extends TileEntityElectricityRunnable implement
LiquidData resource = LiquidHandler.getFromBlockAndMetadata(blockID, meta); LiquidData resource = LiquidHandler.getFromBlockAndMetadata(blockID, meta);
if (color.isValidLiquid(resource.getStack()) && meta == 0 && getFillTarget().fill(pipeConnection, resource.getStack(), false) != 0) if (color.isValidLiquid(resource.getStack()) && meta == 0)
{ {
LiquidStack stack = resource.getStack(); LiquidStack stack = resource.getStack();

16
src/minecraft/hydraulic/core/liquidNetwork/HydraulicNetwork.java
View file

@ -241,7 +241,7 @@ public class HydraulicNetwork
public int addFluidToNetwork(TileEntity source, LiquidStack stack, double pressure, boolean doFill) public int addFluidToNetwork(TileEntity source, LiquidStack stack, double pressure, boolean doFill)
{ {
int used = 0; int used = 0;
LiquidStack prevCombined = this.combinedStorage.getLiquid();
if (!this.processingRequest && stack != null && color.isValidLiquid(stack)) if (!this.processingRequest && stack != null && color.isValidLiquid(stack))
{ {
if (this.combinedStorage.getLiquid() != null && !stack.isLiquidEqual(this.combinedStorage.getLiquid())) if (this.combinedStorage.getLiquid() != null && !stack.isLiquidEqual(this.combinedStorage.getLiquid()))
@ -314,19 +314,18 @@ public class HydraulicNetwork
boolean filledMain = false; boolean filledMain = false;
if (primaryFill != null) if (primaryFill != null)
{ {
System.out.println("Primary Target");
used = primaryFill.fill(fillDir, stack, doFill); used = primaryFill.fill(fillDir, stack, doFill);
System.out.println("Primary Target " + used);
} }
else if (secondayFill != null) else if (secondayFill != null)
{ {
System.out.println("Seconday Target");
used = secondayFill.fill(fillDir, stack, doFill); used = secondayFill.fill(fillDir, stack, doFill);
System.out.println("Seconday Target " + used);
} }
else if (this.combinedStorage.getLiquid() == null || this.combinedStorage.getLiquid().amount < this.combinedStorage.getCapacity()) else if (this.combinedStorage.getLiquid() == null || this.combinedStorage.getLiquid().amount < this.combinedStorage.getCapacity())
{ {
used = this.combinedStorage.fill(stack, doFill); used = this.combinedStorage.fill(stack, doFill);
System.out.println("Network Target filled for " + used); System.out.println("Network Target filled for " + used);
this.moveAndSumVolume(false);
filledMain = true; filledMain = true;
} }
/* IF THE COMBINED STORAGE OF THE PIPES HAS LIQUID MOVE IT FIRST */ /* IF THE COMBINED STORAGE OF THE PIPES HAS LIQUID MOVE IT FIRST */
@ -345,8 +344,12 @@ public class HydraulicNetwork
used = Math.min(used, Math.max(used - this.combinedStorage.getLiquid().amount, 0)); used = Math.min(used, Math.max(used - this.combinedStorage.getLiquid().amount, 0));
drainStack = this.combinedStorage.drain(pUsed - used, doFill); drainStack = this.combinedStorage.drain(pUsed - used, doFill);
} }
System.out.println("Pulling " + drainStack.amount + " from combined leaving " + this.combinedStorage.getLiquid().amount);
}
if (prevCombined != null && this.combinedStorage.getLiquid() != null && prevCombined.amount != this.combinedStorage.getLiquid().amount)
{
this.moveAndSumVolume(false); this.moveAndSumVolume(false);
System.out.println("Pulling " + stack.amount + " from combined");
} }
} }
this.processingRequest = false; this.processingRequest = false;
@ -615,7 +618,8 @@ public class HydraulicNetwork
} }
this.combinedStorage.setLiquid(new LiquidStack(itemID, volume, itemMeta)); this.combinedStorage.setLiquid(new LiquidStack(itemID, volume, itemMeta));
} }
if (this.combinedStorage.getLiquid() != null)
if (this.combinedStorage.getLiquid() != null && this.fluidParts.size() > 0)
{ {
volume = this.combinedStorage.getLiquid().amount / this.fluidParts.size(); volume = this.combinedStorage.getLiquid().amount / this.fluidParts.size();
itemID = this.combinedStorage.getLiquid().itemID; itemID = this.combinedStorage.getLiquid().itemID;