aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities
diff options
context:
space:
mode:
authorSteelux <70096037+Steelux8@users.noreply.github.com>2022-09-14 20:09:18 +0100
committerGitHub <noreply@github.com>2022-09-14 21:09:18 +0200
commitb865d81fa79f31b2adcbff086671aedd4bb30d95 (patch)
tree6f61f3407bd9fff75c4ec612be23bb9915723030 /src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities
parent007609482ffdca396f21a88d1e58c0cc93120839 (diff)
downloadGT5-Unofficial-b865d81fa79f31b2adcbff086671aedd4bb30d95.tar.gz
GT5-Unofficial-b865d81fa79f31b2adcbff086671aedd4bb30d95.tar.bz2
GT5-Unofficial-b865d81fa79f31b2adcbff086671aedd4bb30d95.zip
Bugfixes and Speed Increases for the LFTR Chain (#345)
* Bugfixes, Processing Speed and Gas Output Changes - Changed a few restrictions to allow this chain to be doable in IV, as intended; - Changed the EU/t of the 3 fuels to match the usage of 4 buffered dynamos, and reduced the burning time to keep the total energy per L the same; - Lowered the recipe time of some recipes done in multiblocks; - Other tooltip and bug fixes. * Spotless apply for branch LFTR_Work for #345 (#346) * update BS+Spotless * Fix healing device never getting discharged (#343) * spotlessApply Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java4
2 files changed, 9 insertions, 9 deletions
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 fa8b27dec9..5d7f5fb9c9 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,10 +75,10 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
tt.addMachineType(getMachineType())
.addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.")
.addInfo("Produces Heat & Energy from Radioactive Beta Decay.")
- .addInfo("Outputs U233 every 10 seconds, on average")
- .addInfo("Input Fluorine and Helium for bonus byproducts")
- .addInfo("Input Li2BeF4 and a molten salt as fuel.")
- .addInfo("LiFBeF2ThF4UF4, LiFBeF2ZrF4UF4 or LiFBeF2ZrF4U235")
+ .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("Outputs U233 every 10 seconds, on average, while the reactor is running")
+ .addInfo("Check NEI to see the other outputs - they differ between fuels")
.addPollutionAmount(getPollutionPerSecond(null))
.addSeparator()
.beginStructureBlock(7, 4, 7, true)
@@ -90,7 +90,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
.addDynamoHatch("Top or bottom layer edges", 1)
.addMaintenanceHatch("Top or bottom layer edges", 1)
.addMufflerHatch("Top 3x3", 2)
- .addStructureInfo("All dynamos must be IV or LuV tier.")
+ .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("2x Maintenance Hatches, 4x Mufflers")
@@ -190,7 +190,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
return addToMachineList(aTileEntity, aBaseCasingIndex);
} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo
- && (((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 5
+ && (((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 4
&& ((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier <= 6)) {
return addToMachineList(aTileEntity, aBaseCasingIndex);
} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input
@@ -245,7 +245,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
buildHatchAdder(GregtechMTE_NuclearReactor.class)
.atLeast(Dynamo)
.adder(GregtechMTE_NuclearReactor::addNuclearReactorEdgeList)
- .hatchItemFilterAnd(t -> filterByMTETier(5, 6))
+ .hatchItemFilterAnd(t -> filterByMTETier(4, 6))
.casingIndex(TAE.GTPP_INDEX(12))
.dot(1)
.build(),
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 a83f19fa74..def5a67d3d 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
@@ -66,7 +66,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
.addMufflerHatch("Base platform", 1)
.addMaintenanceHatch("Base platform", 1)
.addEnergyHatch("Base platform", 1)
- .addStructureInfo("Muffler's Tier must be LuV+")
+ .addStructureInfo("Muffler's Tier must be IV+")
.addStructureInfo("4x Input Hatches, 2x Output Hatches, 1x Output Bus")
.addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch")
.toolTipFinisher(CORE.GT_Tooltip_Builder);
@@ -131,7 +131,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
} else {
IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler
- && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 6) {
+ && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 5) {
return addToMachineList(aTileEntity, aBaseCasingIndex);
}
}