Skip to content

Commit 6f6f7ce

Browse files
Zalgo239Zalgo239
committed
Added more nuclear materials
1 parent c885d19 commit 6f6f7ce

File tree

6 files changed

+105
-9
lines changed

6 files changed

+105
-9
lines changed

‎src/main/java/gregtech/api/unification/Elements.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,17 @@ private Elements() {}
114114
public static final Element U235 = add(92, 143, -1, null, "Uranium-235", "U-235", true);
115115
public static final Element U239 = add(92, 147, -1, null, "Uranium-239", "U-239", true);
116116
public static final Element Np = add(93, 144, -1, null, "Neptunium", "Np", false);
117+
public static final Element Np235 = add(93, 142, -1, null, "Neptunium-235", "Np-235", true);
118+
public static final Element Np236 = add(93, 143, -1, null, "Neptunium-236", "Np-236", true);
119+
public static final Element Np237 = add(93, 144, -1, null, "Neptunium-237", "Np-237", true);
117120
public static final Element Np239 = add(93, 146, -1, null, "Neptunium-239", "Np-239", true);
118121
public static final Element Pu = add(94, 152, -1, null, "Plutonium", "Pu", false);
119-
public static final Element Pu239 = add(94, 145, -1, null, "Plutonium-239", "Pu-239", false);
120-
public static final Element Pu241 = add(94, 149, -1, null, "Plutonium-241", "Pu-241", true);
122+
public static final Element Pu238 = add(94, 144, -1, null, "Plutonium-238", "Pu-238", true);
123+
public static final Element Pu239 = add(94, 145, -1, null, "Plutonium-239", "Pu-239", true);
124+
public static final Element Pu240 = add(94, 146, -1, null, "Plutonium-240", "Pu-240", true);
125+
public static final Element Pu241 = add(94, 147, -1, null, "Plutonium-241", "Pu-241", true);
126+
public static final Element Pu242 = add(94, 148, -1, null, "Plutonium-242", "Pu-242", true);
127+
public static final Element Pu244 = add(94, 150, -1, null, "Plutonium-244", "Pu-244", true);
121128
public static final Element Am = add(95, 150, -1, null, "Americium", "Am", false);
122129
public static final Element Cm = add(96, 153, -1, null, "Curium", "Cm", false);
123130
public static final Element Bk = add(97, 152, -1, null, "Berkelium", "Bk", false);

