Multi ToolTip unification (#3343)

Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
Co-authored-by: GDCloud <gdcloudstrike@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

7 files changed, 25 insertions, 39 deletions

diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java
index ee17a1a1b1..3b59d35ba1 100644
--- a/src/main/java/kubatech/api/Variables.java
+++ b/src/main/java/kubatech/api/Variables.java
@@ -29,6 +29,7 @@ import kubatech.api.utils.StringUtils;
 
 public class Variables {
 
+    @Deprecated // use GTValues.authorkuba
     public static final String Author = "Author: "
         + StringUtils.applyRainbow("kuba6000", 0, EnumChatFormatting.BOLD.toString());
 
@@ -46,6 +47,7 @@ public class Variables {
         return b.toString();
     }
 
+    @Deprecated
     public static final String StructureHologram = "To see the structure, use a " + EnumChatFormatting.BLUE
         + "Structure"
         + EnumChatFormatting.DARK_BLUE
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java
index 22098fb788..a361bf7108 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java
@@ -19,8 +19,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_GLOW;
 import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
-import static kubatech.api.Variables.StructureHologram;
-import static kubatech.api.Variables.buildAuthorList;
 
 import java.util.Arrays;
 import java.util.List;
@@ -38,6 +36,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -49,7 +48,6 @@ import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.MultiblockTooltipBuilder;
 import gregtech.api.util.OverclockCalculator;
-import kubatech.Tags;
 import kubatech.api.implementations.KubaTechGTMultiBlockBase;
 import kubatech.loaders.BlockLoader;
 import kubatech.loaders.DEFCRecipes;
@@ -140,13 +138,9 @@ public class MTEDEFusionCrafter extends KubaTechGTMultiBlockBase<MTEDEFusionCraf
     protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Fusion Crafter")
-            .addInfo("Controller Block for the Draconic Evolution Fusion Crafter")
-            .addInfo(buildAuthorList("kuba6000", "Prometheus0000"))
             .addInfo("Machine can be overclocked by using casings above the recipe tier:")
             .addInfo("Recipe time is divided by number of tiers above the recipe")
             .addInfo("Normal EU OC still applies !")
-            .addInfo(StructureHologram)
-            .addSeparator()
             .beginStructureBlock(5, 10, 5, false)
             .addController("Front bottom center")
             .addCasingInfoMin("Naquadah Alloy Fusion Casing", 19, false)
@@ -161,7 +155,7 @@ public class MTEDEFusionCrafter extends KubaTechGTMultiBlockBase<MTEDEFusionCraf
             .addOutputHatch("Any bottom casing", 1)
             .addEnergyHatch("Any bottom casing", 1)
             .addMaintenanceHatch("Any bottom casing", 1)
-            .toolTipFinisher(Tags.MODNAME);
+            .toolTipFinisher(GTValues.AuthorKuba, "Prometheus0000");
         return tt;
     }
 
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java
index eb5b80176a..ad4ad7ab44 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java
@@ -39,8 +39,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_
 import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY;
 import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
 import static gregtech.api.util.GTStructureUtility.ofFrame;
-import static kubatech.api.Variables.Author;
-import static kubatech.api.Variables.StructureHologram;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -104,6 +102,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
@@ -261,8 +260,6 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme
     protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Powered Spawner, EEC")
-            .addInfo("Controller block for the Extreme Entity Crusher")
-            .addInfo(Author)
             .addInfo("Spawns and kills monsters for you.")
             .addInfo("You have to insert the powered spawner in the controller.")
             .addInfo("Base energy usage: 2,000 EU/t")
@@ -279,8 +276,6 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme
             .addInfo("When in ritual mode and the Well Of Suffering ritual is built directly centered on the machine,")
             .addInfo("the mobs will start to buffer and die very slowly by the ritual.")
             .addInfo("You can disable mob animation with a soldering iron.")
-            .addInfo(StructureHologram)
-            .addSeparator()
             .beginStructureBlock(5, 7, 5, true)
             .addController("Front Bottom Center")
             .addCasingInfoMin("Solid Steel Machine Casing", 35, false)
@@ -292,7 +287,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme
             .addOutputHatch("Any bottom casing", 1)
             .addEnergyHatch("Any bottom casing", 1)
             .addMaintenanceHatch("Any bottom casing", 1)
-            .toolTipFinisher(Tags.MODNAME);
+            .toolTipFinisher(GTValues.AuthorKuba);
         return tt;
     }
 
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java
index 0f0c03484d..e75c7dc112 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java
@@ -32,8 +32,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW;
 import static gregtech.api.util.GTStructureUtility.ofHatchAdder;
 import static gregtech.api.util.GTUtility.validMTEList;
-import static kubatech.api.Variables.Author;
-import static kubatech.api.Variables.StructureHologram;
 import static kubatech.api.utils.ItemUtils.readItemStackFromNBT;
 
 import java.io.IOException;
@@ -115,7 +113,6 @@ import gregtech.api.util.VoidProtectionHelper;
 import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
-import kubatech.Tags;
 import kubatech.api.EIGDynamicInventory;
 import kubatech.api.eig.EIGBucket;
 import kubatech.api.eig.EIGDropTable;
@@ -295,8 +292,6 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         String fertilizerBoostMax = String.format("%.0f", EIG_BALANCE_MAX_FERTILIZER_BOOST * 100);
         tt.addMachineType("Crop Farm")
-            .addInfo("Controller block for the Extreme Industrial Greenhouse")
-            .addInfo(Author)
             .addInfo("Grow your crops like a chad!")
             .addInfo("Use screwdriver to enable/change/disable setup mode")
             .addInfo("Use screwdriver while sneaking to enable/disable IC2 mode")
@@ -309,16 +304,15 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE
                     + " seeds")
             .addInfo("Otherwise, around 1% of seeds will be voided each operation")
             .addInfo("You can insert fertilizer each operation to get more drops (max + " + fertilizerBoostMax + ")")
-            .addInfo("--------------------- SETUP MODE ---------------------")
+            .addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + "Setup Mode:")
             .addInfo("Does not take power")
             .addInfo("There are two modes: input / output")
             .addInfo("Input mode: machine will take seeds from input bus and plant them")
             .addInfo("[IC2] You need to also input block that is required under the crop")
             .addInfo("Output mode: machine will take planted seeds and output them");
         EIGModes.addTooltipInfo(tt);
-        tt.addInfo(StructureHologram)
-            .addSeparator()
-            .beginStructureBlock(5, 6, 5, false)
+        tt.beginStructureBlock(5, 6, 5, false)
             .addController("Front bottom center")
             .addCasingInfoMin("Clean Stainless Steel Casings", 70, false)
             .addOtherStructurePart("Borosilicate Glass", "Hollow two middle layers")
@@ -331,7 +325,7 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE
             .addOutputBus("Any casing (Except inner bottom ones)", 1)
             .addInputHatch("Any casing (Except inner bottom ones)", 1)
             .addEnergyHatch("Any casing (Except inner bottom ones)", 1)
-            .toolTipFinisher(Tags.MODNAME);
+            .toolTipFinisher(GTValues.AuthorKuba);
         return tt;
     }
 
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java
index 0de075f497..7ae4adf1da 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java
@@ -36,8 +36,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW;
 import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
-import static kubatech.api.Variables.StructureHologram;
-import static kubatech.api.Variables.buildAuthorList;
 import static kubatech.api.utils.ItemUtils.readItemStackFromNBT;
 import static kubatech.api.utils.ItemUtils.writeItemStackToNBT;
 
@@ -126,7 +124,6 @@ import gregtech.api.util.GTUtility.ItemId;
 import gregtech.api.util.MultiblockTooltipBuilder;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
-import kubatech.Tags;
 import kubatech.api.DynamicInventory;
 import kubatech.api.implementations.KubaTechGTMultiBlockBase;
 import kubatech.client.effect.MegaApiaryBeesRenderer;
@@ -235,7 +232,6 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
         })
         .build();
 
