From 5b5969d61dbdb809c35bf3dcdd930da8cb3910bd Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 28 May 2014 16:39:20 +0800 Subject: [PATCH] #707 Pull mode loosing fluid Fixed output of quite clear glass 'vanilla' recipes. --- .../generator/TileCombustionGenerator.java | 61 +------------------ .../enderio/material/MaterialRecipes.java | 4 +- 2 files changed, 5 insertions(+), 60 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java index 36d987b4..94f361e9 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java @@ -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; diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index d8d24a87..f2d475f6 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -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); }