diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..9bbc975 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index f5feea6..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialIDs.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialIDs.java index 715aa87..87eedc8 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialIDs.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialIDs.java @@ -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; diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java index 2f2f234..d40f69b 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java @@ -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, @@ -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() { } diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelProcessingRecipes.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelProcessingRecipes.java index 694d555..5b5ad7b 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelProcessingRecipes.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelProcessingRecipes.java @@ -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; @@ -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() { @@ -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)) @@ -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); diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelRodRecipes.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelRodRecipes.java index c5cf735..0ac6937 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelRodRecipes.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/FuelRodRecipes.java @@ -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) @@ -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) @@ -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) diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/GTMats.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/GTMats.java index b4c956c..9126f7a 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/GTMats.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/GTMats.java @@ -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