Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed gutters not washing dust from other mods

Browse source
This commit is contained in:
Calclavia 2014-03-18 19:39:28 +08:00
parent 1105ffe9ef
commit c2ed03c4cd
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java
View file

@ -25,7 +25,6 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.archaic.fluid.grate.TileGrate; import resonantinduction.archaic.fluid.grate.TileGrate;
import resonantinduction.core.Reference; import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.ResonantInduction.RecipeType;
import resonantinduction.core.fluid.TilePressureNode; import resonantinduction.core.fluid.TilePressureNode;
import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.FluidPressureNode;
@ -182,18 +181,18 @@ public class TileGutter extends TilePressureNode
@Override @Override
public boolean activate(EntityPlayer player, int side, Vector3 vector3) public boolean activate(EntityPlayer player, int side, Vector3 vector3)
{ {
if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == ResonantInduction.itemDust) if (player.getCurrentEquippedItem() != null)
{ {
if (!world().isRemote) /**
* Manually wash dust into refined dust.
*/
ItemStack itemStack = player.getCurrentEquippedItem();
RecipeResource[] outputs = MachineRecipes.INSTANCE.getOutput(RecipeType.MIXER.name(), itemStack);
if (outputs.length > 0)
{ {
/** if (!world().isRemote)
* Manually wash dust into refined dust.
*/
ItemStack itemStack = player.getCurrentEquippedItem();
RecipeResource[] outputs = MachineRecipes.INSTANCE.getOutput(RecipeType.MIXER.name(), itemStack);
if (outputs.length > 0)
{ {
int drainAmount = 50 + world().rand.nextInt(50); int drainAmount = 50 + world().rand.nextInt(50);
FluidStack drain = drain(ForgeDirection.UP, drainAmount, false); FluidStack drain = drain(ForgeDirection.UP, drainAmount, false);
@ -215,11 +214,10 @@ public class TileGutter extends TilePressureNode
drain(ForgeDirection.UP, drainAmount, true); drain(ForgeDirection.UP, drainAmount, true);
world().playSoundEffect(x() + 0.5, y() + 0.5, z() + 0.5, "liquid.water", 0.5f, 1); world().playSoundEffect(x() + 0.5, y() + 0.5, z() + 0.5, "liquid.water", 0.5f, 1);
return true;
} }
}
return true; return true;
}
} }
if (!world().isRemote) if (!world().isRemote)
@ -229,13 +227,11 @@ public class TileGutter extends TilePressureNode
synchronized (node.getGrid().getNodes()) synchronized (node.getGrid().getNodes())
{ {
for (Object check : node.getGrid().getNodes()) for (Object check : node.getGrid().getNodes())
{
if (check instanceof FluidPressureNode) if (check instanceof FluidPressureNode)
{ if (((FluidPressureNode) check).parent instanceof TileGutter)
tanks.add(((FluidPressureNode) check).parent.getPressureTank()); tanks.add(((FluidPressureNode) check).parent.getPressureTank());
}
}
} }
if (FluidUtility.playerActivatedFluidItem(tanks, player, side)) if (FluidUtility.playerActivatedFluidItem(tanks, player, side))
{ {
synchronized (node.getGrid().getNodes()) synchronized (node.getGrid().getNodes())