From 0d52c4515e9cffdf045d28f4e71641bc0b58690c Mon Sep 17 00:00:00 2001 From: Prospector Date: Thu, 21 Apr 2016 20:51:15 -0700 Subject: [PATCH] Fix builds --- .../techreborn/compat/jei/TechRebornJeiPlugin.java | 2 +- .../rollingMachine/RollingMachineRecipeMaker.java | 7 +++++-- .../rollingMachine/RollingMachineRecipeWrapper.java | 12 +++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index b4d1800d8..a4ab4cac4 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -140,7 +140,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin try { - registry.addRecipes(RollingMachineRecipeMaker.getRecipes()); + registry.addRecipes(RollingMachineRecipeMaker.getRecipes(jeiHelpers)); } catch (RuntimeException e) { Core.logHelper.error( diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java index 72d8a0d8b..cced41868 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java @@ -3,6 +3,9 @@ package techreborn.compat.jei.rollingMachine; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + +import mezz.jei.api.IJeiHelpers; import net.minecraft.item.crafting.IRecipe; import techreborn.api.RollingMachineRecipe; @@ -13,12 +16,12 @@ public class RollingMachineRecipeMaker } - public static List getRecipes() + public static List getRecipes(@Nonnull IJeiHelpers jeiHelpers) { List recipes = new ArrayList<>(); for (IRecipe recipe : RollingMachineRecipe.instance.getRecipeList()) { - RollingMachineRecipeWrapper recipeWrapper = RollingMachineRecipeWrapper.create(recipe); + RollingMachineRecipeWrapper recipeWrapper = RollingMachineRecipeWrapper.create(jeiHelpers, recipe); if (recipeWrapper != null) { recipes.add(recipeWrapper); diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java index 074fba81e..2d1ff997d 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java @@ -5,6 +5,8 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper; import mezz.jei.plugins.vanilla.crafting.ShapedOreRecipeWrapper; @@ -17,6 +19,9 @@ import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import techreborn.Core; +import techreborn.compat.CompatManager; +import techreborn.compat.jei.TechRebornJeiPlugin; public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper { @@ -28,12 +33,13 @@ public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements I } @Nullable - public static RollingMachineRecipeWrapper create(IRecipe baseRecipe) + public static RollingMachineRecipeWrapper create(@Nonnull IJeiHelpers jeiHelpers, IRecipe baseRecipe) { + IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); ICraftingRecipeWrapper recipeWrapper; if (baseRecipe instanceof ShapelessRecipes) { - recipeWrapper = new ShapelessRecipesWrapper((ShapelessRecipes) baseRecipe); + recipeWrapper = new ShapelessRecipesWrapper(guiHelper, (ShapelessRecipes) baseRecipe); } else if (baseRecipe instanceof ShapedRecipes) { recipeWrapper = new ShapedRecipesWrapper((ShapedRecipes) baseRecipe); @@ -42,7 +48,7 @@ public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements I recipeWrapper = new ShapedOreRecipeWrapper((ShapedOreRecipe) baseRecipe); } else if (baseRecipe instanceof ShapelessOreRecipe) { - recipeWrapper = new ShapelessOreRecipeWrapper((ShapelessOreRecipe) baseRecipe); + recipeWrapper = new ShapelessOreRecipeWrapper(guiHelper, (ShapelessOreRecipe) baseRecipe); } else { return null;