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

Fixed some issues where grates get stuck

Browse source
This commit is contained in:
Calclavia 2014-03-17 18:28:17 +08:00
parent 614fe7622d
commit de95792ce6
2 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
archaic/src/main/java/resonantinduction/archaic/fluid/grate/TileGrate.java
View file

@ -7,6 +7,7 @@ import java.util.PriorityQueue;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
@ -30,9 +31,9 @@ import cpw.mods.fml.relauncher.SideOnly;
public class TileGrate extends TilePressureNode implements IRotatable
{
@Config(comment = "The multiplier for the influence of the grate. Dependent on pressure.")
private static double grateEffectMultiplier = 10;
private static double grateEffectMultiplier = 5;
@Config(comment = "The speed in which the grate drains blocks. Dependent on grate block influence.")
private static double grateDrainSpeedMultiplier = 0.5;
private static double grateDrainSpeedMultiplier = 0.01;
@SideOnly(Side.CLIENT)
private static Icon iconFront, iconSide;
@ -71,6 +72,23 @@ public class TileGrate extends TilePressureNode implements IRotatable
iconSide = iconRegister.registerIcon(Reference.PREFIX + "grate");
}
@Override
protected boolean configure(EntityPlayer player, int side, Vector3 hit)
{
if (!player.isSneaking())
{
if (!world().isRemote)
{
fillOver = !fillOver;
player.addChatMessage("Grate now set to " + (fillOver ? "" : "not ") + "fill higher than itself.");
gratePath = null;
}
return true;
}
return super.configure(player, side, hit);
}
@Override
public void readFromNBT(NBTTagCompound nbt)
{
@ -135,7 +153,7 @@ public class TileGrate extends TilePressureNode implements IRotatable
{
// Drain
int maxDrain = getPressureTank().getCapacity() - getPressureTank().getFluidAmount();
// System.out.println(maxDrain);
if (maxDrain > 0)
{
if (gratePath == null)
@ -309,11 +327,14 @@ public class TileGrate extends TilePressureNode implements IRotatable
return 0;
}
filled += FluidUtility.fillBlock(TileGrate.this.worldObj, next.position, new FluidStack(fluidType, amount), true);
int didFill = FluidUtility.fillBlock(TileGrate.this.worldObj, next.position, new FluidStack(fluidType, amount), true);
filled += didFill;
if (filled > 0)
{
if (FluidUtility.getFluidAmountFromBlock(TileGrate.this.worldObj, next.position) > 0 || didFill > 0)
addNextFill(next);
if (filled >= amount)
{
return filled;
}
}
@ -332,8 +353,8 @@ public class TileGrate extends TilePressureNode implements IRotatable
for (int i = 0; i < 6; i++)
{
Vector3 newPosition = next.position.clone().translate(ForgeDirection.getOrientation(i));
if (!this.navigationMap.containsKey(newPosition))
if (!this.navigationMap.containsKey(newPosition) && !(!fillOver && newPosition.intY() > y()))
{
this.navigationMap.put(newPosition, next.position);
this.workingNodes.add(new ComparableVector(newPosition, next.iterations + 1));

4
mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/EnumPipeMaterial.java
View file

@ -10,8 +10,8 @@ import java.awt.Color;
public enum EnumPipeMaterial
{
CERAMIC(5, 5, new Color(0xB3866F)), BRONZE(25, 25, new Color(0xD49568)),
PLASTIC(50, 30, new Color(0xDAF4F7)), IRON(40, 50, new Color(0x5C6362)),
STEEL(400, 100, new Color(0x888888)), FIBERGLASS(1000, 200, new Color(0x9F9691));
PLASTIC(50, 30, new Color(0xDAF4F7)), IRON(100, 50, new Color(0x5C6362)),
STEEL(1000, 100, new Color(0x888888)), FIBERGLASS(10000, 200, new Color(0x9F9691));
public final int maxPressure;