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

Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction

Browse source
This commit is contained in:
Calclavia 2014-02-18 21:12:12 +08:00
commit 3bdef52169
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java
View file

@ -57,7 +57,6 @@ public class BlockChannel extends BlockFluidNetwork
{
return FluidUtility.playerActivatedFluidItem(world, x, y, z, entityplayer, side);
}
return super.onMachineActivated(world, x, y, z, entityplayer, side, hitX, hitY, hitZ);
}

8
archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java
View file

@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import resonantinduction.api.mechanical.fluid.IFluidConnector;
@ -19,6 +20,11 @@ import calclavia.lib.utility.WrenchUtility;
public class TileChannel extends TileFluidNetwork implements IBlockActivate, IFluidPipe
{
private boolean isExtracting = false;
public TileChannel()
{
this.getInternalTank().setCapacity(1 * FluidContainerRegistry.BUCKET_VOLUME);
}
@Override
public void updateEntity()
@ -67,7 +73,7 @@ public class TileChannel extends TileFluidNetwork implements IBlockActivate, IFl
{
if (tileEntity instanceof TileChannel)
{
getNetwork().merge(((IFluidConnector) tileEntity).getNetwork());
getNetwork().merge(((TileChannel) tileEntity).getNetwork());
this.setRenderSide(side, true);
connectedBlocks[side.ordinal()] = tileEntity;
}

2
src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java
View file

@ -38,7 +38,7 @@ public abstract class FluidNetwork extends NodeNetwork<IFluidNetwork, IFluidConn
@Override
public void update()
{
//TODO change to distribute fluid
}
@Override