diff --git a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java index 9dc53e6c5..ebaa5985e 100644 --- a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java +++ b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java @@ -7,13 +7,13 @@ import forestry.apiculture.PluginApiculture; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.genetics.Genome; import forestry.core.utils.JeiUtil; -import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.ISubtypeRegistry; import mezz.jei.api.JEIPlugin; @JEIPlugin -public class ApicultureJeiPlugin extends BlankModPlugin { +public class ApicultureJeiPlugin implements IModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { ItemRegistryApiculture items = PluginApiculture.getItems(); diff --git a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java index 3acd35fd6..7386c5970 100644 --- a/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java +++ b/src/main/java/forestry/arboriculture/charcoal/jei/CharcoalJeiPlugin.java @@ -3,15 +3,15 @@ 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.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import net.minecraft.item.ItemStack; @JEIPlugin -public class CharcoalJeiPlugin extends BlankModPlugin { +public class CharcoalJeiPlugin implements IModPlugin { public static final String RECIPE_UID = "forestry.charcoal.pile"; diff --git a/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java b/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java index c6b82431e..63dd9093e 100644 --- a/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java +++ b/src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java @@ -4,12 +4,12 @@ import com.google.common.base.Preconditions; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.items.ItemRegistryArboriculture; import forestry.core.utils.JeiUtil; -import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; @JEIPlugin -public class ArboricultureJeiPlugin extends BlankModPlugin { +public class ArboricultureJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { ItemRegistryArboriculture items = PluginArboriculture.getItems(); diff --git a/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java index 4dcd84db0..83690fed0 100644 --- a/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java +++ b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java @@ -3,10 +3,10 @@ package forestry.core.recipes.jei; import forestry.core.config.Constants; import forestry.core.utils.Translator; import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; -public abstract class ForestryRecipeCategory extends BlankRecipeCategory { +public abstract class ForestryRecipeCategory implements IRecipeCategory { private final IDrawable background; private final String localizedName; diff --git a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java index e08af32c1..0d21308af 100644 --- a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java +++ b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java @@ -40,9 +40,9 @@ import forestry.factory.recipes.jei.squeezer.SqueezerRecipeMaker; import forestry.factory.recipes.jei.still.StillRecipeCategory; import forestry.factory.recipes.jei.still.StillRecipeMaker; import forestry.plugins.ForestryPluginUids; -import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.gui.BlankAdvancedGuiHandler; @@ -55,7 +55,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @JEIPlugin @SideOnly(Side.CLIENT) -public class FactoryJeiPlugin extends BlankModPlugin { +public class FactoryJeiPlugin implements IModPlugin { @Nullable public static IJeiHelpers jeiHelpers; diff --git a/src/main/java/forestry/mail/compat/MailJeiPlugin.java b/src/main/java/forestry/mail/compat/MailJeiPlugin.java index 42bf6ba58..17b2d8f48 100644 --- a/src/main/java/forestry/mail/compat/MailJeiPlugin.java +++ b/src/main/java/forestry/mail/compat/MailJeiPlugin.java @@ -3,12 +3,12 @@ package forestry.mail.compat; import forestry.core.utils.JeiUtil; import forestry.mail.PluginMail; import forestry.mail.blocks.BlockRegistryMail; -import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; @JEIPlugin -public class MailJeiPlugin extends BlankModPlugin { +public class MailJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { BlockRegistryMail blocks = PluginMail.getBlocks(); diff --git a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java index a88b99130..16540c81c 100644 --- a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java +++ b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java @@ -7,15 +7,15 @@ import forestry.core.blocks.BlockRegistryCore; import forestry.core.items.ItemRegistryCore; import forestry.core.utils.JeiUtil; import forestry.plugins.PluginManager; -import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.ingredients.IIngredientBlacklist; import net.minecraft.item.ItemStack; @JEIPlugin -public class ForestryJeiPlugin extends BlankModPlugin { +public class ForestryJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { IJeiHelpers jeiHelpers = registry.getJeiHelpers(); diff --git a/src/main/java/forestry/storage/compat/StorageJeiPlugin.java b/src/main/java/forestry/storage/compat/StorageJeiPlugin.java index cc90c092b..31e23d624 100644 --- a/src/main/java/forestry/storage/compat/StorageJeiPlugin.java +++ b/src/main/java/forestry/storage/compat/StorageJeiPlugin.java @@ -3,12 +3,12 @@ package forestry.storage.compat; import forestry.core.utils.JeiUtil; import forestry.storage.PluginStorage; import forestry.storage.items.ItemRegistryStorage; -import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; @JEIPlugin -public class StorageJeiPlugin extends BlankModPlugin { +public class StorageJeiPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { ItemRegistryStorage items = PluginStorage.getItems();