From 44a1dc515b6e59ee77b2deb74a9448345f9744c2 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sat, 13 May 2017 21:59:26 +0200
Subject: [PATCH] Fixed #1209 - "No tooltips for filtered fluids in Disk Drive
 GUI in fluid mode."

---
 CHANGELOG.md                                         |  1 +
 .../com/raoulvdberge/refinedstorage/gui/GuiBase.java | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fcb7a1ad..95783915c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Fixed Crafting Tweaks buttons positioned wrongly (blay09)
 - Fixed Crafting Tweaks keybindings interfering with RS keybindings (blay09)
 - Fixed crash when updating storages (raoulvdberge)
+- Fixed no tooltips for fluid filter slots (raoulvdberge)
 - Removed ticking tile entities, every tile entity in RS is non-ticking now (raoulvdberge)
 
 ### 1.4.4
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
index dd4152ad4..e9eebeb88 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
@@ -54,6 +54,8 @@ public abstract class GuiBase extends GuiContainer {
     private int lastButtonId;
     private int lastSideButtonY;
 
+    private String hoveringFluid = null;
+
     protected int screenWidth;
     protected int screenHeight;
 
@@ -115,6 +117,8 @@ public abstract class GuiBase extends GuiContainer {
 
         drawBackground(guiLeft, guiTop, mouseX, mouseY);
 
+        this.hoveringFluid = null;
+
         for (int i = 0; i < inventorySlots.inventorySlots.size(); ++i) {
             Slot slot = inventorySlots.inventorySlots.get(i);
 
@@ -123,6 +127,10 @@ public abstract class GuiBase extends GuiContainer {
 
                 if (stack != null) {
                     FLUID_RENDERER.draw(mc, guiLeft + slot.xPos, guiTop + slot.yPos, stack);
+
+                    if (inBounds(guiLeft + slot.xPos, guiTop + slot.yPos, 18, 18, mouseX, mouseY)) {
+                        this.hoveringFluid = stack.getLocalizedName();
+                    }
                 }
             }
         }
@@ -151,8 +159,8 @@ public abstract class GuiBase extends GuiContainer {
 
         drawForeground(mouseX, mouseY);
 
-        if (sideButtonTooltip != null) {
-            drawTooltip(mouseX, mouseY, sideButtonTooltip);
+        if (sideButtonTooltip != null || hoveringFluid != null) {
+            drawTooltip(mouseX, mouseY, sideButtonTooltip != null ? sideButtonTooltip : hoveringFluid);
         }
     }