dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

downgrade to JEI 9.7 and implement focusLink

Browse Source
This commit is contained in:
Darkere
2022-07-20 18:58:21 +02:00
committed by Raoul
parent 0d98e98374
commit 31c2197691
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -104,9 +104,11 @@ processResources {
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.18.2-40.1.48' 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-common-api:10.1.0.208")
compileOnly fg.deobf("mezz.jei:jei-1.18.2-forge-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") //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') compileOnly fg.deobf('curse.maven:mouse-tweaks-60089:3578801')

11
src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java
View File

@@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.item.CoverItem;
import com.refinedmods.refinedstorage.recipe.CoverRecipe; import com.refinedmods.refinedstorage.recipe.CoverRecipe;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; 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.gui.ingredient.ICraftingGridHelper;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension;
@@ -52,12 +53,12 @@ public class CoverCraftingCategoryExtension implements ICraftingCategoryExtensio
ITag<Item> nuggetTag = ForgeRegistries.ITEMS.tags().getTag(Tags.Items.NUGGETS_IRON); ITag<Item> nuggetTag = ForgeRegistries.ITEMS.tags().getTag(Tags.Items.NUGGETS_IRON);
List<ItemStack> nuggets = nuggetTag.stream().map(ItemStack::new).toList(); List<ItemStack> nuggets = nuggetTag.stream().map(ItemStack::new).toList();
List<List<ItemStack>> inputs = new ArrayList<>(Collections.nCopies(9, new ArrayList<>())); List<List<ItemStack>> inputs = new ArrayList<>(Collections.nCopies(9, new ArrayList<>()));
inputs.set(4, nuggets); inputs.set(3, nuggets);
inputs.set(5, input); inputs.set(4, input);
craftingGridHelper.setInputs(builder, VanillaTypes.ITEM_STACK, inputs, 3, 3); List<IRecipeSlotBuilder> inputSlots = craftingGridHelper.createAndSetInputs(builder, VanillaTypes.ITEM_STACK, inputs, 3, 3);
craftingGridHelper.setOutputs(builder, VanillaTypes.ITEM_STACK, output); IRecipeSlotBuilder outputSlot = craftingGridHelper.createAndSetOutputs(builder, VanillaTypes.ITEM_STACK, output);
//builder.createFocusLink(in, out); //waiting on API update builder.createFocusLink(inputSlots.get(4), outputSlot);
} }
@Override @Override

6
src/main/java/com/refinedmods/refinedstorage/integration/jei/HollowCoverCraftingCategoryExtension.java
View File

@@ -6,6 +6,7 @@ import com.refinedmods.refinedstorage.item.CoverItem;
import com.refinedmods.refinedstorage.recipe.HollowCoverRecipe; import com.refinedmods.refinedstorage.recipe.HollowCoverRecipe;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; 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.gui.ingredient.ICraftingGridHelper;
import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.IFocusGroup;
import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension;
@@ -51,8 +52,9 @@ public class HollowCoverCraftingCategoryExtension implements ICraftingCategoryEx
} }
stacks.set(4, input); stacks.set(4, input);
craftingGridHelper.setInputs(builder, VanillaTypes.ITEM_STACK, stacks, 0, 0); List<IRecipeSlotBuilder> inputSlots = craftingGridHelper.createAndSetInputs(builder, VanillaTypes.ITEM_STACK, stacks, 0, 0);
craftingGridHelper.setOutputs(builder, VanillaTypes.ITEM_STACK, output); IRecipeSlotBuilder outputSlot = craftingGridHelper.createAndSetOutputs(builder, VanillaTypes.ITEM_STACK, output);
builder.createFocusLink(inputSlots.get(4), outputSlot);
} }
@Nullable @Nullable