worked on new pipes
Just need to add renders too the new pipes and change the textures off the old ones. I might also need to do some testing since i changed a few methods.
This commit is contained in:
parent
3684f3300f
commit
57d3fc6cce
6 changed files with 42 additions and 25 deletions
|
@ -3,4 +3,4 @@ dir.mcp=${dir.development}forge/mcp
|
|||
version.minecraft=1.5+
|
||||
version.mod.major=0
|
||||
version.mod.minor=4
|
||||
version.mod.revis=0
|
||||
version.mod.revis=3
|
||||
|
|
|
@ -15,7 +15,7 @@ tile.lmPipe.0.name =Black Pipe
|
|||
tile.lmPipe.1.name =Red Pipe
|
||||
tile.lmPipe.2.name =Green Pipe
|
||||
tile.lmPipe.3.name =Brown Pipe
|
||||
tile.lmPipe.4.name =Water Pipe
|
||||
tile.lmPipe.4.name =Blue Pipe
|
||||
tile.lmPipe.5.name =Purple Pipe
|
||||
tile.lmPipe.6.name =Cyan Pipe
|
||||
tile.lmPipe.7.name =Silver Pipe
|
||||
|
@ -26,7 +26,7 @@ tile.lmPipe.11.name =Yellow Pipe
|
|||
tile.lmPipe.12.name =LightBlue Pipe
|
||||
tile.lmPipe.13.name =White Pipe
|
||||
tile.lmPipe.14.name =Orange Pipe
|
||||
tile.lmPipe.15.name =Generic Pipe
|
||||
tile.lmPipe.15.name =Iron Pipe
|
||||
|
||||
tile.rpipe.0.name =Oil Pipe
|
||||
tile.rpipe.1.name =Lava Pipe
|
||||
|
@ -42,8 +42,8 @@ tile.rpipe.10.name =L Pipe
|
|||
tile.rpipe.11.name =Fuel Pipe
|
||||
tile.rpipe.12.name =LB Pipe
|
||||
tile.rpipe.13.name =Milk Pipe
|
||||
tile.rpipe.14.name =Steam Pipe
|
||||
tile.rpipe.15.name =Generic Pipe
|
||||
tile.rpipe.14.name =Bronze Pipe
|
||||
tile.rpipe.15.name =Stone Pipe
|
||||
|
||||
tile.lmTank.0.name =Oil Tank
|
||||
tile.lmTank.1.name =Lava Tank
|
||||
|
|
|
@ -164,7 +164,7 @@ public class FluidMech extends DummyModContainer
|
|||
CONFIGURATION.load();
|
||||
|
||||
/* BLOCK DECLARATION -- CONFIG LOADER */
|
||||
blockPipe = new BlockPipe(this.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
|
||||
blockGenPipe = new BlockPipe(this.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
|
||||
blockMachine = new BlockPumpMachine(this.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt());
|
||||
blockRod = new BlockRod(this.CONFIGURATION.getBlock("Mechanical Rod", BLOCK_ID_PREFIX + 3).getInt());
|
||||
blockGenerator = new BlockGenerator((this.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt()));
|
||||
|
@ -174,7 +174,7 @@ public class FluidMech extends DummyModContainer
|
|||
blockSink = new BlockSink(this.CONFIGURATION.getBlock("Sink", BLOCK_ID_PREFIX + 8).getInt());
|
||||
blockDrain = new BlockDrain(this.CONFIGURATION.getBlock("Drain", BLOCK_ID_PREFIX + 9).getInt());
|
||||
blockConPump = new BlockConstructionPump(this.CONFIGURATION.getBlock("ConstructionPump", BLOCK_ID_PREFIX + 10).getInt());
|
||||
blockGenPipe = new BlockPipe(this.CONFIGURATION.getBlock("GeneralPipes", BLOCK_ID_PREFIX+11).getInt());
|
||||
blockPipe = new BlockPipe(this.CONFIGURATION.getBlock("RestrictedPipes", BLOCK_ID_PREFIX + 11).getInt());
|
||||
|
||||
/* ITEM DECLARATION -- COFNGI LOADER */
|
||||
itemParts = new ItemParts(this.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt());
|
||||
|
@ -186,7 +186,7 @@ public class FluidMech extends DummyModContainer
|
|||
|
||||
/* BLOCK REGISTER CALLS */
|
||||
GameRegistry.registerBlock(blockPipe, ItemBlockPipe.class, "lmPipe");
|
||||
GameRegistry.registerBlock(blockPipe, ItemBlockPipe.class, "lmGenPipe");
|
||||
GameRegistry.registerBlock(blockGenPipe, ItemBlockPipe.class, "lmGenPipe");
|
||||
GameRegistry.registerBlock(blockReleaseValve, ItemBlockReleaseValve.class, "eValve");
|
||||
GameRegistry.registerBlock(blockRod, "mechRod");
|
||||
GameRegistry.registerBlock(blockGenerator, "lmGen");
|
||||
|
@ -279,7 +279,7 @@ public class FluidMech extends DummyModContainer
|
|||
// obby tube
|
||||
GameRegistry.addRecipe(new ItemStack(itemParts, 4, Parts.Obby.ordinal()), new Object[] { "@@@", '@', Block.obsidian });
|
||||
// nether tube
|
||||
GameRegistry.addRecipe(new ItemStack(itemParts, 4, Parts.Nether.ordinal()), new Object[] { "N@N", 'N', Block.netherrack, '@', new ItemStack(itemParts, 2, Parts.Obby.ordinal()) });
|
||||
GameRegistry.addRecipe(new ItemStack(itemParts, 4, Parts.Nether.ordinal()), new Object[] { "NNN", 'N', Block.netherrack });
|
||||
// seal
|
||||
GameRegistry.addRecipe(new ItemStack(itemParts, 4, Parts.Seal.ordinal()), new Object[] { "@@", "@@", '@', Item.leather });
|
||||
// slime steal
|
||||
|
@ -293,20 +293,28 @@ public class FluidMech extends DummyModContainer
|
|||
GameRegistry.addRecipe(new ItemStack(blockRod, 1), new Object[] { "I@I", 'I', Item.ingotIron, '@', new ItemStack(itemParts, 1, Parts.Iron.ordinal()) });
|
||||
|
||||
// Iron Pipe
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 1, 15), new Object[] { new ItemStack(itemParts, 1, Parts.Iron.ordinal()), new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockGenPipe, 1, 15), new Object[] { new ItemStack(itemParts, 1, Parts.Iron.ordinal()), new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
|
||||
// Lava Tube
|
||||
GameRegistry.addRecipe(new ItemStack(blockPipe, 1, ColorCode.RED.ordinal()), new Object[] { "N@N", 'N', new ItemStack(itemParts, 1, Parts.Nether.ordinal()), '@', new ItemStack(itemParts, 1, Parts.Obby.ordinal()) });
|
||||
// fuel pipe
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, ColorCode.YELLOW.ordinal()), new Object[] { new ItemStack(blockGenPipe, 1, ColorCode.YELLOW.ordinal()), new ItemStack(blockGenPipe, 1, ColorCode.YELLOW.ordinal()), new ItemStack(blockGenPipe, 1, ColorCode.YELLOW.ordinal()), new ItemStack(blockGenPipe, 1, ColorCode.YELLOW.ordinal()), new ItemStack(itemParts, 1, Parts.SlimeSeal.ordinal()) });
|
||||
|
||||
// oil pipe
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, ColorCode.BLACK.ordinal()), new Object[] { new ItemStack(blockGenPipe, 1, ColorCode.BLACK.ordinal()),new ItemStack(blockGenPipe, 1, ColorCode.BLACK.ordinal()),new ItemStack(blockGenPipe, 1, ColorCode.BLACK.ordinal()),new ItemStack(blockGenPipe, 1, ColorCode.BLACK.ordinal()), new ItemStack(itemParts, 1, Parts.SlimeSeal.ordinal()) });
|
||||
|
||||
// water pipe
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, ColorCode.BLUE.ordinal()), new Object[] { new ItemStack(blockGenPipe, 1, ColorCode.BLUE.ordinal()),new ItemStack(blockGenPipe, 1, ColorCode.BLUE.ordinal()),new ItemStack(blockGenPipe, 1, ColorCode.BLUE.ordinal()),new ItemStack(blockGenPipe, 1, ColorCode.BLUE.ordinal()), new ItemStack(itemParts, 1, Parts.SlimeSeal.ordinal()) });
|
||||
|
||||
// steam pipes
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 1, ColorCode.ORANGE.ordinal()), new Object[] { new ItemStack(itemParts, 1, Parts.Bronze.ordinal()), new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, ColorCode.ORANGE.ordinal()), new Object[] { new ItemStack(itemParts, 1, Parts.Bronze.ordinal()), new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
|
||||
|
||||
for (int pipeMeta = 0; pipeMeta < 15; pipeMeta++)
|
||||
{
|
||||
if (pipeMeta != ColorCode.WHITE.ordinal() && pipeMeta != ColorCode.ORANGE.ordinal())
|
||||
if (pipeMeta != ColorCode.WHITE.ordinal() && pipeMeta != ColorCode.NONE.ordinal())
|
||||
{
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, pipeMeta), new Object[] { new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(Item.dyePowder, 1, pipeMeta) });
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockGenPipe, 4, pipeMeta), new Object[] { new ItemStack(blockGenPipe, 1, 15), new ItemStack(blockGenPipe, 1, 15), new ItemStack(blockGenPipe, 1, 15), new ItemStack(blockGenPipe, 1, 15), new ItemStack(Item.dyePowder, 1, pipeMeta) });
|
||||
}
|
||||
}
|
||||
|
||||
// milk pipes
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, ColorCode.WHITE.ordinal()), new Object[] { new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(Item.dyePowder, 1, 15) });
|
||||
|
||||
// lava tank
|
||||
|
|
|
@ -114,11 +114,11 @@ public class BlockPipe extends BlockAdvanced
|
|||
{
|
||||
if (tank.getLiquid().itemID == Block.waterStill.blockID)
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, Block.waterStill.blockID, 7);
|
||||
world.setBlock(x, y, z, Block.waterStill.blockID);
|
||||
}
|
||||
if (tank.getLiquid().itemID == Block.lavaStill.blockID)
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, Block.lavaStill.blockID, 4);
|
||||
world.setBlock(x, y, z, Block.lavaStill.blockID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
package fluidmech.common.machines.pipes;
|
||||
|
||||
import hydraulic.api.ColorCode;
|
||||
import hydraulic.helpers.FluidHelper;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.liquids.ILiquidTank;
|
||||
import net.minecraftforge.liquids.LiquidContainerRegistry;
|
||||
import net.minecraftforge.liquids.LiquidStack;
|
||||
|
||||
public class TileEntityGenericPipe extends TileEntityPipe
|
||||
|
@ -34,15 +36,22 @@ public class TileEntityGenericPipe extends TileEntityPipe
|
|||
return this.fakeTank;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ColorCode getColor()
|
||||
{
|
||||
return ColorCode.NONE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canPipeConnect(TileEntity entity, ForgeDirection dir)
|
||||
{
|
||||
return this.subEntities[dir.ordinal()] == null && entity.getClass().equals(this.getClass());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTankSize()
|
||||
{
|
||||
return LiquidContainerRegistry.BUCKET_VOLUME;
|
||||
}
|
||||
@Override
|
||||
public int getMaxFlowRate(LiquidStack stack, ForgeDirection side)
|
||||
{
|
||||
return FluidHelper.getDefaultFlowRate(stack);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -556,7 +556,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements ITankContainer
|
|||
@Override
|
||||
public int getMaxFlowRate(LiquidStack stack, ForgeDirection side)
|
||||
{
|
||||
return FluidHelper.getDefaultFlowRate(stack) * 2;
|
||||
return FluidHelper.getDefaultFlowRate(stack) * 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -585,7 +585,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements ITankContainer
|
|||
@Override
|
||||
public int getTankSize()
|
||||
{
|
||||
return LiquidContainerRegistry.BUCKET_VOLUME * 2;
|
||||
return LiquidContainerRegistry.BUCKET_VOLUME * 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue