Merge remote-tracking branch 'origin/1.8'

mezz · Dec 4, 2015 · ce3af0e · ce3af0e
2 parents 3ee6acf + 0379169
commit ce3af0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/mezz/jei/JustEnoughItems.java b/src/main/java/mezz/jei/JustEnoughItems.java
@@ -11,6 +11,7 @@
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 import mezz.jei.api.JEIManager;
+import mezz.jei.api.JEIPlugin;
 import mezz.jei.config.Constants;
 import mezz.jei.gui.GuiHelper;
 import mezz.jei.network.PacketHandler;
@@ -34,8 +35,7 @@ public class JustEnoughItems {
 
 	@Mod.EventHandler
 	public void preInit(@Nonnull FMLPreInitializationEvent event) {
-		modPlugins = event.getAsmData().getAll("mezz.jei.api.JEIPlugin");
-
+		modPlugins = event.getAsmData().getAll(JEIPlugin.class.getCanonicalName());
 		packetHandler = new PacketHandler();
 		JEIManager.guiHelper = new GuiHelper();
 		JEIManager.itemBlacklist = new ItemBlacklist();

diff --git a/src/main/java/mezz/jei/input/InputHandler.java b/src/main/java/mezz/jei/input/InputHandler.java
@@ -100,7 +100,7 @@ private boolean handleMouseClick(int mouseButton, int mouseX, int mouseY) {
 			}
 		}
 
-		return false;
+		return recipesGui.isOpen();
 	}
 
 	@Nullable