diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 7f533d0dc..5c3762495 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,5 +1,4 @@ { - "metal.tfc.cast_iron": "Iron", "block.gtceu.tfc_andesite_almandine_ore.prospected": "Almandine", "block.gtceu.tfc_andesite_aluminium_ore.prospected": "Aluminium", "block.gtceu.tfc_andesite_alunite_ore.prospected": "Alunite", diff --git a/kubejs/assets/tfc/lang/ru-ru.json b/kubejs/assets/tfc/lang/ru_ru.json similarity index 99% rename from kubejs/assets/tfc/lang/ru-ru.json rename to kubejs/assets/tfc/lang/ru_ru.json index 1cd375638..a4305de40 100644 --- a/kubejs/assets/tfc/lang/ru-ru.json +++ b/kubejs/assets/tfc/lang/ru_ru.json @@ -1,5 +1,4 @@ { - "metal.tfc.cast_iron": "Железо", "block.gtceu.tfc_andesite_almandine_ore.prospected": "Альмандин", "block.gtceu.tfc_andesite_aluminium_ore.prospected": "Алюминий", "block.gtceu.tfc_andesite_alunite_ore.prospected": "Алюнит", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json deleted file mode 100644 index 6b634ff4f..000000000 --- a/kubejs/assets/tfg/lang/en_us.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "metal.tfg.tin": "Tin", - "metal.tfg.bismuth": "Bismuth", - "metal.tfg.zinc": "Zinc", - "metal.tfg.sterling_silver": "Sterling Silver", - "metal.tfg.rose_gold": "Rose Gold", - "metal.tfg.silver": "Silver", - "metal.tfg.gold": "Gold", - "metal.tfg.copper": "Copper", - "metal.tfg.nickel": "Nickel", - "metal.tfg.brass": "Brass", - "metal.tfg.bronze": "Bronze", - "metal.tfg.bismuth_bronze": "Bismuth Bronze", - "metal.tfg.black_bronze": "Black Bronze", - "metal.tfg.iron": "Iron", - "metal.tfg.wrought_iron": "Wrought Iron", - "metal.tfg.steel": "Steel", - "metal.tfg.black_steel": "Black Steel", - "metal.tfg.blue_steel": "Blue Steel", - "metal.tfg.red_steel": "Red Steel" -} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json deleted file mode 100644 index ad6a17209..000000000 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "metal.tfg.tin": "Олово", - "metal.tfg.bismuth": "Висмут", - "metal.tfg.zinc": "Цинк", - "metal.tfg.sterling_silver": "Серебро Стерлинга", - "metal.tfg.rose_gold": "Розовое золото", - "metal.tfg.silver": "Серебро", - "metal.tfg.gold": "Золото", - "metal.tfg.copper": "Медь", - "metal.tfg.nickel": "Никель", - "metal.tfg.brass": "Латунь", - "metal.tfg.bronze": "Бронза", - "metal.tfg.bismuth_bronze": "Висмутная бронза", - "metal.tfg.black_bronze": "Черная бронза", - "metal.tfg.iron": "Железо", - "metal.tfg.wrought_iron": "Кованное железо", - "metal.tfg.steel": "Сталь", - "metal.tfg.black_steel": "Черная сталь", - "metal.tfg.blue_steel": "Синяя сталь", - "metal.tfg.red_steel": "Красная сталь" -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 8bdf2866d..75269ae41 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -25,29 +25,29 @@ const registerTFCData = (event) => { ) */ const registerTFCMetals = (event) => { - event.metal('gtceu:tin', 230, 0.02143, null, null, null, 1, 'tfg:tin') - event.metal('gtceu:bismuth', 270, 0.02143, null, null, null, 1, 'tfg:bismuth') - event.metal('gtceu:zinc', 420, 0.01429, null, null, null, 1, 'tfg:zinc') - event.metal('gtceu:sterling_silver', 950, 0.00857, null, null, null, 1, 'tfg:sterling_silver') - event.metal('gtceu:rose_gold', 960, 0.00857, null, null, null, 1, 'tfg:rose_gold') - event.metal('gtceu:silver', 961, 0.00625, null, null, null, 1, 'tfg:silver') - event.metal('gtceu:gold', 1060, 0.005, null, null, null, 1, 'tfg:gold') - event.metal('gtceu:copper', 1080, 0.00857, null, null, null, 1, 'tfg:copper') - event.metal('gtceu:nickel', 1453, 0.00625, null, null, null, 1, 'tfg:nickel') + event.metal('gtceu:tin', 230, 0.02143, null, null, null, 1, 'tfc:tin') + event.metal('gtceu:bismuth', 270, 0.02143, null, null, null, 1, 'tfc:bismuth') + event.metal('gtceu:zinc', 420, 0.01429, null, null, null, 1, 'tfc:zinc') + event.metal('gtceu:sterling_silver', 950, 0.00857, null, null, null, 1, 'tfc:sterling_silver') + event.metal('gtceu:rose_gold', 960, 0.00857, null, null, null, 1, 'tfc:rose_gold') + event.metal('gtceu:silver', 961, 0.00625, null, null, null, 1, 'tfc:silver') + event.metal('gtceu:gold', 1060, 0.005, null, null, null, 1, 'tfc:gold') + event.metal('gtceu:copper', 1080, 0.00857, null, null, null, 1, 'tfc:copper') + event.metal('gtceu:nickel', 1453, 0.00625, null, null, null, 1, 'tfc:nickel') - event.metal('gtceu:brass', 930, 0.00857, null, null, null, 2, 'tfg:brass') - event.metal('gtceu:bronze', 950, 0.00857, null, null, null, 2, 'tfg:bronze') - event.metal('gtceu:bismuth_bronze', 985, 0.00857, null, null, null, 2, 'tfg:bismuth_bronze') - event.metal('gtceu:black_bronze', 1070, 0.00857, null, null, null, 2, 'tfg:black_bronze') + event.metal('gtceu:brass', 930, 0.00857, null, null, null, 2, 'tfc:brass') + event.metal('gtceu:bronze', 950, 0.00857, null, null, null, 2, 'tfc:bronze') + event.metal('gtceu:bismuth_bronze', 985, 0.00857, null, null, null, 2, 'tfc:bismuth_bronze') + event.metal('gtceu:black_bronze', 1070, 0.00857, null, null, null, 2, 'tfc:black_bronze') event.metal('gtceu:iron', 1535, 0.00857, null, null, null, 3, 'tfg:iron') - event.metal('gtceu:wrought_iron', 1535, 0.00857, null, null, null, 3, 'tfg:wrought_iron') + event.metal('gtceu:wrought_iron', 1535, 0.00857, null, null, null, 3, 'tfc:wrought_iron') - event.metal('gtceu:steel', 1540, 0.00857, null, null, null, 4, 'tfg:steel') + event.metal('gtceu:steel', 1540, 0.00857, null, null, null, 4, 'tfc:steel') - event.metal('gtceu:black_steel', 1485, 0.00857, null, null, null, 5, 'tfg:black_steel') - event.metal('gtceu:blue_steel', 1540, 0.00857, null, null, null, 6, 'tfg:blue_steel') - event.metal('gtceu:red_steel', 1540, 0.00857, null, null, null, 6, 'tfg:red_steel') + event.metal('gtceu:black_steel', 1485, 0.00857, null, null, null, 5, 'tfc:black_steel') + event.metal('gtceu:blue_steel', 1540, 0.00857, null, null, null, 6, 'tfc:blue_steel') + event.metal('gtceu:red_steel', 1540, 0.00857, null, null, null, 6, 'tfc:red_steel') } /** diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 53f5023c2..cecf5e7bb 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1,21 +1,103 @@ // priority: 0 +const TFC_TO_GT_METALS = { + bismuth: { isGTDup: true, convert_temp: 270 }, + bismuth_bronze: { isGTDup: true, convert_temp: 985 }, + black_bronze: { isGTDup: true, convert_temp: 1070 }, + bronze: { isGTDup: true, convert_temp: 950 }, + brass: { isGTDup: true, convert_temp: 930 }, + nickel: { isGTDup: true, convert_temp: 1453 }, + rose_gold: { isGTDup: true, convert_temp: 960 }, + silver: { isGTDup: true, convert_temp: 961 }, + tin: { isGTDup: true, convert_temp: 230 }, + zinc: { isGTDup: true, convert_temp: 420 }, + sterling_silver: { isGTDup: true, convert_temp: 950 }, + wrought_iron: { isGTDup: true, convert_temp: 1535, custom_fluid: 'tfc:metal/cast_iron' }, + steel: { isGTDup: true, convert_temp: 1540 }, + black_steel: { isGTDup: true, convert_temp: 1485 }, + blue_steel: { isGTDup: true, convert_temp: 1540 }, + red_steel: { isGTDup: true, convert_temp: 1540 }, + copper: { convert_temp: 1080 }, + gold: { convert_temp: 1060 } +} + const registerTFCRecipes = (event) => { - // Bismuth Bronze + // Металлы, которые дублируют гт + Object.entries(TFC_TO_GT_METALS).forEach(keyValuePair => { + + let metal = keyValuePair[0] + let metalSpecs = keyValuePair[1] - // Ingot - event.recipes.tfc.casting('gtceu:bismuth_bronze_ingot', 'tfc:ceramic/ingot_mold', TFC.fluidStackIngredient('gtceu:bismuth_bronze', 144), 0.1) - .id('tfc:casting/bismuth_bronze_fire_ingot') - - event.recipes.tfc.casting('gtceu:bismuth_bronze_ingot', 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient('gtceu:bismuth_bronze', 144), 0.01) - .id('tfc:casting/bismuth_bronze_ingot') + // Металлы дублирующие гт + if (metalSpecs.isGTDup != undefined) + { + // Ingots + event.recipes.tfc.casting(`gtceu:${metal}_ingot`, 'tfc:ceramic/ingot_mold', TFC.fluidStackIngredient(`gtceu:${metal}`, 144), 0.1) + .id(`tfc:casting/${metal}_fire_ingot`) - event.recipes.tfc.heating('gtceu:bismuth_bronze_ingot', 985) - .resultFluid(Fluid.of('gtceu:bismuth_bronze', 144)) - .id('tfc:heating/metal/bismuth_bronze_ingot') - - //event.recipes.tfc.heating('gtceu:bismuth_bronze_ingot', 985) - // .resultFluid(Fluid.of('gtceu:bismuth_bronze', 144)) - // .id('tfc:heating/metal/bismuth_bronze_ingot') + event.recipes.tfc.casting(`gtceu:${metal}_ingot`, 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(`gtceu:${metal}`, 144), 0.01) + .id(`tfc:casting/${metal}_ingot`) + + if (metalSpecs.custom_fluid != undefined) + { + event.recipes.tfc.heating(`gtceu:${metal}_ingot`, metalSpecs.convert_temp) + .resultFluid(Fluid.of(metalSpecs.custom_fluid, 144)) + .id(`tfc:heating/metal/${metal}_ingot`) + } + else + { + event.recipes.tfc.heating(`gtceu:${metal}_ingot`, metalSpecs.convert_temp) + .resultFluid(Fluid.of(`gtceu:${metal}`, 144)) + .id(`tfc:heating/metal/${metal}_ingot`) + } + + } + else + { + // Ingots + event.recipes.tfc.casting(`tfc:metal/ingot/${metal}`, 'tfc:ceramic/ingot_mold', TFC.fluidStackIngredient(`gtceu:${metal}`, 144), 0.1) + .id(`tfc:casting/${metal}_fire_ingot`) + + event.recipes.tfc.casting(`tfc:metal/ingot/${metal}`, 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(`gtceu:${metal}`, 144), 0.01) + .id(`tfc:casting/${metal}_ingot`) + + if (metalSpecs.custom_fluid != undefined) + { + event.recipes.tfc.heating(`tfc:metal/ingot/${metal}`, metalSpecs.convert_temp) + .resultFluid(Fluid.of(metalSpecs.custom_fluid, 144)) + .id(`tfc:heating/metal/${metal}_ingot`) + } + else + { + event.recipes.tfc.heating(`tfc:metal/ingot/${metal}`, metalSpecs.convert_temp) + .resultFluid(Fluid.of(`gtceu:${metal}`, 144)) + .id(`tfc:heating/metal/${metal}_ingot`) + } + } + + + }) + + // Bloom -> Wrought Iron Ingot + event.recipes.tfc.anvil('gtceu:wrought_iron_ingot', 'tfc:refined_iron_bloom', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(2) + .id('tfc:anvil/wrought_iron_from_bloom') + + // High Carbon Steel Ingot -> Steel Ingot + event.recipes.tfc.anvil('gtceu:steel_ingot', 'tfc:metal/ingot/high_carbon_steel', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(3) + .id('tfc:anvil/steel_ingot') + + // High Carbon Black Steel Ingot -> Black Steel Ingot + event.recipes.tfc.anvil('gtceu:black_steel_ingot', 'tfc:metal/ingot/high_carbon_black_steel', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(4) + .id('tfc:anvil/black_steel_ingot') + + // High Carbon Red Steel Ingot -> Red Steel Ingot + event.recipes.tfc.anvil('gtceu:red_steel_ingot', 'tfc:metal/ingot/high_carbon_red_steel', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(5) + .id('tfc:anvil/red_steel_ingot') + + // High Carbon Blue Steel Ingot -> Blue Steel Ingot + event.recipes.tfc.anvil('gtceu:blue_steel_ingot', 'tfc:metal/ingot/high_carbon_blue_steel', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(5) + .id('tfc:anvil/blue_steel_ingot') + + } \ No newline at end of file