Merge remote-tracking branch 'origin/configurable-channels' into dev

Author: Dream-Master

src/main/java/blockrenderer6343/client/utils/TooltipButton.java

@@ -33,6 +33,7 @@ public void drawButton(Minecraft mc, int mouseX, int mouseY) {
     }
 
     public boolean isMouseOver(int mouseX, int mouseY) {
+        if (supplier != null && !supplier.getAsBoolean()) return false;
         return this.enabled && this.visible
                 && mouseX >= this.xPosition
                 && mouseY >= this.yPosition

src/main/java/blockrenderer6343/integration/nei/GUI_MultiblockHandler.java

@@ -76,7 +76,7 @@ public abstract class GUI_MultiblockHandler<T> {
     protected static final int ICON_SIZE_X = 20;
     protected static final int ICON_SIZE_Y = 12;
     protected static final int MOUSE_OFFSET_X = 5;
-    protected static final int MOUSE_OFFSET_Y = 43;
+    protected static final int MOUSE_OFFSET_Y = 37;
     protected static final int BUTTON_LEFT = -5;
     protected static final int UNDER_PREVIEW_Y = 153;
     protected static final int BUTTON_RIGHT = 145;