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 implements IMessage { @@ -83,6 +84,8 @@ public class MessageStoragePush extends MessageHandlerPlayerToServer