aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2023-04-15 20:57:25 +0100
committerGitHub <noreply@github.com>2023-04-15 21:57:25 +0200
commit00d2009cd95f786994b2b010da12f984e0af57a4 (patch)
tree3eecc6a0a521840b593c6ea18fc540a41a11c64f /src/main/java
parent3e85b88f8d89c014faf09d449c6021dea8dfb0ad (diff)
downloadGT5-Unofficial-00d2009cd95f786994b2b010da12f984e0af57a4.tar.gz
GT5-Unofficial-00d2009cd95f786994b2b010da12f984e0af57a4.tar.bz2
GT5-Unofficial-00d2009cd95f786994b2b010da12f984e0af57a4.zip
Misc structure and tooltip fixes (#1884)
* DT structure fix * fix oil cracker description * fix dt tooltip * fix cleanroom tooltip * sa
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java22
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java2
3 files changed, 19 insertions, 13 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 76b867bcbf..300dba92e3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -56,23 +56,27 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
tt.addMachineType("Cleanroom")
.addInfo("Controller block for the Cleanroom")
.addInfo("Consumes 40 EU/t when first turned on")
- .addInfo("and 4 EU/t once at 100% efficiency when not overclocked") // ?
- .addInfo("An energy hatch accepts up to 2A, so you can use 2A LV or 1A MV")
- .addInfo("2 LV batteries + 1 LV generator or 1 MV generator") // ?
+ .addInfo("and 4 EU/t once at 100% efficiency")
+ .addInfo("If you use an LV energy hatch, it will actually accept 2A instead of just 1A.")
+ .addInfo(
+ "MV+ energy hatches just accept 1A as usual. For HV+ the cleanroom will overclock and gain efficiency faster.")
.addInfo("Time required to reach full efficiency is proportional to")
.addInfo("the height of empty space within")
- .addInfo("Make sure your Energy Hatch matches! ?")
.addInfo("Machines that cause pollution aren't allowed to be put in.")
.addSeparator()
.beginVariableStructureBlock(3, 15, 4, 15, 3, 15, true)
.addController("Top center")
.addCasingInfoRange("Plascrete", 20, 1007, false)
- .addStructureInfo(GT_Values.cleanroomGlass + "% of the Plascrete can be replaced with Reinforced Glass") // check
- .addStructureInfo("Other material can be used in place of Plascrete. See config for detail") // check
+ .addStructureInfo(
+ GT_Values.cleanroomGlass
+ + "% of the Plascrete can be replaced with Reinforced Glass (not counting the top layer)")
+ .addStructureInfo(
+ "Other material can be used in place of Plascrete, even in higher percentages. See config for detail")
.addOtherStructurePart("Filter Machine Casing", "Top besides controller and edges")
- .addEnergyHatch("Any casing. Exactly one.") // check
- .addMaintenanceHatch("Any casing")
- .addStructureInfo("1x Reinforced Door (keep closed or efficiency will reduce)")
+ .addEnergyHatch("Any casing except top layer. Exactly one.")
+ .addMaintenanceHatch("Any casing except top layer")
+ .addStructureInfo("0-2x Reinforced Door (keep closed or efficiency will reduce)")
+ .addStructureInfo("Up to 1 Elevator, Rotating Elevator, and Travel Anchor each")
.addStructureInfo("Up to 10 Machine Hulls for Item & Energy transfer through walls")
.addStructureInfo("You can also use Diodes for more power")
.addStructureInfo("Diodes also count towards 10 Machine Hulls count limit")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
index 2d7fcdda22..ec616461a9 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -139,7 +139,7 @@ public class GT_MetaTileEntity_DistillationTower extends
.beginVariableStructureBlock(3, 3, 3, 12, 3, 3, true)
.addController("Front bottom")
.addOtherStructurePart("Clean Stainless Steel Machine Casing", "7 x h - 5 (minimum)")
- .addEnergyHatch("Any casing", 1, 2)
+ .addEnergyHatch("Any casing except top centre", 1, 2)
.addMaintenanceHatch("Any casing", 1, 2, 3)
.addInputHatch("Any bottom layer casing", 1)
.addOutputBus("Any bottom layer casing", 1)
@@ -315,8 +315,10 @@ public class GT_MetaTileEntity_DistillationTower extends
mHeight++;
}
- // validate final invariants...
- return mCasing >= 7 * mHeight - 5 && mHeight >= 2 && mTopLayerFound && mMaintenanceHatches.size() == 1;
+ // validate final invariants... (actual height is mHeight+1)
+ return mCasing >= 7 * (mHeight + 1) - 5 && mHeight + 1 >= 3
+ && mTopLayerFound
+ && mMaintenanceHatches.size() == 1;
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
index 233e754548..389d1b84b6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
@@ -126,7 +126,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult
.addInfo("Gets 10% EU/t reduction per coil tier, up to a maximum of 50%")
.addEnergyHatch("Any casing", 1, 2, 3)
.addMaintenanceHatch("Any casing", 1, 2, 3)
- .addInputHatch("Steam/Hydrogen ONLY, Any middle ring casing", 1)
+ .addInputHatch("For cracking fluid (Steam/Hydrogen/etc.) ONLY, Any middle ring casing", 1)
.addInputHatch("Any left/right side casing", 2, 3)
.addOutputHatch("Any right/left side casing", 2, 3)
.addStructureInfo("Input/Output Hatches must be on opposite sides!")