tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fluidic Plenisher now detects block updates directly below it, and will replace the block if necessary. Will also no longer replace other source blocks.

Browse source
This commit is contained in:
Aidan C. Brady 2014-08-05 21:27:10 -04:00
parent 9652b7adf6
commit 7a67fbf7ca
1 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
View file

@ -17,6 +17,7 @@ import mekanism.common.util.ChargeUtils;
import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.PipeUtils; import mekanism.common.util.PipeUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -126,11 +127,28 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
} }
} }
if(getEnergy() >= Mekanism.fluidicPlenisherUsage && worldObj.getWorldTime() % 10 == 0 && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME && !finishedCalc) if(getEnergy() >= Mekanism.fluidicPlenisherUsage && worldObj.getWorldTime() % 10 == 0 && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME)
{ {
if(fluidTank.getFluid().getFluid().canBePlacedInWorld()) if(fluidTank.getFluid().getFluid().canBePlacedInWorld())
{ {
doPlenish(); if(!finishedCalc)
{
doPlenish();
}
else {
Coord4D below = Coord4D.get(this).getFromSide(ForgeDirection.DOWN);
if(canReplace(below, false) && getEnergy() >= Mekanism.fluidicPlenisherUsage && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME)
{
if(fluidTank.getFluid().getFluid().canBePlacedInWorld())
{
worldObj.setBlock(below.xCoord, below.yCoord, below.zCoord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()), 0, 3);
setEnergy(getEnergy() - Mekanism.fluidicPlenisherUsage);
fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true);
}
}
}
} }
} }
} }
@ -150,7 +168,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
{ {
Coord4D below = Coord4D.get(this).getFromSide(ForgeDirection.DOWN); Coord4D below = Coord4D.get(this).getFromSide(ForgeDirection.DOWN);
if(!canReplace(below)) if(!canReplace(below, true))
{ {
finishedCalc = true; finishedCalc = true;
return; return;
@ -168,7 +186,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
for(Coord4D coord : activeNodes) for(Coord4D coord : activeNodes)
{ {
if(coord.exists(worldObj) && canReplace(coord)) if(coord.exists(worldObj) && canReplace(coord, true))
{ {
worldObj.setBlock(coord.xCoord, coord.yCoord, coord.zCoord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()), 0, 3); worldObj.setBlock(coord.xCoord, coord.yCoord, coord.zCoord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()), 0, 3);
@ -179,7 +197,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
{ {
Coord4D sideCoord = coord.getFromSide(dir); Coord4D sideCoord = coord.getFromSide(dir);
if(coord.exists(worldObj) && canReplace(coord)) if(coord.exists(worldObj) && canReplace(coord, true))
{ {
activeNodes.add(sideCoord); activeNodes.add(sideCoord);
} }
@ -205,9 +223,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
return yCoord-1; return yCoord-1;
} }
public boolean canReplace(Coord4D coord) public boolean canReplace(Coord4D coord, boolean checkNodes)
{ {
if(usedNodes.contains(coord)) if(checkNodes && usedNodes.contains(coord))
{ {
return false; return false;
} }
@ -217,6 +235,11 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
return true; return true;
} }
if(MekanismUtils.isFluid(worldObj, coord.xCoord, coord.yCoord, coord.zCoord))
{
return false;
}
return coord.getBlock(worldObj).isReplaceable(worldObj, coord.xCoord, coord.yCoord, coord.zCoord); return coord.getBlock(worldObj).isReplaceable(worldObj, coord.xCoord, coord.yCoord, coord.zCoord);
} }
@ -400,7 +423,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
@Override @Override
public FluidTankInfo[] getTankInfo(ForgeDirection direction) public FluidTankInfo[] getTankInfo(ForgeDirection direction)
{ {
if(direction == ForgeDirection.getOrientation(1)) if(direction == ForgeDirection.UP)
{ {
return new FluidTankInfo[] {fluidTank.getInfo()}; return new FluidTankInfo[] {fluidTank.getInfo()};
} }