‎src/main/java/gregtech/api/unification/material/Materials.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ public static void register() {
200200
public static Material Neodymium;
201201
public static Material Neon;
202202
public static Material Neptunium;
203+
public static Material Neptunium235;
204+
public static Material Neptunium236;
205+
public static Material Neptunium237;
203206
public static Material Neptunium239;
204207
public static Material Nickel;
205208
public static Material Nihonium;
@@ -213,8 +216,12 @@ public static void register() {
213216
public static Material Phosphorus;
214217
public static Material Polonium;
215218
public static Material Platinum;
219+
public static Material Plutonium238;
216220
public static Material Plutonium239;
221+
public static Material Plutonium240;
217222
public static Material Plutonium241;
223+
public static Material Plutonium242;
224+
public static Material Plutonium244;
218225
public static Material Potassium;
219226
public static Material Praseodymium;
220227
public static Material Promethium;
@@ -470,7 +477,10 @@ public static void register() {
470477
public static Material NaquadriaSulfate;
471478
public static Material Pyrochlore;
472479
public static Material RTMAlloy;
480+
public static Material EnrichedUraniumDioxide;
481+
public static Material DepletedUraniumDioxide;
473482
public static Material HighPressureSteam;
483+
public static Material Plutonium239Dioxide;
474484

475485
/**
476486
* Organic chemistry
@@ -687,8 +697,6 @@ public static void register() {
687697
public static Material UUMatter;
688698
public static Material PCBCoolant;
689699
public static Material Corium;
690-
public static Material EnrichedUraniumDioxide;
691-
public static Material DepletedUraniumDioxide;
692700

693701
/**
694702
* Second Degree Compounds
@@ -748,6 +756,8 @@ public static void register() {
748756
public static Material Redstone;
749757
public static Material LEU235;
750758
public static Material HEU235;
759+
public static Material LowGradeMOX;
760+
public static Material HighGradeMOX;
751761

752762
/**
753763
* Third Degree Materials

‎src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,9 +1023,52 @@ public static void register() {
10231023
.element(Elements.U239)
10241024
.build();
10251025

1026-
Neptunium239 = new Material.Builder(133, gregtechId("neptunium_239"))
1026+
Neptunium235 = new Material.Builder(133, gregtechId("neptunium_235"))
1027+
.color(0x284D7B).iconSet(METALLIC)
1028+
.element(Elements.Np235)
1029+
.build();
1030+
1031+
Neptunium236 = new Material.Builder(134, gregtechId("neptunium_236"))
1032+
.color(0x284D7B).iconSet(METALLIC)
1033+
.element(Elements.Np236)
1034+
.build();
1035+
1036+
Neptunium237 = new Material.Builder(135, gregtechId("neptunium_237"))
1037+
.color(0x284D7B).iconSet(METALLIC)
1038+
.element(Elements.Np237)
1039+
.build();
1040+
1041+
Neptunium239 = new Material.Builder(136, gregtechId("neptunium_239"))
10271042
.color(0x284D7B).iconSet(METALLIC)
10281043
.element(Elements.Np239)
10291044
.build();
1045+
1046+
Plutonium238 = new Material.Builder(137, gregtechId("plutonium_238"))
1047+
.ingot(3)
1048+
.liquid(new FluidBuilder().temperature(913))
1049+
.color(0xF03232).iconSet(METALLIC)
1050+
.element(Elements.Pu238)
1051+
.build();
1052+
1053+
Plutonium240 = new Material.Builder(138, gregtechId("plutonium_240"))
1054+
.ingot(3)
1055+
.liquid(new FluidBuilder().temperature(913))
1056+
.color(0xF03232).iconSet(METALLIC)
1057+
.element(Elements.Pu240)
1058+
.build();
1059+
1060+
Plutonium242 = new Material.Builder(139, gregtechId("plutonium_242"))
1061+
.ingot(3)
1062+
.liquid(new FluidBuilder().temperature(913))
1063+
.color(0xF03232).iconSet(METALLIC)
1064+
.element(Elements.Pu242)
1065+
.build();
1066+
1067+
Plutonium244 = new Material.Builder(140, gregtechId("plutonium_244"))
1068+
.ingot(3)
1069+
.liquid(new FluidBuilder().temperature(913))
1070+
.color(0xF03232).iconSet(METALLIC)
1071+
.element(Elements.Pu244)
1072+
.build();
10301073
}
10311074
}

‎src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,15 +1558,15 @@ public static void register() {
15581558

15591559
EnrichedUraniumDioxide = new Material.Builder(452, gregtechId("enriched_uranium_dioxide"))
15601560
.dust(3)
1561-
.color(0x232323).iconSet(METALLIC)
1561+
.color(0x232323).iconSet(DULL)
15621562
.flags(DISABLE_DECOMPOSITION)
15631563
.components(Uranium235, 1, Oxygen, 2)
15641564
.build()
15651565
.setFormula("UO2", true);
15661566

15671567
DepletedUraniumDioxide = new Material.Builder(453, gregtechId("depleted_uranium_dioxide"))
15681568
.dust(3)
1569-
.color(0x232323).iconSet(METALLIC)
1569+
.color(0x232323).iconSet(DULL)
15701570
.flags(DISABLE_DECOMPOSITION)
15711571
.components(Uranium, 1, Oxygen, 2)
15721572
.build()
@@ -1580,5 +1580,13 @@ public static void register() {
15801580
.flags(DISABLE_DECOMPOSITION)
15811581
.components(Hydrogen, 2, Oxygen, 1)
15821582
.build();
1583+
1584+
Plutonium239Dioxide = new Material.Builder(455, gregtechId("plutonium_239_dioxide"))
1585+
.dust(3)
1586+
.color(0xF03232).iconSet(DULL)
1587+
.flags(DISABLE_DECOMPOSITION)
1588+
.components(Uranium235, 1, Oxygen, 2)
1589+
.build()
1590+
.setFormula("PuO2", true);
15831591
}
15841592
}

‎src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,11 +515,29 @@ public static void register() {
515515

516516
HEU235 = new Material.Builder(2066, gregtechId("heu_235"))
517517
.dust(3)
518-
.color(0x232323).iconSet(METALLIC)
518+
.color(0x242826).iconSet(METALLIC)
519519
.flags(DISABLE_DECOMPOSITION)
520520
.components(EnrichedUraniumDioxide, 1, DepletedUraniumDioxide, 5)
521521
.fissionFuelProperties(2000, 1000, 10., 0., 2000., 0.)
522522
.build()
523523
.setFormula("UO2", true);
524+
525+
LowGradeMOX = new Material.Builder(2067, gregtechId("low_grade_mox"))
526+
.dust(3)
527+
.color(0x62C032).iconSet(METALLIC)
528+
.flags(DISABLE_DECOMPOSITION)
529+
.components(Plutonium239Dioxide, 1, Uraninite, 20)
530+
.fissionFuelProperties(2000, 1500, 50., 10., 1500., 10.)
531+
.build()
532+
.setFormula("(U,Pu)O2", true);
533+
534+
HighGradeMOX = new Material.Builder(2068, gregtechId("high_grade_mox"))
535+
.dust(3)
536+
.color(0x7EA432).iconSet(METALLIC)
537+
.flags(DISABLE_DECOMPOSITION)
538+
.components(Plutonium239Dioxide, 1, Uraninite, 5)
539+
.fissionFuelProperties(2000, 1500, 10., 10., 2000., 10.)
540+
.build()
541+
.setFormula("(U,Pu)O2", true);
524542
}
525543
}

‎src/main/resources/assets/gregtech/lang/en_us.lang

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,15 @@ gregtech.material.enriched_naquadah_sulfate=Enriched Naquadah Sulfate
18031803
gregtech.material.naquadria_sulfate=Naquadria Sulfate
18041804
gregtech.material.pyrochlore=Pyrochlore
18051805
gregtech.material.rtm_alloy=RTM Alloy
1806-
1806+
gregtech.material.enriched_uranium_dioxide=Enriched Uranium Dioxide
1807+
gregtech.material.depleted_uranium_dioxide=Depleted Uranium Dioxide
1808+
gregtech.material.plutonium_239_dioxide=Plutonium 239 Dioxide
1809+
gregtech.material.neptunium_235=Neptunium 235
1810+
gregtech.material.neptunium_236=Neptunium 236
1811+
gregtech.material.neptunium_237=Neptunium 237
1812+
gregtech.material.plutonium_240=Plutonium 240
1813+
gregtech.material.plutonium_242=Plutonium 242
1814+
gregtech.material.plutonium_244=Plutonium 244
18071815

18081816
# Organic Chemistry Materials
18091817
gregtech.material.silicone_rubber=Silicone Rubber
@@ -2074,6 +2082,8 @@ gregtech.material.clay=Clay
20742082
gregtech.material.redstone=Redstone
20752083
gregtech.material.leu_235=LEU-235
20762084
gregtech.material.heu_235=HEU-235
2085+
gregtech.material.low_grade_mox=Low Grade MOX
2086+
gregtech.material.high_grade_mox=High Grade MOX
20772087

20782088
# Third Degree Materials
20792089
gregtech.material.electrotine=Electrotine

0 commit comments

Comments
 (0)