-    @SuppressWarnings("unused")
     public MTEMegaIndustrialApiary(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
@@ -294,18 +290,19 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
     protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType("Mega Apiary")
-            .addInfo("Controller block for Industrial Apicultural Acclimatiser and Drone Domestication Station")
-            .addInfo(buildAuthorList("kuba6000", "Runakai"))
             .addInfo("The ideal home for your bees")
             .addInfo("Use screwdriver to change primary mode (INPUT/OUTPUT/OPERATING)")
             .addInfo("Use screwdriver + shift to change operation mode (NORMAL/SWARMER)")
-            .addInfo("--------------------- INPUT MODE ---------------------")
+            .addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + "Input Mode:")
             .addInfo("- Does not take power")
             .addInfo("- Put your queens in the input bus to put them in the internal buffer")
-            .addInfo("-------------------- OUTPUT MODE ---------------------")
+            .addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + "Output Mode:")
             .addInfo("- Does not take power")
             .addInfo("- Will give your bees back to output bus")
-            .addInfo("------------------- OPERATING MODE -------------------")
+            .addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + "Operating Mode:")
             .addInfo("- NORMAL:")
             .addInfo("  - For each " + voltageTooltipFormatted(6) + " amp you can insert 1 bee")
             .addInfo("  - Processing time: 5 seconds")
@@ -326,8 +323,6 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
             .addInfo("  - Base processing time: 1 minute")
             .addInfo("  - Uses 1 amp " + voltageTooltipFormatted(5))
             .addInfo("  - Can overclock")
-            .addInfo(StructureHologram)
-            .addSeparator()
             .beginStructureBlock(15, 17, 15, false)
             .addController("Front Bottom Center")
             .addCasingInfoMin("Bronze Plated Bricks", 190, false)
@@ -339,7 +334,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
             .addOutputBus("Any casing", 1)
             .addEnergyHatch("Any casing", 1)
             .addMaintenanceHatch("Any casing", 1)
-            .toolTipFinisher(Tags.MODNAME);
+            .toolTipFinisher(GTValues.AuthorKuba, "Runakai");
         return tt;
     }
 
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java
index 1d10a2aa92..d19474db16 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java
@@ -3,6 +3,8 @@ package kubatech.tileentity.gregtech.multiblock.eigmodes;
 import static kubatech.api.utils.StringUtils.voltageTooltipFormatted;
 import static kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_ACCELERATOR_TIER;
 
+import net.minecraft.util.EnumChatFormatting;
+
 import gregtech.api.util.MultiblockTooltipBuilder;
 import kubatech.api.eig.EIGMode;
 import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse;
@@ -71,7 +73,8 @@ public class EIGIC2Mode extends EIGMode {
         double fertilizerBonusMultiplier = this.getFertilizerBoost() * 100;
         String fertilizerBonus = String.format("%.0f%%", fertilizerBonusMultiplier);
 
-        return builder.addInfo("---------------------- IC2 CROPS ---------------------")
+        return builder.addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + "IC2 Crops:")
             .addInfo("Minimal voltage tier: " + minVoltageTier)
             .addInfo("Minimal glass tier: " + minGlassTier)
             .addInfo("Starting with " + this.getStartingSlotCount() + " slot")
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java
index c639b9750d..bfd545b653 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java
@@ -2,6 +2,8 @@ package kubatech.tileentity.gregtech.multiblock.eigmodes;
 
 import static kubatech.api.utils.StringUtils.voltageTooltipFormatted;
 
+import net.minecraft.util.EnumChatFormatting;
+
 import gregtech.api.util.MultiblockTooltipBuilder;
 import kubatech.api.eig.EIGMode;
 import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse;
@@ -68,7 +70,8 @@ public class EIGNormalMode extends EIGMode {
         double fertilizerBonusMultiplier = this.getFertilizerBoost() * 100;
         String fertilizerBonus = String.format("%.0f%%", fertilizerBonusMultiplier);
 
-        return builder.addInfo("-------------------- NORMAL CROPS --------------------")
+        return builder.addSeparator()
+            .addInfo(EnumChatFormatting.GOLD + "Normal Crops:")
             .addInfo("Minimal voltage tier: " + minVoltageTier)
             .addInfo("Starting with " + this.getStartingSlotCount() + " slot")
             .addInfo(