From 676bc0aed9769b448ace64a48ca465a6f9c4ecd6 Mon Sep 17 00:00:00 2001
From: 0xSeb <contact@skate702.de>
Date: Tue, 27 Oct 2015 19:15:37 +0100
Subject: [PATCH] Updated and simplified supported GUIs.

---
 .../skate702/craftingkeys/CraftingKeys.java   | 44 ++++++++++++++-----
 .../de/skate702/craftingkeys/util/Util.java   | 36 ---------------
 .../assets/craftingkeys/lang/de_DE.lang       |  2 +-
 3 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
index a945ca0..3a842f2 100644
--- a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
+++ b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
@@ -17,7 +17,9 @@ import de.skate702.craftingkeys.manager.CraftingManager;
 import de.skate702.craftingkeys.proxies.CraftingKeysProxy;
 import de.skate702.craftingkeys.util.Logger;
 import de.skate702.craftingkeys.util.Util;
-import net.minecraft.client.gui.inventory.GuiCrafting;
+import net.minecraft.client.gui.GuiMerchant;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.inventory.*;
 
 /**
  * The Main Class of the Mod with the important onTick-Method. Some Methods are
@@ -98,19 +100,37 @@ public class CraftingKeys {
             Util.printWarning();
         }
 
-        if (Util.isCraftingGUI(Util.client.currentScreen)) {
+        // Get current Screen, then test
+        GuiScreen currentScreen = Util.client.currentScreen;
 
-            ContainerManager con = new CraftingManager(
-                    ((GuiCrafting) Util.client.currentScreen).inventorySlots);
-            con.acceptKey();
+        if (currentScreen != null) {
+
+            if (currentScreen instanceof GuiCrafting) {
+
+                ContainerManager con = new CraftingManager(
+                        ((GuiCrafting) currentScreen).inventorySlots);
+                con.acceptKey();
+
+            } else if (currentScreen instanceof GuiInventory) {
+
+                Logger.warn("onTick()", "Inventory not implemented");
+            } else if (currentScreen instanceof GuiMerchant) {
+
+                Logger.warn("onTick()", "Villager not implemented");
+            } else if (currentScreen instanceof GuiFurnace) {
+
+                Logger.warn("onTick()", "Furnace not implemented");
+
+            } else if (currentScreen instanceof GuiDispenser) {
+
+                Logger.warn("onTick()", "Dispenser not implemented");
+            } else if (currentScreen instanceof GuiBrewingStand) {
+
+                Logger.warn("onTick()", "BrewingStand not implemented");
+            }
+
+            // TODO: What else should we support?
 
-        } else if (Util.isInventoryGUI(Util.client.currentScreen)) {
-            // do do do
-            Logger.warn("onTick()", "Inventory");
-        } else if (Util.isVillagerGUI(Util.client.currentScreen)) {
-            // do do do
-            //((GuiMerchant) Util.client.currentScreen).inventorySlots
-            Logger.warn("onTick()", "Villager");
         }
 
     }
diff --git a/src/main/java/de/skate702/craftingkeys/util/Util.java b/src/main/java/de/skate702/craftingkeys/util/Util.java
index fbd6186..739738f 100644
--- a/src/main/java/de/skate702/craftingkeys/util/Util.java
+++ b/src/main/java/de/skate702/craftingkeys/util/Util.java
@@ -2,9 +2,6 @@ package de.skate702.craftingkeys.util;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiCrafting;
-import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.util.ChatComponentTranslation;
 
 /**
@@ -60,37 +57,4 @@ public class Util {
         printMessage("de.skate702.craftingkeys.warn.line3");
     }
 
-    /**
-     * Returns true, if the current Screen is a instance of GUI-Screen.
-     *
-     * @param screen The input Screen
-     * @return True, if GuiScreen; False if null
-     */
-    public static boolean isCraftingGUI(GuiScreen screen) {
-        if (screen != null) {
-            if (screen instanceof GuiCrafting) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isInventoryGUI(GuiScreen screen) {
-        if (screen != null) {
-            if (screen instanceof GuiInventory) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isVillagerGUI(GuiScreen screen) {
-        if (screen != null) {
-            if (screen instanceof net.minecraft.client.gui.GuiMerchant) {
-                return true;
-            }
-        }
-        return false;
-    }
-
 }
diff --git a/src/main/resources/assets/craftingkeys/lang/de_DE.lang b/src/main/resources/assets/craftingkeys/lang/de_DE.lang
index baa6fbe..afced74 100644
--- a/src/main/resources/assets/craftingkeys/lang/de_DE.lang
+++ b/src/main/resources/assets/craftingkeys/lang/de_DE.lang
@@ -19,7 +19,7 @@ key.categories.craftingkeys=Crafting Keys
 
 # Config Stuff
 de.skate702.craftingkeys.config.keys=Tastaturbelegung
-de.skate702.craftingkeys.config.other=Weiteres
+de.skate702.craftingkeys.config.other=Anderes
 de.skate702.craftingkeys.config.keys.tooltip=Belege hier deine Tasten (Einfach mal "LWJGL Key codes" googlen!)
 de.skate702.craftingkeys.config.other.tooltip=Saemtliche anderen Einstellungen sind hier!