mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-18 11:29:30 +00:00
#707 Pull mode loosing fluid
Fixed output of quite clear glass 'vanilla' recipes.
This commit is contained in:
1 parent
499cb0bb4d
commit
5b5969d61d
2 files changed
+5
-60
No files matched your search
@@ -49,10 +49,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP
|
||||
|
||||
@Override
|
||||
protected boolean doPull(ForgeDirection dir) {
|
||||
boolean res = super.doPull(dir);
|
||||
// res |= doPull(dir, coolantTank,true);
|
||||
// res |= doPull(dir, fuelTank,false);
|
||||
|
||||
boolean res = super.doPull(dir);
|
||||
BlockCoord loc = getLocation().getLocation(dir);
|
||||
IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc);
|
||||
if(target != null) {
|
||||
@@ -67,8 +64,8 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP
|
||||
if(drained != null && drained.amount > 0) {
|
||||
int filled = fill(dir, drained, false);
|
||||
if(filled > 0) {
|
||||
target.drain(dir.getOpposite(), canPull, true);
|
||||
fill(dir, drained, true);
|
||||
drained = target.drain(dir.getOpposite(), filled, true);
|
||||
fill(dir, drained, true);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -81,58 +78,6 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP
|
||||
return res;
|
||||
}
|
||||
|
||||
private boolean doPull(ForgeDirection dir, FluidTank inputTank, boolean isCoolant) {
|
||||
|
||||
if(isSideDisabled(dir.ordinal())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(inputTank.getFluidAmount() < inputTank.getCapacity()) {
|
||||
BlockCoord loc = getLocation().getLocation(dir);
|
||||
IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc);
|
||||
if(target != null) {
|
||||
|
||||
if(inputTank.getFluidAmount() > 0) {
|
||||
FluidStack canPull = inputTank.getFluid().copy();
|
||||
canPull.amount = inputTank.getCapacity() - inputTank.getFluidAmount();
|
||||
canPull.amount = Math.min(canPull.amount, IO_MB_TICK);
|
||||
FluidStack drained = target.drain(dir.getOpposite(), canPull, true);
|
||||
if(drained != null && drained.amount > 0) {
|
||||
inputTank.fill(drained, true);
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
//empty input tank
|
||||
FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite());
|
||||
for (FluidTankInfo info : infos) {
|
||||
if(info.fluid != null && info.fluid.amount > 0) {
|
||||
FluidStack fluid = info.fluid;
|
||||
|
||||
if(canFill(dir, info.fluid.getFluid())) {
|
||||
if((isCoolant && !IronEngineCoolant.isCoolant(fluid.getFluid()))) {
|
||||
return false;
|
||||
}
|
||||
if(isCoolant && IronEngineFuel.getFuelForFluid(fluid.getFluid()) == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
FluidStack canPull = info.fluid.copy();
|
||||
canPull.amount = Math.min(IO_MB_TICK, canPull.amount);
|
||||
FluidStack drained = target.drain(dir.getOpposite(), canPull, true);
|
||||
if(drained != null && drained.amount > 0) {
|
||||
inputTank.fill(drained, true);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsMode(ForgeDirection faceHit, IoMode mode) {
|
||||
return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL;
|
||||
|
||||
@@ -39,9 +39,9 @@ public class MaterialRecipes {
|
||||
OreDictionary.registerOre("glassHardened", new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()));
|
||||
|
||||
//Glass stuff for compatability
|
||||
GameRegistry.addShapedRecipe(new ItemStack(Blocks.glass_pane), " ", "eee", "eee", 'e', pureGlass);
|
||||
GameRegistry.addShapedRecipe(new ItemStack(Blocks.glass_pane,16,0), " ", "eee", "eee", 'e', pureGlass);
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.glass), pureGlass);
|
||||
GameRegistry.addShapedRecipe(new ItemStack(Items.glass_bottle), " ", "g g", " g ", 'g', pureGlass);
|
||||
GameRegistry.addShapedRecipe(new ItemStack(Items.glass_bottle,3,0), " ", "g g", " g ", 'g', pureGlass);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user