From ef79be6f3f146e365c52682f75d177500ecc5c61 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Fri, 1 Apr 2016 17:06:44 +0200
Subject: [PATCH] Fix wireless grid RF

---
 src/main/java/refinedstorage/item/ItemWirelessGrid.java   | 8 +++++++-
 .../java/refinedstorage/network/MessageStoragePull.java   | 3 ++-
 .../java/refinedstorage/network/MessageStoragePush.java   | 3 +++
 src/main/java/refinedstorage/tile/TileController.java     | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java
index e2b4028de..fc634bfeb 100755
--- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java
+++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java
@@ -29,6 +29,10 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
     public static final String NBT_SORTING_DIRECTION = "SortingDirection";
     public static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode";
 
+    public static final int USAGE_OPEN = 30;
+    public static final int USAGE_PULL = 3;
+    public static final int USAGE_PUSH = 3;
+
     public ItemWirelessGrid() {
         super(3200);
 
@@ -49,7 +53,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
 
     @Override
     public double getDurabilityForDisplay(ItemStack stack) {
-        return 1 - (getEnergyStored(stack) / getMaxEnergyStored(stack));
+        return 1d - ((double) getEnergyStored(stack) / (double) getMaxEnergyStored(stack));
     }
 
     @Override
@@ -64,6 +68,8 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
 
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
+        list.add(I18n.translateToLocalFormatted("misc.refinedstorage:energy_stored", getEnergyStored(stack), getMaxEnergyStored(stack)));
+
         if (isValid(stack)) {
             list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.0", getX(stack)));
             list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.1", getY(stack)));
diff --git a/src/main/java/refinedstorage/network/MessageStoragePull.java b/src/main/java/refinedstorage/network/MessageStoragePull.java
index 535d24f0b..fad3581a8 100755
--- a/src/main/java/refinedstorage/network/MessageStoragePull.java
+++ b/src/main/java/refinedstorage/network/MessageStoragePull.java
@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import refinedstorage.item.ItemWirelessGrid;
 import refinedstorage.storage.StorageItem;
 import refinedstorage.tile.TileController;
 
@@ -101,7 +102,7 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStor
                         player.updateHeldItem();
                     }
 
-                    controller.drainEnergyFromWirelessGrid(player, 300);
+                    controller.drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_PULL);
                 }
             }
         }
diff --git a/src/main/java/refinedstorage/network/MessageStoragePush.java b/src/main/java/refinedstorage/network/MessageStoragePush.java
index 7cddb9a0b..69f59570e 100755
--- a/src/main/java/refinedstorage/network/MessageStoragePush.java
+++ b/src/main/java/refinedstorage/network/MessageStoragePush.java
@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import refinedstorage.item.ItemWirelessGrid;
 import refinedstorage.tile.TileController;
 
 public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStoragePush> implements IMessage {
@@ -83,6 +84,8 @@ public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStor
                         player.inventory.setInventorySlotContents(message.slot, null);
                     }
                 }
+
+                controller.drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_PUSH);
             }
         }
     }
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index 2a8d582d6..51c200508 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -273,8 +273,10 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 
     public void onOpenWirelessGrid(EntityPlayer player, EnumHand hand) {
         wirelessGridConsumers.add(new WirelessGridConsumer(player, hand, player.getHeldItem(hand)));
+
         player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, worldObj, HandUtils.getIdFromHand(hand), 0, 0);
-        drainEnergyFromWirelessGrid(player, 100);
+
+        drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_OPEN);
     }
 
     public void onCloseWirelessGrid(EntityPlayer player) {