Skip to content

Added Thorium Line #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RecursivePineapple merged 1 commit into from
Mar 31, 2025
Merged

Added Thorium Line #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 2 additions & 3 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion ...in/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialIDs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ public enum MaterialIDs {
CALIFORNIUM_IV_OXIDE(52),
LANTHANUM_II_OXIDE(53),
LANTHANIDE_WASTE_MIXTURE(54),

THORIANITE_AQ_SOLUTION(55),
THORIUM_NITRATE(56),
LOW_URANIUM_SLUDGE(57),
URANIUM_POOR_MIXTURE(58),
REFINED_THORIUM(59)
;

private static final int OFFSET_ID = 14_000;
Expand Down
55 changes: 54 additions & 1 deletion ...va/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class MaterialsNuclear {
public static final Werkstoff ENRICHED_THORIUM_FUEL = new Werkstoff(
new short[] { 0, 77, 0 },
"Enriched Thorium Fuel",
process("UO↓2(ThO↓2)↓4"),
process("UO↓2(ThO↓2)↓15"),
RADIO_STATS,
Werkstoff.Types.MIXTURE,
DUST,
Expand Down Expand Up @@ -340,6 +340,59 @@ public class MaterialsNuclear {
MaterialIDs.URANIUM_238_DIOXIDE.id,
TextureSet.SET_DULL);


public static final Werkstoff THORIANITE_AQ_SOLUTION = new Werkstoff(
rgb(0x393b32),
"Thorianite solution (Aqueos State)",
process("??Th(NO↓3)?U?"),
DEFAULT_STATS,
Werkstoff.Types.COMPOUND,
FLUID,
MaterialIDs.THORIANITE_AQ_SOLUTION.id,
TextureSet.SET_FLUID);

public static final Werkstoff THORIUM_NITRATE_SOLUTION = new Werkstoff(
rgb(0x182a21),
"Thorium Nitrate solution",
process("Th(NO↓3)"),
DEFAULT_STATS,
Werkstoff.Types.COMPOUND,
FLUID,
MaterialIDs.THORIUM_NITRATE.id,
TextureSet.SET_FLUID);

public static final Werkstoff LOW_URANIUM_SLUDGE = new Werkstoff(
rgb(0x132602),
"Low Uranium Sludge",
process("?U?(NO↓3)?"),
DEFAULT_STATS,
Werkstoff.Types.COMPOUND,
FLUID,
MaterialIDs.LOW_URANIUM_SLUDGE.id,
TextureSet.SET_FLUID);

public static final Werkstoff POOR_URANIUM_MIXTURE = new Werkstoff(
rgb(0x132602),
"Poor Uranium Mixture",
process("?U?"),
DEFAULT_STATS,
Werkstoff.Types.COMPOUND,
FLUID,
MaterialIDs.URANIUM_POOR_MIXTURE.id,
TextureSet.SET_FLUID);


public static final Werkstoff REFINED_THORIUM = new Werkstoff(
rgb(0x081a11),
"Refined Thorium",
process("Th"),
DEFAULT_STATS,
Werkstoff.Types.COMPOUND,
DUST,
MaterialIDs.REFINED_THORIUM.id,
TextureSet.SET_DULL);


public static void init() {

}
Expand Down
67 changes: 60 additions & 7 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelProcessingRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.recursive_pineapple.nuclear_horizons.recipes;

import static com.recursive_pineapple.nuclear_horizons.recipes.GTMats.*;
import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
import static gregtech.api.recipe.RecipeMaps.*;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
Expand All @@ -18,6 +16,9 @@ public class FuelProcessingRecipes {
public static void registerRecipes() {
registerEnrichmentRecipes();
registerFuelRecipes();

//Not sure where to put this one:
registerThoriumLineRecipes();
}

private static void registerEnrichmentRecipes() {
Expand Down Expand Up @@ -69,6 +70,58 @@ private static void registerEnrichmentRecipes() {
.addTo(multiblockChemicalReactorRecipes);
}

private static void registerThoriumLineRecipes() {

GTValues.RA.stdBuilder()
.fluidInputs(NITRICACID.getFluid(5000))
.itemInputs(THORIANIT.getDust(3))
.fluidOutputs(THORIANITE_AQ_SOLUTION.getFluid(5000))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_HV)
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.fluidInputs(THORIANITE_AQ_SOLUTION.getFluid(2000))
.fluidOutputs(THORIUM_NITRATE_SOLUTION.getFluid(1900),LOW_URANIUM_SLUDGE.getFluid(100))
.duration(5 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(centrifugeRecipes);

//15 Thoranite - 10 thorium ~ 1 uranium dust, sounds fair
GTValues.RA.stdBuilder()
.fluidInputs(LOW_URANIUM_SLUDGE.getFluid(1000))
.itemOutputs(
URANIUM232.getDust(1),
URANIUM233.getDust(1),
URANIUM235.getDust(1),
URANIUM238.getDust(1)
)
.fluidOutputs(NITRICACID.getFluid(1000))
.outputChances(4000, 2000, 100, 1250)
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(centrifugeRecipes);

GTValues.RA.stdBuilder()
.fluidInputs(THORIUM_NITRATE_SOLUTION.getFluid(1900))
.itemInputs(WATER.getCells(2))
.itemOutputs(REFINED_THORIUM.getDust(1), EMPTY.getCells(2))
.fluidOutputs(NITRICACID.getFluid(1890))
.duration(10 * SECONDS)
.eut(TierEU.RECIPE_HV)
.addTo(chemicalReactorRecipes);

GTValues.RA.stdBuilder()
.fluidInputs(THORIUM_NITRATE_SOLUTION.getFluid(1900), WATER.getFluid(2000))
.itemOutputs(REFINED_THORIUM.getDust(1))
.fluidOutputs(NITRICACID.getFluid(1900))
.duration(10 * SECONDS)
.eut(TierEU.RECIPE_HV)
.addTo(multiblockChemicalReactorRecipes);


}

private static void registerFuelRecipes() {
GTValues.RA.stdBuilder()
.itemInputs(URANIUM_233_DIOXIDE.getDust(1), URANIUM_238_DIOXIDE.getDust(4))
Expand All @@ -85,15 +138,15 @@ private static void registerFuelRecipes() {
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(URANIUM_233_DIOXIDE.getDust(1), THORIANIT.getDust(4))
.itemOutputs(ENRICHED_THORIUM_FUEL.getDust(5))
.itemInputs(URANIUM_233_DIOXIDE.getDust(1), REFINED_THORIUM.getDust(15))
.itemOutputs(ENRICHED_THORIUM_FUEL.getDust(16))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(URANIUM_235_DIOXIDE.getDust(1), THORIANIT.getDust(4))
.itemOutputs(ENRICHED_THORIUM_FUEL.getDust(5))
.itemInputs(URANIUM_235_DIOXIDE.getDust(1), REFINED_THORIUM.getDust(15))
.itemOutputs(ENRICHED_THORIUM_FUEL.getDust(16))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(mixerRecipes);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelRodRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static void registerCanning() {
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Loaders.advancedFuelRod, 1),
ENRICHED_THORIUM_FUEL.getDust(4))
ENRICHED_THORIUM_FUEL.getDust(2))
.itemOutputs(new ItemStack(ItemList.THORIUM_1X_ROD, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
Expand All @@ -62,7 +62,7 @@ public static void registerCanning() {
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Loaders.advancedFuelRod, 2),
ENRICHED_THORIUM_FUEL.getDust(8))
ENRICHED_THORIUM_FUEL.getDust(4))
.itemOutputs(new ItemStack(ItemList.THORIUM_2X_ROD, 1))
.duration(40 * SECONDS)
.eut(TierEU.RECIPE_MV)
Expand All @@ -71,7 +71,7 @@ public static void registerCanning() {
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Loaders.advancedFuelRod, 4),
ENRICHED_THORIUM_FUEL.getDust(16))
ENRICHED_THORIUM_FUEL.getDust(8))
.itemOutputs(new ItemStack(ItemList.THORIUM_4X_ROD, 1))
.duration(80 * SECONDS)
.eut(TierEU.RECIPE_MV)
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/GTMats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,6 +1317,11 @@ private GTMats() { }
public static final MaterialWrapper URANIUM_233_DIOXIDE = MaterialWrapper.of(() -> MaterialsNuclear.URANIUM_233_DIOXIDE);
public static final MaterialWrapper URANIUM_235_DIOXIDE = MaterialWrapper.of(() -> MaterialsNuclear.URANIUM_235_DIOXIDE);
public static final MaterialWrapper URANIUM_238_DIOXIDE = MaterialWrapper.of(() -> MaterialsNuclear.URANIUM_238_DIOXIDE);
public static final MaterialWrapper REFINED_THORIUM = MaterialWrapper.of(() -> MaterialsNuclear.REFINED_THORIUM);
public static final MaterialWrapper THORIANITE_AQ_SOLUTION = MaterialWrapper.of(() -> MaterialsNuclear.THORIANITE_AQ_SOLUTION);
public static final MaterialWrapper LOW_URANIUM_SLUDGE = MaterialWrapper.of(() -> MaterialsNuclear.LOW_URANIUM_SLUDGE);
public static final MaterialWrapper THORIUM_NITRATE_SOLUTION = MaterialWrapper.of(() -> MaterialsNuclear.THORIUM_NITRATE_SOLUTION);
public static final MaterialWrapper POOR_URANIUM_MIXTURE = MaterialWrapper.of(() -> MaterialsNuclear.POOR_URANIUM_MIXTURE);
//#endregion

//#region src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsChemical.java
Expand Down
Loading