From fe7c47928d062fffdf353c2ae4ec1041ea0ec67a Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 3 Apr 2016 22:52:49 +0200
Subject: [PATCH] Update forge, better JEI checking

---
 build.gradle                                               | 2 +-
 src/main/java/refinedstorage/RefinedStorage.java           | 5 +++++
 src/main/java/refinedstorage/gui/GuiGrid.java              | 4 ++--
 src/main/java/refinedstorage/jei/PluginRefinedStorage.java | 4 ----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 878132273..d0676fe22 100755
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 
 minecraft {
-    version = "1.9-12.16.0.1826-1.9"
+    version = "1.9-12.16.0.1832-1.9"
     runDir = "run"
     useDepAts = true
     mappings = "snapshot_20160312"
diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
index 37845ae50..9b33e7815 100755
--- a/src/main/java/refinedstorage/RefinedStorage.java
+++ b/src/main/java/refinedstorage/RefinedStorage.java
@@ -3,6 +3,7 @@ package refinedstorage;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.Mod.Instance;
@@ -54,4 +55,8 @@ public final class RefinedStorage {
     public void postInit(FMLPostInitializationEvent e) {
         PROXY.postInit(e);
     }
+
+    public static boolean hasJei() {
+        return Loader.isModLoaded("JEI");
+    }
 }
diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index f3d7c1e62..21905184e 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -58,7 +58,7 @@ public class GuiGrid extends GuiBase {
         addSideButton(new SideButtonGridSortingDirection(grid));
         addSideButton(new SideButtonGridSortingType(grid));
 
-        if (PluginRefinedStorage.isJeiLoaded()) {
+        if (RefinedStorage.hasJei()) {
             addSideButton(new SideButtonGridSearchBoxMode(grid));
         }
 
@@ -307,7 +307,7 @@ public class GuiGrid extends GuiBase {
     @Override
     protected void keyTyped(char character, int keyCode) throws IOException {
         if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) {
-            if (PluginRefinedStorage.isJeiLoaded() && grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) {
+            if (RefinedStorage.hasJei() && grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) {
                 PluginRefinedStorage.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
             }
         } else {
diff --git a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java
index 8196517fd..f93bc633d 100755
--- a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java
+++ b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java
@@ -40,8 +40,4 @@ public class PluginRefinedStorage implements IModPlugin {
     public IJeiRuntime getRuntime() {
         return runtime;
     }
-
-    public static boolean isJeiLoaded() {
-        return INSTANCE != null;
-    }
 }