From 199446db87b1689d0fdf41322094865e7ed019f9 Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Tue, 24 May 2016 15:04:19 -0400 Subject: [PATCH] fix #44 & 1 --- latestversion.txt | 1 - latestversionrv2.txt | 1 + latestversionrv3.txt | 1 + .../ContainerWirelessCraftingTerminal.java | 2 +- .../proxy/ClientProxy.java | 2 +- .../assets/ae2wct/textures/cape/p455cape.png | Bin 22810 -> 22494 bytes 6 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 latestversion.txt create mode 100644 latestversionrv2.txt create mode 100644 latestversionrv3.txt diff --git a/latestversion.txt b/latestversion.txt deleted file mode 100644 index da58bc6..0000000 --- a/latestversion.txt +++ /dev/null @@ -1 +0,0 @@ -1.8.4b \ No newline at end of file diff --git a/latestversionrv2.txt b/latestversionrv2.txt new file mode 100644 index 0000000..c66e75a --- /dev/null +++ b/latestversionrv2.txt @@ -0,0 +1 @@ +1.7.10-rv2-1.8.4b \ No newline at end of file diff --git a/latestversionrv3.txt b/latestversionrv3.txt new file mode 100644 index 0000000..f88578d --- /dev/null +++ b/latestversionrv3.txt @@ -0,0 +1 @@ +1.7.10-rv3-1.8.4b \ No newline at end of file diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java index b7b9c45..020037d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java @@ -195,7 +195,7 @@ 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 = ((IGridHost) this.obj).getGridNode(ForgeDirection.UNKNOWN); + final IGridNode node = ((IGridNode) ((IGrid) this.obj.getTargetGrid()).getPivot()).getMachine().getGridNode(ForgeDirection.UNKNOWN); this.networkNode = node; this.prepareSync(); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java index 49268c9..be692cd 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java @@ -81,7 +81,7 @@ public class ClientProxy extends CommonProxy { private String fetchVersion() { try { - InputStream in = new URL(new String("https://raw.githubusercontent.com/p455w0rd/WirelessCraftingTerminal/master/latestversion.txt")).openStream(); + InputStream in = new URL(new String("https://raw.githubusercontent.com/p455w0rd/WirelessCraftingTerminal/master/latestversionrv3.txt")).openStream(); BufferedReader r = new BufferedReader(new InputStreamReader(in)); return r.readLine(); } diff --git a/src/resources/assets/ae2wct/textures/cape/p455cape.png b/src/resources/assets/ae2wct/textures/cape/p455cape.png index c4e5a4f7ee7e9efba65a849ede510ffa8fb22bbb..e4dafc3f697abb20969e8eed82055f0e55b97963 100644 GIT binary patch delta 4132 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 R(MN#4VP#>Des1oQ@_%14#Jd0h delta 4260 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 t5s1js1O$?sZ~#)dK!5Gn4Da?+j6~{|2d!FFpVO