From c79d6661c3f8f764258fd6a889aa8b24e4479e7f Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Fri, 27 May 2016 18:42:42 -0400 Subject: [PATCH] fix #52, implement #54 --- latestversionrv2.txt | 2 +- latestversionrv3.txt | 2 +- .../client/gui/GuiWirelessCraftingTerminal.java | 4 ++-- .../common/container/ContainerWirelessCraftingTerminal.java | 3 ++- .../helpers/WirelessTerminalGuiObject.java | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/latestversionrv2.txt b/latestversionrv2.txt index abf93e3..9c674d6 100644 --- a/latestversionrv2.txt +++ b/latestversionrv2.txt @@ -1 +1 @@ -1.7.10-rv2-1.8.4.3b \ No newline at end of file +1.7.10-rv2-1.8.5b \ No newline at end of file diff --git a/latestversionrv3.txt b/latestversionrv3.txt index 464ece7..6cf5946 100644 --- a/latestversionrv3.txt +++ b/latestversionrv3.txt @@ -1 +1 @@ -1.7.10-rv3-1.8.4.3b \ No newline at end of file +1.7.10-rv3-1.8.5b \ No newline at end of file diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java index cf8477a..8637113 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java @@ -93,8 +93,8 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo private float xSize_lo; private float ySize_lo; public static int tick = 0, GUI_HEIGHT = 240, GUI_WIDTH = 198, AE_ROW_HEIGHT = 18, AE_NUM_ROWS = 0, - GUI_UPPER_HEIGHT = 35, GUI_SEARCH_ROW = 35, SEARCH_X = 81, SEARCH_Y = 6, SEARCH_WIDTH = 88, - SEARCH_HEIGHT = 10, SEARCH_MAXCHARS = 15, GUI_LOWER_HEIGHT, AE_TOTAL_ROWS_HEIGHT, + GUI_UPPER_HEIGHT = 35, GUI_SEARCH_ROW = 35, SEARCH_X = 81, SEARCH_Y = 5, SEARCH_WIDTH = 88, + SEARCH_HEIGHT = 12, SEARCH_MAXCHARS = 15, GUI_LOWER_HEIGHT, AE_TOTAL_ROWS_HEIGHT, BUTTON_SEARCH_MODE_POS_X = -18, BUTTON_SEARCH_MODE_POS_Y = 68, BUTTON_SIZE = 16, NEI_EXTRA_SPACE = 30, slotYOffset; protected static final int BUTTON_SEARCH_MODE_ID = 5; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java index 020037d..637a45d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java @@ -195,7 +195,8 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon this.obj = getGuiObject(containerstack, player, worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); this.civ = (IPortableCell) this.obj; - final IGridNode node = ((IGridNode) ((IGrid) this.obj.getTargetGrid()).getPivot()).getMachine().getGridNode(ForgeDirection.UNKNOWN); + //final IGridNode node = ((IGridNode) ((IGrid) this.obj.getTargetGrid()).getPivot()).getMachine().getGridNode(ForgeDirection.UNKNOWN); + final IGridNode node = this.obj.getActionableNode(); this.networkNode = node; this.prepareSync(); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java index 831b473..dba4e71 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java @@ -243,7 +243,8 @@ public class WirelessTerminalGuiObject implements IActionHost, IPortableCell, II public IGridNode getActionableNode(boolean ignoreRange) { this.rangeCheck(ignoreRange); if (this.myWap != null) { - return this.myWap.getActionableNode(); + return this.getTargetGrid().getPivot(); + //return this.myWap.getActionableNode(); } return null; }