diff --git a/build.gradle b/build.gradle index 75a45df18..c1dd21228 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { compile files( 'Baubles-deobf.jar' ) - deobfCompile "mezz.jei:jei_1.11.2:4.2.0.210" + deobfCompile "mezz.jei:jei_1.11.2.4.2.8.244" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 77e3a4c3f..542416ce8 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -8,6 +8,7 @@ */ package vazkii.botania.client.integration.jei.brewery; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -88,5 +89,10 @@ public class BreweryRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().init(7, false, 87, 41); recipeLayout.getItemStacks().set(7, ingredients.getOutputs(ItemStack.class).get(0)); } + + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return new ArrayList(); + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index e3e245567..92b031f58 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -8,6 +8,7 @@ */ package vazkii.botania.client.integration.jei.elventrade; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -115,4 +116,9 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { } } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return new ArrayList(); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 622e51860..d087aa861 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -8,7 +8,8 @@ */ package vazkii.botania.client.integration.jei.manapool; -import java.util.Collection; +import java.util.ArrayList; +import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -103,4 +104,9 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().set(index, ingredients.getOutputs(ItemStack.class).get(0)); } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return new ArrayList(); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index b91bc5381..970c6d1a7 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -9,6 +9,7 @@ package vazkii.botania.client.integration.jei.petalapothecary; import java.awt.Point; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -106,4 +107,9 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { return new Point((int) newX, (int) newY); } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return new ArrayList(); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 682318761..a8055ea47 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -8,7 +8,9 @@ */ package vazkii.botania.client.integration.jei.puredaisy; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -103,4 +105,9 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { } } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return new ArrayList(); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 0b0ced980..7b8b9684d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -9,6 +9,7 @@ package vazkii.botania.client.integration.jei.runicaltar; import java.awt.Point; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -107,4 +108,9 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { return new Point((int) newX, (int) newY); } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return new ArrayList(); + } + } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index e53b8ad86..03575e2b8 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -14,7 +14,6 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; -import mezz.jei.util.FakeClientWorld; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityFallingBlock;