From 7b1d0870c7d3a7e9da007563fff6fbbd86567312 Mon Sep 17 00:00:00 2001 From: Daniel Mendes <70096037+Steelux8@users.noreply.github.com> Date: Mon, 1 May 2023 11:37:36 +0100 Subject: Add the Nuclear Salt Processing Plant (#607) * New multi class and calling the class Enable the multi when loading Config handler for the multi More enabling Multi controller recipe Add necessary recipes to new, custom recipemap Add function to generate new recipes Declare item for the controller Define recipe map for the multi Render NEI page for the recipemap properly Change P output from 7 to 6 in recipe Spotless apply * Revert Wildcard on compat handler * Fixes in Salt Plant main class * Remove run1 method * Spotless apply * add isInputSeparationButtonEnabled override * spotlessApply (#615) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: Martin Robertz Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../java/gtPlusPlus/core/config/ConfigHandler.java | 6 ++++++ .../java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 2 ++ src/main/java/gtPlusPlus/core/lib/CORE.java | 1 + .../java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 18 ++++++++++++++++++ 4 files changed, 27 insertions(+) (limited to 'src/main/java/gtPlusPlus/core') diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index b6d5c977b7..296fc0518d 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -58,6 +58,7 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_LiquidFlu import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_MatterFabricator; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_MultiTank; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_PowerSubstation; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_ThermalBoiler; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits; @@ -346,6 +347,11 @@ public class ConfigHandler { GregTech.ID, true, "Refines molten chemicals into nuclear fuels."); + enableMultiblock_NuclearSaltProcessingPlant = config.getBoolean( + "enableMultiblockNuclearSaltProcessingPlant", + GregTech.ID, + true, + "Reprocesses depleted nuclear salts into useful chemicals."); enableMultiblock_IndustrialSifter = config .getBoolean("enableMultiblock_IndustrialSifter", GregTech.ID, true, "Large scale sifting."); enableMultiblock_LargeAutoCrafter = config.getBoolean( diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 694cd86c69..f893486d4f 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -89,6 +89,7 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIsaMill; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMolecularTransformer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNuclearSaltProcessingPlant; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPollutionDevices; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerBreakers; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation; @@ -149,6 +150,7 @@ public class COMPAT_HANDLER { GregtechGeneratorsULV.run(); GregtechEnergyBuffer.run(); GregtechLFTR.run(); + GregtechNuclearSaltProcessingPlant.run(); GregtechSteamCondenser.run(); GregtechSafeBlock.run(); GregtechIronBlastFurnace.run(); diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 918c767a8c..71a812e95a 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -192,6 +192,7 @@ public class CORE { public static boolean enableMultiblock_MultiTank = true; public static boolean enableMultiblock_PowerSubstation = true; public static boolean enableMultiblock_LiquidFluorideThoriumReactor = true; + public static boolean enableMultiblock_NuclearSaltProcessingPlant = true; public static boolean enableMultiblock_NuclearFuelRefinery = true; public static boolean enableMultiblock_TreeFarmer = true; public static boolean enableMultiblock_IndustrialSifter = true; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 92efee13b4..5f6a807746 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -120,6 +120,9 @@ public class RECIPES_Machines { public static ItemStack RECIPE_LFTROuterCasing; public static ItemStack RECIPE_LFTRInnerCasing; + // Nuclear Salt Processing Plant + public static ItemStack RECIPE_SaltPlantController; + // Milling public static ItemStack RECIPE_ISAMill_Controller; public static ItemStack RECIPE_ISAMill_Gearbox; @@ -2451,6 +2454,21 @@ public class RECIPES_Machines { ALLOY.HS188A.getPlateDouble(1), CI.getFieldGenerator(5, 1), GregtechItemList.ReactorProcessingUnit_ZPM.get(1)); + + // Nuclear Salt Processing Plant Controller + RECIPE_SaltPlantController = GregtechItemList.Nuclear_Salt_Processing_Plant.get(1); + + RecipeUtils.addShapedGregtechRecipe( + "plateOsmiridium", + GregtechItemList.ReactorProcessingUnit_IV.get(1), + "plateOsmiridium", + "plateRuridit", + CI.getTieredCircuitOreDictName(7), + "plateRuridit", + "plateOsmiridium", + GregtechItemList.ColdTrap_IV.get(1), + "plateOsmiridium", + RECIPE_SaltPlantController); } // Shelves -- cgit