From a69e32beace6e7e1af7e777cb511d26483d01be7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 27 Apr 2025 17:12:25 +0100 Subject: [PATCH] changed early game recipes to use small gears instead of large, to avoid duping, and make cogs easier --- kubejs/server_scripts/create/recipes.js | 4 +-- .../create_additions/recipes.js | 2 +- .../create_horse_power/recipes.js | 6 ++-- kubejs/server_scripts/greate/recipes.js | 16 ++++----- .../greate/recipes.recycling.js | 8 ++--- kubejs/server_scripts/tfc/recipes.metals.js | 33 ++++--------------- kubejs/startup_scripts/gtceu/materials.js | 3 +- 7 files changed, 27 insertions(+), 45 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index baa860369..f755ae809 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -267,14 +267,14 @@ const registerCreateRecipes = (event) => { A: '#forge:screws/wrought_iron', B: '#forge:plates/brass', C: '#forge:rods/black_steel', - D: '#forge:gears/steel', + D: '#forge:small_gears/steel', E: '#forge:tools/hammers', F: '#forge:storage_blocks/copper', G: '#forge:tools/screwdrivers', }).id('tfg:create/shaped/steam_engine') event.recipes.gtceu.assembler('tfg:create/steam_engine') - .itemInputs('2x #forge:screws/wrought_iron', '#forge:plates/brass', '2x #forge:rods/red_steel', '#forge:gears/steel', '#forge:storage_blocks/copper') + .itemInputs('2x #forge:screws/wrought_iron', '#forge:plates/brass', '2x #forge:rods/red_steel', '#forge:small_gears/steel', '#forge:storage_blocks/copper') .circuit(3) .itemOutputs('create:steam_engine') .duration(200) diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 6b1de2743..d175cd9ab 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -13,7 +13,7 @@ const registerCreateAdditionsRecipes = (event) => { ], { A: 'create:precision_mechanism', B: 'greate:steel_shaft', - C: '#forge:gears/black_steel', + C: '#forge:double_plates/black_steel', D: '#gtceu:circuits/ulv', E: 'gtceu:ulv_machine_hull' }).id('tfg:create_additions/shaped/rolling_mill') diff --git a/kubejs/server_scripts/create_horse_power/recipes.js b/kubejs/server_scripts/create_horse_power/recipes.js index 865f155d6..652bfb2b2 100644 --- a/kubejs/server_scripts/create_horse_power/recipes.js +++ b/kubejs/server_scripts/create_horse_power/recipes.js @@ -11,7 +11,7 @@ function registerCreateHorsePowerBlockRecipes(event) { 'CCC' ], { A: '#forge:fences/wooden', - B: '#forge:gears/bronze', + B: '#forge:small_gears/bronze', C: '#tfc:rock/raw', D: '#forge:tools/hammers', E: '#tfc:chisels' @@ -25,7 +25,7 @@ function registerCreateHorsePowerBlockRecipes(event) { 'CCC' ], { A: '#forge:fences/wooden', - B: '#forge:gears/bismuth_bronze', + B: '#forge:small_gears/bismuth_bronze', C: '#tfc:rock/raw', D: '#forge:tools/hammers', E: '#tfc:chisels' @@ -39,7 +39,7 @@ function registerCreateHorsePowerBlockRecipes(event) { 'CCC' ], { A: '#forge:fences/wooden', - B: '#forge:gears/black_bronze', + B: '#forge:small_gears/black_bronze', C: '#tfc:rock/raw', D: '#forge:tools/hammers', E: '#tfc:chisels' diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 09b318c39..44ae555e0 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -61,22 +61,22 @@ function registerGreateRecipes(event) { // TODO: recycling recipes for these? event.shapeless('greate:steel_cogwheel', ['greate:steel_shaft', '#forge:small_gears/wrought_iron', '#forge:tools/wrenches']) .id('greate:shapeless/steel_cogwheel') - event.shapeless('greate:large_steel_cogwheel', ['greate:steel_shaft', '#forge:gears/wrought_iron', '#forge:tools/wrenches']) + event.shapeless('greate:large_steel_cogwheel', ['greate:steel_shaft', '#forge:small_gears/wrought_iron','#forge:small_gears/wrought_iron', '#forge:tools/wrenches']) .id('greate:shapeless/large_steel_cogwheel'); event.shapeless('greate:aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:small_gears/steel', '#forge:tools/wrenches']) .id('greate:shapeless/aluminium_cogwheel') - event.shapeless('greate:large_aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:gears/steel', '#forge:tools/wrenches']) + event.shapeless('greate:large_aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:small_gears/steel', '#forge:small_gears/steel', '#forge:tools/wrenches']) .id('greate:shapeless/large_aluminium_cogwheel'); event.shapeless('greate:stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:small_gears/aluminium', '#forge:tools/wrenches']) .id('greate:shapeless/stainless_steel_cogwheel') - event.shapeless('greate:large_stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:gears/aluminium', '#forge:tools/wrenches']) + event.shapeless('greate:large_stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:small_gears/aluminium', '#forge:small_gears/aluminium', '#forge:tools/wrenches']) .id('greate:shapeless/large_stainless_steel_cogwheel'); event.shapeless('greate:titanium_cogwheel', ['greate:titanium_shaft', '#forge:small_gears/stainless_steel', '#forge:tools/wrenches']) .id('greate:shapeless/titanium_cogwheel') - event.shapeless('greate:large_titanium_cogwheel', ['greate:titanium_shaft', '#forge:gears/stainless_steel', '#forge:tools/wrenches']) + event.shapeless('greate:large_titanium_cogwheel', ['greate:titanium_shaft', '#forge:small_gears/stainless_steel', '#forge:small_gears/stainless_steel', '#forge:tools/wrenches']) .id('greate:shapeless/large_titanium_cogwheel'); // #endregion @@ -90,7 +90,7 @@ function registerGreateRecipes(event) { ], { A: 'tfc:quern', B: 'tfc:handstone', - C: '#forge:gears/bronze', + C: '#forge:small_gears/bronze', D: '#forge:tools/hammers', E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone') @@ -102,7 +102,7 @@ function registerGreateRecipes(event) { ], { A: 'tfc:quern', B: 'tfc:handstone', - C: '#forge:gears/bismuth_bronze', + C: '#forge:small_gears/bismuth_bronze', D: '#forge:tools/hammers', E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone2') @@ -114,7 +114,7 @@ function registerGreateRecipes(event) { ], { A: 'tfc:quern', B: 'tfc:handstone', - C: '#forge:gears/black_bronze', + C: '#forge:small_gears/black_bronze', D: '#forge:tools/hammers', E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone3') @@ -126,7 +126,7 @@ function registerGreateRecipes(event) { ], { A: '#forge:smooth_stone', B: 'gtceu:treated_wood_slab', - C: '#forge:gears/steel', + C: '#forge:small_gears/steel', D: '#forge:tools/hammers', E: '#forge:tools/wrenches', F: '#forge:dusts/diamond' diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index b38223a16..3ee3cf82a 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -76,25 +76,25 @@ function registerGreateRecyclingRecipes(event) { event.shapeless('#forge:small_gears/wrought_iron', ['greate:steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:steel_shaft', - event.shapeless('#forge:gears/wrought_iron', ['greate:large_steel_cogwheel'])) + event.shapeless('2x #forge:small_gears/wrought_iron', ['greate:large_steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:aluminium_shaft', event.shapeless('#forge:small_gears/steel', ['greate:aluminium_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:aluminium_shaft', - event.shapeless('#forge:gears/steel', ['greate:large_aluminium_cogwheel'])) + event.shapeless('2x #forge:small_gears/steel', ['greate:large_aluminium_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:stainless_steel_shaft', event.shapeless('#forge:small_gears/aluminium', ['greate:stainless_steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:stainless_steel_shaft', - event.shapeless('#forge:gears/aluminium', ['greate:large_stainless_steel_cogwheel'])) + event.shapeless('2x #forge:small_gears/aluminium', ['greate:large_stainless_steel_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:titanium_shaft', event.shapeless('#forge:small_gears/stainless_steel', ['greate:titanium_cogwheel'])) event.recipes.tfc.extra_products_shapeless_crafting('greate:titanium_shaft', - event.shapeless('#forge:gears/stainless_steel', ['greate:large_titanium_cogwheel'])) + event.shapeless('2x #forge:small_gears/stainless_steel', ['greate:large_titanium_cogwheel'])) // #endregion diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index a8617193c..70d220efe 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -272,32 +272,7 @@ function registerTFCMetalsRecipes(event) { .tier(5) .id('tfc:anvil/blue_steel_ingot') - // Gears - event.recipes.tfc.anvil('gtceu:bronze_gear', '#forge:double_plates/bronze', ['punch_last', 'shrink_any', 'draw_any']) - .tier(2) - .id('tfc:anvil/bronze_gear') - event.recipes.tfc.anvil('gtceu:black_bronze_gear', '#forge:double_plates/black_bronze', ['punch_last', 'shrink_any', 'draw_any']) - .tier(2) - .id('tfc:anvil/black_bronze_gear') - event.recipes.tfc.anvil('gtceu:bismuth_bronze_gear', '#forge:double_plates/bismuth_bronze', ['punch_last', 'shrink_any', 'draw_any']) - .tier(2) - .id('tfc:anvil/bismuth_bronze_gear') - event.recipes.tfc.anvil('gtceu:wrought_iron_gear', '#forge:double_plates/wrought_iron', ['punch_last', 'shrink_any', 'draw_any']) - .tier(3) - .id('tfc:anvil/wrought_iron_gear') - event.recipes.tfc.anvil('gtceu:steel_gear', '#forge:double_plates/steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(4) - .id('tfc:anvil/steel_gear') - event.recipes.tfc.anvil('gtceu:black_steel_gear', '#forge:double_plates/black_steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(5) - .id('tfc:anvil/black_steel_gear') - event.recipes.tfc.anvil('gtceu:red_steel_gear', '#forge:double_plates/red_steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(6) - .id('tfc:anvil/red_steel_gear') - event.recipes.tfc.anvil('gtceu:blue_steel_gear', '#forge:double_plates/blue_steel', ['punch_last', 'shrink_any', 'draw_any']) - .tier(6) - .id('tfc:anvil/blue_steel_gear') - + // Small Gears event.recipes.tfc.anvil('gtceu:small_wrought_iron_gear', '#forge:ingots/wrought_iron', ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(3) .id('tfc:anvil/small_wrought_iron_gear') @@ -310,6 +285,12 @@ function registerTFCMetalsRecipes(event) { event.recipes.tfc.anvil('gtceu:small_bronze_gear', '#forge:ingots/bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(2) .id('tfc:anvil/small_bronze_gear') + event.recipes.tfc.anvil('gtceu:small_bismuth_bronze_gear', '#forge:ingots/bismuth_bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) + .tier(2) + .id('tfc:anvil/small_bismuth_bronze_gear') + event.recipes.tfc.anvil('gtceu:small_black_bronze_gear', '#forge:ingots/black_bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) + .tier(2) + .id('tfc:anvil/small_black_bronze_gear') // Cast iron -> Raw Iron Bloom event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('gtceu:iron', 144), 15000) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index ac24ae217..5deb267fd 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -187,7 +187,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Wood.addFlags(GENERATE_SMALL_GEAR); GTMaterials.Brass.addFlags(GENERATE_SMALL_GEAR, GENERATE_RING); - GTMaterials.BismuthBronze.addFlags(GENERATE_GEAR); + GTMaterials.BlackBronze.addFlags(GENERATE_SMALL_GEAR); + GTMaterials.BismuthBronze.addFlags(GENERATE_SMALL_GEAR); GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_SMALL_GEAR);