From 31c2197691ddf9fe72c635150c6bc7ef9a90caba Mon Sep 17 00:00:00 2001 From: Darkere Date: Wed, 20 Jul 2022 18:58:21 +0200 Subject: [PATCH] downgrade to JEI 9.7 and implement focusLink --- build.gradle | 8 +++++--- .../jei/CoverCraftingCategoryExtension.java | 11 ++++++----- .../jei/HollowCoverCraftingCategoryExtension.java | 6 ++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 07fd10e9d..326bdaae0 100755 --- a/build.gradle +++ b/build.gradle @@ -104,9 +104,11 @@ processResources { dependencies { minecraft 'net.minecraftforge:forge:1.18.2-40.1.48' - compileOnly fg.deobf("mezz.jei:jei-1.18.2-common-api:10.1.0.208") - compileOnly fg.deobf("mezz.jei:jei-1.18.2-forge-api:10.1.0.208") - runtimeOnly fg.deobf("mezz.jei:jei-1.18.2-forge:10.1.0.208") + //compileOnly fg.deobf("mezz.jei:jei-1.18.2-common-api:10.1.0.208") + //compileOnly fg.deobf("mezz.jei:jei-1.18.2-forge-api:10.1.0.208") + //runtimeOnly fg.deobf("mezz.jei:jei-1.18.2-forge:10.1.1.231") + compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.1.232:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.1.232") compileOnly fg.deobf('curse.maven:mouse-tweaks-60089:3578801') diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java index fd9be26a0..11e5f1d87 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.item.CoverItem; import com.refinedmods.refinedstorage.recipe.CoverRecipe; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; +import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.ingredient.ICraftingGridHelper; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; @@ -52,12 +53,12 @@ public class CoverCraftingCategoryExtension implements ICraftingCategoryExtensio ITag nuggetTag = ForgeRegistries.ITEMS.tags().getTag(Tags.Items.NUGGETS_IRON); List nuggets = nuggetTag.stream().map(ItemStack::new).toList(); List> inputs = new ArrayList<>(Collections.nCopies(9, new ArrayList<>())); - inputs.set(4, nuggets); - inputs.set(5, input); - craftingGridHelper.setInputs(builder, VanillaTypes.ITEM_STACK, inputs, 3, 3); - craftingGridHelper.setOutputs(builder, VanillaTypes.ITEM_STACK, output); + inputs.set(3, nuggets); + inputs.set(4, input); + List inputSlots = craftingGridHelper.createAndSetInputs(builder, VanillaTypes.ITEM_STACK, inputs, 3, 3); + IRecipeSlotBuilder outputSlot = craftingGridHelper.createAndSetOutputs(builder, VanillaTypes.ITEM_STACK, output); - //builder.createFocusLink(in, out); //waiting on API update + builder.createFocusLink(inputSlots.get(4), outputSlot); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/HollowCoverCraftingCategoryExtension.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/HollowCoverCraftingCategoryExtension.java index 5de4f8af9..520d3d686 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/HollowCoverCraftingCategoryExtension.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/HollowCoverCraftingCategoryExtension.java @@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.item.CoverItem; import com.refinedmods.refinedstorage.recipe.HollowCoverRecipe; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; +import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.ingredient.ICraftingGridHelper; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; @@ -51,8 +52,9 @@ public class HollowCoverCraftingCategoryExtension implements ICraftingCategoryEx } stacks.set(4, input); - craftingGridHelper.setInputs(builder, VanillaTypes.ITEM_STACK, stacks, 0, 0); - craftingGridHelper.setOutputs(builder, VanillaTypes.ITEM_STACK, output); + List inputSlots = craftingGridHelper.createAndSetInputs(builder, VanillaTypes.ITEM_STACK, stacks, 0, 0); + IRecipeSlotBuilder outputSlot = craftingGridHelper.createAndSetOutputs(builder, VanillaTypes.ITEM_STACK, output); + builder.createFocusLink(inputSlots.get(4), outputSlot); } @Nullable