Skip to content

Commit

Permalink
add radon recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechLord22
TechLord22 committed Jun 29, 2021
1 parent 8d5eafa commit 78f1559
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 20 deletions.
2 changes: 2 additions & 0 deletions src/main/java/gregtech/api/unification/Elements.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,11 @@ public static void register() {
add(90, 140, -1, null, "Thorium", "Th", false);
add(91, 138, -1, null, "Protactinium", "Pa", false);
add(92, 146, -1, null, "Uranium", "U", false);
add(92, 146, -1, null, "Uranium-238", "U_238", false);
add(92, 143, -1, null, "Uranium-235", "U_235", true);
add(93, 144, -1, null, "Neptunium", "Np", false);
add(94, 152, -1, null, "Plutonium", "Pu", false);
add(94, 145, -1, null, "Plutonium-239", "Pu_239", false);
add(94, 149, -1, null, "Plutonium-241", "Pu_241", true);
add(95, 150, -1, null, "Americium", "Am", false);
add(96, 153, -1, null, "Curium", "Cm", false);
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/gregtech/api/unification/material/Materials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static void register() {
public static DustMaterial Phosphorus = new DustMaterial(78, "phosphorus", 0xFFFF00, DULL, 2, of(), 0, Elements.get("Phosphorus"));
public static IngotMaterial Polonium = new IngotMaterial(79, "polonium", 0xC9D47E, DULL, 4, of(), 0, Elements.get("Polonium"));
public static IngotMaterial Platinum = new IngotMaterial(80, "platinum", 0xFFFFC8, SHINY, 2, of(), EXT2_METAL | GENERATE_ORE | GENERATE_FLUID_BLOCK, Elements.get("Platinum"));
public static IngotMaterial Plutonium = new IngotMaterial(81, "plutonium", 0xF03232, METALLIC, 3, of(), EXT_METAL, Elements.get("Plutonium"));
public static IngotMaterial Plutonium239 = new IngotMaterial(81, "plutonium", 0xF03232, METALLIC, 3, of(), EXT_METAL, Elements.get("Plutonium-239"));
public static IngotMaterial Plutonium241 = new IngotMaterial(82, "plutonium241", 0xFA4646, SHINY, 3, of(), EXT_METAL, Elements.get("Plutonium-241"));
public static IngotMaterial Potassium = new IngotMaterial(83, "potassium", 0xFAFAFA, METALLIC, 1, of(), EXT_METAL, Elements.get("Potassium"));
public static IngotMaterial Praseodymium = new IngotMaterial(84, "praseodymium", 0xCECECE, METALLIC, 2, of(), EXT_METAL, Elements.get("Praseodymium"), 1208);
Expand Down Expand Up @@ -149,7 +149,7 @@ public static void register() {
public static IngotMaterial Titanium = new IngotMaterial(113, "titanium", 0xDCA0F0, METALLIC, 3, of(), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_SPRING | GENERATE_FRAME | GENERATE_DENSE, Elements.get("Titanium"), 7.0F, 3.0f, 1600, 1941);
public static FluidMaterial Tritium = new FluidMaterial(114, "tritium", 0xFFFFFF, METALLIC, of(), STATE_GAS, Elements.get("Tritium"));
public static IngotMaterial Tungsten = new IngotMaterial(115, "tungsten", 0x323232, METALLIC, 3, of(), EXT2_METAL, Elements.get("Tungsten"), 7.0F, 3.0f, 2560, 3000);
public static IngotMaterial Uranium = new IngotMaterial(116, "uranium", 0x32F032, METALLIC, 3, of(), STD_METAL | GENERATE_ORE, Elements.get("Uranium"), 6.0F, 3.0f, 512);
public static IngotMaterial Uranium238 = new IngotMaterial(116, "uranium", 0x32F032, METALLIC, 3, of(), STD_METAL | GENERATE_ORE, Elements.get("Uranium-238"), 6.0F, 3.0f, 512);
public static IngotMaterial Uranium235 = new IngotMaterial(117, "uranium235", 0x46FA46, SHINY, 3, of(), STD_METAL | GENERATE_ORE | GENERATE_ROD, Elements.get("Uranium-235"), 6.0F, 3.0f, 512);
public static IngotMaterial Vanadium = new IngotMaterial(118, "vanadium", 0x323232, METALLIC, 2, of(), STD_METAL, Elements.get("Vanadium"), 2183);
public static FluidMaterial Xenon = new FluidMaterial(119, "xenon", 0x270095, FLUID, of(), 0, Elements.get("Xenon"));
Expand Down Expand Up @@ -245,7 +245,7 @@ public static void register() {
public static GemMaterial Topaz = new GemMaterial(203, "topaz", 0xFF8000, GEM_HORIZONTAL, 3, of(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), STD_GEM | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, null, 7.0F, 2.0f, 256);
public static DustMaterial Tungstate = new DustMaterial(204, "tungstate", 0x373223, DULL, 3, of(new MaterialStack(Tungsten, 1), new MaterialStack(Lithium, 2), new MaterialStack(Oxygen, 4)), GENERATE_ORE | DECOMPOSITION_REQUIRES_HYDROGEN, null);
public static IngotMaterial Ultimet = new IngotMaterial(205, "ultimet", 0xB4B4E6, SHINY, 4, of(new MaterialStack(Cobalt, 5), new MaterialStack(Chrome, 2), new MaterialStack(Nickel, 1), new MaterialStack(Molybdenum, 1)), EXT2_METAL, null, 9.0F, 4.0f, 2048, 2700);
public static DustMaterial Uraninite = new DustMaterial(206, "uraninite", 0x232323, METALLIC, 3, of(new MaterialStack(Uranium, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE | DISABLE_DECOMPOSITION);
public static DustMaterial Uraninite = new DustMaterial(206, "uraninite", 0x232323, METALLIC, 3, of(new MaterialStack(Uranium238, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE | DISABLE_DECOMPOSITION);
public static DustMaterial Uvarovite = new DustMaterial(207, "uvarovite", 0xB4FFB4, DIAMOND, 2, of(new MaterialStack(Calcium, 3), new MaterialStack(Chrome, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)), 0);
public static IngotMaterial VanadiumGallium = new IngotMaterial(208, "vanadium_gallium", 0x80808C, SHINY, 2, of(new MaterialStack(Vanadium, 3), new MaterialStack(Gallium, 1)), STD_METAL | GENERATE_FOIL | GENERATE_ROD, null, 4500);
public static IngotMaterial WroughtIron = new IngotMaterial(209, "wrought_iron", 0xC8B4B4, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING | GENERATE_LONG_ROD | DISABLE_DECOMPOSITION, null, 6.0F, 3.5f, 384);
Expand Down Expand Up @@ -703,8 +703,8 @@ public static void register() {
Vermiculite.addOreByProducts(Iron, Aluminium, Magnesium);
FullersEarth.addOreByProducts(Aluminium, Silicon, Magnesium);
Bentonite.addOreByProducts(Aluminium, Calcium, Magnesium);
Uraninite.addOreByProducts(Uranium, Thorium, Uranium235);
Pitchblende.addOreByProducts(Thorium, Uranium, Lead);
Uraninite.addOreByProducts(Uranium238, Thorium, Uranium235);
Pitchblende.addOreByProducts(Thorium, Uranium238, Lead);
Galena.addOreByProducts(Sulfur, Silver, Lead, Silver);
Lapis.addOreByProducts(Lazurite, Sodalite, Pyrite);
Pyrite.addOreByProducts(Sulfur, TricalciumPhosphate, Iron);
Expand All @@ -719,7 +719,7 @@ public static void register() {
Chrysotile.addOreByProducts(Asbestos, Silicon, Magnesium);
Asbestos.addOreByProducts(Asbestos, Silicon, Magnesium);
Pentlandite.addOreByProducts(Iron, Sulfur, Cobalt);
Uranium.addOreByProducts(Lead, Uranium235, Thorium);
Uranium238.addOreByProducts(Lead, Uranium235, Thorium);
Scheelite.addOreByProducts(Manganese, Molybdenum, Calcium);
Tungstate.addOreByProducts(Manganese, Silver, Lithium, Silver);
Bauxite.addOreByProducts(Grossular, Rutile, Gallium);
Expand All @@ -744,8 +744,8 @@ public static void register() {
Antimony.addOreByProducts(Zinc, Iron, Zinc);
Silver.addOreByProducts(Lead, Sulfur, Silver);
Lead.addOreByProducts(Silver, Sulfur, Silver);
Thorium.addOreByProducts(Uranium, Lead);
Plutonium.addOreByProducts(Uranium, Lead);
Thorium.addOreByProducts(Uranium238, Lead);
Plutonium239.addOreByProducts(Uranium238, Lead);
Electrum.addOreByProducts(Gold, Silver);
Bronze.addOreByProducts(Copper, Tin);
Brass.addOreByProducts(Copper, Zinc);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ public static void init() {
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Beryllium.getFluid(16), Materials.Tungsten.getFluid(16)).fluidOutputs(Materials.Platinum.getFluid(16)).duration(32).EUt(32768).EUToStart(150000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Neodymium.getFluid(16), Materials.Hydrogen.getFluid(48)).fluidOutputs(Materials.Europium.getFluid(16)).duration(64).EUt(24576).EUToStart(150000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Lutetium.getFluid(16), Materials.Chrome.getFluid(16)).fluidOutputs(Materials.Americium.getFluid(16)).duration(96).EUt(49152).EUToStart(200000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Plutonium.getFluid(16), Materials.Thorium.getFluid(16)).fluidOutputs(Materials.Naquadah.getFluid(16)).duration(64).EUt(32768).EUToStart(300000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Plutonium239.getFluid(16), Materials.Thorium.getFluid(16)).fluidOutputs(Materials.Naquadah.getFluid(16)).duration(64).EUt(32768).EUToStart(300000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Americium.getFluid(16), Materials.Naquadria.getFluid(16)).fluidOutputs(Materials.Neutronium.getFluid(2)).duration(200).EUt(98304).EUToStart(600000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Tungsten.getFluid(16), Materials.Helium.getFluid(16)).fluidOutputs(Materials.Osmium.getFluid(16)).duration(64).EUt(24578).EUToStart(150000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Manganese.getFluid(16), Materials.Hydrogen.getFluid(16)).fluidOutputs(Materials.Iron.getFluid(16)).duration(64).EUt(8192).EUToStart(120000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getFluid(16)).fluidOutputs(Materials.Uranium.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Gold.getFluid(16), Materials.Aluminium.getFluid(16)).fluidOutputs(Materials.Uranium.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Uranium.getFluid(16), Materials.Helium.getFluid(16)).fluidOutputs(Materials.Plutonium.getFluid(16)).duration(128).EUt(49152).EUToStart(480000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getFluid(16)).fluidOutputs(Materials.Uranium238.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Gold.getFluid(16), Materials.Aluminium.getFluid(16)).fluidOutputs(Materials.Uranium238.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Uranium238.getFluid(16), Materials.Helium.getFluid(16)).fluidOutputs(Materials.Plutonium239.getFluid(16)).duration(128).EUt(49152).EUToStart(480000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Vanadium.getFluid(16), Materials.Hydrogen.getFluid(125)).fluidOutputs(Materials.Chrome.getFluid(16)).duration(64).EUt(24576).EUToStart(140000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Gallium.getFluid(16), Materials.Radon.getFluid(125)).fluidOutputs(Materials.Duranium.getFluid(16)).duration(64).EUt(16384).EUToStart(140000000).buildAndRegister();
RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Titanium.getFluid(48), Materials.Duranium.getFluid(32)).fluidOutputs(Materials.Tritanium.getFluid(16)).duration(64).EUt(32768).EUToStart(200000000).buildAndRegister();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -919,8 +919,8 @@ private static void registerDecompositionRecipes() {
.fluidOutputs(Materials.Oxygen.getFluid(5000))
.buildAndRegister();

RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(800).EUt(320).input(OrePrefix.dust, Materials.Uranium, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium, 1), 200, 80).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium235, 1), 2000, 350).buildAndRegister();
RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(1600).EUt(320).input(OrePrefix.dust, Materials.Plutonium, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium, 1), 3000, 450).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium241, 1), 2000, 300).buildAndRegister();
RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(800).EUt(320).input(OrePrefix.dust, Materials.Uranium238, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium239, 1), 200, 80).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium235, 1), 2000, 350).buildAndRegister();
RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(1600).EUt(320).input(OrePrefix.dust, Materials.Plutonium239, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium238, 1), 3000, 450).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium241, 1), 2000, 300).buildAndRegister();
RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(3200).EUt(320).input(OrePrefix.dust, Materials.Naquadah, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Naquadria, 1), 1000, 300).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.NaquadahEnriched, 1), 5000, 750).buildAndRegister();
RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(6400).EUt(640).input(OrePrefix.dust, Materials.NaquadahEnriched, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Naquadah, 1), 3000, 400).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Naquadria, 1), 2000, 450).buildAndRegister();

