From 79eb211126cd977cf33b33ab59a8e4b6b14011a5 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Fri, 18 Jan 2013 08:09:05 -0500 Subject: [PATCH] bug Fixes *corrected pipes connection issue with generic tanks *corrected liquid lose when tank would try to create flow in pipes on top or bottom side depending on liquid type. *corrected the release valve crafting receipe --- .../common/LiquidMechanics.java | 6 ++---- .../common/tileentity/TileEntityPipe.java | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/minecraft/liquidmechanics/common/LiquidMechanics.java b/minecraft/liquidmechanics/common/LiquidMechanics.java index a0a4d98c..91d4dccf 100644 --- a/minecraft/liquidmechanics/common/LiquidMechanics.java +++ b/minecraft/liquidmechanics/common/LiquidMechanics.java @@ -77,7 +77,6 @@ public class LiquidMechanics extends DummyModContainer public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir() + "/UniversalElectricity/", NAME + ".cfg")); public final static int BLOCK_ID_PREFIX = 3100; - public final static int LIQUID_ID_PREFIX = 200; public final static int ITEM_ID_PREFIX = 13200; public static Block blockPipe; @@ -115,6 +114,7 @@ public class LiquidMechanics extends DummyModContainer blockGenerator = new BlockGenerator((this.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt())); blockReleaseValve = new BlockReleaseValve((this.CONFIGURATION.getBlock("Release Valve", BLOCK_ID_PREFIX + 5).getInt())); blockTank = new BlockTank(this.CONFIGURATION.getBlock("Tank", BLOCK_ID_PREFIX + 6).getInt()); + blockWasteLiquid = new BlockWasteLiquid(this.CONFIGURATION.getBlock("WasteLiquid", BLOCK_ID_PREFIX + 7).getInt()); // Items itemParts = new ItemParts(this.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt()); @@ -124,8 +124,6 @@ public class LiquidMechanics extends DummyModContainer // Valve item itemGauge = new ItemGuage(this.CONFIGURATION.getItem("PipeGuage", ITEM_ID_PREFIX + 3).getInt()); - // Liquid Registry - blockWasteLiquid = new BlockWasteLiquid(this.CONFIGURATION.getBlock("WasteLiquid", LIQUID_ID_PREFIX).getInt()); CONFIGURATION.save(); proxy.preInit(); @@ -280,7 +278,7 @@ public class LiquidMechanics extends DummyModContainer // release valve GameRegistry.addRecipe(new ItemStack(blockReleaseValve, 1), new Object[] { - "RPR", "PVP", "RPR", " P ", + "RPR", "PVP", "RPR", 'P', new ItemStack(blockPipe, 1, 15), 'V', new ItemStack(itemParts, 1, Parts.Valve.ordinal()), 'R', Item.redstone }); diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java b/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java index 30ce9349..2e331942 100644 --- a/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java +++ b/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java @@ -73,8 +73,24 @@ public class TileEntityPipe extends TileEntity implements ITankContainer, IReadO } } + else if (connectedBlocks[i] instanceof TileEntityTank && ((TileEntityTank) connectedBlocks[i]).getColor() == this.color) + { + if (dir == ForgeDirection.UP && !color.getLiquidData().getCanFloat()) + { + + } + else if (dir == ForgeDirection.DOWN && color.getLiquidData().getCanFloat()) + { + + } + else + { + stored.drain(((ITankContainer) connectedBlocks[i]).fill(dir.getOpposite(), stack, true), true); + } + } else { + stored.drain(((ITankContainer) connectedBlocks[i]).fill(dir.getOpposite(), stack, true), true); } } @@ -259,7 +275,8 @@ public class TileEntityPipe extends TileEntity implements ITankContainer, IReadO connectedBlocks[i] = null; } - if (this.color != ColorCode.NONE && ent instanceof TileEntityTank && color != ((TileEntityTank) ent).getColor()) + if (this.color != ColorCode.NONE && ent instanceof TileEntityTank && ((TileEntityTank) ent).getColor() != ColorCode.NONE && color != ((TileEntityTank) ent).getColor() + ) { connectedBlocks[i] = null; }