Add skyblock crafting category

2 files changed, 14 insertions, 4 deletions

diff --git a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java
index 05bb7c5e..c08155a5 100644
--- a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java
+++ b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java
@@ -1,6 +1,8 @@
 package de.hysky.skyblocker.compatibility.jei;
 
 import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.utils.ItemUtils;
+import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.helpers.IGuiHelper;
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.library.plugins.vanilla.crafting.CraftingRecipeCategory;
@@ -14,9 +16,11 @@ public class SkyblockCraftingRecipeCategory extends CraftingRecipeCategory {
     @SuppressWarnings({"unchecked", "RedundantCast", "rawtypes"})
     private static final RecipeType<RecipeEntry<CraftingRecipe>> SKYBLOCK_RECIPE = new RecipeType<>(Identifier.of(SkyblockerMod.NAMESPACE, "skyblock"), (Class<? extends RecipeEntry<CraftingRecipe>>) (Class) RecipeEntry.class);
     private final Text title = Text.translatable("emi.category.skyblocker.skyblock");
+    private final IDrawable icon;
 
     public SkyblockCraftingRecipeCategory(IGuiHelper guiHelper) {
         super(guiHelper);
+        icon = guiHelper.createDrawableItemStack(ItemUtils.getSkyblockerStack());
     }
 
     @Override
@@ -30,4 +34,9 @@ public class SkyblockCraftingRecipeCategory extends CraftingRecipeCategory {
     public Text getTitle() {
         return title;
     }
+
+    @Override
+    public IDrawable getIcon() {
+        return icon;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java
index 0c709232..a1e57682 100644
--- a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java
+++ b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java
@@ -5,13 +5,13 @@ import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.utils.datafixer.ItemStackComponentizationFixer;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
-import mezz.jei.api.constants.RecipeTypes;
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.registration.IRecipeCategoryRegistration;
 import mezz.jei.api.registration.IRecipeRegistration;
 import mezz.jei.api.registration.ISubtypeRegistration;
 import mezz.jei.library.ingredients.subtypes.SubtypeInterpreters;
 import mezz.jei.library.load.registration.SubtypeRegistration;
+import mezz.jei.library.plugins.vanilla.crafting.CraftingCategoryExtension;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.*;
 import net.minecraft.recipe.book.CraftingRecipeCategory;
@@ -40,14 +40,15 @@ public class SkyblockerJEIPlugin implements IModPlugin {
 
     @Override
     public void registerCategories(@NotNull IRecipeCategoryRegistration registration) {
-//        registration.addRecipeCategories(skyblockCraftingRecipeCategory = new SkyblockCraftingRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
+        skyblockCraftingRecipeCategory = new SkyblockCraftingRecipeCategory(registration.getJeiHelpers().getGuiHelper());
+        skyblockCraftingRecipeCategory.addExtension(CraftingRecipe.class, new CraftingCategoryExtension());
+        registration.addRecipeCategories(skyblockCraftingRecipeCategory);
     }
 
     @Override
     public void registerRecipes(@NotNull IRecipeRegistration registration) {
         registration.getIngredientManager().addIngredientsAtRuntime(VanillaTypes.ITEM_STACK, ItemRepository.getItems());
-//        registration.addRecipes(skyblockCraftingRecipeCategory.getRecipeType(), ItemRepository.getRecipesStream().map(recipe ->
-        registration.addRecipes(RecipeTypes.CRAFTING, ItemRepository.getRecipesStream().map(recipe ->
+        registration.addRecipes(skyblockCraftingRecipeCategory.getRecipeType(), ItemRepository.getRecipesStream().map(recipe ->
                 new RecipeEntry<CraftingRecipe>(recipe.getId(), new ShapedRecipe("", CraftingRecipeCategory.MISC, RawShapedRecipe.create(Map.of(
                         'a', Ingredient.ofStacks(recipe.getGrid().get(0)),
                         'b', Ingredient.ofStacks(recipe.getGrid().get(1)),