diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 1feebba8c..55b50deb1 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2066,7 +2066,7 @@ "quests.extreme_voltage.tunsgten_line_step.title": "Looping Soda Ash", "quests.extreme_voltage.tunsgten_line_step.subtitle": "You may not want to mine it forever", "quests.extreme_voltage.tunsgten_line_step.desc.1": "Looping the &5Tungsten Line&r perfectly isn’t the easiest task, so we’ll use this quest to guide you in the right direction.\n\nThe &bSalt&r you obtain should be combined with &aCarbon Dioxide&r and &6Ammonia&r to produce &3Ammonium Chloride&r, which you can then electrolyze to recycle your &6Ammonia&r and obtain the &9Hydrochloric Acid&r needed for &eSodium Tungstate&r.\n\nThis process also produces &bSodium Bicarbonate&r, which you should electrolyze to recover your &dSoda Ash&r.", - "quests.extreme_voltage.tunsgten_line_step.desc.2": "Finally, to close the loop, you need to manage your &aCarbon Dioxide&r. You can either split a portion of your &dSoda Ash&r and electrolyze it to recover &aCarbon&r and &9Oxygen&r, allowing you to get back some &aCarbon Dioxide&r, or brute force it by using &bLiquid Air&r distillation to produce an infinite supply of &aCarbon Dioxide&r.", + "quests.extreme_voltage.tunsgten_line_step.desc.2": "Finally, to close the loop, you need to manage your &aCarbon Dioxide&r. You get half back when you electrolyze your &aSodium Bicarbonate&r, the rest can be obtained from the &aCarbon&r and &9Oxygen&r byproducts from your &6Tungstate&r or from the &dCalcite&r byproduct if you input &6Scheelite&r. Alternatively, you could brute force it by using &bLiquid Air&r distillation to produce an infinite supply of &aCarbon Dioxide&r.", "quests.extreme_voltage.tunsgten_line_step_1.title": "The new Tungsten Line", "quests.extreme_voltage.tunsgten_line_step_1.subtitle": "Why? Just why?", "quests.extreme_voltage.tunsgten_line_step_1.desc": "The &eTungsten Line&r in TerraFirmaGreg has been completely reworked and you’ll be happy (or not) to know that it’s now &cmuch harder&r.\n\nIt’s possible to &afully loop&r every material in the Tungsten Line, but doing so requires a lot of engineering. Alternatively, you can brute-force your way through by &cmass-producing&r the resources you need.\n\nA little tip: &4Mars&r has several &agood ore veins&r for &eSoda Ash&r and &eTungsten&r.\n\nTake your time, optimize, and the Tungsten Line will become the foundation of your mid-to-late game progress.", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index d6fed9bac..7d3f8dd1c 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -1963,7 +1963,7 @@ "quests.extreme_voltage.tunsgten_line_step.title": "Looping Soda Ash", "quests.extreme_voltage.tunsgten_line_step.subtitle": "You may not want to mine it forever", "quests.extreme_voltage.tunsgten_line_step.desc.1": "Looping the &5Tungsten Line&r perfectly isn’t the easiest task, so we’ll use this quest to guide you in the right direction.\n\nThe &bSalt&r you obtain should be combined with &aCarbon Dioxide&r and &6Ammonia&r to produce &3Ammonium Chloride&r, which you can then electrolyze to recycle your &6Ammonia&r and obtain the &9Hydrochloric Acid&r needed for &eSodium Tungstate&r.\n\nThis process also produces &bSodium Bicarbonate&r, which you should electrolyze to recover your &dSoda Ash&r.", - "quests.extreme_voltage.tunsgten_line_step.desc.2": "Finally, to close the loop, you need to manage your &aCarbon Dioxide&r. You can either split a portion of your &dSoda Ash&r and electrolyze it to recover &aCarbon&r and &9Oxygen&r, allowing you to get back some &aCarbon Dioxide&r, or brute force it by using &bLiquid Air&r distillation to produce an infinite supply of &aCarbon Dioxide&r.", + "quests.extreme_voltage.tunsgten_line_step.desc.2": "Finally, to close the loop, you need to manage your &aCarbon Dioxide&r. You get half back when you electrolyze your &aSodium Bicarbonate&r, the rest can be obtained from the &aCarbon&r and &9Oxygen&r byproducts from your &6Tungstate&r or from the &dCalcite&r byproduct if you input &6Scheelite&r. Alternatively, you could brute force it by using &bLiquid Air&r distillation to produce an infinite supply of &aCarbon Dioxide&r.", "quests.extreme_voltage.tunsgten_line_step_1.title": "The new Tungsten Line", "quests.extreme_voltage.tunsgten_line_step_1.subtitle": "Why? Just why?", "quests.extreme_voltage.tunsgten_line_step_1.desc": "The &eTungsten Line&r in TerraFirmaGreg has been completely reworked and you’ll be happy (or not) to know that it’s now &cmuch harder&r.\n\nIt’s possible to &afully loop&r every material in the Tungsten Line, but doing so requires a lot of engineering. Alternatively, you can brute-force your way through by &cmass-producing&r the resources you need.\n\nA little tip: &4Mars&r has several &agood ore veins&r for &eSoda Ash&r and &eTungsten&r.\n\nTake your time, optimize, and the Tungsten Line will become the foundation of your mid-to-late game progress.", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 7bd2b17cf..840814f3b 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -1980,7 +1980,7 @@ "quests.extreme_voltage.tunsgten_line_step.title": "Looping Soda Ash", "quests.extreme_voltage.tunsgten_line_step.subtitle": "You may not want to mine it forever", "quests.extreme_voltage.tunsgten_line_step.desc.1": "Looping the &5Tungsten Line&r perfectly isn’t the easiest task, so we’ll use this quest to guide you in the right direction.\n\nThe &bSalt&r you obtain should be combined with &aCarbon Dioxide&r and &6Ammonia&r to produce &3Ammonium Chloride&r, which you can then electrolyze to recycle your &6Ammonia&r and obtain the &9Hydrochloric Acid&r needed for &eSodium Tungstate&r.\n\nThis process also produces &bSodium Bicarbonate&r, which you should electrolyze to recover your &dSoda Ash&r.", - "quests.extreme_voltage.tunsgten_line_step.desc.2": "Finally, to close the loop, you need to manage your &aCarbon Dioxide&r. You can either split a portion of your &dSoda Ash&r and electrolyze it to recover &aCarbon&r and &9Oxygen&r, allowing you to get back some &aCarbon Dioxide&r, or brute force it by using &bLiquid Air&r distillation to produce an infinite supply of &aCarbon Dioxide&r.", + "quests.extreme_voltage.tunsgten_line_step.desc.2": "Finally, to close the loop, you need to manage your &aCarbon Dioxide&r. You get half back when you electrolyze your &aSodium Bicarbonate&r, the rest can be obtained from the &aCarbon&r and &9Oxygen&r byproducts from your &6Tungstate&r or from the &dCalcite&r byproduct if you input &6Scheelite&r. Alternatively, you could brute force it by using &bLiquid Air&r distillation to produce an infinite supply of &aCarbon Dioxide&r.", "quests.extreme_voltage.tunsgten_line_step_1.title": "The new Tungsten Line", "quests.extreme_voltage.tunsgten_line_step_1.subtitle": "Why? Just why?", "quests.extreme_voltage.tunsgten_line_step_1.desc": "The &eTungsten Line&r in TerraFirmaGreg has been completely reworked and you’ll be happy (or not) to know that it’s now &cmuch harder&r.\n\nIt’s possible to &afully loop&r every material in the Tungsten Line, but doing so requires a lot of engineering. Alternatively, you can brute-force your way through by &cmass-producing&r the resources you need.\n\nA little tip: &4Mars&r has several &agood ore veins&r for &eSoda Ash&r and &eTungsten&r.\n\nTake your time, optimize, and the Tungsten Line will become the foundation of your mid-to-late game progress.", diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index b76dc2ea4..8f0da9c69 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1694,21 +1694,24 @@ const registerGTCEURecipes = (event) => { event.remove({ id: 'gtceu:chemical_bath/tungstic_acid_from_scheelite' }) event.remove({ id: 'gtceu:chemical_bath/tungstic_acid_from_tungstate' }) event.remove({ id: 'gtceu:electrolyzer/tungstic_acid_electrolysis' }) + event.remove({ id: 'gtceu:chemical_reactor/sodium_bicarbonate_from_salt' }) + event.remove({ id: 'gtceu:large_chemical_reactor/sodium_bicarbonate_from_salt' }) + event.remove({ id: 'gtceu:electrolyzer/soda_ash_from_bicarbonate' }) // Transform Tungstate and Scheelite event.recipes.gtceu.large_chemical_reactor('tfg:scheelite_to_sodium_tungstate') .itemInputs(Item.of('gtceu:scheelite_dust', 6)) .itemInputs(Item.of('gtceu:soda_ash_dust', 6)) - .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 6)) - .itemOutputs(Item.of('gtceu:calcite_dust', 6)) + .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 7)) + .itemOutputs(Item.of('gtceu:calcite_dust', 5)) .duration(20*12) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.large_chemical_reactor('tfg:tungstate_to_sodium_tungstate') - .itemInputs(Item.of('gtceu:tungstate_dust', 6)) + .itemInputs(Item.of('gtceu:tungstate_dust', 7)) .itemInputs(Item.of('gtceu:soda_ash_dust', 6)) - .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 6)) + .itemOutputs(Item.of('tfg:sodium_tungstate_dust', 7)) .itemOutputs(Item.of('gtceu:lithium_dust', 2)) .itemOutputs(Item.of('gtceu:carbon_dust', 1)) .outputFluids(Fluid.of('gtceu:oxygen', 3000)) @@ -1716,16 +1719,16 @@ const registerGTCEURecipes = (event) => { .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.chemical_bath('tfg:tungstate_to_tungsten_acid') - .inputFluids(Fluid.of('gtceu:hydrochloric_acid', 12000)) - .itemInputs(Item.of('tfg:sodium_tungstate_dust', 6)) - .itemOutputs(Item.of('gtceu:salt_dust', 48)) - .itemOutputs(Item.of('gtceu:tungstic_acid_dust', 6)) + .inputFluids(Fluid.of('gtceu:hydrochloric_acid', 2000)) + .itemInputs(Item.of('tfg:sodium_tungstate_dust', 7)) + .itemOutputs(Item.of('gtceu:salt_dust', 4)) + .itemOutputs(Item.of('gtceu:tungstic_acid_dust', 7)) .duration(20*24) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.chemical_bath('tfg:tungsten_acid_to_ammonium_tungstate') .inputFluids(Fluid.of('gtceu:ammonia', 10000)) - .itemInputs(Item.of('gtceu:tungstic_acid_dust', 12)) + .itemInputs(Item.of('gtceu:tungstic_acid_dust', 21)) .itemOutputs(Item.of('tfg:ammonium_tungstate_dust', 1)) .duration(20*16) .EUt(GTValues.VA[GTValues.EV]) @@ -1733,6 +1736,7 @@ const registerGTCEURecipes = (event) => { event.recipes.gtceu.evaporation_tower('tfg:ammonium_tungstate_to_apt_h') .itemInputs(Item.of('tfg:ammonium_tungstate_dust', 1)) .itemOutputs(Item.of('tfg:apt_gem', 1)) + .outputFluids(Fluid.of('gtceu:hydrogen', 6000)) .outputFluids(Fluid.of('gtceu:hydrogen', 500)) .outputFluids(Fluid.of('gtceu:hydrogen', 500)) .outputFluids(Fluid.of('gtceu:hydrogen', 500)) @@ -1745,7 +1749,7 @@ const registerGTCEURecipes = (event) => { event.recipes.gtceu.distillery('tfg:ammonium_tungstate_to_apt') .itemInputs(Item.of('tfg:ammonium_tungstate_dust', 1)) .itemOutputs(Item.of('tfg:apt_gem', 1)) - .outputFluids(Fluid.of('gtceu:hydrogen', 500)) + .outputFluids(Fluid.of('gtceu:hydrogen', 6000)) .duration(20*90) .EUt(GTValues.VHA[GTValues.HV]) @@ -1772,7 +1776,63 @@ const registerGTCEURecipes = (event) => { .itemOutputs(Item.of('gtceu:tungsten_dust', 1)) .duration(20*2.8) .EUt(GTValues.VA[GTValues.EV]) - + + // Looping soda ash and synthetic water + + event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/sodium_bicarbonate_from_salt') + .itemInputs(Item.of('gtceu:salt_dust', 2)) + .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) + .inputFluids(Fluid.of('gtceu:ammonia', 1000)) + .inputFluids(Fluid.of('tfg:synthetic_water', 1000)) + .itemOutputs(Item.of('gtceu:ammonium_chloride_dust', 2)) + .itemOutputs(Item.of('gtceu:sodium_bicarbonate_dust', 6)) + .circuit(2) + .duration(20*20) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:large_chemical_reactor/sodium_bicarbonate_from_salt') + .itemInputs(Item.of('gtceu:salt_dust', 2)) + .inputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) + .inputFluids(Fluid.of('gtceu:ammonia', 1000)) + .inputFluids(Fluid.of('tfg:synthetic_water', 1000)) + .itemOutputs(Item.of('gtceu:ammonium_chloride_dust', 2)) + .itemOutputs(Item.of('gtceu:sodium_bicarbonate_dust', 6)) + .circuit(2) + .duration(20*20) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.electrolyzer('tfg:electrolyzer/sodium_bicarbonate') + .itemInputs(Item.of('gtceu:sodium_bicarbonate_dust', 12)) + .itemOutputs(Item.of('gtceu:soda_ash_dust', 6)) + .outputFluids(Fluid.of('gtceu:carbon_dioxide', 1000)) + .outputFluids(Fluid.of('tfg:synthetic_water', 1000)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.chemical_reactor('tfg:chemical_reactor/synthetic_water') + .inputFluids(Fluid.of('gtceu:hydrogen', 2000)) + .inputFluids(Fluid.of('gtceu:oxygen', 1000)) + .outputFluids(Fluid.of('tfg:synthetic_water', 1000)) + .circuit(2) + .duration(20*4) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:large_chemical_reactor/synthetic_water') + .inputFluids(Fluid.of('gtceu:hydrogen', 2000)) + .inputFluids(Fluid.of('gtceu:oxygen', 1000)) + .outputFluids(Fluid.of('tfg:synthetic_water', 1000)) + .circuit(2) + .duration(20*4) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.electrolyzer('tfg:electrolyzer/synthetic_water') + .inputFluids(Fluid.of('tfg:synthetic_water', 1000)) + .outputFluids(Fluid.of('gtceu:hydrogen', 2000)) + .outputFluids(Fluid.of('gtceu:oxygen', 1000)) + .duration(20*4) + .EUt(GTValues.VA[GTValues.MV]) + + //#endregion // New Alloys diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 4666d23a6..7ee7b7773 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -381,9 +381,6 @@ global.ADD_CIRCUIT = /** @type {const} */ ([ { recipeId: "gtceu:chemical_reactor/formic_acid", circuitNumber: 1 }, { recipeId: "gtceu:large_chemical_reactor/formic_acid", circuitNumber: 1 }, - - { recipeId: "gtceu:chemical_reactor/sodium_bicarbonate_from_salt", circuitNumber: 2 }, - { recipeId: "gtceu:large_chemical_reactor/sodium_bicarbonate_from_salt", circuitNumber: 2 }, { recipeId: "gtceu:chemical_reactor/acetic_acid_from_methanol", circuitNumber: 1 }, { recipeId: "gtceu:large_chemical_reactor/acetic_acid_from_methanol", circuitNumber: 1 }, diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index 0133e5b7d..a8b86ac65 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -3,6 +3,16 @@ const registerTFGFluids = (event) => { + //#region Tungsten Line + + event.create('tfg:synthetic_water') + .thinTexture(0x036bfc) + .bucketColor(0x036bfc) + .temperature(300) + .noBlock() + + //#endregion + //#region Mars event.create('tfg:heavy_ammoniacal_water')