Cover gui: Right click to open instead take.2

3 files changed, 14 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_GUICover.java b/src/main/java/gregtech/api/gui/GT_GUICover.java
index 760d888c02..b182f6f6d5 100644
--- a/src/main/java/gregtech/api/gui/GT_GUICover.java
+++ b/src/main/java/gregtech/api/gui/GT_GUICover.java
@@ -1,6 +1,7 @@
 package gregtech.api.gui;
 
 import gregtech.api.enums.Dyes;
+import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
 import gregtech.api.gui.widgets.GT_GuiTooltip;
 import gregtech.api.gui.widgets.GT_GuiTooltipManager;
 import gregtech.api.gui.widgets.GT_GuiTooltipManager.GT_IToolTipRenderer;
@@ -10,6 +11,7 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
@@ -26,15 +28,20 @@ public abstract class GT_GUICover extends GuiScreen implements GT_IToolTipRender
     protected int guiTop, guiLeft;
     protected boolean drawButtons = true;
     private GuiButton selectedButton;
+    public String header;
+    public GT_GuiFakeItemButton headerIcon;
+
 
     protected List<IGuiElement> elements = new ArrayList<>();
 
     public GT_GUICover() {
     }
 
-    public GT_GUICover(int width, int height) {
+    public GT_GUICover(int width, int height, ItemStack cover) {
         this.gui_width = width;
         this.gui_height = height;
+        this.header = (cover != null) ? cover.getDisplayName() : "";
+        this.headerIcon = new GT_GuiFakeItemButton(this, 5, 5, null).setItem(cover);
     }
 
     @Override
@@ -98,7 +105,9 @@ public abstract class GT_GUICover extends GuiScreen implements GT_IToolTipRender
         drawTexturedModalRect(guiLeft, guiTop, 0,0, gui_width, gui_height);
     }
 
-    public void drawExtras(int mouseX, int mouseY, float parTicks) {}
+    public void drawExtras(int mouseX, int mouseY, float parTicks) {
+        this.fontRendererObj.drawString(header, 25, 9, 0xFF222222);
+    }
 
     @Override
     public boolean doesGuiPauseGame()
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java
index 25af30965a..db7029d60f 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java
@@ -26,8 +26,9 @@ public class GT_GuiFakeItemButton implements IGuiScreen.IGuiElement {
         gui.addElement(this);
     }
 
-    public void setItem(ItemStack i) {
+    public GT_GuiFakeItemButton setItem(ItemStack i) {
         item = i;
+        return this;
     }
 
     public ItemStack getItem(){
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
index bd1e921592..f68962f58f 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
@@ -56,7 +56,7 @@ public class GT_GuiIconButton extends GuiButton implements IGuiScreen.IGuiElemen
             int x = xPosition;
             int y = yPosition;
             if(!this.field_146123_n) {
-                GL11.glColor4f(160F/255F, 170F/255F, 1, 1);
+                GL11.glColor4f(200F/255F, 210F/255F, 1, 1);
             }
             else
                 GL11.glColor4f(1, 1, 1, 1);