LFTR Chain Fixes, Buffs and Tweaks (#584)

* Update LFTR Tooltip

* Update Fuel Refinery Tooltip

* Fix casing name in Refinery tooltip

* Clarify Sparge Tower Speed in Tooltip

* Lithium Hydroxide Recipe Buff

* LFTR Fuel Exploit Fixed

* Protactinium Recipe Changes

* spotlessApply (#585)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

6 files changed, 52 insertions, 38 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 8ddcfc4112..9c733141c1 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2335,7 +2335,7 @@ public class RECIPES_Machines {
                     CI.craftingToolScrewdriver,
                     "plateDoubleHastelloyC276",
                     "gearGtTalonite",
-                    CI.fieldGenerator_MV,
+                    CI.fieldGenerator_LV,
                     "gearGtTalonite",
                     "plateDoubleHastelloyC276",
                     CI.craftingToolHammer_Hard,
@@ -2377,7 +2377,7 @@ public class RECIPES_Machines {
                     "gearGtStellite",
                     GregtechItemList.Industrial_FuelRefinery.get(1));
 
-            ItemStack mInnerTank = ItemList.Quantum_Tank_LV.get(1);
+            ItemStack mInnerTank = ItemList.Super_Tank_IV.get(1);
 
             // Incoloy Casing
             RecipeUtils.addShapedGregtechRecipe(
@@ -3369,7 +3369,7 @@ public class RECIPES_Machines {
         // Sparge Tower Casing
         CORE.RA.addSixSlotAssemblingRecipe(
                 new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredGTPPMachineCasing(3, 1),
-                        ALLOY.HS188A.getPlate(8), ALLOY.HASTELLOY_N.getRing(4),
+                        ALLOY.HS188A.getPlate(2), ALLOY.HASTELLOY_N.getRing(4),
                         CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4),
                         ALLOY.HASTELLOY_N.getScrew(4), },
                 ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
index 23b389a724..90c8290d2c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
@@ -123,6 +123,9 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Gas Sparge Tower").addInfo("Controller block for the Sparging Tower")
+                .addInfo("Runs gases through depleted molten salts to extract precious fluids")
+                .addInfo("Has a speed bonus of 10x - recipe times are 1/10 of what is shown on NEI")
+                .addInfo("Works the same way as the Distillation Tower, but with a fixed height of 8")
                 .addInfo("Fluids are only put out at the correct height")
                 .addInfo("The correct height equals the slot number in the NEI recipe").addSeparator()
                 .beginStructureBlock(3, 8, 3, true).addController("Front bottom")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index 780bff2a0f..d20f05df3c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -75,11 +75,12 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType(getMachineType()).addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.")
-                .addInfo("Produces Heat & Energy from Radioactive Beta Decay.")
-                .addInfo("Input Li2BeF4 and a molten salt as fuel, and match the 4 Dynamo Hatches:")
-                .addInfo("LFTR Fuel 1 (4 IV amps), LFTR Fuel 2 (4 LuV amps), LFTR Fuel 3 (4 ZPM amps)")
+                .addInfo("Produces energy and new elements from Radioactive Beta Decay!")
+                .addInfo("Input LFTB and a molten salt as fuel, and match the 4 Buffered Dynamo Hatches:")
+                .addInfo("LFTR Fuel 1 (4 EV Hatches), LFTR Fuel 2 (4 IV Hatches), LFTR Fuel 3 (4 LuV Hatches)")
+                .addInfo("If using better hatches for a worse fuel, only 1 hatch will output EU")
                 .addInfo("Outputs U233 every 10 seconds, on average, while the reactor is running")
-                .addInfo("Check NEI to see the other outputs - they differ between fuels")
+                .addInfo("Check NEI to see the other 3 outputs - they differ between fuels")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(7, 4, 7, true)
                 .addController("Bottom Center").addCasingInfo("Hastelloy-N Reactor Casing", 27)
                 .addCasingInfo("Zeron-100 Reactor Shielding", 26).addInputHatch("Top or bottom layer edges", 1)
@@ -87,7 +88,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
                 .addMaintenanceHatch("Top or bottom layer edges", 1).addMufflerHatch("Top 3x3", 2)
                 .addStructureInfo("All dynamos must be between EV and LuV tier.")
                 .addStructureInfo("All other hatches must be IV+ tier.")
-                .addStructureInfo("3x Output Hatches, 2x Input Hatches, 4x Dynamo Hatches")
+                .addStructureInfo("4x Output Hatches, 2x Input Hatches, 4x Dynamo Hatches")
                 .addStructureInfo("2x Maintenance Hatches, 4x Mufflers").toolTipFinisher(CORE.GT_Tooltip_Builder.get());
         return tt;
     }
@@ -376,8 +377,24 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
             this.mOutputItems = new ItemStack[] {};
             this.mOutputFluids = new FluidStack[] {};
             this.mLastRecipe = aFuelProcessing;
+            mFuelRemaining = getStoredFuel(aFuelProcessing); // Record available fuel
             // Deplete Inputs
             if (aFuelProcessing.mFluidInputs.length > 0) {
+                if (this.mFuelRemaining < 100) {
+                    this.mEfficiency = 0;
+                    this.lEUt = 0;
+                    this.mLastRecipe = null;
+                    return false;
+                }
+                for (GT_MetaTileEntity_Hatch_Input aInputHatch : this.mInputHatches) {
+                    if (aInputHatch.getFluid().getFluid().equals(NUCLIDE.Li2BeF4.getFluid())
+                            && aInputHatch.getFluidAmount() < 200) {
+                        this.mEfficiency = 0;
+                        this.lEUt = 0;
+                        this.mLastRecipe = null;
+                        return false;
+                    }
+                }
                 for (FluidStack aInputToConsume : aFuelProcessing.mFluidInputs) {
                     Logger.WARNING(
                             "Depleting " + aInputToConsume.getLocalizedName() + " - " + aInputToConsume.amount + "L");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
index e7d3321975..db403aee02 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
@@ -52,8 +52,13 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType(getMachineType()).addInfo("Controller Block for the Fission Fuel Processing Unit")
+                .addInfo("Refines fluorides and Uranium into nuclear fuel for the LFTR")
+                .addInfo("LFTR Fuel 2 and Fuel 3 have alternative, much more efficient recipes")
+                .addInfo("However, they require fission breeding outputs from the LFTR itself")
+                .addInfo("Only one Energy Hatch is allowed per Processing Unit")
+                .addInfo("All recipe times in this multi are very long, watch out!")
                 .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 9, 3, false)
-                .addController("Bottom Center").addCasingInfo("Hastelloy-X Structural Casing", 7)
+                .addController("Bottom Center").addCasingInfo("Hastelloy-X Structural Block", 7)
                 .addCasingInfo("Incoloy-DS Fluid Containment Block", 5).addCasingInfo("Zeron-100 Reactor Shielding", 4)
                 .addCasingInfo("Hastelloy-N Sealant Blocks", 17).addInputHatch("Base platform", 1)
                 .addOutputHatch("Base platform", 1).addOutputBus("Base platform", 1).addMufflerHatch("Base platform", 1)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 486d956ff2..e382e0b26c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -200,7 +200,7 @@ public class RecipeLoader_Nuclear {
                 ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
                 ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16),
                 FluidUtils.getFluidStack("water", 1000),
-                FluidUtils.getFluidStack("lithiumhydroxide", 144 * 4),
+                FluidUtils.getFluidStack("lithiumhydroxide", 2000 + 144 * 4),
                 CI.emptyCells(1),
                 300 * 20);
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
index d2a6741221..e85f4989d7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
@@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.GT_Values;
-import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
@@ -44,7 +43,7 @@ public class RecipeLoader_NuclearFuelProcessing {
                 null, // Extra 5 inputs
                 FluidUtils.getFluidStack(aLiFBeF2ZrF4U235, 1000),
                 null,
-                90 * 60 * 20, // Duration
+                30 * 60 * 20, // Duration
                 MaterialUtils.getVoltageForTier(4));
 
         // 7LiF - BeF2 - ZrF4 - UF4 - 650C
@@ -60,7 +59,7 @@ public class RecipeLoader_NuclearFuelProcessing {
                 null, // Extra 5 inputs
                 FluidUtils.getFluidStack(aLiFBeF2ZrF4UF4, 1000),
                 null,
-                120 * 60 * 20,
+                40 * 60 * 20,
                 MaterialUtils.getVoltageForTier(5));
 
         // 7liF - BeF2 - ThF4 - UF4 - 566C
@@ -76,7 +75,7 @@ public class RecipeLoader_NuclearFuelProcessing {
                 null, // Extra 5 inputs
                 FluidUtils.getFluidStack(aLiFBeF2ThF4UF4, 1000),
                 null,
-                150 * 60 * 20, // Duration
+                50 * 60 * 20, // Duration
                 MaterialUtils.getVoltageForTier(5));
 
         // Reprocess Fuels
@@ -87,12 +86,9 @@ public class RecipeLoader_NuclearFuelProcessing {
                 ELEMENT.getInstance().FLUORINE.getCell(6),
                 NUCLIDE.LiFThF4.getFluidStack(10000),
                 new ItemStack[] { CI.emptyCells(5), FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1) },
                 new int[] { 10000, 10000, 500, 500, 500, 250, 250, 250 },
                 NUCLIDE.UF6F2.getFluidStack(1500),
                 20 * 60 * 10,
@@ -102,12 +98,10 @@ public class RecipeLoader_NuclearFuelProcessing {
                 ELEMENT.getInstance().FLUORINE.getCell(6),
                 NUCLIDE.LiFBeF2ThF4.getFluidStack(10000),
                 new ItemStack[] { CI.emptyCells(4), FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
-                        FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1), ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+                        FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1) },
                 new int[] { 10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500 },
                 NUCLIDE.UF6F2.getFluidStack(3000),
                 20 * 60 * 10,
@@ -119,12 +113,9 @@ public class RecipeLoader_NuclearFuelProcessing {
                 ELEMENT.getInstance().FLUORINE.getCell(6),
                 NUCLIDE.Sparged_LiFThF4.getFluidStack(10000),
                 new ItemStack[] { CI.emptyCells(4), FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1) },
                 new int[] { 10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000 },
                 NUCLIDE.UF6F2.getFluidStack(3000),
                 20 * 60 * 5,
@@ -134,12 +125,10 @@ public class RecipeLoader_NuclearFuelProcessing {
                 ELEMENT.getInstance().FLUORINE.getCell(6),
                 NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(10000),
                 new ItemStack[] { CI.emptyCells(2), FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
-                        FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2), ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
-                        ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+                        FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1), ELEMENT.getInstance().PROTACTINIUM.getDust(1),
+                        ELEMENT.getInstance().PROTACTINIUM.getDust(1) },
                 new int[] { 10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000 },
                 NUCLIDE.UF6F2.getFluidStack(6000),
                 20 * 60 * 5,