Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
updated antimatter, added proper uranium processing from gt6
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Sep 17, 2023
1 parent 2bfd9da commit 237a3f3
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 167 deletions.
2 changes: 1 addition & 1 deletion AntimatterAPI
Submodule AntimatterAPI updated 1 files
+4 −2 common/src/main/java/muramasa/antimatter/util/Utils.java
47 changes: 6 additions & 41 deletions common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,6 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
event.setMaterial(UUAmplifier).asFluid();
event.setMaterial(UUMatter).asFluid();
//Nuclear
event.setMaterial(LeachingSolution).asFluid();
event.setMaterial(LeachedThorium).asFluid();
event.setMaterial(LeachedUranium).asFluid();
event.setMaterial(Thoriumdioxidedinitrate).asFluid();
event.setMaterial(Uraniumdioxidedinitrate).asFluid();
/**
*** Gases/Plasmas
**/
Expand Down Expand Up @@ -559,11 +554,6 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
event.setMaterial(HydroCrackedHeavyFuel).asFluid();
event.setMaterial(HydroCrackedNaphtha).asFluid();
event.setMaterial(HydroCrackedRefineryGas).asGas();
/**
** Nuclear Processing
*/
event.setMaterial(Ammoniumdithoranate).asDust();
event.setMaterial(Ammoniumdiuranate).asDust();
processInto(event);
nuclearIsotopes(event);
toolsAndArmor(event);
Expand Down Expand Up @@ -1169,42 +1159,17 @@ private static void nuclearIsotopes(GregTechMaterialEvent event){
//event.setMaterial(Radon219).asGas().mats(of(Radon, 1));
//event.setMaterial(Radon220).asGas().mats(of(Radon, 1));
//event.setMaterial(Radon222).asGas().mats(of(Radon, 1));
/**
* Cakes and dioxides
*/
event.setMaterial(ThoriumCake).asDust().mats(of(ThoriumDioxide,1,TrithoriumOctoxide,4));
event.setMaterial(UraniumCake).asDust().mats(of(UraniumDioxide,1,TriuraniumOctoxide,4));
event.setMaterial(ThoriumDioxide).asDust().mats(of(Thorium,1,Oxygen,2));
//event.setMaterial(Thorium227Dioxide).asDust().mats(of(Thorium227,1,Oxygen,2));
//event.setMaterial(Thorium228Dioxide).asDust().mats(of(Thorium228,1,Oxygen,2));
//event.setMaterial(Thorium229Dioxide).asDust().mats(of(Thorium229,1,Oxygen,2));
event.setMaterial(Thorium230Dioxide).asDust().mats(of(Thorium230,1,Oxygen,2));
//event.setMaterial(Thorium231Dioxide).asDust().mats(of(Thorium231,1,Oxygen,2));
//event.setMaterial(Thorium233Dioxide).asDust().mats(of(Thorium233,1,Oxygen,2));
//event.setMaterial(Thorium234Dioxide).asDust().mats(of(Thorium234,1,Oxygen,2));
event.setMaterial(UraniumDioxide).asDust().mats(of(Uranium,1,Oxygen,2));
event.setMaterial(Uranium233Dioxide).asDust().mats(of(Uranium233,1,Oxygen,2));
event.setMaterial(Uranium235Dioxide).asDust().mats(of(Uranium235,1,Oxygen,2));
event.setMaterial(TrithoriumOctoxide).asDust().mats(of(Thorium,3,Oxygen,8));
event.setMaterial(TriuraniumOctoxide).asDust().mats(of(Uranium,3,Oxygen,8));
/**
* Tetrafluorides
*/
event.setMaterial(ThoriumTetrafluoride).asGas().mats(of(Thorium,1,Fluorine,4));
event.setMaterial(UraniumTetrafluoride).asGas().mats(of(Uranium,1,Fluorine,4));
event.setMaterial(UraniumTetrafluoride).asDust().mats(of(Uranium,1,Fluorine,4));
event.setMaterial(Uranium235Tetrafluoride).asDust().mats(of(Uranium235, 1, Fluorine, 4));
event.setMaterial(Uranium238Tetrafluoride).asDust().mats(of(Uranium, 1, Fluorine, 4));
/**
* Hexafluorides
*/
event.setMaterial(ThoriumHexafluoride).asGas().mats(of(Thorium,1,Fluorine,6));
//event.setMaterial(Thorium227Hexafluoride).asGas().mats(of(Thorium227,1,Fluorine,6));
//event.setMaterial(Thorium228Hexafluoride).asGas().mats(of(Thorium228,1,Fluorine,6));
//event.setMaterial(Thorium229Hexafluoride).asGas().mats(of(Thorium229,1,Fluorine,6));
event.setMaterial(Thorium230Hexafluoride).asGas().mats(of(Thorium230,1,Fluorine,6));
//event.setMaterial(Thorium231Hexafluoride).asGas().mats(of(Thorium231,1,Fluorine,6));
//event.setMaterial(Thorium233Hexafluoride).asGas().mats(of(Thorium233,1,Fluorine,6));
//event.setMaterial(Thorium234Hexafluoride).asGas().mats(of(Thorium234,1,Fluorine,6));
event.setMaterial(UraniumHexafluoride).asGas().mats(of(Uranium,1,Fluorine,6));
event.setMaterial(Uranium233Hexafluoride).asGas().mats(of(Uranium233,1,Fluorine,6));
event.setMaterial(UraniumHexafluoride).asGas();
event.setMaterial(Uranium238Hexafluoride).asGas().mats(of(Uranium,1,Fluorine,6));
event.setMaterial(Uranium235Hexafluoride).asGas().mats(of(Uranium235,1,Fluorine,6));
/**
* Fissile Fuels
Expand Down Expand Up @@ -1404,7 +1369,7 @@ private static void flags(GregTechMaterialEvent event){
CALCITE2X.add(Pyrite, YellowLimonite);
CALCITE3X.add(Iron, BrownLimonite);
CENT5.add(FiberReinforcedEpoxyResin, /*Chrysolite*/ Flint, /*Niter*/ Glass, /*Perlite*/ WroughtIron, DarkAsh, AnnealedCopper, NobleGases,
Cinnabar, Uraninite);
Cinnabar);
CENT10.add(Magnalium, VanadiumMagnetite, BrownLimonite, YellowLimonite, BlackGranite, Cupronickel, NiobiumTitanium, BorosilicateGlass,
GalliumArsenide, Marble, Limestone, Invar, TinAlloy, TungstenCarbide, EnderEye, Powellite, VanadiumGallium, Blaze,
TungstenSteel, Brass, Nichrome, Electrum, Bronze, Stibnite, Wulfenite, RedAlloy, SterlingSilver, RoseGold, BatteryAlloy, SolderingAlloy);
Expand Down
87 changes: 2 additions & 85 deletions common/src/main/java/muramasa/gregtech/data/Materials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,61 +224,6 @@ public class Materials {
*** Solids
**/

/**
** Nuclear Fuel Processing
**/

/**
* Cakes
**/

public static Material ThoriumCake = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_cake", 0x112f11, DULL));
public static Material UraniumCake = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_cake", 0x43f243, DULL));

/**
* Dioxides
**/

public static Material ThoriumDioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_dioxide", 0x114011, DULL));
public static Material Thorium227Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium227_dioxide", 0x114011, DULL));
public static Material Thorium228Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium228_dioxide", 0x114011, DULL));
public static Material Thorium229Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium229_dioxide", 0x114011, DULL));
public static Material Thorium230Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium230_dioxide", 0x114011, DULL));
public static Material Thorium231Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium231_dioxide", 0x114011, DULL));
public static Material Thorium233Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium233_dioxide", 0x114011, DULL));
public static Material Thorium234Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium234_dioxide", 0x114011, DULL));
public static Material UraniumDioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_dioxide", 0x43f443, DULL));
public static Material Uranium232Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium232_dioxide", 0x43f443, DULL));
public static Material Uranium233Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium233_dioxide", 0x43f443, DULL));
public static Material Uranium234Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium234_dioxide", 0x43f443, DULL));
public static Material Uranium235Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium235_dioxide", 0x43f443, DULL));
public static Material Uranium236Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium236_dioxide", 0x43f443, DULL));
public static Material Uranium237Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium237_dioxide", 0x43f443, DULL));
public static Material Uranium238Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium238_dioxide", 0x43f443, DULL));
public static Material Uranium239Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium239_dioxide", 0x43f443, DULL));
public static Material Uranium240Dioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium240_dioxide", 0x43f443, DULL));

/**
* Octoxides
**/

public static Material TrithoriumOctoxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "trithorium_octoxide", 0x115111, DULL));
public static Material TriuraniumOctoxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "triuranium_octoxide", 0x43f643, DULL));

