From f7a1f629bead77c46b5f935b27637145d0e6f47d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 18:59:23 -0500 Subject: [PATCH] JEI hack for 1.10 --- .../integration/jei/brewery/BreweryRecipeHandler.java | 6 ++++++ .../integration/jei/elventrade/ElvenTradeRecipeHandler.java | 6 ++++++ .../integration/jei/manapool/ManaPoolRecipeHandler.java | 6 ++++++ .../jei/petalapothecary/PetalApothecaryRecipeHandler.java | 6 ++++++ .../integration/jei/puredaisy/PureDaisyRecipeHandler.java | 6 ++++++ .../integration/jei/runicaltar/RunicAltarRecipeHandler.java | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index fdd5a08f6..94333df71 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -28,6 +28,12 @@ public class BreweryRecipeHandler implements IRecipeHandler { return "botania.brewery"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index e80a550af..d4737d903 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -28,6 +28,12 @@ public class ElvenTradeRecipeHandler implements IRecipeHandler return "botania.elvenTrade"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index 8dc1eed45..d7e5a0136 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -28,6 +28,12 @@ public class ManaPoolRecipeHandler implements IRecipeHandler return "botania.manaPool"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index 9c462db79..1e8ffd20d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -28,6 +28,12 @@ public class PetalApothecaryRecipeHandler implements IRecipeHandler { return "botania.pureDaisy"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index 83156eb25..73018b711 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -28,6 +28,12 @@ public class RunicAltarRecipeHandler implements IRecipeHandler return "botania.runicAltar"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) {