diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 0d18febee..6258d640e 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -288,7 +288,7 @@ const registerCreateRecipes = (event) => { .circuit(1) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:hose_pulley', { 'copper': 3 }); + TFGHelpers.registerMaterialInfo('create:hose_pulley', [GTMaterials.Copper, 3, GTMaterials.Rubber, 1/8]); // Слив из предметов event.shaped('create:item_drain', [ @@ -416,7 +416,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .circuit(22) - TFGHelpers.registerMaterialInfo('create:rope_pulley', { 'wood': 1, 'wrought_iron': 2 }); + TFGHelpers.registerMaterialInfo('create:rope_pulley', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 2]); // Шкиф подъемника event.shaped('create:elevator_pulley', [ @@ -438,7 +438,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:elevator_pulley', { 'wood': 1, 'brass': 1, 'steel': 1 }); + TFGHelpers.registerMaterialInfo('create:elevator_pulley', [GTMaterials.Wood, 1, GTMaterials.Brass, 1, GTMaterials.Steel, 1]); // Сборщик вагонеток event.shaped('create:cart_assembler', [ @@ -528,7 +528,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .circuit(19) - TFGHelpers.registerMaterialInfo('create:mechanical_drill', { 'wood': 1, 'steel': 4, 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('create:mechanical_drill', [GTMaterials.Wood, 1, GTMaterials.Steel, 4, GTMaterials.WroughtIron, 3]); event.shaped('create:mechanical_roller', [ 'GBG', @@ -551,7 +551,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .circuit(20) - TFGHelpers.registerMaterialInfo('create:mechanical_roller', { 'wood': 1,'wrought_iron': 4 }); + TFGHelpers.registerMaterialInfo('create:mechanical_roller', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 4]); // Редстоуновый контакт event.shaped('2x create:redstone_contact', [ @@ -595,7 +595,7 @@ const registerCreateRecipes = (event) => { .duration(200) .EUt(20) - TFGHelpers.registerMaterialInfo('create:mechanical_harvester', { 'wood': 1, 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('create:mechanical_harvester', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 3]); // Механический плуг event.shaped('create:mechanical_plough', [ @@ -618,7 +618,7 @@ const registerCreateRecipes = (event) => { .duration(200) .EUt(20) - TFGHelpers.registerMaterialInfo('create:mechanical_plough', { 'wood': 1, 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('create:mechanical_plough', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 3]); // Create sail creation using custom sail items. @@ -828,7 +828,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:andesite_funnel', { 'wrought_iron': 1 }); + TFGHelpers.registerMaterialInfo('create:andesite_funnel', [GTMaterials.WroughtIron, 1]); // Умный раздатчик/приемник из латуни event.shaped('2x create:brass_funnel', [ @@ -869,7 +869,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:brass_funnel', { 'brass': 1 }); + TFGHelpers.registerMaterialInfo('create:brass_funnel', [GTMaterials.Brass, 1]); // Тунель из железа event.shaped('create:andesite_tunnel', [ @@ -906,7 +906,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:andesite_tunnel', { 'wrought_iron': 1 }); + TFGHelpers.registerMaterialInfo('create:andesite_tunnel', [GTMaterials.WroughtIron, 1]); // Тунель из латуни event.shaped('create:brass_tunnel', [ @@ -945,7 +945,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:brass_tunnel', { 'brass': 1 }); + TFGHelpers.registerMaterialInfo('create:brass_tunnel', [GTMaterials.Brass, 1]); // Дисплей столешница (чзх) event.shaped('create:display_board', [ @@ -1015,7 +1015,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:deployer', { 'brass': 12/9, 'wrought_iron': 8 }); + TFGHelpers.registerMaterialInfo('create:deployer', [GTMaterials.Brass, 12/9, GTMaterials.WroughtIron, 8]); // Соединятор вагонеток event.shapeless('create:minecart_coupling', [ @@ -1242,7 +1242,7 @@ const registerCreateRecipes = (event) => { A: '#forge:rods/tin_alloy' }).id('tfg:create/shaped/andesite_ladder') - TFGHelpers.registerMaterialInfo('create:andesite_ladder', { 'tin_alloy': 0.5 }) + TFGHelpers.registerMaterialInfo('create:andesite_ladder', [GTMaterials.TinAlloy, 0.5]) // Лестница из латуни event.shaped('7x create:brass_ladder', [ @@ -1253,7 +1253,7 @@ const registerCreateRecipes = (event) => { A: '#forge:rods/brass' }).id('tfg:create/shaped/brass_ladder') - TFGHelpers.registerMaterialInfo('create:brass_ladder', { 'brass': 0.5 }) + TFGHelpers.registerMaterialInfo('create:brass_ladder', [GTMaterials.Brass, 0.5]) // Лестница из железа event.shaped('7x create:copper_ladder', [ @@ -1264,7 +1264,7 @@ const registerCreateRecipes = (event) => { A: '#forge:rods/copper' }).id('tfg:create/shaped/copper_ladder') - TFGHelpers.registerMaterialInfo('create:copper_ladder', { 'copper': 0.5 }) + TFGHelpers.registerMaterialInfo('create:copper_ladder', [GTMaterials.Copper, 0.5]) // Леса из железа event.shaped('4x create:andesite_scaffolding', [ @@ -1563,7 +1563,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .circuit(1) - TFGHelpers.registerMaterialInfo('create:windmill_bearing', { 'wood': 1.5, 'brass': 1, 'wrought_iron': 1 }); + TFGHelpers.registerMaterialInfo('create:windmill_bearing', [GTMaterials.Wood, 1.5, GTMaterials.Brass, 1, GTMaterials.WroughtIron, 1]); // #endregion @@ -2085,7 +2085,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .circuit(17) - TFGHelpers.registerMaterialInfo('create:redstone_link', { 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('create:redstone_link', [GTMaterials.WroughtIron, 3]); event.shaped('create:display_link', [ 'FED', @@ -2127,6 +2127,8 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + TFGHelpers.registerMaterialInfo('create:rotation_speed_controller', [GTMaterials.Wood, 1, GTMaterials.Brass, 3, GTMaterials.RedAlloy, 1]); + event.shaped('create:pulse_timer', [ 'E E', 'ABC', @@ -2167,7 +2169,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('create:sequenced_gearshift', { 'wood': 1, 'steel': 4, 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('create:sequenced_gearshift', [GTMaterials.Wood, 1, GTMaterials.Steel, 4, GTMaterials.WroughtIron, 3]); event.shaped('create:mechanical_bearing', [ 'CBE', @@ -2189,7 +2191,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .circuit(15) - TFGHelpers.registerMaterialInfo('create:mechanical_bearing', { 'wood': 1, 'wrought_iron': 2 }); + TFGHelpers.registerMaterialInfo('create:mechanical_bearing', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 2]); event.shaped('create:gantry_carriage', [ 'DCE', @@ -2211,7 +2213,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .circuit(2) - TFGHelpers.registerMaterialInfo('create:gantry_carriage', { 'wood': 1.5, 'wrought_iron': 1 }); + TFGHelpers.registerMaterialInfo('create:gantry_carriage', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1]); event.shaped('create:weighted_ejector', [ ' B ', @@ -2233,7 +2235,7 @@ const registerCreateRecipes = (event) => { .circuit(16) .addMaterialInfo(true) - TFGHelpers.registerMaterialInfo('create:gantry_carriage', { 'wood': 1, 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('create:gantry_carriage', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 3]); event.shaped('create:turntable', [ 'DA ', @@ -2271,7 +2273,7 @@ const registerCreateRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .addMaterialInfo(true) - TFGHelpers.registerMaterialInfo('create:gearshift', { 'wood': 1, 'wrought_iron': 1, 'redstone': 1 }); + TFGHelpers.registerMaterialInfo('create:gearshift', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.Redstone, 1]); event.shaped('create:clutch', [ ' C ', @@ -2387,13 +2389,10 @@ const registerCreateRecipes = (event) => { ]; create_metals.forEach(bar => { - let quarterMap = {}; - quarterMap[bar.material] = 0.25; - event.recipes.tfc.anvil(`4x create:${bar.metal}_bars`, `#forge:ingots/${bar.material}`, ['upset_last', 'punch_second_last', 'punch_third_last']) .tier(bar.tier).id(`tfg:anvil/create_${bar.metal}_bars`) - TFGHelpers.registerMaterialInfo(`create:${bar.metal}_bars`, quarterMap) + TFGHelpers.registerMaterialInfo(`create:${bar.metal}_bars`, [GTMaterials.get(bar.material), 0.25]) event.recipes.tfc.anvil(`8x create:${bar.metal}_bars`, `#forge:double_ingots/${bar.material}`, ['upset_last', 'punch_second_last', 'punch_third_last']) .tier(bar.tier).id(`tfg:anvil/create_${bar.metal}_bars_double`) diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 1833b692b..81d86924e 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -240,8 +240,6 @@ const registerCreatedecoRecipes = (event) => { event.remove({ id: `createdeco:${bar.metal}_trapdoor` }) event.remove({ id: `createdeco:${bar.metal}_door` }) - let quarterMap = {}; - quarterMap[bar.material] = 0.25; if (bar.metal !== 'iron') { // Bars @@ -252,7 +250,7 @@ const registerCreatedecoRecipes = (event) => { event.stonecutting(`4x createdeco:${bar.metal}_bars`, `#forge:ingots/${bar.material}`) - TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_bars`, quarterMap) + TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_bars`, [GTMaterials.get(bar.material), 0.25]) event.recipes.tfc.anvil(`8x createdeco:${bar.metal}_bars`, `#forge:double_ingots/${bar.material}`, ['upset_last', 'punch_second_last', 'punch_third_last']) .tier(bar.tier).id(`tfg:anvil/createdeco_${bar.metal}_bars_double`) @@ -269,7 +267,7 @@ const registerCreatedecoRecipes = (event) => { let twoMap = {}; twoMap[bar.material] = 2; - TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_door`, twoMap) + TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_door`, [GTMaterials.get(bar.material), 2]) } // Overlay bars @@ -283,7 +281,7 @@ const registerCreatedecoRecipes = (event) => { event.recipes.tfc.anvil(`8x createdeco:${bar.metal}_bars_overlay`, `#forge:double_ingots/${bar.material}`, ['upset_last', 'punch_second_last', 'punch_third_last']) .tier(bar.tier).id(`tfg:anvil/createdeco_${bar.metal}_bars_overlay_double`) - TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_bars_overlay`, quarterMap) + TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_bars_overlay`, [GTMaterials.get(bar.material), 0.25]) // Facade event.shaped(`4x createdeco:${bar.metal}_facade`, [ @@ -302,11 +300,11 @@ const registerCreatedecoRecipes = (event) => { event.shapeless(`createdeco:copper_trapdoor`, `tfc:metal/trapdoor/copper`) event.shapeless(`tfc:metal/trapdoor/copper`, `createdeco:copper_trapdoor`) - TFGHelpers.registerMaterialInfo('createdeco:copper_trapdoor', { 'copper': 1 }) + TFGHelpers.registerMaterialInfo('createdeco:copper_trapdoor', [GTMaterials.Copper, 1]) event.shapeless(`createdeco:industrial_iron_trapdoor`, `tfc:metal/trapdoor/steel`) event.shapeless(`tfc:metal/trapdoor/steel`, `createdeco:industrial_iron_trapdoor`) - TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_trapdoor', { 'steel': 1 }) + TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_trapdoor', [GTMaterials.Steel, 1]) // TODO: move these two into the tag prefixes in tfg-core, then remove these recipes @@ -328,7 +326,7 @@ const registerCreatedecoRecipes = (event) => { .duration(GTMaterials.Brass.getMass()) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('createdeco:brass_trapdoor', { 'brass': 1 }) + TFGHelpers.registerMaterialInfo('createdeco:brass_trapdoor', [GTMaterials.Brass, 1]) event.recipes.tfc.anvil(`createdeco:zinc_trapdoor`, `#forge:ingots/zinc`, ['shrink_last', 'draw_second_last', 'draw_third_last']) .tier(1).id(`createdeco:anvil/zinc_trapdoor`) @@ -348,7 +346,7 @@ const registerCreatedecoRecipes = (event) => { .duration(GTMaterials.Zinc.getMass()) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('createdeco:zinc_trapdoor', { 'zinc': 1 }) + TFGHelpers.registerMaterialInfo('createdeco:zinc_trapdoor', [GTMaterials.Zinc, 1]) event.recipes.tfc.anvil(`createdeco:andesite_trapdoor`, `#forge:ingots/tin_alloy`, ['shrink_last', 'draw_second_last', 'draw_third_last']) .tier(3).id(`createdeco:anvil/andesite_trapdoor`) @@ -368,7 +366,7 @@ const registerCreatedecoRecipes = (event) => { .duration(GTMaterials.TinAlloy.getMass()) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('createdeco:andesite_trapdoor', { 'tin_alloy': 1 }) + TFGHelpers.registerMaterialInfo('createdeco:andesite_trapdoor', [GTMaterials.TinAlloy, 1]) // #endregion @@ -475,7 +473,7 @@ const registerCreatedecoRecipes = (event) => { event.stonecutting('2x createdeco:iron_ladder', '#forge:ingots/wrought_iron') - TFGHelpers.registerMaterialInfo('createdeco:iron_ladder', { 'wrought_iron': 0.5 }) + TFGHelpers.registerMaterialInfo('createdeco:iron_ladder', [GTMaterials.WroughtIron, 0.5]) event.shaped('7x createdeco:zinc_ladder', [ 'A A', @@ -485,7 +483,7 @@ const registerCreatedecoRecipes = (event) => { A: '#forge:rods/zinc' }).id('tfg:createdeco/shaped/zinc_ladder') - TFGHelpers.registerMaterialInfo('createdeco:zinc_ladder', { 'zinc': 0.5 }) + TFGHelpers.registerMaterialInfo('createdeco:zinc_ladder', [GTMaterials.Zinc, 0.5]) event.shaped('7x createdeco:industrial_iron_ladder', [ 'A A', @@ -495,7 +493,7 @@ const registerCreatedecoRecipes = (event) => { A: '#forge:rods/steel' }).id('tfg:createdeco/shaped/industrial_iron_ladder') - TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_ladder', { 'steel': 0.5 }) + TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_ladder', [GTMaterials.Steel, 0.5]) // #endregion @@ -534,17 +532,17 @@ const registerCreatedecoRecipes = (event) => { // #region Sheet Metal event.stonecutting('4x createdeco:andesite_sheet_metal', '#forge:plates/tin_alloy') - TFGHelpers.registerMaterialInfo('createdeco:andesite_sheet_metal', { 'tin_alloy': 0.25 }) + TFGHelpers.registerMaterialInfo('createdeco:andesite_sheet_metal', [GTMaterials.TinAlloy, 0.25]) event.stonecutting('4x createdeco:brass_sheet_metal', '#forge:plates/brass') - TFGHelpers.registerMaterialInfo('createdeco:brass_sheet_metal', { 'brass': 0.25 }) + TFGHelpers.registerMaterialInfo('createdeco:brass_sheet_metal', [GTMaterials.Brass, 0.25]) event.stonecutting('4x createdeco:iron_sheet_metal', '#forge:plates/wrought_iron') - TFGHelpers.registerMaterialInfo('createdeco:iron_sheet_metal', { 'wrought_iron': 0.25 }) + TFGHelpers.registerMaterialInfo('createdeco:iron_sheet_metal', [GTMaterials.WroughtIron, 0.25]) event.stonecutting('4x createdeco:copper_sheet_metal', '#forge:plates/copper') - TFGHelpers.registerMaterialInfo('createdeco:copper_sheet_metal', { 'copper': 0.25 }) + TFGHelpers.registerMaterialInfo('createdeco:copper_sheet_metal', [GTMaterials.Copper, 0.25]) event.stonecutting('4x createdeco:industrial_iron_sheet_metal', '#forge:plates/steel') - TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_sheet_metal', { 'steel': 0.25 }) + TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_sheet_metal', [GTMaterials.Steel, 0.25]) event.stonecutting('4x createdeco:zinc_sheet_metal', '#forge:plates/zinc') - TFGHelpers.registerMaterialInfo('createdeco:zinc_sheet_metal', { 'zinc': 0.25 }) + TFGHelpers.registerMaterialInfo('createdeco:zinc_sheet_metal', [GTMaterials.Zinc, 0.25]) // #endregion }; diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 2f48a8e4f..aa6173590 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -121,20 +121,20 @@ function registerGreateRecipes(event) { }) - TFGHelpers.registerMaterialInfo('greate:andesite_alloy_gearbox', { 'wood': 1, 'wrought_iron': 1 }); - TFGHelpers.registerMaterialInfo('greate:andesite_alloy_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1 }); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1]); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_vertical_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1]); - TFGHelpers.registerMaterialInfo('greate:steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); - TFGHelpers.registerMaterialInfo('greate:steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:steel_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.Steel, 4/9]); + TFGHelpers.registerMaterialInfo('greate:steel_vertical_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.Steel, 4/9]); - TFGHelpers.registerMaterialInfo('greate:aluminium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); - TFGHelpers.registerMaterialInfo('greate:aluminium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:aluminium_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.Aluminium, 4/9]); + TFGHelpers.registerMaterialInfo('greate:aluminium_vertical_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.Aluminium, 4/9]); - TFGHelpers.registerMaterialInfo('greate:stainless_steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); - TFGHelpers.registerMaterialInfo('greate:stainless_steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:stainless_steel_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.StainlessSteel, 4/9]); + TFGHelpers.registerMaterialInfo('greate:stainless_steel_vertical_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.StainlessSteel, 4/9]); - TFGHelpers.registerMaterialInfo('greate:titanium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); - TFGHelpers.registerMaterialInfo('greate:titanium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:titanium_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.Titanium, 4/9]); + TFGHelpers.registerMaterialInfo('greate:titanium_vertical_gearbox', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 1, GTMaterials.Titanium, 4/9]); // #endregion @@ -147,8 +147,8 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_andesite_alloy_cogwheel', ['greate:andesite_alloy_cogwheel', '#forge:small_gears/wood']) .id('tfg:shapeless/large_andesite_alloy_cogwheel_upgrade'); - TFGHelpers.registerMaterialInfo('greate:andesite_alloy_cogwheel', { 'wood': 1 }); - TFGHelpers.registerMaterialInfo('greate:large_andesite_alloy_cogwheel', { 'wood': 2 }); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_cogwheel', [GTMaterials.Wood, 1]); + TFGHelpers.registerMaterialInfo('greate:large_andesite_alloy_cogwheel', [GTMaterials.Wood, 2]); event.shapeless('greate:steel_cogwheel', ['greate:steel_shaft', '#forge:small_gears/wrought_iron']) .id('tfg:shapeless/steel_cogwheel') @@ -157,8 +157,8 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_steel_cogwheel', ['greate:steel_cogwheel', '#forge:small_gears/wrought_iron']) .id('tfg:shapeless/large_steel_cogwheel_upgrade'); - TFGHelpers.registerMaterialInfo('greate:steel_cogwheel', { 'wrought_iron': 1, 'steel': 1/9 }); - TFGHelpers.registerMaterialInfo('greate:large_steel_cogwheel', { 'wrought_iron': 2, 'steel': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:steel_cogwheel', [GTMaterials.WroughtIron, 1, GTMaterials.Steel, 1/9]); + TFGHelpers.registerMaterialInfo('greate:large_steel_cogwheel', [GTMaterials.WroughtIron, 2, GTMaterials.Steel, 1/9]); event.shapeless('greate:aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:small_gears/steel']) .id('tfg:shapeless/aluminium_cogwheel') @@ -167,8 +167,8 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_aluminium_cogwheel', ['greate:aluminium_cogwheel', '#forge:small_gears/steel']) .id('tfg:shapeless/large_aluminium_cogwheel_upgrade'); - TFGHelpers.registerMaterialInfo('greate:aluminium_cogwheel', { 'steel': 1, 'aluminium': 1/9 }); - TFGHelpers.registerMaterialInfo('greate:large_aluminium_cogwheel', { 'steel': 2, 'aluminium': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:aluminium_cogwheel', [GTMaterials.Steel, 1, GTMaterials.Aluminium, 1/9]); + TFGHelpers.registerMaterialInfo('greate:large_aluminium_cogwheel', [GTMaterials.Steel, 2, GTMaterials.Aluminium, 1/9]); event.shapeless('greate:stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:small_gears/aluminium']) .id('tfg:shapeless/stainless_steel_cogwheel') @@ -177,8 +177,8 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_stainless_steel_cogwheel', ['greate:stainless_steel_cogwheel', '#forge:small_gears/aluminium']) .id('tfg:shapeless/large_stainless_steel_cogwheel_upgrade'); - TFGHelpers.registerMaterialInfo('greate:stainless_steel_cogwheel', { 'aluminium': 1, 'stainless_steel': 1/9 }); - TFGHelpers.registerMaterialInfo('greate:large_stainless_steel_cogwheel', { 'aluminium': 2, 'stainless_steel': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:stainless_steel_cogwheel', [GTMaterials.Aluminium, 1, GTMaterials.StainlessSteel, 1/9]); + TFGHelpers.registerMaterialInfo('greate:large_stainless_steel_cogwheel', [GTMaterials.Aluminium, 2, GTMaterials.StainlessSteel, 1/9]); event.shapeless('greate:titanium_cogwheel', ['greate:titanium_shaft', '#forge:small_gears/stainless_steel']) .id('tfg:shapeless/titanium_cogwheel') @@ -187,8 +187,8 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_titanium_cogwheel', ['greate:titanium_cogwheel', '#forge:small_gears/stainless_steel']) .id('tfg:shapeless/large_titanium_cogwheel_upgrade'); - TFGHelpers.registerMaterialInfo('greate:titanium_cogwheel', { 'stainless_steel': 1, 'titanium': 1/9 }); - TFGHelpers.registerMaterialInfo('greate:large_titanium_cogwheel', { 'stainless_steel': 2, 'titanium': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:titanium_cogwheel', [GTMaterials.StainlessSteel, 1, GTMaterials.Titanium, 1/9]); + TFGHelpers.registerMaterialInfo('greate:large_titanium_cogwheel', [GTMaterials.StainlessSteel, 2, GTMaterials.Titanium, 1/9]); // #endregion @@ -230,7 +230,7 @@ function registerGreateRecipes(event) { E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone3') - TFGHelpers.registerMaterialInfo('greate:andesite_alloy_millstone', { 'stone': 9 }); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_millstone', [GTMaterials.Stone, 9]); event.shaped('greate:steel_millstone', [ 'FBF', @@ -327,7 +327,7 @@ function registerGreateRecipes(event) { D: '#forge:gems/diamond' }).id('greate:steel_crushing_wheel') - TFGHelpers.registerMaterialInfo('greate:steel_crushing_wheel', { 'wrought_iron': 14, 'tin_alloy': 8, 'steel': 4, 'diamond': 4 }); + TFGHelpers.registerMaterialInfo('greate:steel_crushing_wheel', [GTMaterials.WroughtIron, 14, GTMaterials.TinAlloy, 8, GTMaterials.Steel, 4, GTMaterials.Diamond, 4]); event.recipes.createMechanicalCrafting('2x greate:aluminium_crushing_wheel', [ ' AAA ', @@ -342,7 +342,7 @@ function registerGreateRecipes(event) { D: '#forge:gems/diamond' }).id('greate:aluminium_crushing_wheel') - TFGHelpers.registerMaterialInfo('greate:aluminium_crushing_wheel', { 'steel': 14, 'vanadium_steel': 8, 'aluminium': 4, 'diamond': 4 }); + TFGHelpers.registerMaterialInfo('greate:aluminium_crushing_wheel', [GTMaterials.Steel, 14, GTMaterials.VanadiumSteel, 8, GTMaterials.Aluminium, 4, GTMaterials.Diamond, 4]); event.recipes.createMechanicalCrafting('2x greate:stainless_steel_crushing_wheel', [ ' AAA ', @@ -357,7 +357,7 @@ function registerGreateRecipes(event) { D: 'gtceu:diamond_grinding_head' }).id('greate:stainless_steel_crushing_wheel') - TFGHelpers.registerMaterialInfo('greate:stainless_steel_crushing_wheel', { 'aluminium': 14, 'blue_alloy': 8, 'stainless_steel': 4, 'steel': 32, 'diamond': 20 }); + TFGHelpers.registerMaterialInfo('greate:stainless_steel_crushing_wheel', [GTMaterials.Aluminium, 4, GTMaterials.BlueAlloy, 8, GTMaterials.StainlessSteel, 4, GTMaterials.Steel, 32, GTMaterials.Diamond, 20]); event.recipes.createMechanicalCrafting('2x greate:titanium_crushing_wheel', [ ' AAA ', @@ -372,7 +372,7 @@ function registerGreateRecipes(event) { D: 'gtceu:diamond_grinding_head' }).id('greate:titanium_crushing_wheel') - TFGHelpers.registerMaterialInfo('greate:titanium_crushing_wheel', { 'stainless_steel': 14, 'ultimet': 8, 'titanium': 4, 'steel': 32, 'diamond': 20 }); + TFGHelpers.registerMaterialInfo('greate:titanium_crushing_wheel', [GTMaterials.StainlessSteel, 14, GTMaterials.Ultimet, 8, GTMaterials.Titanium, 4, GTMaterials.Steel, 32, GTMaterials.Diamond, 20]); // #endregion @@ -481,7 +481,7 @@ function registerGreateRecipes(event) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:andesite_alloy_mechanical_saw', { 'wood': 1, 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_mechanical_saw', [GTMaterials.Wood, 1, GTMaterials.WroughtIron, 3]); event.shaped('greate:steel_mechanical_saw', [ 'ABA', @@ -651,7 +651,7 @@ function registerGreateRecipes(event) { event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_belt_connector' }) event.remove({ id: 'gtceu:arc_furnace/arc_andesite_alloy_belt_connector' }) - TFGHelpers.registerMaterialInfo('greate:andesite_alloy_belt_connector', { 'wood': 1 }); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_belt_connector', [GTMaterials.Wood, 1]); // Leather event.recipes.tfc.damage_inputs_shaped_crafting( @@ -674,7 +674,7 @@ function registerGreateRecipes(event) { removeMaceratorRecipe(event, 'macerate_stone_belt_connector') event.remove({ id: 'greate:shaped/stone_belt_connector' }) - TFGHelpers.registerMaterialInfo('greate:stone_belt_connector', { 'air': 1 }); + TFGHelpers.registerMaterialInfo('greate:stone_belt_connector', [GTMaterials.Air, 1]); // Rubber event.shaped('greate:rubber_belt_connector', [ @@ -698,7 +698,7 @@ function registerGreateRecipes(event) { removeMaceratorRecipe(event, 'macerate_rubber_belt_connector') event.remove({ id: 'gtceu:extractor/extract_rubber_belt_connector' }) - TFGHelpers.registerMaterialInfo('greate:rubber_belt_connector', { 'rubber': 3 }); + TFGHelpers.registerMaterialInfo('greate:rubber_belt_connector', [GTMaterials.Rubber, 3]); // Silicone rubber event.shaped('greate:silicone_rubber_belt_connector', [ @@ -722,7 +722,7 @@ function registerGreateRecipes(event) { removeMaceratorRecipe(event, 'macerate_silicone_rubber_belt_connector') event.remove({ id: 'gtceu:extractor/extract_silicone_rubber_belt_connector' }) - TFGHelpers.registerMaterialInfo('greate:silicone_rubber_belt_connector', { 'silicone_rubber': 3 }); + TFGHelpers.registerMaterialInfo('greate:silicone_rubber_belt_connector', [GTMaterials.SiliconeRubber, 3]); // SBR rubber event.shaped('greate:styrene_butadiene_rubber_belt_connector', [ @@ -746,7 +746,7 @@ function registerGreateRecipes(event) { removeMaceratorRecipe(event, 'macerate_styrene_butadiene_rubber_belt_connector') event.remove({ id: 'gtceu:extractor/extract_styrene_butadiene_rubber_belt_connector' }) - TFGHelpers.registerMaterialInfo('greate:styrene_butadiene_rubber_belt_connector', { 'styrene_butadiene_rubber': 3 }); + TFGHelpers.registerMaterialInfo('greate:styrene_butadiene_rubber_belt_connector', [GTMaterials.StyreneButadieneRubber, 3]); // #endregion // #region Mixer @@ -1035,7 +1035,7 @@ function registerGreateRecipes(event) { F: 'greate:andesite_alloy_shaft' }).id('greate:shaped/andesite_alloy_mechanical_press') - TFGHelpers.registerMaterialInfo('greate:andesite_alloy_mechanical_press', { 'iron': 2 }); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_mechanical_press', [GTMaterials.Iron, 2]); event.shaped('greate:steel_mechanical_press', [ ' AD', diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 0177031bf..1c267e4cb 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -41,6 +41,7 @@ function removeGreateRecipes(event) { event.remove({ id: `gtceu:extractor/extract_${tier}` }) event.remove({ id: `gtceu:extractor/extract_${tier}_shaft` }) event.remove({ id: `gtceu:extractor/extract_${tier}_cogwheel` }) + event.remove({ id: `gtceu:extractor/extract_large_${tier}_cogwheel` }) event.remove({ id: `gtceu:extractor/extract_${tier}_alloy` }) event.remove({ id: `gtceu:extractor/extract_${tier}_gearbox` }) event.remove({ id: `gtceu:extractor/extract_${tier}_vertical_gearbox` }) diff --git a/kubejs/server_scripts/gregtech/recipes.recycling.js b/kubejs/server_scripts/gregtech/recipes.recycling.js index 36effdb6f..809491ee1 100644 --- a/kubejs/server_scripts/gregtech/recipes.recycling.js +++ b/kubejs/server_scripts/gregtech/recipes.recycling.js @@ -7,52 +7,52 @@ function registerGTCEURecyclingRecipes(event) { // Capacitors - TFGHelpers.registerMaterialInfo('gtceu:tantalum_capacitor', { 'tantalum': 1/9, 'polyethylene': 1/9 }) - TFGHelpers.registerMaterialInfo('gtceu:capacitor', { 'polyethylene': 1/9 }) + TFGHelpers.registerMaterialInfo('gtceu:tantalum_capacitor', [GTMaterials.Tantalum, 1/9, GTMaterials.Polyethylene, 1/9]) + TFGHelpers.registerMaterialInfo('gtceu:capacitor', [GTMaterials.Polyethylene, 1/9]) // Empty batteries - TFGHelpers.registerMaterialInfo('gtceu:empty_tier_i_battery', { 'ultimet': 6 }) - TFGHelpers.registerMaterialInfo('gtceu:empty_tier_ii_battery', { 'ruridit': 6 }) - TFGHelpers.registerMaterialInfo('gtceu:empty_tier_iii_battery', { 'neutronium': 6 }) + TFGHelpers.registerMaterialInfo('gtceu:empty_tier_i_battery', [GTMaterials.Ultimet, 6]) + TFGHelpers.registerMaterialInfo('gtceu:empty_tier_ii_battery', [GTMaterials.Ruridit, 6]) + TFGHelpers.registerMaterialInfo('gtceu:empty_tier_iii_battery', [GTMaterials.Neutronium, 6]) // Iron Door - TFGHelpers.registerMaterialInfo('minecraft:iron_door', { 'iron': 2 }) + TFGHelpers.registerMaterialInfo('minecraft:iron_door', [GTMaterials.Iron, 2]) // #region Hanging Signs - global.TFC_EQUIPMENT_METALS.forEach(metal => { + global.TFC_EQUIPMENT_METALS.forEach(metal => { // Recycling Hardwood - // Arc Recycling Hardwood - event.recipes.gtceu.arc_furnace(`tfg:arc_recycling/${metal}/hardwood`) - .itemInputs(`#tfg:hanging_sign/${metal}/hardwood`) - .itemOutputs('gtceu:tiny_ash_dust') - .chancedOutput(`#forge:nuggets/${metal}`, 3750, 0) - .duration(12) - .EUt(30) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - // Macerating Hardwood - event.recipes.gtceu.macerator(`tfg:macerating/hanging_sign/'${metal}/hardwood`) - .itemInputs(`#tfg:hanging_sign/${metal}/hardwood`) - .itemOutputs('gtceu:hardwood_dust') - .chancedOutput(`#forge:tiny_dusts/${metal}`, 3750, 0) - .duration(108) - .EUt(8) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - + // Arc Recycling Hardwood + event.recipes.gtceu.arc_furnace(`tfg:arc_recycling/${metal}/hardwood`) + .itemInputs(`#tfg:hanging_sign/${metal}/hardwood`) + .itemOutputs('gtceu:tiny_ash_dust') + .chancedOutput(`#forge:nuggets/${metal}`, 3750, 0) + .duration(12) + .EUt(30) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + // Macerating Hardwood + event.recipes.gtceu.macerator(`tfg:macerating/hanging_sign/'${metal}/hardwood`) + .itemInputs(`#tfg:hanging_sign/${metal}/hardwood`) + .itemOutputs('gtceu:hardwood_dust') + .chancedOutput(`#forge:tiny_dusts/${metal}`, 3750, 0) + .duration(108) + .EUt(8) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + // Recycling Softwood - // Arc Recycling Softwood - event.recipes.gtceu.arc_furnace(`tfg:arc_recycling/${metal}/softwood`) - .itemInputs(`#tfg:hanging_sign/${metal}/softwood`) - .itemOutputs('gtceu:tiny_ash_dust') - .chancedOutput(`#forge:nuggets/${metal}`, 3750, 0) - .duration(12) - .EUt(30) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - // Macerating Softwood - event.recipes.gtceu.macerator(`tfg:macerating/hanging_sign/'${metal}/softwood`) - .itemInputs(`#tfg:hanging_sign/${metal}/softwood`) - .itemOutputs('gtceu:wood_dust') - .chancedOutput(`#forge:tiny_dusts/${metal}`, 3750, 0) - .duration(108) - .EUt(8) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + // Arc Recycling Softwood + event.recipes.gtceu.arc_furnace(`tfg:arc_recycling/${metal}/softwood`) + .itemInputs(`#tfg:hanging_sign/${metal}/softwood`) + .itemOutputs('gtceu:tiny_ash_dust') + .chancedOutput(`#forge:nuggets/${metal}`, 3750, 0) + .duration(12) + .EUt(30) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + // Macerating Softwood + event.recipes.gtceu.macerator(`tfg:macerating/hanging_sign/'${metal}/softwood`) + .itemInputs(`#tfg:hanging_sign/${metal}/softwood`) + .itemOutputs('gtceu:wood_dust') + .chancedOutput(`#forge:tiny_dusts/${metal}`, 3750, 0) + .duration(108) + .EUt(8) + .category(GTRecipeCategories.MACERATOR_RECYCLING) }) // #endregion diff --git a/kubejs/server_scripts/tfcbetterbf/recipes.js b/kubejs/server_scripts/tfcbetterbf/recipes.js index 12cc0d3db..86cc9ad9e 100644 --- a/kubejs/server_scripts/tfcbetterbf/recipes.js +++ b/kubejs/server_scripts/tfcbetterbf/recipes.js @@ -15,17 +15,5 @@ const registerTFCBetterBFRecipes = (event) => { .resultFluid(Fluid.of('gtceu:iron', 432)) .id(`tfcbetterbf:heating/insulated_fire_bricks`) - event.recipes.gtceu.macerator('tfcbetterbf:insulated_fire_bricks') - .itemInputs('tfcbetterbf:insulated_fire_bricks') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 3)) - .duration(GTMaterials.WroughtIron.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('tfcbetterbf:insulated_fire_bricks') - .itemInputs('tfcbetterbf:insulated_fire_bricks') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 3)) - .duration(GTMaterials.Steel.getMass() * 3) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) + TFGHelpers.registerMaterialInfo('tfcbetterbf:insulated_fire_bricks', [GTMaterials.WroughtIron, 3]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.molds.js b/kubejs/server_scripts/tfg/machines/recipes.molds.js index fbc41a399..74bf13c2e 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.molds.js +++ b/kubejs/server_scripts/tfg/machines/recipes.molds.js @@ -281,19 +281,7 @@ function registerTFGMoldRecipes(event) { global.TFG_EXTRUDER_MOLDS.forEach(mold => { - event.recipes.gtceu.arc_furnace(`arc_${linuxUnfucker(mold)}`) - .itemInputs(mold) - .itemOutputs(steelIngots) - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator(`macerate_${linuxUnfucker(mold)}`) - .itemInputs(mold) - .itemOutputs(steelDusts) - .duration(224) - .EUt(GTValues.VA[GTValues.ULV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + TFGHelpers.registerMaterialInfo(mold, [GTMaterials.Steel, 4]) event.recipes.gtceu.forming_press(`copy_shape_${linuxUnfucker(mold)}`) .itemInputs('gtceu:empty_mold') @@ -304,20 +292,8 @@ function registerTFGMoldRecipes(event) { }) global.TFG_CASTING_MOLDS.forEach(mold => { - - event.recipes.gtceu.arc_furnace(`arc_${linuxUnfucker(mold)}`) - .itemInputs(mold) - .itemOutputs(steelIngots) - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator(`macerate_${linuxUnfucker(mold)}`) - .itemInputs(mold) - .itemOutputs(steelDusts) - .duration(224) - .EUt(GTValues.VA[GTValues.ULV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + + TFGHelpers.registerMaterialInfo(mold, [GTMaterials.Steel, 4]) event.recipes.gtceu.forming_press(`copy_shape_${linuxUnfucker(mold)}`) .itemInputs('gtceu:empty_mold') diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tag_prefixes.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tag_prefixes.js index 05e50be06..9bc386672 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tag_prefixes.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tag_prefixes.js @@ -352,9 +352,7 @@ function processLamp(event, material) { const materialName = material.getName(); // Unfinished lamp - let matMap = { 'glass': 1 }; - matMap[materialName] = 1; - TFGHelpers.registerMaterialInfo(finishedLampItem, matMap); + TFGHelpers.registerMaterialInfo(finishedLampItem, [material, 1, GTMaterials.Glass, 1]); addTFCMelting(event, finishedLampItem, material, 144, 'lamp'); addMaterialRecycling(event, unfinishedLampItem, material, 'unfinished_lamp', TFGTagPrefix.lampUnfinished); @@ -373,20 +371,6 @@ function processLamp(event, material) { .itemOutputs(finishedLampItem) .duration(100) .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator(`tfg:macerate_${materialName}_lamp`) - .itemInputs(finishedLampItem) - .itemOutputs(`#forge:dusts/${materialName}`, `#forge:dusts/glass`) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(material.getMass()) - .EUt(2); - - event.recipes.gtceu.arc_furnace(`tfg:arc_${materialName}_lamp`) - .itemInputs(finishedLampItem) - .itemOutputs(`#forge:ingots/${materialName}`) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .duration(material.getMass()) - .EUt(30); } /** diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js index 4e54a2db7..eaaad9b3a 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js @@ -97,29 +97,7 @@ function addMaterialRecyclingNoTagPrefix(event, inputItem, material, recipeSuffi // Remove existing macerator recipes because Greate removeMaceratorRecipe(event, `macerate_${materialName}_${recipeSuffix}`); - const maceratorOutput = ChemicalHelper.getDust(material, GTValues.M * ingotAmount); - if (!maceratorOutput.isEmpty()) { - event.recipes.gtceu.macerator(`tfg:macerate_${materialName}_${recipeSuffix}`) - .itemInputs(inputItem) - .itemOutputs(maceratorOutput) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(material.getMass() * ingotAmount) - .EUt(2); - } - - const arcOutput = ChemicalHelper.getIngot(material, GTValues.M * ingotAmount); - if (!arcOutput.isEmpty()) { - event.recipes.gtceu.arc_furnace(`tfg:arc_${materialName}_${recipeSuffix}`) - .itemInputs(inputItem) - .itemOutputs(arcOutput) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .duration(material.getMass() * ingotAmount) - .EUt(30); - } - - let matmap = {}; - matmap[materialName] = ingotAmount; - TFGHelpers.registerMaterialInfo(inputItem, matmap); + TFGHelpers.registerMaterialInfo(inputItem, [material, ingotAmount]); } /** diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index fe3ec5369..5392b40ab 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -119,7 +119,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(20 * 10) .EUt(GTValues.VA[GTValues.LV]) }); - TFGHelpers.registerMaterialInfo('tfg:cobalt_brass_wheel', { 'rubber': 1, 'cobalt_brass': 4 }); + TFGHelpers.registerMaterialInfo('tfg:cobalt_brass_wheel', [GTMaterials.Rubber, 1, GTMaterials.CobaltBrass, 4]); event.recipes.create.mechanical_crafting('tfg:cobalt_brass_wheel', [ ' D ', @@ -166,7 +166,7 @@ function registerTFGMiscellaneousRecipes(event) { G: `#forge:mattock_heads/${type}_steel` }).id(`tfg:mechanical_crafter/rnr_plow/${type}_steel`) }); - TFGHelpers.registerMaterialInfo('tfg:rnr_plow', { 'cobalt_brass': 9, 'invar': 4, 'steel': 2, 'wrought_iron': 3, 'treated_wood': 2 }); + TFGHelpers.registerMaterialInfo('tfg:rnr_plow', [GTMaterials.CobaltBrass, 9, GTMaterials.Invar, 4, GTMaterials.Steel, 2, GTMaterials.WroughtIron, 3, GTMaterials.TreatedWood, 2]); //#endregion diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 3ec5b8a8f..d94a75582 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -56,13 +56,13 @@ function registerVintageImprovementsRecipes(event) { ' A ' ], { A: '#forge:plates/treated_wood', - B: '#forge:rods/long/steel', + B: '#forge:rods/black_steel', C: 'create:andesite_casing', D: '#forge:frames/treated_wood', E: 'greate:steel_cogwheel' }).id('tfg:vi/mechanical_crafting/centrifuge') - TFGHelpers.registerMaterialInfo('vintageimprovements:centrifuge', { 'black_steel': 1, 'wrought_iron': 3 }); + TFGHelpers.registerMaterialInfo('vintageimprovements:centrifuge', [GTMaterials.WroughtIron, 3, GTMaterials.BlackSteel, 2]); event.recipes.gtceu.shaped('vintageimprovements:curving_press', [ 'DBD', @@ -90,7 +90,7 @@ function registerVintageImprovementsRecipes(event) { F: '#forge:tools/hammers' }).id('tfg:vi/shaped/helve_hammer') - TFGHelpers.registerMaterialInfo('vintageimprovements:helve_hammer', { 'iron': 2 }); + TFGHelpers.registerMaterialInfo('vintageimprovements:helve_hammer', [GTMaterials.Iron, 2]); event.shaped('vintageimprovements:grinder_belt', [ 'AAA',