/**
* Dioxiddinitrates
**/

public static Material Thoriumdioxidedinitrate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_dioxide_dinitrate", 0x222f22, SHINY));
public static Material Uraniumdioxidedinitrate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_dioxide_dinitrate", 0x43f043, SHINY));

/**
* Ammoniumdianates
**/

public static Material Ammoniumdithoranate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ammonium_dithoranate", 0x332f33, SHINY));
public static Material Ammoniumdiuranate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ammonium_diuranate", 0x54f054, SHINY));

/**
** Metals
**/
Expand Down Expand Up @@ -715,47 +660,19 @@ public class Materials {
public static Material SteamCrackedNaphtha = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "steam_cracked_naphtha", 0xffff00, NONE));
public static Material SteamCrackedRefineryGas = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "steam_cracked_refinery_gas", 0xffffff, NONE));

/**
** Nuclear Processing
**/

/**
* Leached Stuff
**/

public static Material LeachingSolution = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "leaching_solution", 0xffffff, NONE));
public static Material LeachedThorium = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "leached_thorium", 0xeeeeee, NONE));
public static Material LeachedUranium = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "leached_uranium", 0xeeffee, NONE));

/**
* Tetrafluorides
**/

public static Material ThoriumTetrafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_tetrafluoride", 0x001c00, NONE));
public static Material UraniumTetrafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_tetrafluoride", 0x21d921, NONE));
public static Material Uranium238Tetrafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_238_tetrafluoride", 0x21d921, NONE));
public static Material Uranium235Tetrafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_235_tetrafluoride", 0x21d921, NONE));

