From c9c858a83541b9ce2ad295af6391788d664ee9f5 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Thu, 5 Jul 2018 13:29:28 +0200
Subject: [PATCH] Fix server crash.

---
 .../gui/grid/stack/GridStackItem.java         |  3 ++-
 .../refinedstorage/util/RenderUtils.java      | 16 ++++++++++++++++
 .../refinedstorage/util/StackUtils.java       | 19 -------------------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java
index 1e0740de3..9a7d3f1f3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java
@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageTrackerEntry;
 import com.raoulvdberge.refinedstorage.gui.GuiBase;
+import com.raoulvdberge.refinedstorage.util.RenderUtils;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.resources.I18n;
@@ -99,7 +100,7 @@ public class GridStackItem implements IGridStack {
     @Override
     public String getTooltip() {
         try {
-            return StackUtils.getItemTooltip(stack).stream().collect(Collectors.joining("\n"));
+            return RenderUtils.getItemTooltip(stack).stream().collect(Collectors.joining("\n"));
         } catch (Throwable t) {
             return "";
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
index 01263fafc..dbd182e12 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
@@ -12,6 +12,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -464,4 +465,19 @@ public final class RenderUtils {
             GlStateManager.enableRescaleNormal();
         }
     }
+
+    public static List<String> getItemTooltip(ItemStack stack) {
+        List<String> lines = stack.getTooltip(Minecraft.getMinecraft().player, Minecraft.getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL);
+
+        // From GuiScreen#getItemToolTip
+        for (int i = 0; i < lines.size(); ++i) {
+            if (i == 0) {
+                lines.set(i, stack.getRarity().rarityColor + lines.get(i));
+            } else {
+                lines.set(i, TextFormatting.GRAY + lines.get(i));
+            }
+        }
+
+        return lines;
+    }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
index b75dd3c9f..a62631e8c 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
@@ -5,15 +5,12 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
 import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fluids.Fluid;
@@ -28,7 +25,6 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.List;
 import java.util.function.Function;
 
 public final class StackUtils {
@@ -206,21 +202,6 @@ public final class StackUtils {
         return Pair.of(null, null);
     }
 
-    public static List<String> getItemTooltip(ItemStack stack) {
-        List<String> lines = stack.getTooltip(Minecraft.getMinecraft().player, Minecraft.getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL);
-
-        // From GuiScreen#getItemToolTip
-        for (int i = 0; i < lines.size(); ++i) {
-            if (i == 0) {
-                lines.set(i, stack.getRarity().rarityColor + lines.get(i));
-            } else {
-                lines.set(i, TextFormatting.GRAY + lines.get(i));
-            }
-        }
-
-        return lines;
-    }
-
     private static final String NBT_ITEM_TYPE = "Type";
     private static final String NBT_ITEM_QUANTITY = "Quantity";
     private static final String NBT_ITEM_DAMAGE = "Damage";