diff --git a/gradle.properties b/gradle.properties index ddf3ca419..6e6f99c2d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ mcversion=1.11.2 -forgeversion=13.20.0.2230 +forgeversion=13.20.0.2262 mcp_mappings=snapshot_20161220 tesla_version=1.11-1.3.0.51 -jei_version=4.2.0.211 +jei_version=4.3.0.252 #ic2_version=2.6.76-ex110 version_major=5 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index ba3ae1abd..9797895ea 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -55,7 +55,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; guiFactory = "forestry.core.config.ForestryGuiConfigFactory", acceptedMinecraftVersions = "[1.11]", dependencies = "required-after:forge@[13.20.0.2230,);" - + "after:JEI@[4.1.1,);") + + "after:JEI@[4.3.0,);") // + "after:" + PluginIC2.modId + ";") public class Forestry { diff --git a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java index 4926a5245..07d38a506 100644 --- a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java +++ b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java @@ -2,6 +2,7 @@ package forestry.arboriculture.charcoal.jei; import forestry.api.arboriculture.TreeManager; import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.charcoal.CharcoalPileWall; import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IModRegistry; @@ -17,8 +18,8 @@ public class CharcoalJeiPlugin extends BlankModPlugin { public void register(IModRegistry registry) { IGuiHelper guiHelper = registry.getJeiHelpers().getGuiHelper(); registry.addRecipeCategories(new CharcoalPileWallCategory(guiHelper)); - registry.addRecipeHandlers(new CharcoalPileWallHandler(guiHelper)); - registry.addRecipes(TreeManager.pileWalls); + registry.handleRecipes(CharcoalPileWall.class, CharcoalPileWallWrapper::new, RECIPE_UID); + registry.addRecipes(TreeManager.pileWalls, RECIPE_UID); registry.addRecipeCategoryCraftingItem(new ItemStack(PluginArboriculture.getBlocks().woodPile), RECIPE_UID); } diff --git a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallHandler.java b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallHandler.java deleted file mode 100644 index 2153f3412..000000000 --- a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package forestry.arboriculture.charcoal.jei; - -import forestry.arboriculture.charcoal.CharcoalPileWall; -import mezz.jei.api.IGuiHelper; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class CharcoalPileWallHandler implements IRecipeHandler { - - private IGuiHelper guiHelper; - - public CharcoalPileWallHandler(IGuiHelper guiHelper) { - this.guiHelper = guiHelper; - } - - @Override - public Class getRecipeClass() { - return CharcoalPileWall.class; - } - - @Override - public String getRecipeCategoryUid(CharcoalPileWall recipe) { - return CharcoalJeiPlugin.RECIPE_UID; - } - - @Override - public IRecipeWrapper getRecipeWrapper(CharcoalPileWall recipe) { - return new CharcoalPileWallWrapper(recipe, guiHelper); - } - - @Override - public boolean isRecipeValid(CharcoalPileWall recipe) { - if(recipe.getDisplyItems().isEmpty()){ - return false; - } - if(recipe.getCharcoalAmount() <= 0) { - return false; - } - return true; - } - -} diff --git a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallWrapper.java b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallWrapper.java index fb4860d97..68766da94 100644 --- a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallWrapper.java +++ b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalPileWallWrapper.java @@ -1,8 +1,8 @@ package forestry.arboriculture.charcoal.jei; import java.util.Collections; + import forestry.api.arboriculture.ICharcoalPileWall; -import mezz.jei.api.IGuiHelper; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.init.Items; @@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack; public class CharcoalPileWallWrapper extends BlankRecipeWrapper { private final ICharcoalPileWall pileWall; - - public CharcoalPileWallWrapper(ICharcoalPileWall pileWall, IGuiHelper guiHelper) { + + public CharcoalPileWallWrapper(ICharcoalPileWall pileWall) { this.pileWall = pileWall; } diff --git a/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java b/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java index d6f8ef336..3266a0268 100644 --- a/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java +++ b/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java @@ -15,13 +15,26 @@ import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ForestryGuiConfigFactory implements IModGuiFactory { @Override public void initialize(Minecraft minecraftInstance) { } + @Override + public boolean hasConfigGui() { + return true; + } + + @Override + public GuiScreen createConfigGui(GuiScreen parentScreen) { + return new ForestryGuiConfig(parentScreen); + } + @Override public Class mainConfigGuiClass() { return ForestryGuiConfig.class; diff --git a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java index ae7943eae..ceb1c4982 100644 --- a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java +++ b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java @@ -5,7 +5,6 @@ import java.awt.Rectangle; import java.util.List; import com.google.common.base.Preconditions; - import forestry.api.core.ForestryAPI; import forestry.core.gui.GuiForestry; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; @@ -21,35 +20,24 @@ import forestry.factory.gui.GuiMoistener; import forestry.factory.gui.GuiSqueezer; import forestry.factory.gui.GuiStill; import forestry.factory.recipes.jei.bottler.BottlerRecipeCategory; -import forestry.factory.recipes.jei.bottler.BottlerRecipeHandler; import forestry.factory.recipes.jei.bottler.BottlerRecipeMaker; import forestry.factory.recipes.jei.carpenter.CarpenterRecipeCategory; -import forestry.factory.recipes.jei.carpenter.CarpenterRecipeHandler; import forestry.factory.recipes.jei.carpenter.CarpenterRecipeMaker; import forestry.factory.recipes.jei.carpenter.CarpenterRecipeTransferHandler; import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeCategory; -import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeHandler; import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeMaker; import forestry.factory.recipes.jei.fabricator.FabricatorRecipeCategory; -import forestry.factory.recipes.jei.fabricator.FabricatorRecipeHandler; import forestry.factory.recipes.jei.fabricator.FabricatorRecipeMaker; import forestry.factory.recipes.jei.fabricator.FabricatorRecipeTransferHandler; import forestry.factory.recipes.jei.fermenter.FermenterRecipeCategory; -import forestry.factory.recipes.jei.fermenter.FermenterRecipeHandler; import forestry.factory.recipes.jei.fermenter.FermenterRecipeMaker; import forestry.factory.recipes.jei.moistener.MoistenerRecipeCategory; -import forestry.factory.recipes.jei.moistener.MoistenerRecipeHandler; import forestry.factory.recipes.jei.moistener.MoistenerRecipeMaker; import forestry.factory.recipes.jei.rainmaker.RainmakerRecipeCategory; -import forestry.factory.recipes.jei.rainmaker.RainmakerRecipeHandler; import forestry.factory.recipes.jei.rainmaker.RainmakerRecipeMaker; -import forestry.factory.recipes.jei.squeezer.SqueezerContainerRecipeWrapper; import forestry.factory.recipes.jei.squeezer.SqueezerRecipeCategory; -import forestry.factory.recipes.jei.squeezer.SqueezerRecipeHandler; import forestry.factory.recipes.jei.squeezer.SqueezerRecipeMaker; -import forestry.factory.recipes.jei.squeezer.SqueezerRecipeWrapper; import forestry.factory.recipes.jei.still.StillRecipeCategory; -import forestry.factory.recipes.jei.still.StillRecipeHandler; import forestry.factory.recipes.jei.still.StillRecipeMaker; import forestry.plugins.ForestryPluginUids; import mezz.jei.api.BlankModPlugin; @@ -93,29 +81,16 @@ public class FactoryJeiPlugin extends BlankModPlugin { new StillRecipeCategory(guiHelper) ); - registry.addRecipeHandlers( - new BottlerRecipeHandler(), - new CarpenterRecipeHandler(), - new CentrifugeRecipeHandler(), - new FabricatorRecipeHandler(), - new FermenterRecipeHandler(), - new MoistenerRecipeHandler(), - new RainmakerRecipeHandler(), - new SqueezerRecipeHandler<>(SqueezerRecipeWrapper.class), - new SqueezerRecipeHandler<>(SqueezerContainerRecipeWrapper.class), - new StillRecipeHandler() - ); - - registry.addRecipes(BottlerRecipeMaker.getBottlerRecipes(registry.getIngredientRegistry())); - registry.addRecipes(CarpenterRecipeMaker.getCarpenterRecipes()); - registry.addRecipes(CentrifugeRecipeMaker.getCentrifugeRecipe()); - registry.addRecipes(FabricatorRecipeMaker.getFabricatorRecipes()); - registry.addRecipes(FermenterRecipeMaker.getFermenterRecipes(jeiHelpers.getStackHelper())); - registry.addRecipes(MoistenerRecipeMaker.getMoistenerRecipes()); - registry.addRecipes(RainmakerRecipeMaker.getRecipes()); - registry.addRecipes(SqueezerRecipeMaker.getSqueezerRecipes()); - registry.addRecipes(SqueezerRecipeMaker.getSqueezerContainerRecipes(registry.getIngredientRegistry())); - registry.addRecipes(StillRecipeMaker.getStillRecipes()); + registry.addRecipes(BottlerRecipeMaker.getBottlerRecipes(registry.getIngredientRegistry()), ForestryRecipeCategoryUid.BOTTLER); + registry.addRecipes(CarpenterRecipeMaker.getCarpenterRecipes(), ForestryRecipeCategoryUid.CARPENTER); + registry.addRecipes(CentrifugeRecipeMaker.getCentrifugeRecipe(), ForestryRecipeCategoryUid.CENTRIFUGE); + registry.addRecipes(FabricatorRecipeMaker.getFabricatorRecipes(), ForestryRecipeCategoryUid.FABRICATOR); + registry.addRecipes(FermenterRecipeMaker.getFermenterRecipes(jeiHelpers.getStackHelper()), ForestryRecipeCategoryUid.FERMENTER); + registry.addRecipes(MoistenerRecipeMaker.getMoistenerRecipes(), ForestryRecipeCategoryUid.MOISTENER); + registry.addRecipes(RainmakerRecipeMaker.getRecipes(), ForestryRecipeCategoryUid.RAINMAKER); + registry.addRecipes(SqueezerRecipeMaker.getSqueezerRecipes(), ForestryRecipeCategoryUid.SQUEEZER); + registry.addRecipes(SqueezerRecipeMaker.getSqueezerContainerRecipes(registry.getIngredientRegistry()), ForestryRecipeCategoryUid.SQUEEZER); + registry.addRecipes(StillRecipeMaker.getStillRecipes(), ForestryRecipeCategoryUid.STILL); registry.addRecipeClickArea(GuiBottler.class, 107, 33, 26, 22, ForestryRecipeCategoryUid.BOTTLER); registry.addRecipeClickArea(GuiBottler.class, 45, 33, 26, 22, ForestryRecipeCategoryUid.BOTTLER); diff --git a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java deleted file mode 100644 index ce177e259..000000000 --- a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -package forestry.factory.recipes.jei.bottler; - -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class BottlerRecipeHandler implements IRecipeHandler { - - @Override - public Class getRecipeClass() { - return BottlerRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(BottlerRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.BOTTLER; - } - - @Override - public IRecipeWrapper getRecipeWrapper(BottlerRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(BottlerRecipeWrapper wrapper) { - return wrapper.fluid.amount > 0; - } - -} diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java deleted file mode 100644 index 7bd5b99b1..000000000 --- a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package forestry.factory.recipes.jei.carpenter; - -import forestry.api.recipes.ICarpenterRecipe; -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class CarpenterRecipeHandler implements IRecipeHandler { - - @Override - public Class getRecipeClass() { - return CarpenterRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(CarpenterRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.CARPENTER; - } - - @Override - public IRecipeWrapper getRecipeWrapper(CarpenterRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(CarpenterRecipeWrapper wrapper) { - ICarpenterRecipe recipe = wrapper.getRecipe(); - if (recipe.getPackagingTime() <= 0) { - return false; - } - int inputCount = recipe.getCraftingGridRecipe().getIngredients().size(); - return inputCount > 0; - } - -} diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeHandler.java deleted file mode 100644 index e536d644c..000000000 --- a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package forestry.factory.recipes.jei.centrifuge; - -import forestry.api.recipes.ICentrifugeRecipe; -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class CentrifugeRecipeHandler implements IRecipeHandler { - - @Override - public Class getRecipeClass() { - return CentrifugeRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(CentrifugeRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.CENTRIFUGE; - } - - @Override - public IRecipeWrapper getRecipeWrapper(CentrifugeRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(CentrifugeRecipeWrapper wrapper) { - ICentrifugeRecipe recipe = wrapper.getRecipe(); - if (recipe.getProcessingTime() <= 0) { - return false; - } - if (recipe.getInput().isEmpty()) { - return false; - } - int inputCount = recipe.getAllProducts().keySet().size(); - return inputCount > 0; - } - -} diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeHandler.java deleted file mode 100644 index 755733178..000000000 --- a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package forestry.factory.recipes.jei.fabricator; - -import forestry.api.recipes.IFabricatorRecipe; -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class FabricatorRecipeHandler implements IRecipeHandler { - @Override - public Class getRecipeClass() { - return FabricatorRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(FabricatorRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.FABRICATOR; - } - - @Override - public IRecipeWrapper getRecipeWrapper(FabricatorRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(FabricatorRecipeWrapper wrapper) { - IFabricatorRecipe recipe = wrapper.getRecipe(); - int inputCount = recipe.getIngredients().size(); - return inputCount > 0; - } - -} diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeHandler.java deleted file mode 100644 index a8a20365d..000000000 --- a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package forestry.factory.recipes.jei.fermenter; - -import forestry.api.recipes.IFermenterRecipe; -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class FermenterRecipeHandler implements IRecipeHandler { - @Override - public Class getRecipeClass() { - return FermenterRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(FermenterRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.FERMENTER; - } - - @Override - public IRecipeWrapper getRecipeWrapper(FermenterRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(FermenterRecipeWrapper wrapper) { - IFermenterRecipe recipe = wrapper.getRecipe(); - return recipe.getFermentationValue() > 0 && - !(recipe.getModifier() <= 0); - } -} diff --git a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeHandler.java deleted file mode 100644 index 4674c60d5..000000000 --- a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -package forestry.factory.recipes.jei.moistener; - -import forestry.api.recipes.IMoistenerRecipe; -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class MoistenerRecipeHandler implements IRecipeHandler { - @Override - public Class getRecipeClass() { - return MoistenerRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(MoistenerRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.MOISTENER; - } - - @Override - public IRecipeWrapper getRecipeWrapper(MoistenerRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(MoistenerRecipeWrapper wrapper) { - IMoistenerRecipe recipe = wrapper.getRecipe(); - return recipe.getTimePerItem() > 0; - } -} diff --git a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeHandler.java deleted file mode 100644 index b5771f447..000000000 --- a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package forestry.factory.recipes.jei.rainmaker; - -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class RainmakerRecipeHandler implements IRecipeHandler { - @Override - public Class getRecipeClass() { - return RainmakerRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(RainmakerRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.RAINMAKER; - } - - @Override - public IRecipeWrapper getRecipeWrapper(RainmakerRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(RainmakerRecipeWrapper wrapper) { - return true; - } -} diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeHandler.java deleted file mode 100644 index fe5cfa240..000000000 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeHandler.java +++ /dev/null @@ -1,34 +0,0 @@ -package forestry.factory.recipes.jei.squeezer; - -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class SqueezerRecipeHandler implements IRecipeHandler { - private final Class recipeClass; - - public SqueezerRecipeHandler(Class recipeClass) { - this.recipeClass = recipeClass; - } - - @Override - public Class getRecipeClass() { - return recipeClass; - } - - @Override - public String getRecipeCategoryUid(R recipe) { - return ForestryRecipeCategoryUid.SQUEEZER; - } - - @Override - public IRecipeWrapper getRecipeWrapper(R recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(R wrapper) { - return true; - } - -} diff --git a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeHandler.java deleted file mode 100644 index 9c212a2e2..000000000 --- a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package forestry.factory.recipes.jei.still; - -import forestry.core.recipes.jei.ForestryRecipeCategoryUid; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class StillRecipeHandler implements IRecipeHandler { - @Override - public Class getRecipeClass() { - return StillRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid(StillRecipeWrapper recipe) { - return ForestryRecipeCategoryUid.STILL; - } - - @Override - public IRecipeWrapper getRecipeWrapper(StillRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(StillRecipeWrapper wrapper) { - return true; - } -} diff --git a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java index 49a1788e1..a88b99130 100644 --- a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java +++ b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java @@ -8,10 +8,10 @@ import forestry.core.items.ItemRegistryCore; import forestry.core.utils.JeiUtil; import forestry.plugins.PluginManager; import mezz.jei.api.BlankModPlugin; -import mezz.jei.api.IItemBlacklist; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; +import mezz.jei.api.ingredients.IIngredientBlacklist; import net.minecraft.item.ItemStack; @JEIPlugin @@ -19,10 +19,10 @@ public class ForestryJeiPlugin extends BlankModPlugin { @Override public void register(IModRegistry registry) { IJeiHelpers jeiHelpers = registry.getJeiHelpers(); - IItemBlacklist itemBlacklist = jeiHelpers.getItemBlacklist(); + IIngredientBlacklist ingredientBlacklist = jeiHelpers.getIngredientBlacklist(); List hiddenItems = PluginManager.getHiddenItems(); for (ItemStack hiddenItem : hiddenItems) { - itemBlacklist.addItemToBlacklist(hiddenItem); + ingredientBlacklist.addIngredientToBlacklist(hiddenItem); } ItemRegistryCore items = PluginCore.getItems();