From e67cced0ed97689c4e816d17c2704c7c4dc0d891 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Thu, 5 May 2016 14:22:45 +0200
Subject: [PATCH] Fix bugs

---
 .../container/slot/UpgradeItemValidator.java  |  12 +++++++++---
 .../refinedstorage/item/ItemWirelessGrid.java |  18 +++++++++++++++++-
 .../textures/gui/destructor.png               | Bin 1987 -> 1989 bytes
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java b/src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java
index 357f6ee3b..34ab0bfda 100755
--- a/src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java
+++ b/src/main/java/refinedstorage/container/slot/UpgradeItemValidator.java
@@ -3,8 +3,6 @@ package refinedstorage.container.slot;
 import net.minecraft.item.ItemStack;
 import refinedstorage.RefinedStorageItems;
 
-import java.util.Arrays;
-
 public class UpgradeItemValidator implements IItemValidator {
     private int[] allowedUpgrades;
 
@@ -14,6 +12,14 @@ public class UpgradeItemValidator implements IItemValidator {
 
     @Override
     public boolean isValid(ItemStack stack) {
-        return stack.getItem() == RefinedStorageItems.UPGRADE && Arrays.asList(allowedUpgrades).contains(stack.getMetadata());
+        if (stack.getItem() == RefinedStorageItems.UPGRADE) {
+            for (int upgrade : allowedUpgrades) {
+                if (upgrade == stack.getMetadata()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 }
diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java
index 93d0f3279..bfd88f378 100755
--- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java
+++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java
@@ -133,7 +133,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) {
-        if (!world.isRemote && getDimensionId(stack) == player.dimension) {
+        if (!world.isRemote && hasValidNBT(stack) && getDimensionId(stack) == player.dimension) {
             TileEntity tile = world.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack)));
 
             if (tile instanceof TileController) {
@@ -191,6 +191,22 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
 
     @Override
     public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
+        if (oldStack.getItem() == newStack.getItem()) {
+            if (hasValidNBT(oldStack) && hasValidNBT(newStack)) {
+                int x1 = getX(oldStack);
+                int y1 = getY(oldStack);
+                int z1 = getZ(oldStack);
+                int dim1 = getDimensionId(oldStack);
+                int x2 = getX(newStack);
+                int y2 = getY(newStack);
+                int z2 = getZ(newStack);
+                int dim2 = getDimensionId(newStack);
+
+                if (x1 == x2 && y1 == y2 && z1 == z2 && dim1 == dim2) {
+                    return false;
+                }
+            }
+        }
         return slotChanged;
     }
 
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/destructor.png b/src/main/resources/assets/refinedstorage/textures/gui/destructor.png
index 76e785c9d70a841ceb96a4bdf1f2f43e05b8719e..c0abac7bce673e2ce7ff379ab1a43fddc2fa1def 100755
GIT binary patch
delta 648
zcmX@if0TbiD@(n$r;B4qMcmst-Fb%$1XzOQ{{KIznLbV8&|<Z(TO+I&dujJwiRxF<
z(s^NW{<6gx@h?B*Z10~l@jqU;<IVfZ=i7OGl;8fZuz3I8H9hvCpJ0JR>)my4ARLYh
z@A(`=7aWxJW7>D^&1=!OJvs^dmD)HQ7?@7&o8`#BB+$@Mzv-KR0s|w5#!|rx@eTI^
zLcg6lW$(Wzbs2;1rh-3PJh!+oFs);Gb6W9%>DR6@w|&gl{=9P0SYNT;bITsl1?gf*
z9SkfA3*M}jWC5Adv9$W?nb|JhAkNZ~riS0!!{(cHPU~bk29$Jg(2TXRubH`F7xT3b
zk_)R`t${A7XA%gwCdUNUV8SF&P}RWjw)$Z>)0etMlYS(Mr!LJD(lutynAm#c^4{FZ
z8J!^8rs&Q6J&)t5=zG)7Y1_*WNZBcetj}NvTEM`R^fJ!$v)V-=ux-5zEH-Om)@M9d
zO1OPI>|YVkr1uS`o$1!6ye_LmrEy(Q;_j?B|GW+CNr3>b>F4<4)#tL<9Em+}&gFoJ
zb!}5~LvZffZ}ZCkFMY6p$#3uc1<z+ohB}xFGyt6e^pV6Hmlf)#WjCmO%yEy*oRz|T
zVeYmG6~_6qL6Sh%0M&hc#|EOn${if;dHSvQ+|*zQl3Q@^?hcL%@i((oKh}gpbjQzb
zJz}46TMeq0MZsb3?nbCyppFUUvu<Zk(n;U}8ko=cajwSKcgMbb($1LgUeCB(eyuIj
z`+Ds+>PZJbe?QyyAZC|3r*|LgWJdN?lLOe5C6=A}Z0`16)J{rlBM$=*c)I$ztaD0e
F0ssrh33>nk

delta 646
zcmX@gf0%zmD@(nmr;B4qMcmstjd`~m1YBY{{{KI@?)!`%Ld-86^P|H)&r|A+SabQu
zQLd9G&uv=gEqm>!&g-I;hw~hq@-F^<tTXl8|4$2rYhr$7GW#BI7xi0S)?{CE*-n&K
zm}yHD<35fHPdfS}mak&q%_|W4@cP6~c|*Tc#^=n2E(}Zp7tUo%)UzlsFmhyMPY03?
z4%%}S9P0f`&Ye0}KhNc~4`Woy^G|t`GddYq6c$X)n|uCx>;e5R%EwmLu*&>gExT~f
zqs?j;Kka7NyII&7WX{_?ZH_>58yX_2!p`pT+yb=Z63d-`sULx6%+y%G#^J!g6qU*1
z@_e_w`r363%6F8n)b~rU18rttx^+txND5r=Qf6Sh-My3P%j**Lk7?qm=@~-0#;h3=
z=N`Gc_qy6eA+R%h8!Al8-8I(#SmU|nPaUhwL%D@@M=U_b2ncweUp3Rba~jmHGvXg^
z<!b*g0vfWuLAkTq`qa4#Dp6@%7nH0!#Xo0Hu7`Tg&0){3-;NJe9_YPe@>64)W^tL_
zg5yTk>zw?`Z}D7Wq8q-}HQbY5wyGf$6kb4!%+lW8e&RccHRJx$$vd_$e#7ItiS>oo
zZO=V3;%7sZ2sAK!oyP_Y4`A?tgZG}_xiy}f8l*tHfcKd-To>-eW~&$0hu@T(mBM{t
z`B}e5?6<OoA*z9XS#a+%$V*WDCvKmeYw9T$z|5j>Alku3Xvw|H5p^|8um8@_PxyW5
zmT1Mlg)8g@x#Q%wYaQJB#Ybq`8rI2z>~ki6U^A3hw&r#I$_Ju$Zny4fF#v(5tDnm{
Hr-UW|OkWDT