/**
* Hexafluorides
**/

public static Material ThoriumHexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_hexafluoride", 0x001a00, NONE));
public static Material Thorium227Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_227_hexafluoride", 0x001a00, NONE));
public static Material Thorium228Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_228_hexafluoride", 0x001a00, NONE));
public static Material Thorium229Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_229_hexafluoride", 0x001a00, NONE));
public static Material Thorium230Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_230_hexafluoride", 0x001a00, NONE));
public static Material Thorium231Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_231_hexafluoride", 0x001a00, NONE));
public static Material Thorium233Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_233_hexafluoride", 0x001a00, NONE));
public static Material Thorium234Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "thorium_234_hexafluoride", 0x001a00, NONE));
public static Material UraniumHexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_hexafluoride", 0x10c810, NONE));
public static Material Uranium232Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_232_hexafluoride", 0x10c810, NONE));
public static Material Uranium233Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_233_hexafluoride", 0x10c810, NONE));
public static Material Uranium234Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_234_hexafluoride", 0x10c810, NONE));
public static Material Uranium235Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_235_hexafluoride", 0x10c810, NONE));
public static Material Uranium236Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_236_hexafluoride", 0x10c810, NONE));
public static Material Uranium237Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_237_hexafluoride", 0x10c810, NONE));
public static Material Uranium238Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_238_hexafluoride", 0x10c810, NONE));
public static Material Uranium239Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_239_hexafluoride", 0x10c810, NONE));
public static Material Uranium240Hexafluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "uranium_240_hexafluoride", 0x10c810, NONE));

// TODO go through the GT_Loader_Item_Block_And_Fluid and make sure all explicitly added fluids have the LIQUID tag
public static void init() {
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/muramasa/gregtech/loader/machines/CentrifugingLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public static void init() {
CENTRIFUGING.RB().fi(Propane.getGas(320)).fo(Lubricant.getLiquid(290)).add("propane", 20, 5);
CENTRIFUGING.RB().fi(Butane.getGas(320)).fo(Lubricant.getLiquid(370)).add("butane", 20, 5);
CENTRIFUGING.RB().fi(RefineryGas.getGas(800)).fo(LPG.getGas(400)).add("refinery_gas", 20, 5);
CENTRIFUGING.RB().fi(UraniumHexafluoride.getGas(1400)).fo(Uranium238Hexafluoride.getGas(1000), Uranium235Hexafluoride.getGas(400)).add("uranium_hexafluoride", 24, 512);
//Cake Centrifuging
/*CENTRIFUGING.RB().ii(of(DUST.get(ThoriumCake, 5))).io(DUST.get(ThoriumDioxide, 1), DUST.get(TrithoriumOctoxide, 4)).add("thorium_cake_centrifuging",400, 500);
CENTRIFUGING.RB().ii(of(DUST.get(UraniumCake, 5))).io(DUST.get(UraniumDioxide, 1), DUST.get(TriuraniumOctoxide, 4)).add("uranium_cake_centrifuging",400, 500);*/
Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/muramasa/gregtech/loader/machines/ChemicalDehydrator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

public class ChemicalDehydrator {
public static void init() {
DEHYDRATING.RB().fi(LeachedThorium.getLiquid(1000)).io(DUST.get(ThoriumCake)).add("thorium_cake_dehydrating",1000,8);
DEHYDRATING.RB().fi(LeachedUranium.getLiquid(1000)).io(DUST.get(UraniumCake)).add("uranium_cake_dehydrating",1000,8);
//Waste Processing
DEHYDRATING.RB().ii(of(ThoriumWaste)).fi(SulfuricAcid.getLiquid(100)).io(new ItemStack(NuclearWaste),DUST_SMALL.get(Rhodium,4)).add("thorium_waste_reprocessing",500,8);
DEHYDRATING.RB().ii(of(ProtactiniumWaste)).fi(SulfuricAcid.getLiquid(100)).io(new ItemStack(NuclearWaste),DUST_SMALL.get(Rhodium,2),DUST_SMALL.get(Palladium,2)).add("protactinium_waste_reprocessing",500,8);
Expand Down
Loading

0 comments on commit 237a3f3

Please sign in to comment.