Expand Down Expand Up @@ -1081,7 +1081,7 @@ private static void registerRecyclingRecipes() {
RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
.input(OrePrefix.stone, Materials.GraniteRed)
.outputs(OreDictUnifier.get(OrePrefix.dust, Materials.GraniteRed, 1))
.chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Uranium, 1), 100, 40)
.chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Uranium238, 1), 100, 40)
.buildAndRegister();

RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package gregtech.loaders.recipe.chemistry;

import gregtech.api.recipes.RecipeMaps;
import gregtech.api.recipes.ingredients.IntCircuitIngredient;
import gregtech.api.unification.OreDictUnifier;
import gregtech.api.unification.material.Materials;
Expand All @@ -12,7 +11,6 @@
import net.minecraftforge.oredict.OreDictionary;

import static gregtech.api.recipes.RecipeMaps.CHEMICAL_RECIPES;
import static gregtech.api.recipes.RecipeMaps.MIXER_RECIPES;
import static gregtech.api.unification.material.Materials.*;
import static gregtech.api.unification.ore.OrePrefix.*;
import static gregtech.api.unification.ore.OrePrefix.block;
Expand Down Expand Up @@ -922,15 +920,15 @@ public static void init() {
CHEMICAL_RECIPES.recipeBuilder()
.input(dust, Uraninite, 3)
.input(dust, Aluminium)
.output(dust, Uranium)
.output(dust, Uranium238)
.fluidOutputs(Aluminium.getFluid(144))
.fluidOutputs(Oxygen.getFluid(2000))
.duration(360).EUt(120).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.input(dust, Uraninite, 3)
.input(dust, Magnesium)
.output(dust, Uranium)
.output(dust, Uranium238)
.fluidOutputs(Magnesium.getFluid(144))
.fluidOutputs(Oxygen.getFluid(2000))
.duration(360).EUt(120).buildAndRegister();
Expand Down Expand Up @@ -1071,5 +1069,13 @@ public static void init() {
.fluidOutputs(AceticAcid.getFluid(1000))
.fluidOutputs(Methanol.getFluid(1000))
.duration(264).EUt(60).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.input(ingot, Plutonium239, 8)
.input(dustTiny, Uranium238)
.fluidInputs(Air.getFluid(1000))
.output(dust, Plutonium239, 8)
.fluidOutputs(Radon.getFluid(100))
.duration(12000).EUt(8).buildAndRegister();
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/gregtech/lang/en_us.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ material.oxygen=Oxygen
material.palladium=Palladium
material.phosphorus=Phosphorus
material.platinum=Platinum
material.plutonium=Plutonium 244
material.plutonium=Plutonium 239
material.plutonium241=Plutonium 241
material.polonium=Polonium
material.potassium=Potassium
Expand Down

0 comments on commit 78f1559

Please sign in to comment.