diff --git a/src/main/java/gregtech/api/unification/Elements.java b/src/main/java/gregtech/api/unification/Elements.java index f0b0652e644..9f842a333fc 100644 --- a/src/main/java/gregtech/api/unification/Elements.java +++ b/src/main/java/gregtech/api/unification/Elements.java @@ -114,10 +114,17 @@ private Elements() {} public static final Element U235 = add(92, 143, -1, null, "Uranium-235", "U-235", true); public static final Element U239 = add(92, 147, -1, null, "Uranium-239", "U-239", true); public static final Element Np = add(93, 144, -1, null, "Neptunium", "Np", false); + public static final Element Np235 = add(93, 142, -1, null, "Neptunium-235", "Np-235", true); + public static final Element Np236 = add(93, 143, -1, null, "Neptunium-236", "Np-236", true); + public static final Element Np237 = add(93, 144, -1, null, "Neptunium-237", "Np-237", true); public static final Element Np239 = add(93, 146, -1, null, "Neptunium-239", "Np-239", true); public static final Element Pu = add(94, 152, -1, null, "Plutonium", "Pu", false); - public static final Element Pu239 = add(94, 145, -1, null, "Plutonium-239", "Pu-239", false); - public static final Element Pu241 = add(94, 149, -1, null, "Plutonium-241", "Pu-241", true); + public static final Element Pu238 = add(94, 144, -1, null, "Plutonium-238", "Pu-238", true); + public static final Element Pu239 = add(94, 145, -1, null, "Plutonium-239", "Pu-239", true); + public static final Element Pu240 = add(94, 146, -1, null, "Plutonium-240", "Pu-240", true); + public static final Element Pu241 = add(94, 147, -1, null, "Plutonium-241", "Pu-241", true); + public static final Element Pu242 = add(94, 148, -1, null, "Plutonium-242", "Pu-242", true); + public static final Element Pu244 = add(94, 150, -1, null, "Plutonium-244", "Pu-244", true); public static final Element Am = add(95, 150, -1, null, "Americium", "Am", false); public static final Element Cm = add(96, 153, -1, null, "Curium", "Cm", false); public static final Element Bk = add(97, 152, -1, null, "Berkelium", "Bk", false); diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 6bddfb3c097..4d08dca3561 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -200,6 +200,9 @@ public static void register() { public static Material Neodymium; public static Material Neon; public static Material Neptunium; + public static Material Neptunium235; + public static Material Neptunium236; + public static Material Neptunium237; public static Material Neptunium239; public static Material Nickel; public static Material Nihonium; @@ -213,8 +216,12 @@ public static void register() { public static Material Phosphorus; public static Material Polonium; public static Material Platinum; + public static Material Plutonium238; public static Material Plutonium239; + public static Material Plutonium240; public static Material Plutonium241; + public static Material Plutonium242; + public static Material Plutonium244; public static Material Potassium; public static Material Praseodymium; public static Material Promethium; @@ -470,7 +477,10 @@ public static void register() { public static Material NaquadriaSulfate; public static Material Pyrochlore; public static Material RTMAlloy; + public static Material EnrichedUraniumDioxide; + public static Material DepletedUraniumDioxide; public static Material HighPressureSteam; + public static Material Plutonium239Dioxide; /** * Organic chemistry @@ -687,8 +697,6 @@ public static void register() { public static Material UUMatter; public static Material PCBCoolant; public static Material Corium; - public static Material EnrichedUraniumDioxide; - public static Material DepletedUraniumDioxide; /** * Second Degree Compounds @@ -748,6 +756,8 @@ public static void register() { public static Material Redstone; public static Material LEU235; public static Material HEU235; + public static Material LowGradeMOX; + public static Material HighGradeMOX; /** * Third Degree Materials diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java index 4c96c013ec5..75175572a5d 100644 --- a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java @@ -1023,9 +1023,52 @@ public static void register() { .element(Elements.U239) .build(); - Neptunium239 = new Material.Builder(133, gregtechId("neptunium_239")) + Neptunium235 = new Material.Builder(133, gregtechId("neptunium_235")) + .color(0x284D7B).iconSet(METALLIC) + .element(Elements.Np235) + .build(); + + Neptunium236 = new Material.Builder(134, gregtechId("neptunium_236")) + .color(0x284D7B).iconSet(METALLIC) + .element(Elements.Np236) + .build(); + + Neptunium237 = new Material.Builder(135, gregtechId("neptunium_237")) + .color(0x284D7B).iconSet(METALLIC) + .element(Elements.Np237) + .build(); + + Neptunium239 = new Material.Builder(136, gregtechId("neptunium_239")) .color(0x284D7B).iconSet(METALLIC) .element(Elements.Np239) .build(); + + Plutonium238 = new Material.Builder(137, gregtechId("plutonium_238")) + .ingot(3) + .liquid(new FluidBuilder().temperature(913)) + .color(0xF03232).iconSet(METALLIC) + .element(Elements.Pu238) + .build(); + + Plutonium240 = new Material.Builder(138, gregtechId("plutonium_240")) + .ingot(3) + .liquid(new FluidBuilder().temperature(913)) + .color(0xF03232).iconSet(METALLIC) + .element(Elements.Pu240) + .build(); + + Plutonium242 = new Material.Builder(139, gregtechId("plutonium_242")) + .ingot(3) + .liquid(new FluidBuilder().temperature(913)) + .color(0xF03232).iconSet(METALLIC) + .element(Elements.Pu242) + .build(); + + Plutonium244 = new Material.Builder(140, gregtechId("plutonium_244")) + .ingot(3) + .liquid(new FluidBuilder().temperature(913)) + .color(0xF03232).iconSet(METALLIC) + .element(Elements.Pu244) + .build(); } } diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java index 6789e453a49..57b4c631dc7 100644 --- a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java @@ -1558,7 +1558,7 @@ public static void register() { EnrichedUraniumDioxide = new Material.Builder(452, gregtechId("enriched_uranium_dioxide")) .dust(3) - .color(0x232323).iconSet(METALLIC) + .color(0x232323).iconSet(DULL) .flags(DISABLE_DECOMPOSITION) .components(Uranium235, 1, Oxygen, 2) .build() @@ -1566,7 +1566,7 @@ public static void register() { DepletedUraniumDioxide = new Material.Builder(453, gregtechId("depleted_uranium_dioxide")) .dust(3) - .color(0x232323).iconSet(METALLIC) + .color(0x232323).iconSet(DULL) .flags(DISABLE_DECOMPOSITION) .components(Uranium, 1, Oxygen, 2) .build() @@ -1580,5 +1580,13 @@ public static void register() { .flags(DISABLE_DECOMPOSITION) .components(Hydrogen, 2, Oxygen, 1) .build(); + + Plutonium239Dioxide = new Material.Builder(455, gregtechId("plutonium_239_dioxide")) + .dust(3) + .color(0xF03232).iconSet(DULL) + .flags(DISABLE_DECOMPOSITION) + .components(Uranium235, 1, Oxygen, 2) + .build() + .setFormula("PuO2", true); } } diff --git a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java index f0ff957ac8f..ac5d6d622c3 100644 --- a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java @@ -515,11 +515,29 @@ public static void register() { HEU235 = new Material.Builder(2066, gregtechId("heu_235")) .dust(3) - .color(0x232323).iconSet(METALLIC) + .color(0x242826).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(EnrichedUraniumDioxide, 1, DepletedUraniumDioxide, 5) .fissionFuelProperties(2000, 1000, 10., 0., 2000., 0.) .build() .setFormula("UO2", true); + + LowGradeMOX = new Material.Builder(2067, gregtechId("low_grade_mox")) + .dust(3) + .color(0x62C032).iconSet(METALLIC) + .flags(DISABLE_DECOMPOSITION) + .components(Plutonium239Dioxide, 1, Uraninite, 20) + .fissionFuelProperties(2000, 1500, 50., 10., 1500., 10.) + .build() + .setFormula("(U,Pu)O2", true); + + HighGradeMOX = new Material.Builder(2068, gregtechId("high_grade_mox")) + .dust(3) + .color(0x7EA432).iconSet(METALLIC) + .flags(DISABLE_DECOMPOSITION) + .components(Plutonium239Dioxide, 1, Uraninite, 5) + .fissionFuelProperties(2000, 1500, 10., 10., 2000., 10.) + .build() + .setFormula("(U,Pu)O2", true); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 814d71c0a4a..dc280e1bcd9 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -1803,7 +1803,15 @@ gregtech.material.enriched_naquadah_sulfate=Enriched Naquadah Sulfate gregtech.material.naquadria_sulfate=Naquadria Sulfate gregtech.material.pyrochlore=Pyrochlore gregtech.material.rtm_alloy=RTM Alloy - +gregtech.material.enriched_uranium_dioxide=Enriched Uranium Dioxide +gregtech.material.depleted_uranium_dioxide=Depleted Uranium Dioxide +gregtech.material.plutonium_239_dioxide=Plutonium 239 Dioxide +gregtech.material.neptunium_235=Neptunium 235 +gregtech.material.neptunium_236=Neptunium 236 +gregtech.material.neptunium_237=Neptunium 237 +gregtech.material.plutonium_240=Plutonium 240 +gregtech.material.plutonium_242=Plutonium 242 +gregtech.material.plutonium_244=Plutonium 244 # Organic Chemistry Materials gregtech.material.silicone_rubber=Silicone Rubber @@ -2074,6 +2082,8 @@ gregtech.material.clay=Clay gregtech.material.redstone=Redstone gregtech.material.leu_235=LEU-235 gregtech.material.heu_235=HEU-235 +gregtech.material.low_grade_mox=Low Grade MOX +gregtech.material.high_grade_mox=High Grade MOX # Third Degree Materials gregtech.material.electrotine=Electrotine