From e6c8d35894d561e6aea1cfb7450f00a70c9e01d8 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:46:59 +0200 Subject: Multi ToolTip unification (#3343) Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: GDCloud Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz --- src/main/java/gtnhlanth/common/tileentity/MTEDigester.java | 5 +---- src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java | 5 +---- src/main/java/gtnhlanth/common/tileentity/MTELINAC.java | 5 +---- src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java | 6 +----- src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java | 6 +----- src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java | 7 +------ src/main/java/gtnhlanth/util/DescTextLocalization.java | 1 + 7 files changed, 7 insertions(+), 28 deletions(-) (limited to 'src/main/java/gtnhlanth') diff --git a/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java b/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java index 9e1fc65c1b..d6bf06a4e9 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java @@ -206,10 +206,7 @@ public class MTEDigester extends MTEEnhancedMultiBlockBase implemen protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Digester") - .addInfo("Controller block for the Digester") .addInfo("Input ores and fluid, output water.") - .addInfo(DescTextLocalization.BLUEPRINT_INFO) - .addSeparator() .addController("Front bottom") .addInputHatch("Hint block with dot 1") .addInputBus("Hint block with dot 1") @@ -217,7 +214,7 @@ public class MTEDigester extends MTEEnhancedMultiBlockBase implemen .addOutputBus("Hint block with dot 1") .addMaintenanceHatch("Hint block with dot 1") .addMufflerHatch("Hint block with dot 1") - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java b/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java index 7d5a64b579..1031d05dba 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java @@ -236,18 +236,15 @@ public class MTEDissolutionTank extends MTEEnhancedMultiBlockBase implements ISu .addInfo("Use a lower temperature coolant to improve output focus") .addInfo("Output energy does not scale for input energies higher than 7500 keV") // .addInfo("Extendable, with a minimum length of 18 blocks") - .addInfo(DescTextLocalization.BLUEPRINT_INFO) .addInfo(DescTextLocalization.BEAMLINE_SCANNER_INFO) .addInfo("Valid Coolants:"); @@ -197,7 +196,6 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase implements ISu } tt.addInfo("Requires (length + 1)kL/s of coolant") - .addSeparator() .beginVariableStructureBlock(7, 7, 7, 7, 19, 83, false) .addController("Front bottom") .addCasingInfoRange(LanthItemList.SHIELDED_ACCELERATOR_CASING.getLocalizedName(), 325, 1285, false) @@ -213,8 +211,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase implements ISu .addOutputHatch(addDotText(2)) .addOtherStructurePart("Beamline Input Hatch", addDotText(3)) .addOtherStructurePart("Beamline Output Hatch", addDotText(4)) - - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java index 3c1984171f..8fb94d505c 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java @@ -12,7 +12,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_A import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_GLOW; import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static gtnhlanth.util.DescTextLocalization.BLUEPRINT_INFO; import static gtnhlanth.util.DescTextLocalization.addDotText; import java.util.ArrayList; @@ -125,11 +124,8 @@ public class MTESourceChamber extends MTEEnhancedMultiBlockBase im protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Particle Accelerator") - .addInfo("Controller block for the Synchrotron") .addInfo("Torus-shaped, accelerates electrons to produce high-energy electromagnetic radiation,") .addInfo("in the form of photons") .addInfo("Antenna Casings can be one of two tiers, upgrade them to improve output rate and energy scaling") .addInfo("Minimum input focus: " + MIN_INPUT_FOCUS) - .addInfo(DescTextLocalization.BLUEPRINT_INFO) .addInfo(DescTextLocalization.BEAMLINE_SCANNER_INFO) .addInfo("Use a lower temperature coolant to improve output focus") @@ -513,7 +511,6 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase im } tt.addInfo("Requires 32 kL/s of coolant") - .addSeparator() .beginStructureBlock(36, 7, 34, true) .addController("Front middle") .addCasingInfoExactly(LanthItemList.SHIELDED_ACCELERATOR_CASING.getLocalizedName(), 676, false) @@ -528,8 +525,7 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase im .addInputHatch(addDotText(4)) .addOutputHatch(addDotText(5)) .addEnergyHatch(addDotText(6)) - - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java index 12be87754b..ffc16fddf0 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java @@ -13,7 +13,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_A import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_GLOW; import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static gtnhlanth.util.DescTextLocalization.BLUEPRINT_INFO; import static gtnhlanth.util.DescTextLocalization.addDotText; import java.util.ArrayList; @@ -183,12 +182,8 @@ public class MTETargetChamber extends MTEEnhancedMultiBlockBase