diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nuclearcraft.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nuclearcraft.groovy new file mode 100644 index 0000000..118ae4f --- /dev/null +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nuclearcraft.groovy @@ -0,0 +1,69 @@ +import com.cleanroommc.groovyscript.helper.ingredient.OreDictIngredient +import net.minecraft.item.ItemStack +import net.minecraftforge.fluids.FluidStack + +import static gregtech.api.GTValues.* + +// Replace Cooler Crafting Recipes with Canner Recipes +def replaceCannerRecipe = (ItemStack cooler, FluidStack fluid) -> { + crafting.removeByOutput(cooler) + mods.gregtech.canner.recipeBuilder() + .inputs(item('nuclearcraft:cooler')) + .fluidInputs(fluid) + .outputs(cooler) + .duration(400).EUt(VA[LV]) + .buildAndRegister() +} + +// Add a Hidden version of Cooler Canner Recipe, using Solids (LEGACY RECIPES) +def addLegacyCoolerRecipe = (ItemStack cooler, OreDictIngredient ing) -> { + mods.gregtech.canner.recipeBuilder() + .hidden() + .inputs(item('nuclearcraft:cooler'), ing * 16) + .outputs(cooler) + .duration(400).EUt(VA[LV]) + .buildAndRegister() +} + +replaceCannerRecipe(item('nuclearcraft:cooler', 1), fluid('water') * 1000) + +replaceCannerRecipe(item('nuclearcraft:cooler', 2), fluid('redstone') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 2), ore('dustRedstone')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 3), fluid('quartz') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 3), ore('dustNetherQuartz')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 4), fluid('gold') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 4), ore('dustGold')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 5), fluid('glowstone') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 5), ore('dustGlowstone')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 6), fluid('lapis') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 6), ore('dustLapis')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 7), fluid('diamond') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 7), ore('dustDiamond')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 8), fluid('liquid_helium') * 1000) + +replaceCannerRecipe(item('nuclearcraft:cooler', 9), fluid('enderium') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 9), ore('dustEnderium')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 10), fluid('cryotheum') * 1000) + +replaceCannerRecipe(item('nuclearcraft:cooler', 11), fluid('iron') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 11), ore('dustIron')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 12), fluid('emerald') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 12), ore('dustEmerald')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 13), fluid('copper') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 13), ore('dustCopper')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 14), fluid('tin') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 14), ore('dustTin')) + +replaceCannerRecipe(item('nuclearcraft:cooler', 15), fluid('magnesium') * (L * 9)) +addLegacyCoolerRecipe(item('nuclearcraft:cooler', 15), ore('dustMagnesium')) + diff --git a/overrides/scripts/Nuclearcraft.zs b/overrides/scripts/Nuclearcraft.zs index ea48554..48430a7 100644 --- a/overrides/scripts/Nuclearcraft.zs +++ b/overrides/scripts/Nuclearcraft.zs @@ -585,102 +585,6 @@ alloy.recipeBuilder() .inputs([, ]) .duration(300).EUt(16).buildAndRegister(); - -// remove table recipes for coolers and replace with canning machine recipes - -recipes.remove(); -fluid_canner.recipeBuilder() - .outputs([]) - .inputs([]) - .fluidInputs([ * 1000]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -fluid_canner.recipeBuilder() - .outputs([]) - .inputs([]) - .fluidInputs([ * 1000]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(9).buildAndRegister(); - -recipes.remove(); -fluid_canner.recipeBuilder() - .outputs([]) - .inputs([]) - .fluidInputs([ * 1000]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - -recipes.remove(); -canner.recipeBuilder() - .outputs([]) - .inputs([, * 16]) - .duration(400).EUt(2).buildAndRegister(); - //Uranium RTG recipes.remove(); makeShaped("of_nc_rtg_uranium", ,