From 679a67cd6faa5030007f180dc05001f8ef2927ef Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:17:56 +1000 Subject: [PATCH] Update Nomi Labs to v0.9 (#1028) [BUG] [DETAILS] details = [ "Fixes Disappearing Covers on Pipes (#987)", "Fixes Cleanroom Loader Incompatibility (#993)", "Makes Scrolling P2Ps Respect Direction", "Fixes Drawer Keys on Empty Drawers", ] [DETAILS] --- manifest.json | 2 +- .../Main/Mod-Specific/ae2/items.groovy | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/manifest.json b/manifest.json index 7332e23..72c4e9d 100644 --- a/manifest.json +++ b/manifest.json @@ -715,7 +715,7 @@ }, { "projectID": 932060, - "fileID": 5677263, + "fileID": 5781848, "required": true }, { diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy index a55545e..241475d 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy @@ -1,4 +1,5 @@ import com.nomiceu.nomilabs.groovy.ChangeRecipeBuilder +import com.nomiceu.nomilabs.groovy.ChangeRecipeBuilderCollection import com.nomiceu.nomilabs.util.LabsModeHelper import gregtech.api.recipes.RecipeBuilder import gregtech.api.recipes.ingredients.GTRecipeItemInput @@ -287,17 +288,14 @@ for (FluidStack joiningFluid : [fluid('tin') * 576, fluid('soldering_alloy') * 2 // Add Circuits to Quartz and Certus Quartz Autoclave Recipes (So Doesn't Conflict with Purified Shortcut) // 2D List of Recipes, Each List is Seperate Quartz Type -List> quartzRecipes = [] +List quartzRecipes = [] for (ItemStack quartz : [item('minecraft:quartz'), metaitem('gemCertusQuartz')]) { - List toAdd = [] - toAdd.addAll(mods.gregtech.autoclave.changeByOutput(null, null, [chanced(quartz, 7000, 1000)], null).iterator()) - toAdd.addAll(mods.gregtech.autoclave.changeByOutput([quartz], null).iterator()) - - quartzRecipes.add(toAdd) + quartzRecipes.add(mods.gregtech.autoclave.changeByOutput(null, null, [chanced(quartz, 7000, 1000)], null) + .with(mods.gregtech.autoclave.changeByOutput([quartz], null))) } -quartzRecipes.forEach { List builders -> +quartzRecipes.forEach { ChangeRecipeBuilderCollection builders -> builders.forEach { ChangeRecipeBuilder builder -> builder.builder { RecipeBuilder recipe -> recipe.circuitMeta(1) @@ -306,9 +304,8 @@ quartzRecipes.forEach { List builders -> } // Copy a Quartz Recipe for Fluix -quartzRecipes[0].forEach { builder -> - builder.copyOriginal() - .builder { RecipeBuilder recipe -> +quartzRecipes[0].copy().forEach { ChangeRecipeBuilder builder -> + builder.builder { RecipeBuilder recipe -> recipe.clearInputs() .inputs(item('appliedenergistics2:material', 8)) .circuitMeta(1)