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

cleanup

Browse source
This commit is contained in:
DarkGuardsman 2013-07-04 02:10:47 -04:00
parent f96560d6a5
commit f231b67db3
4 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,9 +4,6 @@
[submodule "Dark-Library"] [submodule "Dark-Library"]
path = Dark-Library path = Dark-Library
url = git@github.com:DarkGuardsman/Dark-Library.git url = git@github.com:DarkGuardsman/Dark-Library.git
[submodule "Basic-Compoents"]
path = Basic-Compoents
url = git://github.com/calclavia/Basic-Components.git
[submodule "API-Bank"] [submodule "API-Bank"]
path = API-Bank path = API-Bank
url = git://github.com/DarkGuardsman/API-Bank.git url = git://github.com/DarkGuardsman/API-Bank.git

2
Dark-Library

@ -1 +1 @@
Subproject commit fe90843d440be93a48d631278364259797b65cfd Subproject commit ce76d225eefc4a53bc8e3e7c8294dee7281a5fc2

21
src/minecraft/dark/fluid/common/pipes/BlockPipe.java
View file

@ -1,6 +1,5 @@
package dark.fluid.common.pipes; package dark.fluid.common.pipes;
import java.util.List; import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -10,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ILiquidTank;
import universalelectricity.prefab.block.BlockAdvanced; import universalelectricity.prefab.block.BlockAdvanced;
import dark.core.hydraulic.helpers.FluidRestrictionHandler; import dark.core.hydraulic.helpers.FluidRestrictionHandler;
@ -29,6 +29,7 @@ public class BlockPipe extends BlockAdvanced
this.setResistance(3f); this.setResistance(3f);
} }
@Override @Override
public boolean isOpaqueCube() public boolean isOpaqueCube()
{ {
@ -80,7 +81,7 @@ public class BlockPipe extends BlockAdvanced
@Override @Override
public TileEntity createNewTileEntity(World var1) public TileEntity createNewTileEntity(World var1)
{ {
if(this.blockID == FluidMech.blockGenPipe.blockID) if (this.blockID == FluidMech.blockGenPipe.blockID)
{ {
return new TileEntityGenericPipe(); return new TileEntityGenericPipe();
} }
@ -128,4 +129,20 @@ public class BlockPipe extends BlockAdvanced
} }
} }
} }
@Override
public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour)
{
if (this.blockID == FluidMech.blockGenPipe.blockID)
{
int meta = world.getBlockMetadata(x, y, z);
if (meta != colour)
{
world.setBlockMetadataWithNotify(x, y, z, colour, 3);
this.onNeighborBlockChange(world, x, y, z, world.getBlockId(x, y, z));
return true;
}
}
return false;
}
} }

12
src/minecraft/dark/fluid/common/pump/BlockDrain.java
View file

@ -28,6 +28,12 @@ public class BlockDrain extends BlockAdvanced
this.setUnlocalizedName("lmDrain"); this.setUnlocalizedName("lmDrain");
} }
@Override
public TileEntity createNewTileEntity(World var1)
{
return new TileEntityDrain();
}
@Override @Override
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
@ -36,12 +42,6 @@ public class BlockDrain extends BlockAdvanced
this.fillIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "drain2"); this.fillIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "drain2");
} }
@Override
public TileEntity createNewTileEntity(World var1)
{
return new TileEntityDrain();
}
@Override @Override
public Icon getIcon(int par1, int par2) public Icon getIcon(int par1, int par2)
{ {