From c35faabfd88ef4b3291ee7f46c1d5594589ae0e5 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sun, 18 May 2014 14:44:58 -0500 Subject: [PATCH 1/2] Fixed Bug: #0436 - Fluid Tunnels don't require Power Fixed bug where fluid tunnels would not function properly. --- parts/p2p/PartP2PLiquids.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/parts/p2p/PartP2PLiquids.java b/parts/p2p/PartP2PLiquids.java index afc47682..b7deb04a 100644 --- a/parts/p2p/PartP2PLiquids.java +++ b/parts/p2p/PartP2PLiquids.java @@ -24,7 +24,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl private final static FluidTankInfo[] activeTank = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; private final static FluidTankInfo[] inactiveTank = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; - + public TunnelType getTunnelType() { return TunnelType.FLUID; @@ -92,7 +92,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl { for (PartP2PLiquids l : getOutputs()) { - IFluidHandler targ = getTarget(); + IFluidHandler targ = l.getTarget(); if ( targ != null ) { if ( targ.canFill( side.getOpposite(), input ) ) @@ -128,6 +128,9 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl IFluidHandler getTarget() { + if ( !proxy.isActive() ) + return null; + if ( cachedTank != null ) return cachedTank; From 440ac95dc452d4fe080055d1d8143ec0677524d2 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sun, 18 May 2014 14:53:18 -0500 Subject: [PATCH 2/2] Change Tooltip for clear button in Crafting Terminal. --- client/gui/implementations/GuiCraftingTerm.java | 2 +- client/gui/widgets/GuiImgButton.java | 1 + core/localization/ButtonToolTips.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/gui/implementations/GuiCraftingTerm.java b/client/gui/implementations/GuiCraftingTerm.java index 12d2f880..5e536ed9 100644 --- a/client/gui/implementations/GuiCraftingTerm.java +++ b/client/gui/implementations/GuiCraftingTerm.java @@ -27,7 +27,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable public void initGui() { super.initGui(); - buttonList.add( clearBtn = new GuiImgButton( this.guiLeft + 92, this.guiTop + this.ySize - 156, Settings.ACTIONS, ActionItems.CLOSE ) ); + buttonList.add( clearBtn = new GuiImgButton( this.guiLeft + 92, this.guiTop + this.ySize - 156, Settings.ACTIONS, ActionItems.STASH ) ); clearBtn.halfSize = true; } diff --git a/client/gui/widgets/GuiImgButton.java b/client/gui/widgets/GuiImgButton.java index 24ab6540..6c06ef26 100644 --- a/client/gui/widgets/GuiImgButton.java +++ b/client/gui/widgets/GuiImgButton.java @@ -156,6 +156,7 @@ public class GuiImgButton extends GuiButton implements ITooltip registerApp( 66, Settings.ACTIONS, ActionItems.WRENCH, ButtonToolTips.PartitionStorage, ButtonToolTips.PartitionStorageHint ); registerApp( 6, Settings.ACTIONS, ActionItems.CLOSE, ButtonToolTips.Clear, ButtonToolTips.ClearSettings ); + registerApp( 6, Settings.ACTIONS, ActionItems.STASH, ButtonToolTips.Stash, ButtonToolTips.StashDesc ); registerApp( 16, Settings.VIEW_MODE, ViewItems.STORED, ButtonToolTips.View, ButtonToolTips.StoredItems ); registerApp( 18, Settings.VIEW_MODE, ViewItems.ALL, ButtonToolTips.View, ButtonToolTips.StoredCraftable ); diff --git a/core/localization/ButtonToolTips.java b/core/localization/ButtonToolTips.java index 07b9aece..e5a059e6 100644 --- a/core/localization/ButtonToolTips.java +++ b/core/localization/ButtonToolTips.java @@ -32,7 +32,9 @@ public enum ButtonToolTips Blocking, NonBlocking, Craft, DontCraft, - LevelType, LevelType_Energy, LevelType_Item, InventoryTweaks, TerminalStyle, TerminalStyle_Full, TerminalStyle_Tall, TerminalStyle_Small; + LevelType, LevelType_Energy, LevelType_Item, InventoryTweaks, TerminalStyle, TerminalStyle_Full, TerminalStyle_Tall, TerminalStyle_Small, + + Stash, StashDesc; String root;