From 3896d00977a29c73ef1af6f19a41f7ac857a70f3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 14 Dec 2025 17:32:25 +0000 Subject: [PATCH] migrate all vintageimprovements recipes to the new kjs format --- kubejs/server_scripts/afc/recipes.js | 44 +- kubejs/server_scripts/create/recipes.js | 8 - .../gregtech/recipes.materials.js | 51 +- kubejs/server_scripts/gregtech/utility.js | 11 +- kubejs/server_scripts/sacksnstuff/recipes.js | 23 +- .../server_scripts/tfc/recipes.materials.js | 32 +- .../server_scripts/tfg/mars/recipes.mars.js | 22 +- .../tfg/natural_blocks/recipes.dirt.js | 10 +- .../tfg/natural_blocks/recipes.rocks.js | 8 - .../tfg/primitive/recipes.cloth.js | 30 +- .../tfg/primitive/recipes.wood.js | 22 +- .../vintage_improvements/recipes.js | 532 +++++++----------- kubejs/startup_scripts/minecraft/constants.js | 1 + 13 files changed, 285 insertions(+), 509 deletions(-) diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 305f4ff47..3cf811739 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -250,21 +250,15 @@ const registerAFCRecipes = (event) => { .duration(50) .EUt(2) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/log/${wood}` }], - results: [{ item: `afc:wood/stripped_log/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_log`) + event.recipes.vintageimprovements.polishing(`afc:wood/stripped_log/${wood}`, `afc:wood/log/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_log`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/wood/${wood}` }], - results: [{ item: `afc:wood/stripped_wood/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_wood`) + event.recipes.vintageimprovements.polishing(`afc:wood/stripped_wood/${wood}`, `afc:wood/wood/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_wood`) }) const MORE_STRIPPING = [ @@ -289,20 +283,14 @@ const registerAFCRecipes = (event) => { .duration(50) .EUt(2) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/log/${x.wood}` }], - results: [{ item: `${x.stripped_mod}:wood/stripped_log/${x.stripped}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${x.wood}_log`) + event.recipes.vintageimprovements.polishing(`${x.stripped_mod}:wood/stripped_log/${x.stripped}`, `afc:wood/log/${x.wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${x.wood}_log`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `afc:wood/wood/${x.wood}` }], - results: [{ item: `${x.stripped_mod}:wood/stripped_wood/${x.stripped}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${x.wood}_wood`) + event.recipes.vintageimprovements.polishing(`${x.stripped_mod}:wood/stripped_wood/${x.stripped}`, `afc:wood/wood/${x.wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${x.wood}_wood`) }) } diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index bf6d47c34..9dda130ec 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1929,14 +1929,6 @@ const registerCreateRecipes = (event) => { .duration(32) .EUt(GTValues.VA[GTValues.ULV]) - //event.custom({ - // type: 'vintageimprovements:laser_cutting', - // ingredients: [{ item: x.base }], - // results: [{item: x.cut }], - // energy: GTValues.VA[GTValues.ULV] * 32 * 4, - // maxChargeRate: GTValues.VA[GTValues.ULV] * 4 - //}).id(`tfg:vi/laser/create/${x.cut.split(':')[1]}`) - event.shaped(`2x create:layered_${x.cut.split('_')[1]}`, [ 'AA' ], { diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index d10117130..3f8f507fc 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -90,17 +90,9 @@ function registerGTCEUMetalRecipes(event) { .duration(material.getMass() * 6) .EUt(GTValues.VA[GTValues.LV]) - let ingotArray = []; - for (let i = 0; i < materialAmount; i++) - ingotArray.push(ingotItem) - - event.custom({ - type: 'vintageimprovements:curving', - ingredients: ingotArray, - itemAsHead: extruderMold, - results: [toolHeadItem], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${material.getName()}_ingot_to_${tagPrefixName}`) + event.recipes.vintageimprovements.curving(toolHeadItem, ingotItem.copyWithCount(materialAmount)) + .head(extruderMold) + .id(`tfg:vi/curving/${material.getName()}_ingot_to_${tagPrefixName}`) if (GTMaterials.Stone !== material) { removeMaceratorRecipe(event, `macerate_${material.getName()}_${tagPrefixName}`) @@ -717,15 +709,12 @@ function registerGTCEUMetalRecipes(event) { // Centrifuging let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(0, material); - let byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1).toJson() - byproductItem.add("chance", 0.111); - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [impureDustItem], - results: [dustItem, byproductItem], - processingTime: material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/centrifuge/${material.getName()}_dust_from_impure`) + event.recipes.vintageimprovements.centrifugation( + [dustItem, Item.of(ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1)).withChance(0.111)], + impureDustItem) + .processingTime(material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/centrifuge/${material.getName()}_dust_from_impure`) // Dropping in water event.custom({ @@ -763,15 +752,12 @@ function registerGTCEUMetalRecipes(event) { // Centrifuging let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(1, material); - let byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1).toJson() - byproductItem.add("chance", 0.111); - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [pureDust], - results: [dustItem, byproductItem], - processingTime: material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/centrifuge/${material.getName()}_dust_from_pure`) + event.recipes.vintageimprovements.centrifugation( + [dustItem, Item.of(ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1)).withChance(0.111)], + pureDust) + .processingTime(material.getMass() * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/centrifuge/${material.getName()}_dust_from_pure`) // Dropping in water event.custom({ @@ -1117,13 +1103,10 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[isLowTier ? GTValues.LV : GTValues.MV]) if (isLowTier) { - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [doublePlateItem], - results: [buzzsawBladeItem], - speed_limits: 0, - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/lathe/${material.getName()}_buzzsaw`) + event.recipes.vintageimprovements.polishing(buzzsawBladeItem, doublePlateItem) + .speedLimits(0) + .processingTime(material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/${material.getName()}_buzzsaw`) } removeMaceratorRecipe(event, `macerate_${material.getName()}_buzz_saw_blade`) diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index bbda57007..0f000d949 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -377,13 +377,10 @@ function woodBuilder(event, name, lumber, logs, log, stripped_log, plank, stair, .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: log }], - results: [{ item: stripped_log }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${name}_log`) + event.recipes.vintageimprovements.polishing(stripped_log, log) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${name}_log`) } if (logs && lumber && name) { diff --git a/kubejs/server_scripts/sacksnstuff/recipes.js b/kubejs/server_scripts/sacksnstuff/recipes.js index 216fdee8c..f49d33ae7 100644 --- a/kubejs/server_scripts/sacksnstuff/recipes.js +++ b/kubejs/server_scripts/sacksnstuff/recipes.js @@ -156,14 +156,10 @@ const registerSNSRecipes = (event) => { .itemOutputs('sns:buckle') .duration(40) .EUt(GTValues.VA[GTValues.LV]) - - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:plates/wrought_iron' }], - itemAsHead: 'gtceu:small_pipe_extruder_mold', - results: [{ item: 'sns:buckle' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('sns:vi/curving/buckle') + + event.recipes.vintageimprovements.curving('sns:buckle', '#forge:plates/wrought_iron') + .head('gtceu:small_pipe_extruder_mold') + .id('sns:vi/curving/buckle') event.recipes.gtceu.extruder('sns:buckle2') .itemInputs('#forge:plates/steel') @@ -172,13 +168,10 @@ const registerSNSRecipes = (event) => { .duration(80) .EUt(GTValues.VA[GTValues.LV]) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:plates/steel' }], - itemAsHead: 'gtceu:small_pipe_extruder_mold', - results: [{ item: 'sns:buckle', count: 2 }], - processingTime: 80 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('sns:vi/curving/buckle2') + event.recipes.vintageimprovements.curving('2x sns:buckle', '#forge:plates/steel') + .head('gtceu:small_pipe_extruder_mold') + .id('sns:vi/curving/buckle2') + event.shaped('sns:pack_frame', [ 'AAA', diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 1a8d62187..850c48c2f 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -240,15 +240,9 @@ function registerTFCMaterialsRecipes(event) { // These aren't TFC recipes but they go here since they don't have a tag prefix // and I'm too lazy to make them one - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [doublePlateItem], - // tuyeres are roughly bottle shaped, right? - // (there's no other mold that wouldn't conflict and this seems close enough) - itemAsHead: 'gtceu:bottle_extruder_mold', - results: [{ item: `tfc:metal/tuyere/${material.getName()}` }], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${material.getName()}_tuyere`) + event.recipes.vintageimprovements.curving(`tfc:metal/tuyere/${material.getName()}`, doublePlateItem) + .head('gtceu:bottle_extruder_mold') + .id(`tfg:vi/curving/${material.getName()}_tuyere`) event.recipes.gtceu.extruder(`tfg:${material.getName()}_tuyere`) .itemInputs(doublePlateItem) @@ -271,13 +265,9 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_shield`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [doublePlateItem], - itemAsHead: 'gtceu:plate_extruder_mold', - results: [{ item: `tfc:metal/shield/${material.getName()}` }], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${material.getName()}_shield`) + event.recipes.vintageimprovements.curving(`tfc:metal/shield/${material.getName()}`, doublePlateItem) + .head('gtceu:plate_extruder_mold') + .id(`tfg:vi/curving/${material.getName()}_shield`) event.recipes.gtceu.extruder(`tfg:${material.getName()}_shield`) .itemInputs(doublePlateItem) @@ -1325,13 +1315,9 @@ function registerTFCMaterialsRecipes(event) { if (!tongsStack.isEmpty() && !tongPartStack.isEmpty() && material !== GTMaterials.Iron) { // tong parts - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [ChemicalHelper.get(TagPrefix.rodLong, material, 1)], - itemAsHead: 'gtceu:rod_extruder_mold', - results: [tongPartStack], - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${material.getName()}_tong`) + event.recipes.vintageimprovements.curving(tongPartStack, `#forge:rods/long/${material.getName()}`) + .head('gtceu:rod_extruder_mold') + .id(`tfg:vi/curving/${material.getName()}_tong`) event.recipes.gtceu.extruder(`tfg:${material.getName()}_tong`) .itemInputs(`#forge:rods/long/${material.getName()}`) diff --git a/kubejs/server_scripts/tfg/mars/recipes.mars.js b/kubejs/server_scripts/tfg/mars/recipes.mars.js index 1e3f8e1b4..35439105a 100644 --- a/kubejs/server_scripts/tfg/mars/recipes.mars.js +++ b/kubejs/server_scripts/tfg/mars/recipes.mars.js @@ -119,13 +119,10 @@ function registerTFGMarsRecipes(event) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: 'beneath:wood/wood/crimson' }], - results: [{ item: 'beneath:wood/stripped_wood/crimson' }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_crimson_wood`) + event.recipes.vintageimprovements.polishing('beneath:wood/stripped_wood/crimson', 'beneath:wood/wood/crimson') + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_crimson_wood`) woodBuilder(event, 'warped', 'beneath:wood/lumber/warped', '#tfc:warped_logs', 'beneath:wood/log/warped', 'beneath:wood/stripped_log/warped', 'beneath:wood/planks/warped', null, @@ -138,13 +135,10 @@ function registerTFGMarsRecipes(event) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: 'beneath:wood/wood/warped' }], - results: [{ item: 'beneath:wood/stripped_wood/warped' }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_warped_wood`) + event.recipes.vintageimprovements.polishing('beneath:wood/stripped_wood/warped', 'beneath:wood/wood/warped') + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_warped_wood`) // Alphacene diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js index 714706f91..da3f7600f 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.dirt.js @@ -74,13 +74,9 @@ function registerTFGDirtRecipes(event) { .duration(100) .EUt(2) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ item: `tfc:mud/${mud}` }], - itemAsHead: 'gtceu:ingot_extruder_mold', - results: [{ item: `tfc:drying_bricks/${mud}`, count: 4 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${mud}_bricks`) + event.recipes.vintageimprovements.curving(`4x tfc:drying_bricks/${mud}`, `tfc:mud/${mud}`) + .head('gtceu:ingot_extruder_mold') + .id(`tfg:vi/curving/${mud}_bricks`) // Влажный кирпич -> Кирпич event.smelting(`tfc:mud_brick/${mud}`, `tfc:drying_bricks/${mud}`) diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index 9be05b6e3..9a6aa0c4d 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -346,14 +346,6 @@ function registerTFGRockRecipes(event) { .notConsumable('tfc:lens') .duration(30) .EUt(GTValues.VA[GTValues.ULV]) - - //event.custom({ - // type: 'vintageimprovements:laser_cutting', - // ingredients: [{ item: x.raw }], - // results: [{item: x.polished }], - // energy: GTValues.VA[GTValues.ULV] * 30 * 4, - // maxChargeRate: GTValues.VA[GTValues.ULV] * 4 - //}).id(`tfg:vi/laser/tfg/${x.raw.replace(/:/g, '_')}_to_${x.polished.replace(/:/g, '_')}`) }) // #endregion RAW_TO_POLISHED diff --git a/kubejs/server_scripts/tfg/primitive/recipes.cloth.js b/kubejs/server_scripts/tfg/primitive/recipes.cloth.js index 284666095..6d8a1d59f 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.cloth.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.cloth.js @@ -194,19 +194,13 @@ function registerTFGClothRecipes(event) { .duration(1800) .EUt(GTValues.VA[GTValues.LV]) - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [{ item: 'tfg:flax_product' }], - results: [{ item: 'tfg:flax_line', count: 2 }, { item: 'tfg:flax_tow' }, { item: 'tfc:groundcover/humus' }], - processingTime: 40 * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('tfg:vi_seperate_flax') - - event.custom({ - type: 'vintageimprovements:centrifugation', - ingredients: [{ item: 'tfg:flax_bundle' }], - results: [{ item: 'tfg:flax_line', count: 18 }, { item: 'tfg:flax_tow', count: 9 }, { item: 'tfc:groundcover/humus', count: 9 }], - processingTime: 360 * 90 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('tfg:vi_seperate_flax_from_bundle') + event.recipes.vintageimprovements.centrifugation(['2x tfg:flax_line', 'tfg:flax_tow', 'tfc:groundcover/humus'], 'tfg:flax_product') + .processingTime(200 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi_seperate_flax') + + event.recipes.vintageimprovements.centrifugation(['18x tfg:flax_line', '9x tfg:flax_tow', '9x tfc:groundcover/humus'], 'tfg:flax_bundle') + .processingTime(1500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi_seperate_flax_from_bundle') // #endregion @@ -218,12 +212,10 @@ function registerTFGClothRecipes(event) { ]).id('tfg:shapeless/linen_thread') ) - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'tfg:flax_line' }], - results: [{ item: 'tfg:linen_thread', count: 4 }], - processingTime: 2 * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id('tfg:vi_spin_flax_line') + event.recipes.vintageimprovements.coiling('4x tfg:linen_thread', 'tfg:flax_line') + .processingTime(20 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .springColor('F6E6B5') + .id('tfg:vi_spin_flax_line') event.recipes.gtceu.wiremill('tfg:spin_flax_line') .itemInputs('tfg:flax_line') diff --git a/kubejs/server_scripts/tfg/primitive/recipes.wood.js b/kubejs/server_scripts/tfg/primitive/recipes.wood.js index 23367a412..79017f62a 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.wood.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.wood.js @@ -217,20 +217,14 @@ function registerTFGWoodRecipes(event) { .duration(50) .EUt(2) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `tfc:wood/log/${wood}` }], - results: [{ item: `tfc:wood/stripped_log/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_log`) + event.recipes.vintageimprovements.polishing(`tfc:wood/stripped_log/${wood}`, `tfc:wood/log/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_log`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ item: `tfc:wood/wood/${wood}` }], - results: [{ item: `tfc:wood/stripped_wood/${wood}` }], - speed_limits: 0, - processingTime: 50 - }).id(`tfg:vi/lathe/stripping_${wood}_wood`) + event.recipes.vintageimprovements.polishing(`tfc:wood/stripped_wood/${wood}`, `tfc:wood/wood/${wood}`) + .speedLimits(0) + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/stripping_${wood}_wood`) }) } \ No newline at end of file diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 6df9af966..516b529bc 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -277,48 +277,46 @@ function registerVintageImprovementsRecipes(event) { // #region Coiling if (material.hasFlag(MaterialFlags.GENERATE_ROD) && material.hasFlag(MaterialFlags.GENERATE_SPRING_SMALL)) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.rod, material, 1)], - results: [ChemicalHelper.get(TagPrefix.springSmall, material, 2)], - processingTime: (material.getMass() / 2) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_small_spring`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.springSmall, material, 2), + ChemicalHelper.get(TagPrefix.rod, material, 1)) + .processingTime((material.getMass() / 2) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_small_spring`) + .springColor(material.getMaterialRGB().toString(16)) } if (material.hasFlag(MaterialFlags.GENERATE_LONG_ROD) && material.hasFlag(MaterialFlags.GENERATE_SPRING)) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.rodLong, material, 1)], - results: [ChemicalHelper.get(TagPrefix.spring, material, 1)], - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_spring`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.spring, material, 1), + ChemicalHelper.get(TagPrefix.rodLong, material, 1)) + .processingTime(material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_spring`) + .springColor(material.getMaterialRGB().toString(16)) } const singleWire = ChemicalHelper.get(TagPrefix.wireGtSingle, material, 2) if (singleWire !== null) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.ingot, material, 1)], - results: [singleWire], - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_single_wire`) + event.recipes.vintageimprovements.coiling(singleWire, ChemicalHelper.get(TagPrefix.ingot, material, 1)) + .processingTime(material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_single_wire`) + .springColor(material.getMaterialRGB().toString(16)) } if (material.hasFlag(MaterialFlags.GENERATE_FINE_WIRE)) { if (singleWire !== null) { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.wireGtSingle, material, 1)], - results: [ChemicalHelper.get(TagPrefix.wireFine, material, 4)], - processingTime: material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.wireFine, material, 4), + ChemicalHelper.get(TagPrefix.wireGtSingle, material, 1)) + .processingTime(material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + .springColor(material.getMaterialRGB().toString(16)) } else { - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.ingot, material, 1)], - results: [ChemicalHelper.get(TagPrefix.wireFine, material, 8)], - processingTime: material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + event.recipes.vintageimprovements.coiling( + ChemicalHelper.get(TagPrefix.wireFine, material, 8), + ChemicalHelper.get(TagPrefix.ingot, material, 1)) + .processingTime(material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/${material.getName()}_fine_wire`) + .springColor(material.getMaterialRGB().toString(16)) } } @@ -355,13 +353,10 @@ function registerVintageImprovementsRecipes(event) { : ChemicalHelper.get(TagPrefix.ingot, material, 1) if (latheInput !== null) { - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [latheInput], - results: [ChemicalHelper.get(TagPrefix.rod, material, 2)], - speed_limits: 3, - processingTime: material.getMass() * 4 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/lathe/${material.getName()}_to_rod`) + event.recipes.vintageimprovements.polishing(ChemicalHelper.get(TagPrefix.rod, material, 2), latheInput) + .speedLimits(3) + .processingTime(material.getMass() * 4 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/${material.getName()}_to_rod`) } if (material.hasProperty(PropertyKey.GEM)) { @@ -371,13 +366,12 @@ function registerVintageImprovementsRecipes(event) { } if (material.hasFlag(MaterialFlags.GENERATE_BOLT_SCREW)) { - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [ChemicalHelper.get(TagPrefix.bolt, material, 1)], - results: [ChemicalHelper.get(TagPrefix.screw, material, 1)], - speed_limits: 2, - processingTime: Math.max(1, material.getMass() / 8) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/lathe/${material.getName()}_bolt_to_screw`) + event.recipes.vintageimprovements.polishing( + ChemicalHelper.get(TagPrefix.screw, material, 1), + ChemicalHelper.get(TagPrefix.bolt, material, 1)) + .speedLimits(2) + .processingTime(Math.max(1, material.getMass() / 8) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/${material.getName()}_bolt_to_screw`) } // #endregion @@ -386,109 +380,81 @@ function registerVintageImprovementsRecipes(event) { // #region Vibrating - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ tag: 'tfc:rock/gravel' }], - results: [ - { item: 'minecraft:flint' }, - { item: 'minecraft:flint', chance: 0.9 }, - { item: 'minecraft:flint', chance: 0.8 }, - { item: 'minecraft:flint', chance: 0.6 }, - { item: 'minecraft:flint', chance: 0.33 }, - { item: 'minecraft:flint', chance: 0.25 } - ], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/gravel`) + event.recipes.vintageimprovements.vibrating([ + Item.of('minecraft:flint'), + Item.of('minecraft:flint').withChance(0.9), + Item.of('minecraft:flint').withChance(0.8), + Item.of('minecraft:flint').withChance(0.6), + Item.of('minecraft:flint').withChance(0.33), + Item.of('minecraft:flint').withChance(0.25) + ], '#tfc:rock/gravel') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/gravel`) global.TFC_STONE_TYPES.forEach(stone => { - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/native_gold/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Gold, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_gold`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Gold, 1), + `tfc:deposit/native_gold/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_gold`) - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/native_copper/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Copper, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_copper`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Copper, 1), + `tfc:deposit/native_copper/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_copper`) - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/native_silver/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Silver, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_silver`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Silver, 1), + `tfc:deposit/native_silver/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_silver`) - event.custom({ - type: 'vintageimprovements:vibrating', - ingredients: [{ item: `tfc:deposit/cassiterite/${stone}` }], - results: [ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Cassiterite, 1)], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/vibrating/deposits/${stone}_cassiterite`) + event.recipes.vintageimprovements.vibrating( + ChemicalHelper.get(TagPrefix.rawOre, GTMaterials.Cassiterite, 1), + `tfc:deposit/cassiterite/${stone}`) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/vibrating/deposits/${stone}_cassiterite`) }) // #endregion // #region Lathe - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:glass' }], - results: [{ item: 'tfc:lens' }], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/lens`) + event.recipes.vintageimprovements.polishing('tfc:lens', '#forge:glass') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/rose_quartz' }], - results: [ChemicalHelper.get(TagPrefix.lens, $GreateMaterials.RoseQuartz, 1), ChemicalHelper.get(TagPrefix.dust, $GreateMaterials.RoseQuartz, 2)], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/rose_quartz_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/rose_quartz', '2x #forge:dusts/rose_quartz'], '#forge:exquisite_gems/rose_quartz') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/rose_quartz_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/diamond' }], - results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Diamond, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2)], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/diamond_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/diamond', '2x #forge:dusts/diamond'], '#forge:exquisite_gems/diamond') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/diamond_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/emerald' }], - results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Emerald, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Emerald, 2)], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/emerald_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/emerald', '2x #forge:dusts/emerald'], '#forge:exquisite_gems/emerald') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/emerald_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/ruby' }], - results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Ruby, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ruby, 2)], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/ruby_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/ruby', '2x #forge:dusts/ruby'], '#forge:exquisite_gems/ruby') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/ruby_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/sapphire' }], - results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Sapphire, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Sapphire, 2)], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/sapphire_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/sapphire', '2x #forge:dusts/sapphire'], '#forge:exquisite_gems/sapphire') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/sapphire_lens`) - event.custom({ - type: 'vintageimprovements:polishing', - ingredients: [{ tag: 'forge:exquisite_gems/amethyst' }], - results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Amethyst, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Amethyst, 2)], - speed_limits: 1, - processingTime: 100 - }).id(`tfg:vi/lathe/amethyst_lens`) + event.recipes.vintageimprovements.polishing(['#forge:lenses/amethyst', '2x #forge:dusts/amethyst'], '#forge:exquisite_gems/amethyst') + .speedLimits(1) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/lathe/amethyst_lens`) // #endregion @@ -502,7 +468,7 @@ function registerVintageImprovementsRecipes(event) { // LV recipes only let EUt = (r.tickInputs && r.tickInputs.eu) ? r.tickInputs.eu[0].content : null; - if (!(EUt <= 32)) return + if (EUt > 32) return // Skip this one if (r.outputs.item[0].content.ingredient.item === "gtceu:nan_certificate") return // Skip glass too @@ -518,13 +484,9 @@ function registerVintageImprovementsRecipes(event) { let output = r.outputs.item[0].content.ingredient; output.count = r.outputs.item[0].content.count; - event.custom({ - type: 'vintageimprovements:curving', - ingredients: input_array, - itemAsHead: r.inputs.item[1].content.ingredient.item, - results: [output], - processingTime: r.duration * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/${recipe.getId().split(':')[1]}`) + event.recipes.vintageimprovements.curving(output, input_array) + .head(r.inputs.item[1].content.ingredient.item) + .id(`tfg:vi/curving/${recipe.getId().split(':')[1]}`) } ) @@ -535,238 +497,144 @@ function registerVintageImprovementsRecipes(event) { // Item to fluids: vacuumizing // Fluids to item: pressurizing - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfc:glue' }], - results: [{ fluid: 'gtceu:glue', amount: 50 }], - heatRequirement: "heated", - processingTime: 100 - }).id('tfg:vi/vacuumizing/glue_melting') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 50), 'tfc:glue') + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_melting') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'gtceu:sticky_resin' }], - results: [{ fluid: 'gtceu:glue', amount: 100 }], - heatRequirement: "heated", - processingTime: 200 - }).id('tfg:vi/vacuumizing/glue_from_resin') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 100), 'gtceu:sticky_resin') + .heated() + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_from_resin') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:conifer_rosin' }], - results: [{ fluid: 'gtceu:glue', amount: 50 }], - heatRequirement: "heated", - processingTime: 200 - }).id('tfg:vi/vacuumizing/glue_from_rosin') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 50), 'tfg:conifer_rosin') + .heated() + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_from_rosin') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'minecraft:bone_meal' }, { fluid: 'tfc:limewater', amount: 500 }], - results: [{ fluid: 'gtceu:glue', amount: 50 }], - heatRequirement: "heated", - processingTime: 100 - }).id('tfg:vi/vacuumizing/glue_from_bone_meal') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:glue', 50), [Fluid.of('tfc:limewater', 500), 'minecraft:bone_meal']) + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/glue_from_bone_meal') - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [{ fluid: 'gtceu:glue', amount: 50 }], - results: [{ item: 'tfc:glue' }], - processingTime: 100 - }).id('tfg:vi/pressurizing/glue_solidifying') + event.recipes.vintageimprovements.pressurizing('tfc:glue', Fluid.of('gtceu:glue', 50)) + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/pressurizing/glue_solidifying') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'gtceu:rubber_dust' }], - results: [{ fluid: 'gtceu:rubber', amount: 144 }], - heatRequirement: "heated", - processingTime: 100 - }).id('tfg:vi/vacuum/rubber') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:rubber', 144), '#forge:dusts/rubber') + .heated() + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuum/rubber') // Vaccuming rubber wood stuff for latex - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:latex_logs' }], - results: [{ fluid: 'tfg:latex', amount: 100 }], - processingTime: 600 - }).id('tfg:vi/vacuumizing/latex_from_rubber_logs') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 100), '#tfg:latex_logs') + .processingTime(300 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_logs') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:rubber_saplings' }], - results: [{ fluid: 'tfg:latex', amount: 25 }], - processingTime: 300 - }).id('tfg:vi/vacuumizing/latex_from_rubber_sapling') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 25), '#tfg:rubber_saplings') + .processingTime(150 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_sapling') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:rubber_leaves' }], - results: [{ fluid: 'tfg:latex', amount: 10 }], - processingTime: 150 - }).id('tfg:vi/vacuumizing/latex_from_rubber_leaves') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 10), '#tfg:rubber_leaves') + .processingTime(75 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_leaves') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'tfg:rubber_plants' }, { item: 'tfc:powder/soda_ash' }, { fluid: 'tfc:salt_water', amount: 50 }], - results: [{ fluid: 'tfg:latex', amount: 50 }], - heatRequirement: "heated", - processingTime: 40 - }).id('tfg:vi/vacuumizing/latex_from_rubber_plants') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('tfg:latex', 50), ['#tfg:rubber_plants', 'tfc:powder/soda_ash', Fluid.of('tfc:salt_water', 50)]) + .heated() + .processingTime(20 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/latex_from_rubber_plants') // Vulc. latex to raw rubber pulp - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [{ fluid: 'tfg:vulcanized_latex', amount: 250 }], - results: [{ item: 'gtceu:raw_rubber_dust' }], - heatRequirement: "heated", - processingTime: 120 - }).id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber') + event.recipes.vintageimprovements.pressurizing(Fluid.of('tfg:vulcanized_latex', 250), '#forge:dusts/raw_rubber') + .heated() + .processingTime(60 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber') // Seed oils - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:sunflower_product' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 350 }], - processingTime: 1000 - }).id('tfg:vi/vacuumizing/sunflower') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 350), 'tfg:sunflower_product') + .processingTime(500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/sunflower') + + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 600), 'tfg:rapeseed_product') + .processingTime(500 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/rapeseed') - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ item: 'tfg:rapeseed_product' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 600 }], - processingTime: 1000 - }).id('tfg:vi/vacuumizing/rapeseed') - - event.custom({ - type: 'vintageimprovements:vacuumizing', - ingredients: [{ tag: 'forge:seeds' }], - results: [{ fluid: 'gtceu:seed_oil', amount: 16 }], - processingTime: 100 - }).id('tfg:vi/vacuumizing/seed_oil') - - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [{ fluid: 'tfc:lye', amount: 1000 }], - results: [{ item: 'gtceu:sodium_hydroxide_dust' }], - heatRequirement: "heated", - processingTime: 300 - }).id('tfg:vi/pressurizing/lye') + event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:seed_oil', 16), '#forge:seeds') + .processingTime(50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id('tfg:vi/vacuumizing/seed_oil') + + event.recipes.vintageimprovements.pressurizing('#forge:dusts/sodium_hydroxide', Fluid.of('tfc:lye', 1000)) + .processingTime(150 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .heated() + .id('tfg:vi/pressurizing/lye') // #endregion // #region Coiling + event.recipes.vintageimprovements.coiling('8x tfc:wool_yarn', 'tfc:wool') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/wool_yarn`) - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'tfc:wool' }], - results: [{ item: 'tfc:wool_yarn', count: 8 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/wool_yarn`) + event.recipes.vintageimprovements.coiling('8x tfc:wool_yarn', 'tfg:glacian_wool') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/glacian_wool_yarn`) + .springColor('FFCCFC') - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'tfg:glacian_wool' }], - results: [{ item: 'tfc:wool_yarn', count: 8 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/glacian_wool_yarn`) + event.recipes.vintageimprovements.coiling('16x tfg:phantom_thread', 'minecraft:phantom_membrane') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/phantom_thread`) + .springColor('E1C4C4') - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'minecraft:phantom_membrane' }], - results: [{ item: 'tfg:phantom_thread', count: 16 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/phantom_thread`) + event.recipes.vintageimprovements.coiling('8x firmalife:pineapple_yarn', 'firmalife:pineapple_fiber') + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/pineapple_yarn`) + .springColor('FFFCCC') - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [{ item: 'firmalife:pineapple_fiber' }], - results: [{ item: 'firmalife:pineapple_yarn', count: 8 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/pineapple_yarn`) - - event.custom({ - type: 'vintageimprovements:coiling', - ingredients: [ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)], - results: [{ item: 'tfg:polycaprolactam_string', count: 32 }], - processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/coiling/nylon_string`) + event.recipes.vintageimprovements.coiling('32x tfg:polycaprolactam_string', ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)) + .processingTime(100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER) + .id(`tfg:vi/coiling/nylon_string`) + .springColor('000000') // #endregion // #region Curving - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ item: 'minecraft:clay_ball' }], - itemAsHead: 'gtceu:ingot_extruder_mold', - results: [{ item: 'tfc:ceramic/unfired_brick' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/clay_brick`) + event.recipes.vintageimprovements.curving('tfc:ceramic/unfired_brick', 'minecraft:clay_ball') + .head('gtceu:ingot_extruder_mold') + .id(`tfg:vi/curving/clay_brick`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ item: 'tfc:fire_clay' }], - itemAsHead: 'gtceu:ingot_extruder_mold', - results: [{ item: 'tfc:ceramic/unfired_fire_brick' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/fire_brick`) + event.recipes.vintageimprovements.curving('tfc:ceramic/unfired_fire_brick', 'tfc:fire_clay') + .head('gtceu:ingot_extruder_mold') + .id(`tfg:vi/curving/fire_brick`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:ingots/copper' }], - itemAsHead: 'gtceu:bottle_extruder_mold', - results: [{ item: 'afc:tree_tap' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/tree_tap`) + event.recipes.vintageimprovements.curving('afc:tree_tap', '#forge:ingots/copper') + .head('gtceu:bottle_extruder_mold') + .id(`tfg:vi/curving/tree_tap`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:plates/copper' }], - itemAsHead: 'tfg:small_casing_extruder_mold', - results: [{ item: 'firmalife:sprinkler' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/sprinkler`) + event.recipes.vintageimprovements.curving('firmalife:sprinkler', '#forge:plates/copper') + .head('tfg:small_casing_extruder_mold') + .id(`tfg:vi/curving/sprinkler`) - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:double_plates/wrought_iron' }], - itemAsHead: 'tfg:large_casing_extruder_mold', - results: [{ item: 'tfc:wrought_iron_grill' }], - processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/curving/wrought_iron_grill`) - - // #endregion - - // #region Centrifuging - - //event.custom({ - // type: 'vintageimprovements:centrifugation', - // ingredients: [{ tag: 'forge:dusts/oilsands' }], - // results: [ - // { item: "tfc:sand/yellow", chance: 0.5 }, - // { fluid: "gtceu:oil", amount: 2000 } - // ], - // processingTime: 10 * 20 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - //}).id(`tfg:vi/centrifuge/oilsands`) + event.recipes.vintageimprovements.curving('tfc:wrought_iron_grill', '#forge:double_plates/wrought_iron') + .head('tfg:large_casing_extruder_mold') + .id(`tfg:vi/curving/wrought_iron_grill`) // #endregion } function generateHammeringRecipe(event, material, blows, anvil) { - event.custom({ - type: 'vintageimprovements:hammering', - hammerBlows: blows, - ingredients: [ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)], - results: [ChemicalHelper.get(TagPrefix.plate, material, 1)], - anvilBlock: `tfc:metal/anvil/${anvil}` - }).id(`tfg:vi/hammer/${material.getName()}_plate_on_${anvil}_anvil`) + event.recipes.vintageimprovements.hammering( + ChemicalHelper.get(TagPrefix.plate, material, 1), + ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)) + .anvilBlock(`tfc:metal/anvil/${anvil}`) + .hammerBlows(blows) + .id(`tfg:vi/hammer/${material.getName()}_plate_on_${anvil}_anvil`) } function generateHammeringRecipeFromItem(event, input, output, blows, anvil) { - event.custom({ - type: 'vintageimprovements:hammering', - hammerBlows: blows, - ingredients: [{ item: input }], - results: [{ item: output }], - anvilBlock: `tfc:metal/anvil/${anvil}` - }).id(`tfg:vi/hammer/${input.replace(/[#:]/g, '_')}_on_${anvil}_anvil`) + event.recipes.vintageimprovements.hammering(output, input) + .anvilBlock(`tfc:metal/anvil/${anvil}`) + .hammerBlows(blows) + .id(`tfg:vi/hammer/${input.replace(/[#:]/g, '_')}_on_${anvil}_anvil`) } \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 658c290f9..e406882eb 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -620,6 +620,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:furnace', 'minecraft:amethyst_cluster', 'minecraft:rabbit_hide', + 'minecraft:raw_copper', 'minecraft:raw_iron', 'minecraft:raw_gold', 'minecraft:compass',