diff --git a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java index 4b8492f27..0697895a2 100644 --- a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java @@ -25,6 +25,7 @@ package techreborn.compat.jei; import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -99,8 +100,8 @@ public abstract class BaseRecipeWrapper implements IRecipe public void getIngredients( @Nonnull IIngredients ingredients) { - ingredients.setInputLists(ItemStack.class, inputs); - ingredients.setOutputs(ItemStack.class, baseRecipe.getOutputs()); + ingredients.setInputLists(VanillaTypes.ITEM, inputs); + ingredients.setOutputs(VanillaTypes.ITEM, baseRecipe.getOutputs()); } @Nonnull diff --git a/src/main/java/techreborn/compat/jei/RecipeUtil.java b/src/main/java/techreborn/compat/jei/RecipeUtil.java index 350902c97..912129fb1 100644 --- a/src/main/java/techreborn/compat/jei/RecipeUtil.java +++ b/src/main/java/techreborn/compat/jei/RecipeUtil.java @@ -28,6 +28,7 @@ import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; @@ -83,7 +84,7 @@ public class RecipeUtil { IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); if (itemInputSlots != null) { - List> inputs = ingredients.getInputs(ItemStack.class); + List> inputs = ingredients.getInputs(VanillaTypes.ITEM); for (int i = 0; i < inputs.size() && i < itemInputSlots.length; i++) { int inputSlot = itemInputSlots[i]; guiItemStacks.set(inputSlot, inputs.get(i)); @@ -91,7 +92,7 @@ public class RecipeUtil { } if (itemOutputSlots != null) { - List> outputs = ingredients.getOutputs(ItemStack.class); + List> outputs = ingredients.getOutputs(VanillaTypes.ITEM); for (int i = 0; i < outputs.size() && i < itemOutputSlots.length; i++) { int outputSlot = itemOutputSlots[i]; guiItemStacks.set(outputSlot, outputs.get(i)); @@ -99,7 +100,7 @@ public class RecipeUtil { } if (fluidInputSlots != null) { - List> fluidInputs = ingredients.getInputs(FluidStack.class); + List> fluidInputs = ingredients.getInputs(VanillaTypes.FLUID); for (int i = 0; i < fluidInputs.size() && i < fluidInputSlots.length; i++) { int inputTank = fluidInputSlots[i]; guiFluidStacks.set(inputTank, fluidInputs.get(i)); @@ -107,7 +108,7 @@ public class RecipeUtil { } if (fluidOutputSlots != null) { - List> fluidOutputs = ingredients.getOutputs(FluidStack.class); + List> fluidOutputs = ingredients.getOutputs(VanillaTypes.FLUID); for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) { int outputTank = fluidOutputSlots[i]; guiFluidStacks.set(outputTank, fluidOutputs.get(i)); diff --git a/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java index 26e34d3ae..5ddafa4e1 100644 --- a/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java @@ -29,6 +29,7 @@ import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -57,13 +58,10 @@ public class FluidReplicatorRecipeWrapper implements IRecipeWrapper { IDrawableAnimated.StartDirection.LEFT, false); } - /* (non-Javadoc) - * @see mezz.jei.api.recipe.IRecipeWrapper#getIngredients(mezz.jei.api.ingredients.IIngredients) - */ @Override public void getIngredients(IIngredients ingredients) { - ingredients.setInput(ItemStack.class, new ItemStack(ModItems.UU_MATTER, recipe.getInput())); - ingredients.setOutput(FluidStack.class, new FluidStack(recipe.getFluid(), Fluid.BUCKET_VOLUME)); + ingredients.setInput(VanillaTypes.ITEM, new ItemStack(ModItems.UU_MATTER, recipe.getInput())); + ingredients.setOutput(VanillaTypes.FLUID, new FluidStack(recipe.getFluid(), Fluid.BUCKET_VOLUME)); } @Override diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java index 2632879bd..966bb821f 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java @@ -29,8 +29,8 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.ingredients.VanillaTypes; import mezz.jei.api.recipe.IRecipeCategory; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import reborncore.common.util.StringUtils; import techreborn.compat.jei.RecipeCategoryUids; @@ -88,7 +88,7 @@ public class FusionReactorRecipeCategory implements IRecipeCategory