From 56029e65b186281c7ba31d74deabe84381c248a0 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 26 Jun 2016 14:31:49 -0700 Subject: [PATCH] Update Forge --- gradle.properties | 2 +- src/main/java/mezz/jei/JustEnoughItems.java | 4 ++-- src/main/java/mezz/jei/gui/MasterFocus.java | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5d5e76eff..ed697dae1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.10 -forgeversion=12.18.0.1981-1.10.0 +forgeversion=12.18.0.1999-1.10.0 mcp_mappings=snapshot_20160518 curse_project_id=238222 diff --git a/src/main/java/mezz/jei/JustEnoughItems.java b/src/main/java/mezz/jei/JustEnoughItems.java index 6e85c55a0..5f102b4c9 100644 --- a/src/main/java/mezz/jei/JustEnoughItems.java +++ b/src/main/java/mezz/jei/JustEnoughItems.java @@ -22,8 +22,8 @@ name = Constants.NAME, version = Constants.VERSION, guiFactory = "mezz.jei.config.JEIModGuiFactory", - acceptedMinecraftVersions = "[1.9,1.10]", - dependencies = "required-after:Forge@[12.17.0.1946,);") + acceptedMinecraftVersions = "[1.10]", + dependencies = "required-after:Forge@[12.18.0.1999,);") public class JustEnoughItems { @SidedProxy(clientSide = "mezz.jei.ProxyCommonClient", serverSide = "mezz.jei.ProxyCommon") diff --git a/src/main/java/mezz/jei/gui/MasterFocus.java b/src/main/java/mezz/jei/gui/MasterFocus.java index 99d91d588..aefb5b0e3 100644 --- a/src/main/java/mezz/jei/gui/MasterFocus.java +++ b/src/main/java/mezz/jei/gui/MasterFocus.java @@ -71,11 +71,6 @@ private static FluidStack getFluidFromItemStack(@Nonnull ItemStack stack) { } } - // workaround for broken FluidContainerRegistry entry for potions - if (item instanceof ItemPotion) { - return null; - } - FluidStack fluidContained = FluidUtil.getFluidContained(stack); if (fluidContained != null) { return fluidContained;