Update forge and jei

build.gradle

@@ -23,7 +23,7 @@ if(hasProperty('buildnumber')){
 }
 
 minecraft {
-    version = "1.10.2-12.18.1.2076"
+    version = "1.10.2-12.18.2.2114"
     runDir = "idea"
 
     mappings = "snapshot_20160519"
@@ -45,7 +45,7 @@ repositories {
 
 dependencies {
     compile "net.darkhax.tesla:Tesla:1.10.2-1.2.1.42"
-    deobfCompile "mezz.jei:jei_1.10.2:3.7.8.235"
+    deobfCompile "mezz.jei:jei_1.10.2:3.13.0.335"
 }
 
 processResources {

src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java

@@ -30,6 +30,7 @@ import de.ellpeck.actuallyadditions.mod.jei.reconstructor.ReconstructorRecipeCat
 import de.ellpeck.actuallyadditions.mod.jei.reconstructor.ReconstructorRecipeHandler;
 import de.ellpeck.actuallyadditions.mod.util.Util;
 import mezz.jei.api.*;
+import mezz.jei.api.ingredients.IModIngredientRegistration;
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
 import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;
 import net.minecraft.item.ItemStack;
@@ -37,6 +38,16 @@ import net.minecraft.item.ItemStack;
 @JEIPlugin
 public class JEIActuallyAdditionsPlugin implements IModPlugin{
 
+    @Override
+    public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry){
+
+    }
+
+    @Override
+    public void registerIngredients(IModIngredientRegistration registry){
+
+    }
+
     @Override
     public void register(IModRegistry registry){
         IJeiHelpers helpers = registry.getJeiHelpers();

src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java

@@ -14,6 +14,7 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
@@ -60,6 +61,11 @@ public class BookletRecipeCategory implements IRecipeCategory{
 
     @Override
     public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){
+
+    }
+
+    @Override
+    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients){
         if(recipeWrapper instanceof BookletRecipeWrapper){
             BookletRecipeWrapper wrapper = (BookletRecipeWrapper)recipeWrapper;
             recipeLayout.getItemStacks().init(0, true, 70, -4);

src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java

@@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.TextFormatting;
@@ -33,6 +34,11 @@ public class BookletRecipeWrapper extends RecipeWrapperWithButton implements IRe
         this.thePage = page;
     }
 
+    @Override
+    public void getIngredients(IIngredients ingredients){
+
+    }
+
     @Override
     public List getInputs(){
         return Arrays.asList(this.thePage.getItemStacksForPage());

src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java

@@ -15,6 +15,7 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
@@ -59,6 +60,10 @@ public class CoffeeMachineRecipeCategory implements IRecipeCategory{
 
     @Override
     public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){
+    }
+
+    @Override
+    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients){
         if(recipeWrapper instanceof CoffeeMachineRecipeWrapper){
             CoffeeMachineRecipeWrapper wrapper = (CoffeeMachineRecipeWrapper)recipeWrapper;
 

src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java

@@ -20,6 +20,7 @@ import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
@@ -43,6 +44,11 @@ public class CoffeeMachineRecipeWrapper extends RecipeWrapperWithButton implemen
         ActuallyAdditionsAPI.methodHandler.addEffectToStack(this.theOutput, this.theIngredient);
     }
 
+    @Override
+    public void getIngredients(IIngredients ingredients){
+
+    }
+
     @Override
     public List getInputs(){
         List list = new ArrayList();

src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java

@@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
@@ -63,6 +64,10 @@ public class CrusherRecipeCategory implements IRecipeCategory{
 
     @Override
     public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){
+    }
+
+    @Override
+    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients){
         if(recipeWrapper instanceof CrusherRecipeWrapper){
             CrusherRecipeWrapper wrapper = (CrusherRecipeWrapper)recipeWrapper;
 

src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java

@@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
@@ -33,6 +34,11 @@ public class CrusherRecipeWrapper extends RecipeWrapperWithButton implements IRe
         this.theRecipe = recipe;
     }
 
+    @Override
+    public void getIngredients(IIngredients ingredients){
+
+    }
+
     @Override
     public List getInputs(){
         return RecipeUtil.getCrusherRecipeInputs(this.theRecipe);

src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java

@@ -15,6 +15,7 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
@@ -57,6 +58,10 @@ public class EmpowererRecipeCategory implements IRecipeCategory{
 
     @Override
     public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){
+    }
+
+    @Override
+    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients){
         if(recipeWrapper instanceof EmpowererRecipeWrapper){
             EmpowererRecipeWrapper wrapper = (EmpowererRecipeWrapper)recipeWrapper;
 

src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java

@@ -15,6 +15,7 @@ import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
@@ -33,6 +34,11 @@ public class EmpowererRecipeWrapper extends RecipeWrapperWithButton implements I
         this.theRecipe = recipe;
     }
 
+    @Override
+    public void getIngredients(IIngredients ingredients){
+
+    }
+
     @Override
     public List getInputs(){
         return Arrays.asList(this.theRecipe.input, this.theRecipe.modifier1, this.theRecipe.modifier2, this.theRecipe.modifier3, this.theRecipe.modifier4);

src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java

@@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
@@ -63,6 +64,10 @@ public class ReconstructorRecipeCategory implements IRecipeCategory{
 
     @Override
     public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper){
+    }
+
+    @Override
+    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients){
         if(recipeWrapper instanceof ReconstructorRecipeWrapper){
             ReconstructorRecipeWrapper wrapper = (ReconstructorRecipeWrapper)recipeWrapper;
 

src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java

@@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
+import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
@@ -32,6 +33,11 @@ public class ReconstructorRecipeWrapper extends RecipeWrapperWithButton implemen
         this.theRecipe = recipe;
     }
 
+    @Override
+    public void getIngredients(IIngredients ingredients){
+
+    }
+
     @Override
     public List getInputs(){
         return RecipeUtil.getConversionLensInputs(this.theRecipe);