From 51e8d36ca50120de7942c895aafa6c7ff62b30d7 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 29 Oct 2016 10:47:33 +0200 Subject: [PATCH] Update forge and jei --- build.gradle | 4 ++-- .../mod/jei/JEIActuallyAdditionsPlugin.java | 11 +++++++++++ .../mod/jei/booklet/BookletRecipeCategory.java | 6 ++++++ .../mod/jei/booklet/BookletRecipeWrapper.java | 6 ++++++ .../mod/jei/coffee/CoffeeMachineRecipeCategory.java | 5 +++++ .../mod/jei/coffee/CoffeeMachineRecipeWrapper.java | 6 ++++++ .../mod/jei/crusher/CrusherRecipeCategory.java | 5 +++++ .../mod/jei/crusher/CrusherRecipeWrapper.java | 6 ++++++ .../mod/jei/empowerer/EmpowererRecipeCategory.java | 5 +++++ .../mod/jei/empowerer/EmpowererRecipeWrapper.java | 6 ++++++ .../reconstructor/ReconstructorRecipeCategory.java | 5 +++++ .../jei/reconstructor/ReconstructorRecipeWrapper.java | 6 ++++++ 12 files changed, 69 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8bb344b2f..c16898ffe 100644 --- a/build.gradle +++ b/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 { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java index 07d011f33..b3adf3e88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java +++ b/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(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java index 8a7c36300..ac1352e2a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java +++ b/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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java index d58019dcc..4b7e00760 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java +++ b/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()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java index 0104db896..7a3591fa5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java index 3cb2f1e11..20eb35547 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java +++ b/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(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java index 4b9c47fb0..48669f70c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java index dd9cc1592..1f822eb9a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java +++ b/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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java index f70b4bb4b..8d9fcb37b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java index f5b439284..05e3759b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java +++ b/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); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java index e0671e56b..1f9816fc0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java index b40904cfa..73509e0ee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java +++ b/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);