diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 051faba1b..7198628da 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -2185,7 +2185,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '#tfg:reactant_fluix_ruby', '#tfg:reactant_fluix_quartz', '4x ae2:charged_certus_quartz_crystal') - .inputFluids(JsonIO.of({ amount: 150, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 150") .itemOutputs('5x ae2:fluix_crystal') .duration(120) .EUt(256) @@ -2195,7 +2195,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '#tfg:reactant_fluix_ruby_exquisite', '#tfg:reactant_fluix_quartz', '4x ae2:charged_certus_quartz_crystal') - .inputFluids(JsonIO.of({ amount: 150, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 150") .itemOutputs('20x ae2:fluix_crystal') .duration(80) .EUt(256) @@ -2205,7 +2205,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '#tfg:reactant_fluix_ruby', '#tfg:reactant_fluix_quartz_exquisite', '4x ae2:charged_certus_quartz_crystal') - .inputFluids(JsonIO.of({ amount: 150, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 150") .itemOutputs('20x ae2:fluix_crystal') .duration(80) .EUt(256) diff --git a/kubejs/server_scripts/firmaciv/recipes.js b/kubejs/server_scripts/firmaciv/recipes.js index e9ce24659..dbb956595 100644 --- a/kubejs/server_scripts/firmaciv/recipes.js +++ b/kubejs/server_scripts/firmaciv/recipes.js @@ -62,7 +62,7 @@ const registerFirmaCivRecipes = (event) => { //#region Barometer event.recipes.gtceu.assembler('tfg:firmaciv/barometer') .itemInputs('#forge:plates/brass', '2x #forge:small_gears/brass', '#forge:glass_panes') - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 1000") .circuit(12) .itemOutputs('firmaciv:barometer') .duration(75) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index e4a81bb74..568fb0091 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -522,7 +522,7 @@ const registerFirmaLifeRecipes = (event) => { event.recipes.gtceu.mixer('sugar_water') .itemInputs('#tfc:sweetener') - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" } })) + .inputFluids("#tfg:clean_water 1000") .outputFluids(Fluid.of('firmalife:sugar_water', 500)) .circuit(5) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index d517f1552..17789561a 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -16,14 +16,21 @@ const registerGTCEURecipes = (event) => { //#region Выход: Удобрение // В обычном миксере - event.recipes.gtceu.mixer('fertilizer') + event.recipes.gtceu.mixer('tfg:fertilizer') .itemInputs( '#tfc:dirt', '2x #tfg:wood_dusts', '4x #forge:sand' ) .circuit(1) - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 1000") + .itemOutputs('4x gtceu:fertilizer') + .duration(300) + .EUt(30) + + event.recipes.gtceu.mixer('tfg:fertilizer_2') + .itemInputs('tfc:compost') + .inputFluids('#tfg:clean_water 1000') .itemOutputs('4x gtceu:fertilizer') .duration(300) .EUt(30) @@ -209,56 +216,56 @@ const registerGTCEURecipes = (event) => { event.recipes.gtceu.brewery('biomass_from_tfc_seeds') .itemInputs('#tfc:seeds') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) event.recipes.gtceu.brewery('biomass_from_tfc_food') .itemInputs('#tfc:foods') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) event.recipes.gtceu.brewery('biomass_from_tfc_plants') .itemInputs('#tfc:plants') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) event.recipes.gtceu.brewery('biomass_from_tfc_corals') .itemInputs('#tfc:corals') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) event.recipes.gtceu.brewery('biomass_from_spider_eyes') .itemInputs('minecraft:spider_eye') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) event.recipes.gtceu.brewery('biomass_from_leaves') .itemInputs('#minecraft:leaves') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) event.recipes.gtceu.brewery('biomass_from_fallen_leaves') .itemInputs('#tfc:fallen_leaves') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) event.recipes.gtceu.brewery('biomass_from_minecraft_plants') .itemInputs('#createaddition:plants') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(128) .EUt(3) @@ -288,13 +295,13 @@ const registerGTCEURecipes = (event) => { //#region Выход: Цемент generateMixerRecipe(event, ['2x #tfg:stone_dusts', 'gtceu:marble_dust', 'gtceu:gypsum_dust'], - JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }}), [], null, Fluid.of('gtceu:concrete', 1152), 40, 16, 64, 'concrete_from_marble') + "#tfg:clean_water 1000", [], null, 'gtceu:concrete 1152', 40, 16, 64, 'concrete_from_marble') generateMixerRecipe(event, ['3x #tfg:stone_dusts', 'gtceu:clay_dust'], - JsonIO.of({ amount: 500, value: { tag: "tfg:clean_water" }}), [], null, Fluid.of('gtceu:concrete', 576), 20, 16, 64, 'concrete_from_clay') + "#tfg:clean_water 500", [], null, 'gtceu:concrete 576', 20, 16, 64, 'concrete_from_clay') generateMixerRecipe(event, ['3x #tfg:stone_dusts', 'gtceu:calcite_dust', 'gtceu:gypsum_dust'], - JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }}), [], null, Fluid.of('gtceu:concrete', 1152), 40, 16, 64, 'concrete_from_calcite') + "#tfg:clean_water 1000", [], null, 'gtceu:concrete 1152', 40, 16, 64, 'concrete_from_calcite') //GT light/dark concrete recipe fix @@ -356,18 +363,8 @@ const registerGTCEURecipes = (event) => { //#region Выход: Бурильная жидкость - generateMixerRecipe( - event, - ['2x #tfg:stone_dusts'], - [Fluid.of('gtceu:lubricant', 20), JsonIO.of({ amount: 4000, value: { tag: "tfg:clean_water" }})], - [], - null, - Fluid.of('gtceu:drilling_fluid', 5000), - 40, - 16, - 64, - 'drilling_fluid' - ) + generateMixerRecipe(event, ['2x #tfg:stone_dusts'], ['gtceu:lubricant 20', "#tfg:clean_water 4000"], + [], null, Fluid.of('gtceu:drilling_fluid', 5000), 40, 16, 64, 'drilling_fluid') //#endregion diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index 0fc4ec6f4..1a9e5cda7 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -77,32 +77,36 @@ function generateGreenHouseRecipe(event, input, fluid_amount, output, id, dimens let r = event.recipes.gtceu.greenhouse(id) .notConsumable(input) .circuit(1) - .inputFluids(JsonIO.of({ amount: fluid_amount, value: { tag: "tfg:clean_water" }})) + .inputFluids(`#tfg:clean_water ${fluid_amount}`) .itemOutputs(output) .chancedOutput(input, 750, 0) .chancedOutput(input, 500, 0) .duration(36000) // 30 mins + .EUt(EUt) - if (dimension !== null)r.dimension(dimension) - if (output_secondary !== null) r.chancedOutput(output_secondary, 750, 0) + if (dimension !== null) + r.dimension(dimension) + if (output_secondary !== null) + r.chancedOutput(output_secondary, 750, 0) - r.EUt(EUt) // С удобрением (With fertilizer) r = event.recipes.gtceu.greenhouse(`${id}_fertilized`) .notConsumable(input) .itemInputs(Item.of('gtceu:fertilizer', fertiliser_count)) .circuit(2) - .inputFluids(JsonIO.of({ amount: fluid_amount, value: { tag: "tfg:clean_water" }})) + .inputFluids(`#tfg:clean_water ${fluid_amount}`) .itemOutputs(output) .chancedOutput(input, 4000, 0) .chancedOutput(input, 3000, 0) .duration(12000) // 10 mins + .EUt(EUt) - if (dimension !== null) r.dimension(dimension) - if (output_secondary !== null) r.chancedOutput(output_secondary, 4000, 0) - r.EUt(EUt) + if (dimension !== null) + r.dimension(dimension) + if (output_secondary !== null) + r.chancedOutput(output_secondary, 4000, 0) } //#endregion diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 78885c39c..dc0e24d96 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -42,7 +42,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_reactor(`tfg:minecraft/oxidizing_block_${element.name}`) .itemInputs(element.block) - .inputFluids(JsonIO.of({ amount: 150, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 150") .circuit(1) .itemOutputs(element2.block) .duration(1000) @@ -50,7 +50,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_reactor(`tfg:minecraft/oxidizing_cutted_${element.name}`) .itemInputs(element.cutted) - .inputFluids(JsonIO.of({ amount: 150, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 150") .circuit(1) .itemOutputs(element2.cutted) .duration(1000) @@ -58,7 +58,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_reactor(`tfg:minecraft/oxidizing_stairs_${element.name}`) .itemInputs(element.stairs) - .inputFluids(JsonIO.of({ amount: 150, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 150") .circuit(1) .itemOutputs(element2.stairs) .duration(1000) @@ -66,7 +66,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_reactor(`tfg:minecraft/oxidizing_slabs_${element.name}`) .itemInputs(element.slabs) - .inputFluids(JsonIO.of({ amount: 150, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 150") .circuit(1) .itemOutputs(element2.slabs) .duration(1000) @@ -153,7 +153,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_bath('paper_from_papyrus') .itemInputs('tfc:papyrus') - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 100") .itemOutputs('minecraft:paper') .duration(100) .EUt(7) @@ -164,7 +164,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.centrifuge('sugar_from_sugarcane') .itemInputs('tfc:food/sugarcane') - .inputFluids(JsonIO.of({ amount: 600, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 600") .itemOutputs('minecraft:sugar', 'gtceu:plant_ball') .duration(800) .EUt(6) @@ -230,9 +230,9 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_reactor('minecraft:gtceu/chemical_reactor/sponge') .itemInputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.SodiumBisulfate, 1)) - .inputFluids(Fluid.of('gtceu:polyethylene', 144), JsonIO.of({ amount: 250, value: { tag: "tfg:clean_water" }})) + .inputFluids('gtceu:polyethylene 144', "#tfg:clean_water 250") .itemOutputs('2x minecraft:sponge') - .outputFluids(Fluid.of('gtceu:sodium_persulfate', 35)) + .outputFluids('gtceu:sodium_persulfate 35') .duration(80) .EUt(GTValues.VA[GTValues.LV]) diff --git a/kubejs/server_scripts/rnr/recipes.js b/kubejs/server_scripts/rnr/recipes.js index 913a9736b..27cd2d635 100644 --- a/kubejs/server_scripts/rnr/recipes.js +++ b/kubejs/server_scripts/rnr/recipes.js @@ -53,8 +53,8 @@ const registerRnrRecipes = (event) => { ).id('rnr:smelting/unfired_roof_tile') event.recipes.gtceu.mixer('rnr:mixer/wet_concrete_mix') - .inputFluids(Fluid.of('gtceu:concrete', 192), JsonIO.of({ amount: 808, value: { tag: "tfg:clean_water" }})) - .outputFluids(Fluid.of('rnr:concrete', 1000)) + .inputFluids('gtceu:concrete 192', "#tfg:clean_water 808") + .outputFluids('rnr:concrete 1000') .circuit(7) .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/tfc/recipes.dirt.js b/kubejs/server_scripts/tfc/recipes.dirt.js index 95df9f597..cda85a26b 100644 --- a/kubejs/server_scripts/tfc/recipes.dirt.js +++ b/kubejs/server_scripts/tfc/recipes.dirt.js @@ -33,7 +33,7 @@ function registerTFCDirtRecipes(event) { // Dirt -> Mud event.recipes.gtceu.mixer(`${mud}_grass_to_mud`) .itemInputs(`tfc:dirt/${mud}`) - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfc:any_water" }})) + .inputFluids("#tfc:any_water 100") .circuit(2) .itemOutputs(`tfc:mud/${mud}`) .duration(200) diff --git a/kubejs/server_scripts/tfc/recipes.dyes.js b/kubejs/server_scripts/tfc/recipes.dyes.js index 9d2365847..8499a98f5 100644 --- a/kubejs/server_scripts/tfc/recipes.dyes.js +++ b/kubejs/server_scripts/tfc/recipes.dyes.js @@ -142,7 +142,7 @@ function registerTFCDyeRecipes(event) { event.recipes.gtceu.chemical_reactor(`chemical_dye_${dyeName}_acetic`) .itemInputs(`#forge:dyes/${dyeName}`) - .inputFluids(Fluid.of('gtceu:acetic_acid', 250), JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }})) + .inputFluids('gtceu:acetic_acid 250', "#tfg:clean_water 1000") .outputFluids(Fluid.of(`tfc:${dyeName}_dye`, 144 * 3)) .duration(15 * 20) .EUt(24) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 2757f069e..2a8b97ec1 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -165,9 +165,7 @@ const registerTFCRecipes = (event) => { .id('tfg:tfc/pot/salt') // Salt Water - generateMixerRecipe(event, - ['#forge:dusts/salt'], - JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }}), + generateMixerRecipe(event, ['#forge:dusts/salt'], "#tfg:clean_water 1000", [], 2, Fluid.of('tfc:salt_water', 1000), 40, 7, 64, 'tfg:tfc/salt_water') @@ -199,8 +197,7 @@ const registerTFCRecipes = (event) => { .id('tfg:splashing/wash_torch') //Lye in mixer - generateMixerRecipe(event, 'tfc:powder/wood_ash', - JsonIO.of({ amount: 200, value: { tag: "tfg:clean_water" }}), + generateMixerRecipe(event, 'tfc:powder/wood_ash', "#tfg:clean_water 200", [], null, Fluid.of('tfc:lye', 200), 100, 2, 64, 'lye_in_mixer') // Brass Mechanism diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index 6b3421e07..c9e5cd79b 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -312,8 +312,7 @@ function registerTFCMachineRecipes(event) { .EUt(4) // Jute Fiber - generateMixerRecipe(event, 'tfc:jute', - JsonIO.of({ amount: 200, value: { tag: "tfg:clean_water" }}), + generateMixerRecipe(event, 'tfc:jute', "#tfg:clean_water 200", 'tfc:jute_fiber', null, [], 100, 4, 16, 'tfg:tfc/jute_fiber') // Ceramic Recycling diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index b8e87417d..da8753d8b 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -327,7 +327,7 @@ function registerTFCMetalsRecipes(event) { event.recipes.gtceu.ore_washer(`tfc:ore_washer/water/deposit/${ore}/${stone}`) .itemInputs(`1x tfc:deposit/${ore}/${stone}`) - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 100") .circuit(4) .itemOutputs(`1x tfc:ore/normal_${ore}`) .duration(400) diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js index 8fcaf4944..09a873d09 100644 --- a/kubejs/server_scripts/tfc/recipes.stone.js +++ b/kubejs/server_scripts/tfc/recipes.stone.js @@ -253,7 +253,7 @@ function registerTFCStoneRecipes(event) { event.recipes.gtceu.assembler(`${stone}_cobble_rocks_to_mossy_cobble`) .itemInputs(`tfc:rock/cobble/${stone}`, '#tfc:compost_greens_low') .circuit(0) - .inputFluids(JsonIO.of({ amount: 144, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 144") .itemOutputs(`tfc:rock/mossy_cobble/${stone}`) .duration(50) .EUt(2) @@ -265,7 +265,7 @@ function registerTFCStoneRecipes(event) { event.recipes.gtceu.assembler(`mossy_bricks_${stone}`) .itemInputs(`tfc:rock/bricks/${stone}`, '#tfc:compost_greens_low') .circuit(0) - .inputFluids(JsonIO.of({ amount: 144, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 144") .itemOutputs(`tfc:rock/mossy_bricks/${stone}`) .duration(50) .EUt(2) diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 9460eec77..e72356a45 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -145,8 +145,9 @@ function registerTFGFoodRecipes(event) { itemInputs: [`tfc:food/${grain}_flour`], itemOutputs: [`2x tfc:food/${grain}_dough`], circuit: 1, + fluidInputs: ['#tfg:clean_water 100'], itemOutputProvider: TFC.isp.of(`2x tfc:food/${grain}_dough`).copyFood() - }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + }) // Firmalife dough processorRecipe(`${grain}_dough`, 300, 16, { @@ -276,41 +277,46 @@ function registerTFGFoodRecipes(event) { processorRecipe(`white_chocolate_blend`, 300, 16, { circuit: 3, itemInputs: ['2x firmalife:food/cocoa_butter', '#tfc:sweetener'], + fluidInputs: ['#tfc:milks 1000'], itemOutputs: ['2x firmalife:food/white_chocolate_blend'], itemOutputProvider: TFC.isp.of('2x firmalife:food/white_chocolate_blend').resetFood(), - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:milks" }})) + }) processorRecipe(`dark_chocolate_blend`, 300, 16, { circuit: 2, itemInputs: ['2x firmalife:food/cocoa_powder', '#tfc:sweetener'], + fluidInputs: ['#tfc:milks 1000'], itemOutputs: ['2x firmalife:food/dark_chocolate_blend'], itemOutputProvider: TFC.isp.of('2x firmalife:food/dark_chocolate_blend').resetFood(), - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:milks" }})) + }) processorRecipe(`milk_chocolate_blend`, 300, 16, { circuit: 1, itemInputs: ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener'], + fluidInputs: ['#tfc:milks 1000'], itemOutputs: ['2x firmalife:food/milk_chocolate_blend'], itemOutputProvider: TFC.isp.of('2x firmalife:food/milk_chocolate_blend').resetFood(), - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:milks" }})) + }) // TODO: this has nutrition dynamically set in the pot recipe, can we do that here? processorRecipe(`egg_noodles`, 50, 8, { circuit: 6, itemInputs: ["#tfc:foods/flour", 'tfc:powder/salt', '#forge:eggs'], + fluidInputs: ['#tfc:milks 1000'], itemOutputs: ['firmalife:food/raw_egg_noodles'], itemOutputProvider: TFC.isp.of("firmalife:food/raw_egg_noodles").copyOldestFood(), - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:milks" }})) + }) processorRecipe(`rice_noodles`, 50, 8, { itemInputs: ["tfc:food/rice_flour", 'tfc:food/maize_flour', 'tfc:powder/salt'], + fluidInputs: ['#tfc:milks 1000'], itemOutputs: ['2x firmalife:food/raw_rice_noodles'], itemOutputProvider: TFC.isp.of('2x firmalife:food/raw_rice_noodles').copyOldestFood() - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:milks" }})) + }) // No ISP needed here event.recipes.gtceu.fermenter(`tfg:fermenter/cream`) - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:milks" }})) + .inputFluids("#tfc:milks 1000") .outputFluids(Fluid.of('firmalife:cream')) .circuit(6) .duration(1200) @@ -450,30 +456,29 @@ function registerTFGFoodRecipes(event) { processorRecipe(`${name}_jam`, 200, 8, { circuit: 15, itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "4x #tfc:empty_jar_with_lid"], + fluidInputs: ['#tfg:clean_water 100'], itemOutputs: [`4x tfc:jar/${name}`], itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}`).copyFood() - }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + }) processorRecipe(`${name}_jam_no_seal`, 200, 8, { circuit: 16, itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "4x tfc:empty_jar"], + fluidInputs: ['#tfg:clean_water 100'], itemOutputs: [`4x tfc:jar/${name}_unsealed`], itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}_unsealed`).copyFood() - }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + }) }) - cookingRecipe("pasta", "firmalife:food/raw_egg_noodles", "firmalife:food/cooked_pasta") - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + cookingRecipe("pasta", "firmalife:food/raw_egg_noodles", "firmalife:food/cooked_pasta", "#tfg:clean_water 100") cookingRecipe("corn_tortilla", "firmalife:food/masa", "firmalife:food/corn_tortilla") cookingRecipe("baked_potato", "tfc:food/potato", "tfc:food/baked_potato") - cookingRecipe("boiled_egg", "#firmalife:foods/raw_eggs", "tfc:food/boiled_egg") - .inputFluids(JsonIO.of({ amount: 200, value: { tag: "tfg:clean_water" }})) + cookingRecipe("boiled_egg", "#firmalife:foods/raw_eggs", "tfc:food/boiled_egg", "#tfg:clean_water 200") - cookingRecipe("cooked_rice", "tfc:food/rice_grain", "tfc:food/cooked_rice") - .inputFluids(JsonIO.of({ amount: 200, value: { tag: "tfg:clean_water" }})) + cookingRecipe("cooked_rice", "tfc:food/rice_grain", "tfc:food/cooked_rice", "#tfg:clean_water 200") processorRecipe("pasta_tomato_sauce", 60, 8, { itemInputs: ["firmalife:food/cooked_pasta", "firmalife:food/tomato_sauce"], @@ -497,9 +502,10 @@ function registerTFGFoodRecipes(event) { processorRecipe('firmalife_masa', 300, 2, { circuit: 3, itemInputs: ["firmalife:food/masa_flour"], + fluidInputs: ['#tfg:clean_water 100'], itemOutputs: ["2x firmalife:food/masa"], itemOutputProvider: TFC.isp.of("2x firmalife:food/masa").copyFood() - }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + }) processorRecipe("tortilla_chips", 40, 16, { itemInputs: ["firmalife:food/taco_shell", "tfc:powder/salt"], @@ -515,9 +521,10 @@ function registerTFGFoodRecipes(event) { processorRecipe("tomato_sauce_from_mix", 200, 8, { itemInputs: ['firmalife:food/tomato_sauce_mix'], + fluidInputs: ['#tfg:clean_water 200'], itemOutputs: ['firmalife:food/tomato_sauce'], itemOutputProvider: TFC.isp.of('firmalife:food/tomato_sauce').copyOldestFood(), - }).inputFluids(JsonIO.of({ amount: 200, value: { tag: "tfg:clean_water" }})) + }) processorRecipe("olive_paste", 60, 8, { itemInputs: ['tfc:food/olive'], @@ -552,14 +559,9 @@ function registerTFGFoodRecipes(event) { processorRecipe('vinegar_alcohol', 600, 32, { circuit: 5, itemInputs: ['#tfc:foods/fruits'], + fluidInputs: ['#tfc:alcohols 250'], fluidOutputs: [Fluid.of('tfc:vinegar', 250)], }) - .inputFluids(JsonIO.of({ - amount: 250, - value: { - tag: "tfc:alcohols" - } - })) processorRecipe("pizza_no_extra", 600, 16, { itemInputs: ["firmalife:food/pizza_dough", "firmalife:food/tomato_sauce", "firmalife:food/shredded_cheese"], @@ -592,9 +594,10 @@ function registerTFGFoodRecipes(event) { processorRecipe("pizza_dough", 300, 16, { itemInputs: ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt'], + fluidInputs: ['#firmalife:oils 100'], itemOutputs: ['4x firmalife:food/pizza_dough'], itemOutputProvider: TFC.isp.of("4x firmalife:food/pizza_dough").copyOldestFood() - }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "firmalife:oils" }})) + }) processorRecipe("vanilla_ice_cream", 300, 16, { itemInputs: ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla'], @@ -632,16 +635,18 @@ function registerTFGFoodRecipes(event) { processorRecipe("pie_dough", 300, 16, { circuit: 2, itemInputs: ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour'], + fluidInputs: ['#tfg:clean_water 1000'], itemOutputs: ['firmalife:food/pie_dough'], itemOutputProvider: TFC.isp.of('firmalife:food/pie_dough').copyOldestFood() - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }})) + }) processorRecipe("pumpkin_pie_dough", 300, 16, { circuit: 2, itemInputs: ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour'], + fluidInputs: ['#tfg:clean_water 1000'], itemOutputs: ['firmalife:food/pumpkin_pie_dough'], itemOutputProvider: TFC.isp.of('firmalife:food/pumpkin_pie_dough').copyOldestFood() - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }})) + }) processorRecipe("raw_pumpkin_pie", 20, 8, { itemInputs: ["firmalife:food/pumpkin_pie_dough", "firmalife:pie_pan"], @@ -663,9 +668,10 @@ function registerTFGFoodRecipes(event) { processorRecipe("hardtack_dough", 300, 16, { itemInputs: ['tfc:powder/salt', '#tfc:foods/flour'], + fluidInputs: ['#tfg:clean_water 1000'], itemOutputs: ['4x firmalife:food/hardtack_dough'], itemOutputProvider: TFC.isp.of('4x firmalife:food/hardtack_dough').copyOldestFood() - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfg:clean_water" }})) + }) processorRecipe("yeast_starter", 1200, 8, { circuit: 2, @@ -676,9 +682,10 @@ function registerTFGFoodRecipes(event) { processorRecipe("yeast_starter_from_water", 7200, 8, { circuit: 10, - fluidOutputs: [Fluid.of('firmalife:yeast_starter', 600)], itemInputs: ['#tfc:foods/fruits'], - }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + fluidInputs: ['#tfg:clean_water 100'], + fluidOutputs: [Fluid.of('firmalife:yeast_starter', 600)], + }) processorRecipe("cocoa_dust", 100, 4, { itemInputs: ["firmalife:food/roasted_cocoa_beans"], @@ -707,18 +714,20 @@ function registerTFGFoodRecipes(event) { processorRecipe("soy_mixture", 300, 8, { itemInputs: ["tfc:food/soybean", 'tfc:powder/salt'], + fluidInputs: ['#tfg:clean_water 50'], itemOutputs: ["firmalife:food/soy_mixture"], itemOutputProvider: TFC.isp.of('firmalife:food/soy_mixture').copyOldestFood() - }).inputFluids(JsonIO.of({ amount: 50, value: { tag: "tfg:clean_water" }})) + }) // Cakes processorRecipe("cake_base", 300, 8, { circuit: 4, itemInputs: ["#forge:eggs", "2x #tfg:sugars", "2x #tfc:foods/flour"], + fluidInputs: ['#tfc:milks 1000'], itemOutputs: ["createaddition:cake_base"], itemOutputProvider: TFC.isp.of("createaddition:cake_base").copyOldestFood() - }).inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:milks" }})) + }) cookingRecipe("baked_cake_base", "createaddition:cake_base", "createaddition:cake_base_baked") @@ -775,7 +784,7 @@ function registerTFGFoodRecipes(event) { event.recipes.gtceu.fermenter('soybean_oil') .itemInputs('firmalife:food/soybean_paste') - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 100") .outputFluids(Fluid.of('firmalife:soybean_oil', 250)) .EUt(GTValues.VA[GTValues.ULV]) .duration(600) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 8b8cd7408..49ab96728 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -253,7 +253,7 @@ function registerTFGMiscellaneousRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.fluid_solidifier('tfg:ice') - .inputFluids(JsonIO.of({ amount: 144, value: { tag: "tfg:clean_water" } })) + .inputFluids("#tfg:clean_water 144") .notConsumable('gtceu:block_casting_mold') .itemOutputs('minecraft:ice') .duration(200) @@ -263,7 +263,7 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.gtceu.mixer('tfg:ice_slush_from_dry_ice') .itemInputs('1x tfg:dry_ice') - .inputFluids( JsonIO.of({ amount: 8000, value: { tag: "tfc:water" }})) + .inputFluids("#tfc:water 8000") .outputFluids(Fluid.of('gtceu:ice', 8000)) .duration(80) .EUt(GTValues.VA[GTValues.ULV]) @@ -467,7 +467,7 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.gtceu.mixer('tfg:clean_foil_pack') .itemInputs('1x tfg:used_foil_pack') - .inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" } })) + .inputFluids("#tfg:clean_water 100") .itemOutputs('1x tfg:clean_foil_pack') .duration(200) .circuit(1) @@ -548,28 +548,28 @@ function registerTFGMiscellaneousRecipes(event) { // Biofuels event.recipes.gtceu.chemical_reactor(`seed_oil_alcohol_biodiesel`) - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:alcohols" } })) + .inputFluids("#tfc:alcohols 1000") .inputFluids(Fluid.of('gtceu:seed_oil', 6000)) .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) event.recipes.gtceu.chemical_reactor(`olive_oil_alcohol_biodiesel`) - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:alcohols" } })) + .inputFluids("#tfc:alcohols 1000") .inputFluids(Fluid.of('tfc:olive_oil', 4000)) .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) event.recipes.gtceu.chemical_reactor(`soybean_oil_alcohol_biodiesel`) - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:alcohols" } })) + .inputFluids("#tfc:alcohols 1000") .inputFluids(Fluid.of('firmalife:soybean_oil', 4000)) .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) .EUt(GTValues.VHA[GTValues.ULV]) event.recipes.gtceu.chemical_reactor(`fish_oil_alcohol_biodiesel`) - .inputFluids(JsonIO.of({ amount: 1000, value: { tag: "tfc:alcohols" } })) + .inputFluids("#tfc:alcohols 1000") .inputFluids(Fluid.of('gtceu:fish_oil', 6000)) .outputFluids(Fluid.of('gtceu:bio_diesel', 6000)) .duration(20 * 10) diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index 39ce77bba..6df194cd7 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -98,7 +98,7 @@ function registerTFGPapermakingRecipes(event) { .outputItem('tfg:soaked_hardwood_strip') .id('tfg:barrel/soak_hardwood_strip') event.recipes.gtceu.chemical_bath('tfg:chemical_bath/soak_hardwood_strips') - .inputFluids( JsonIO.of({ amount: 100, value: { tag: "tfc:clean_water" }})) + .inputFluids("#tfc:clean_water 100") .itemInputs('tfg:hardwood_strip') .itemOutputs('tfg:soaked_hardwood_strip') .duration(200) diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 99069b8b2..8b1d279e3 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -208,7 +208,7 @@ function registerTFGSpaceRecipes(event) { event.recipes.gtceu.brewery('biomass_from_twisting_vines') .itemInputs('minecraft:twisting_vines') - .inputFluids(JsonIO.of({ amount: 20, value: { tag: "tfg:clean_water" }})) + .inputFluids("#tfg:clean_water 20") .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(50) .EUt(3)