diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index b3d864a9a..3dec60671 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1171,10 +1171,20 @@ const registerGTCEURecipes = (event) => { GTRegistries.MATERIALS.forEach(material => { if (material.hasProperty(PropertyKey.ORE)) { - // Сырая руда -> Дробленная руда + Дробленная руда (30%) - event.recipes.createCrushing([`gtceu:${material}_crushed_ore`, Item.of(`gtceu:${material}_crushed_ore`).withChance(0.3)], `#forge:raw_materials/${material}`) + // Бедная сырая руда -> Дробленная руда + Дробленная руда (30%) + event.recipes.createCrushing(Item.of(`gtceu:${material}_crushed_ore`).withChance(0.75), `#forge:poor_raw_materials/${material}`) .processingTime(200) - .id(`tfg:crushing/${material}_crushed_ore`) + .id(`tfg:crushing/${material}_crushed_ore_from_poor_raw_ore`) + + // Нормальная сырая руда -> Дробленная руда + Дробленная руда (30%) + event.recipes.createCrushing([`gtceu:${material}_crushed_ore`, Item.of(`gtceu:${material}_crushed_ore`).withChance(0.2)], `#forge:raw_materials/${material}`) + .processingTime(200) + .id(`tfg:crushing/${material}_crushed_ore_from_normal_raw_ore`) + + // Богатая сырая руда -> Дробленная руда + Дробленная руда (30%) + event.recipes.createCrushing([`gtceu:${material}_crushed_ore`, `gtceu:${material}_crushed_ore`, Item.of(`gtceu:${material}_crushed_ore`).withChance(0.2)], `#forge:rich_raw_materials/${material}`) + .processingTime(200) + .id(`tfg:crushing/${material}_crushed_ore_from_rich_raw_ore`) // Грязная пыль -> Пыль (90%) event.recipes.createSplashing(Item.of(`gtceu:${material}_dust`).withChance(0.9), `gtceu:${material}_impure_dust`) diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 9af41d0e5..cfd51cda2 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -55,7 +55,9 @@ const registerTFCHeats = (event) => { } if (metalSpecs.props.includes('ore_chunks')) { + event.itemHeat(`#forge:rich_raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) event.itemHeat(`#forge:raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) + event.itemHeat(`#forge:poor_raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp) } if (metalSpecs.props.includes('tool')) { diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 94ee5b9cc..f7ed8242a 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -800,10 +800,20 @@ const registerTFCRecipes = (event) => { } if (metalSpecs.props.includes(global.ORE_CHUNKS_GEN)) { - // Декрафт куска руды + // Декрафт нормального куска руды event.recipes.tfc.heating(`#forge:raw_materials/${metal}`, metalSpecs.melt_temp) .resultFluid(Fluid.of(metalSpecs.output_fluid, global.calcAmountOfMetal(36, metalSpecs.percent_of_material))) .id(`tfg:heating/raw/${metal}`) + + // Декрафт богатого куска руды + event.recipes.tfc.heating(`#forge:rich_raw_materials/${metal}`, metalSpecs.melt_temp) + .resultFluid(Fluid.of(metalSpecs.output_fluid, global.calcAmountOfMetal(48, metalSpecs.percent_of_material))) + .id(`tfg:heating/rich_raw/${metal}`) + + // Декрафт бедного куска руды + event.recipes.tfc.heating(`#forge:poor_raw_materials/${metal}`, metalSpecs.melt_temp) + .resultFluid(Fluid.of(metalSpecs.output_fluid, global.calcAmountOfMetal(24, metalSpecs.percent_of_material))) + .id(`tfg:heating/poor_raw/${metal}`) } })