Skip to content

Commit

Permalink
Add JeiHelpers access to VanillaCategoryExtension (#3159)
Browse files Browse the repository at this point in the history
  • Loading branch information
Edivad99 committed Mar 24, 2023
1 parent c6c115c commit 21ba22e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
@@ -1,6 +1,7 @@
package mezz.jei.api.registration;

import mezz.jei.api.IModPlugin;
import mezz.jei.api.helpers.IJeiHelpers;
import net.minecraft.world.item.crafting.CraftingRecipe;

import mezz.jei.api.recipe.category.extensions.IExtendableRecipeCategory;
Expand All @@ -13,6 +14,12 @@
* {@link IModPlugin#registerVanillaCategoryExtensions(IVanillaCategoryExtensionRegistration)}
*/
public interface IVanillaCategoryExtensionRegistration {
/**
* {@link IJeiHelpers} provides helpers and tools for addon mods.
*
* @since 12.4.0
*/
IJeiHelpers getJeiHelpers();
/**
* Get the vanilla crafting category, to extend it with your own mod's crafting category extensions.
*/
Expand Down
Expand Up @@ -89,7 +89,7 @@ private List<IRecipeCategory<?>> createRecipeCategories(List<IModPlugin> plugins
PluginCaller.callOnPlugins("Registering categories", plugins, p -> p.registerCategories(recipeCategoryRegistration));
CraftingRecipeCategory craftingCategory = vanillaPlugin.getCraftingCategory()
.orElseThrow(() -> new NullPointerException("vanilla crafting category"));
VanillaCategoryExtensionRegistration vanillaCategoryExtensionRegistration = new VanillaCategoryExtensionRegistration(craftingCategory);
VanillaCategoryExtensionRegistration vanillaCategoryExtensionRegistration = new VanillaCategoryExtensionRegistration(craftingCategory, jeiHelpers);
PluginCaller.callOnPlugins("Registering vanilla category extensions", plugins, p -> p.registerVanillaCategoryExtensions(vanillaCategoryExtensionRegistration));
return recipeCategoryRegistration.getRecipeCategories();
}
Expand Down
@@ -1,5 +1,7 @@
package mezz.jei.library.load.registration;

import mezz.jei.api.helpers.IJeiHelpers;
import mezz.jei.library.runtime.JeiHelpers;
import net.minecraft.world.item.crafting.CraftingRecipe;

import mezz.jei.api.recipe.category.extensions.IExtendableRecipeCategory;
Expand All @@ -8,13 +10,20 @@

public class VanillaCategoryExtensionRegistration implements IVanillaCategoryExtensionRegistration {
private final IExtendableRecipeCategory<CraftingRecipe, ICraftingCategoryExtension> craftingCategory;
private final JeiHelpers jeiHelpers;

public VanillaCategoryExtensionRegistration(IExtendableRecipeCategory<CraftingRecipe, ICraftingCategoryExtension> craftingCategory) {
public VanillaCategoryExtensionRegistration(IExtendableRecipeCategory<CraftingRecipe, ICraftingCategoryExtension> craftingCategory, JeiHelpers jeiHelpers) {
this.craftingCategory = craftingCategory;
this.jeiHelpers = jeiHelpers;
}

@Override
public IExtendableRecipeCategory<CraftingRecipe, ICraftingCategoryExtension> getCraftingCategory() {
return craftingCategory;
}

@Override
public IJeiHelpers getJeiHelpers() {
return jeiHelpers;
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Expand Up @@ -38,7 +38,7 @@ curseHomepageUrl=https://www.curseforge.com/minecraft/mc-mods/jei
jUnitVersion=5.8.2

# Version
specificationVersion=12.3.0
specificationVersion=12.4.0

# Workaround for Spotless bug
# https://github.com/diffplug/spotless/issues/834
Expand Down

0 comments on commit 21ba22e

Please sign in to comment.