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 --- .../common/tileentities/multis/MTEBioVat.java | 5 +---- .../multis/MTECircuitAssemblyLine.java | 24 ++++++---------------- .../multis/MTEDeepEarthHeatingPump.java | 6 ++---- .../multis/MTEElectricImplosionCompressor.java | 5 +---- .../multis/MTEHighTempGasCooledReactor.java | 7 +------ .../common/tileentities/multis/MTEManualTrafo.java | 8 +++----- .../multis/MTEThoriumHighTempReactor.java | 5 +---- .../common/tileentities/multis/MTEWindmill.java | 7 +------ .../multis/mega/MTEMegaBlastFurnace.java | 5 +---- .../multis/mega/MTEMegaChemicalReactor.java | 11 +++------- .../multis/mega/MTEMegaDistillTower.java | 5 +---- .../multis/mega/MTEMegaOilCracker.java | 5 +---- .../multis/mega/MTEMegaVacuumFreezer.java | 5 +---- 13 files changed, 23 insertions(+), 75 deletions(-) (limited to 'src/main/java/bartworks/common') diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java index d3b2aa804b..477089ff21 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static bartworks.util.BWUtil.ofGlassTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; @@ -153,9 +152,7 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase implements I protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Bacterial Vat") - .addInfo("Controller block for the Bacterial Vat") .addInfo("For maximum efficiency boost keep the Output Hatch always half filled!") - .addSeparator() .beginStructureBlock(5, 4, 5, false) .addController("Front bottom center") .addCasingInfoMin("Clean Stainless Steel Casings", 19, false) @@ -169,7 +166,7 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase implements I .addInputHatch("Any casing", 1) .addOutputHatch("Any casing", 1) .addEnergyHatch("Any casing", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java index 63558feb8b..324d041efc 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static bartworks.util.BWUtil.ofGlassTieredMixed; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.HatchElement.Energy; @@ -64,7 +63,6 @@ import bartworks.API.modularUI.BWUITextures; import bartworks.API.recipe.BartWorksRecipeMaps; import bartworks.system.material.CircuitGeneration.BWMetaItems; import bartworks.system.material.CircuitGeneration.CircuitImprintLoader; -import bartworks.util.BWTooltipReference; import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; @@ -158,32 +156,22 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Transformer") - .addInfo("Controller block for the Manual Trafo") .addInfo("Operates in 4 diffrent modes:") .addInfo("Mode 1: Circuit 0 in controller: Direct-Upstep") .addInfo("Mode 2: Circuit 1 in controller: Direct-Downstep") .addInfo("Mode 3: Circuit 2 in controller: Tapped-Upstep (currently disabled)") .addInfo("Mode 4: Circuit 2 in controller: Tapped-Downstep (currently disabled)") - .addSeparator() .beginVariableStructureBlock(3, 3, 3, 10, 3, 3, false) .addController("Front bottom center") .addCasingInfoMin("MV Machine Casing", 0, false) @@ -144,11 +141,12 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase { .addMaintenanceHatch("Any bottom layer casing", 1) .addEnergyHatch("Any bottom layer casing", 1) .addDynamoHatch("Any top layer casing", 2) - .addStructureInfo("---------TAPPED MODE---------") + .addStructureInfo("") + .addStructureInfo("Tapped Mode :") .addEnergyHatch("Touching Transformer-Winding Blocks", 3) .addDynamoHatch("Touching Transformer-Winding Blocks", 3) .addStructureInfo("Hatches touching Transformer-Winding Blocks must be tiered from bottom to top") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java index 04a0b86feb..850884a97c 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; @@ -132,7 +131,6 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Windmill") - .addInfo("Controller block for the Windmill") .addInfo("A primitive Grinder powered by Kinetic energy") .addInfo("Speed and output will be affected by wind speed, recipe and rotor") .addInfo("Please use the Primitive Rotor") .addInfo("Macerates 16 items at a time") - .addInfo("The structure is too complex!") - .addInfo("Follow the StructureLib hologram projector to build the main structure.") - .addSeparator() .beginStructureBlock(7, 12, 7, false) .addController("Front bottom center") .addCasingInfoMin("Hardened Clay block", 40, false) .addOtherStructurePart("Dispenser", "Any Hardened Clay block") .addOtherStructurePart("0-1 Wooden door", "Any Hardened Clay block") .addStructureHint("Primitive Kinetic Shaftbox", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java index 337154953a..7a5e361c8d 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; import static gregtech.api.enums.HatchElement.*; @@ -172,7 +171,6 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Furnace") - .addInfo("Controller block for the Mega Blast Furnace") .addInfo("You can use some fluids to reduce recipe time. Place the circuit in the Input Bus") .addInfo("Each 900K over the min. Heat required reduces power consumption by 5% (multiplicatively)") .addInfo("Each 1800K over the min. Heat allows for an overclock to be upgraded to a perfect overclock.") @@ -189,7 +187,6 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase + EnumChatFormatting.GRAY + " Laser Hatches.") .addPollutionAmount(20 * this.getPollutionPerTick(null)) - .addSeparator() .beginStructureBlock(15, 20, 15, true) .addController("3rd layer center") .addCasingInfoRange("Heat Proof Machine Casing", 0, 279, false) @@ -206,7 +203,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase .addStructureInfo("Recovery amount scales with Muffler Hatch tier") .addOutputHatch("Platline fluids, Any bottom layer casing") .addStructureHint("This Mega Multiblock is too big to have its structure hologram displayed fully.") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java index f1620abebc..2adcae3003 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -71,9 +70,8 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Distillery") - .addInfo("Controller block for the Distillation Tower") .addInfo("Fluids are only put out at the correct height") .addInfo("The correct height equals the slot number in the NEI recipe") - .addSeparator() .beginVariableStructureBlock(15, 15, 16, 56, 15, 15, true) .addController("Front bottom") .addOtherStructurePart("Clean Stainless Steel Machine Casing", "15 x h - 5 (minimum)") @@ -274,7 +271,7 @@ public class MTEMegaDistillTower extends MegaMultiBlockBase .addOutputHatch("2-11x Output Hatches (One per Output Layer except bottom layer)") .addStructureInfo("An \"Output Layer\" consists of 5 layers!") .addStructureHint("The interior of this Mega Multiblock's hologram is empty, it should be all air.") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java index 88159bc2a8..951903cc56 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; @@ -142,7 +141,6 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Cracker") - .addInfo("Controller block for the Mega Oil Cracking") .addInfo("Thermally cracks heavy hydrocarbons into lighter fractions") .addInfo("More efficient than the Chemical Reactor") .addInfo("Gives different benefits whether it hydro or steam-cracks:") @@ -160,7 +158,6 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp + "Tech" + EnumChatFormatting.GRAY + " Laser Hatches.") - .addSeparator() .beginStructureBlock(13, 7, 9, true) .addController("Front bottom") .addStructureInfo("The glass tier limits the Energy Input tier") @@ -171,7 +168,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp .addOutputHatch("Hint block", 2, 3) .addInputHatch("Steam/Hydrogen ONLY, Hint block", 4) .addInputBus("Optional, for programmed circuit automation. Hint block", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java index 753e6a2d7e..83251ee40d 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -235,7 +234,6 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase