diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index ad10c5371..25134a320 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -2581,7 +2581,7 @@ public class FirstDegreeMaterials{ AmmoniumDiuranate = new Material.Builder(8477, SuSyUtility.susyId('ammonium_diuranate')) .dust() .iconSet(SHINY) - .components(Nitrogen, 2, Hydrogen, 8, Uranium235, 2, Oxygen, 7) + .components(Nitrogen, 2, Hydrogen, 8, Uranium238, 2, Oxygen, 7) .color(0xe6be22) .build(); @@ -3325,6 +3325,24 @@ public class FirstDegreeMaterials{ .fluidTemp(323) .components(Gelatin, 1, Water, 1) .colorAverage() - .build(); + .build(); + + UraniumDioxide = new Material.Builder(8587, SuSyUtility.susyId("uranium_dioxide")) + .dust() + .iconSet(SAND) + .components(Uranium238, 1, Oxygen, 2) + .color(0x20291b) + .build(); + + UraniumDioxide.setFormula("UO2", true) + + UraniumTetrafluoride = new Material.Builder(8588, SuSyUtility.susyId("uranium_tetrafluoride")) + .dust() + .iconSet(SAND) + .components(Uranium238, 1, Fluorine, 4) + .color(0x58826a) + .build(); + + UraniumTetrafluoride.setFormula("UF4", true) } } diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy index 01476d8ea..71d888c55 100644 --- a/groovy/material/SuSyMaterials.groovy +++ b/groovy/material/SuSyMaterials.groovy @@ -1079,6 +1079,8 @@ class SuSyMaterials { public static Material HydrogenIodide; public static Material AcrylicCatalyst; public static Material GelatinSolution; + public static Material UraniumDioxide; + public static Material UraniumTetrafluoride; // Second Degree Materials diff --git a/groovy/postInit/chemistry/elements/UraniumChain.groovy b/groovy/postInit/chemistry/elements/UraniumChain.groovy index d3a7c26c3..257b285b5 100644 --- a/groovy/postInit/chemistry/elements/UraniumChain.groovy +++ b/groovy/postInit/chemistry/elements/UraniumChain.groovy @@ -28,6 +28,7 @@ REACTION_FURNACE = recipemap('reaction_furnace') ELECTROMAGNETIC_SEPARATOR = recipemap('electromagnetic_separator') PSA = recipemap('pressure_swing_adsorption') CHEMICAL_BATH = recipemap('chemical_bath') +ROTARY_KILN = recipemap('rotary_kiln') MIXER.recipeBuilder() .fluidInputs(fluid('hot_sulfuric_acid') * 2000) @@ -134,4 +135,58 @@ LCR.recipeBuilder() .outputs(metaitem('dustAmmoniumDiuranate') * 19) .EUt(720) .duration(200) + .buildAndRegister() + +REACTION_FURNACE.recipeBuilder() + .inputs(ore('dustAmmoniumDiuranate') * 19) + .fluidInputs(fluid('hydrogen') * 2000) + .outputs(metaitem('dustUraniumDioxide') * 6) + .fluidOutputs(fluid('ammonia') * 2000) + .fluidOutputs(fluid('steam') * 3000) + .EUt(3840) + .duration(600) + .buildAndRegister() + +REACTION_FURNACE.recipeBuilder() + .inputs(ore('dustUraniumDioxide') * 3) + .inputs(ore('dustMagnesium') * 2) + .outputs(metaitem('dustUranium')) + .outputs(metaitem('dustMagnesia') * 4) + .EUt(3840) + .duration(300) + .buildAndRegister() + +ROTARY_KILN.recipeBuilder() + .inputs(ore('dustUraniumDioxide') * 3) + .fluidInputs(fluid('hydrogen_fluoride') * 4000) + .outputs(metaitem('dustUraniumTetrafluoride') * 5) + .fluidOutputs(fluid('steam') * 2000) + .EUt(1920) + .duration(80) + .buildAndRegister() + +FLUIDIZEDBR.recipeBuilder() + .inputs(ore('dustUraniumTetrafluoride') * 5) + .fluidInputs(fluid('fluorine') * 2000) + .fluidOutputs(fluid('uranium_hexafluoride') * 1000) + .EUt(240) + .duration(80) + .buildAndRegister() + +FLUIDIZEDBR.recipeBuilder() + .fluidInputs(fluid('uranium_hexafluoride') * 1000) + .fluidInputs(fluid('hydrogen') * 2000) + .outputs(metaitem('dustUraniumTetrafluoride') * 5) + .fluidOutputs(fluid('hydrogen_fluoride') * 2000) + .EUt(240) + .duration(80) + .buildAndRegister() + +REACTION_FURNACE.recipeBuilder() + .inputs(ore('dustUraniumTetrafluoride') * 5) + .inputs(ore('dustMagnesium') * 2) + .outputs(ore('dustUranium238').first()) + .outputs(metaitem('dustMagnesiumFluoride') * 6) + .EUt(3840) + .duration(80) .buildAndRegister() \ No newline at end of file diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index e465f1916..e7a2d33bd 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -1947,6 +1947,8 @@ susy.material.crotonaldehyde_mixture=Crotonaldehyde Mixture susy.material.crotonaldehyde=Crotonaldehyde susy.material.treated_collagen=Treated Collagen susy.material.gelatin_solution=Gelatin Solution +susy.material.uranium_dioxide=Uranium Dioxide +susy.material.uranium_tetrafluoride=Uranium Tetrafluoride # Isotopes