aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common
diff options
context:
space:
mode:
authorDaniel Mendes <70096037+Steelux8@users.noreply.github.com>2023-04-01 14:43:57 +0100
committerGitHub <noreply@github.com>2023-04-01 15:43:57 +0200
commit28f834adedf872aac7048b18271603fc5a88edb5 (patch)
tree1eb95e3fc43a826196dc6e456da4935d8ef07e4f /src/main/java/gtPlusPlus/xmod/gregtech/common
parent0d0e9460755613374290bbaada7c01d08ed1f171 (diff)
downloadGT5-Unofficial-28f834adedf872aac7048b18271603fc5a88edb5.tar.gz
GT5-Unofficial-28f834adedf872aac7048b18271603fc5a88edb5.tar.bz2
GT5-Unofficial-28f834adedf872aac7048b18271603fc5a88edb5.zip
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>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java7
3 files changed, 31 insertions, 6 deletions
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)