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/gregtech/common/GTProxy.java | 5 +++++ src/main/java/gregtech/common/config/Client.java | 4 ++++ .../common/items/behaviors/BehaviourCoverTool.java | 9 +++++++-- .../behaviors/BehaviourSprayColorInfinite.java | 10 +++------- .../machines/multi/MTEAssemblyLine.java | 4 +--- .../machines/multi/MTEBrickedBlastFurnace.java | 4 +--- .../machines/multi/MTECharcoalPit.java | 4 +--- .../tileentities/machines/multi/MTECleanroom.java | 4 +--- .../machines/multi/MTEConcreteBackfillerBase.java | 4 +--- .../machines/multi/MTEDieselEngine.java | 4 +--- .../machines/multi/MTEDistillationTower.java | 4 +--- .../machines/multi/MTEElectricBlastFurnace.java | 4 +--- .../machines/multi/MTEExtremeDieselEngine.java | 4 +--- .../machines/multi/MTEFusionComputer.java | 4 +--- .../machines/multi/MTEFusionComputer1.java | 4 +--- .../machines/multi/MTEFusionComputer2.java | 4 +--- .../machines/multi/MTEFusionComputer3.java | 4 +--- .../machines/multi/MTEHeatExchanger.java | 4 +--- .../machines/multi/MTEImplosionCompressor.java | 4 +--- .../machines/multi/MTEIndustrialBrewery.java | 5 +---- .../MTEIndustrialElectromagneticSeparator.java | 13 ++---------- .../machines/multi/MTEIndustrialExtractor.java | 5 +---- .../machines/multi/MTEIndustrialLaserEngraver.java | 5 +---- .../machines/multi/MTEIntegratedOreFactory.java | 4 +--- .../machines/multi/MTELargeBoiler.java | 6 ++---- .../machines/multi/MTELargeChemicalReactor.java | 4 +--- .../machines/multi/MTELargeFluidExtractor.java | 4 +--- .../machines/multi/MTELargeTurbineGas.java | 4 +--- .../machines/multi/MTELargeTurbineGasAdvanced.java | 7 +++---- .../machines/multi/MTELargeTurbineHPSteam.java | 4 +--- .../machines/multi/MTELargeTurbinePlasma.java | 4 +--- .../machines/multi/MTELargeTurbineSteam.java | 4 +--- .../machines/multi/MTEMultiAutoclave.java | 11 +---------- .../machines/multi/MTEMultiCanner.java | 5 +---- .../machines/multi/MTEMultiFurnace.java | 4 +--- .../tileentities/machines/multi/MTEMultiLathe.java | 11 +---------- .../machines/multi/MTEMultiSolidifier.java | 23 +--------------------- .../tileentities/machines/multi/MTENanoForge.java | 18 ++++++----------- .../tileentities/machines/multi/MTEOilCracker.java | 4 +--- .../machines/multi/MTEOilDrillBase.java | 4 +--- .../machines/multi/MTEOilDrillInfinite.java | 4 +--- .../machines/multi/MTEOreDrillingPlantBase.java | 4 +--- .../tileentities/machines/multi/MTEPCBFactory.java | 5 +---- .../machines/multi/MTEPlasmaForge.java | 18 +++++++++-------- .../machines/multi/MTEProcessingArray.java | 3 +-- .../machines/multi/MTEPyrolyseOven.java | 4 +--- .../machines/multi/MTETranscendentPlasmaMixer.java | 4 +--- .../machines/multi/MTEVacuumFreezer.java | 4 +--- .../machines/multi/MTEWormholeGenerator.java | 17 +++++----------- .../multi/compressor/MTEBlackHoleCompressor.java | 11 +---------- .../multi/compressor/MTEHIPCompressor.java | 5 +---- .../multi/compressor/MTEIndustrialCompressor.java | 6 +----- .../multi/compressor/MTENeutroniumCompressor.java | 5 +---- .../machines/multi/drone/MTEDroneCentre.java | 6 +----- .../multi/purification/MTEPurificationPlant.java | 4 +--- .../MTEPurificationUnitBaryonicPerfection.java | 4 +--- .../purification/MTEPurificationUnitClarifier.java | 6 +----- .../purification/MTEPurificationUnitDegasser.java | 4 +--- .../MTEPurificationUnitFlocculation.java | 5 +---- .../purification/MTEPurificationUnitOzonation.java | 4 +--- .../MTEPurificationUnitPhAdjustment.java | 5 +---- .../MTEPurificationUnitPlasmaHeater.java | 5 +---- .../MTEPurificationUnitUVTreatment.java | 5 +---- .../machines/multiblock/AdvChemicalProcessor.java | 5 +---- .../machines/multiblock/DistillationTower.java | 5 +---- .../machines/multiblock/LaserEngraver.java | 1 - .../machines/multiblock/LayeredCokeBattery.java | 4 +--- .../machines/multiblock/Macerator.java | 4 +--- 68 files changed, 104 insertions(+), 290 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java index 01d6315ebf..1515256ec1 100644 --- a/src/main/java/gregtech/common/GTProxy.java +++ b/src/main/java/gregtech/common/GTProxy.java @@ -686,6 +686,11 @@ public abstract class GTProxy implements IGTMod, IFuelHandler { */ public int mTitleTabStyle = 0; + /** + * Which style should tooltip separator lines have? 0: empty line, 1: dashed line, 2+: continuous line + */ + public int separatorStyle = 2; + /** * Whether to show seconds or ticks on NEI */ diff --git a/src/main/java/gregtech/common/config/Client.java b/src/main/java/gregtech/common/config/Client.java index f871b846a4..f51c154466 100644 --- a/src/main/java/gregtech/common/config/Client.java +++ b/src/main/java/gregtech/common/config/Client.java @@ -103,6 +103,10 @@ public class Client { @Config.Comment("Which style to use for title tab on machine GUI? 0: text tab split-dark, 1: text tab unified, 2: item icon tab.") @Config.DefaultInt(0) public int titleTabStyle; + + @Config.Comment("Which style should tooltip separator lines have? 0: empty line, 1: dashed line, 2+: continuous line.") + @Config.DefaultInt(2) + public int separatorStyle; } @Config.LangKey("GT5U.gui.config.client.preference") diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java index b39135fed2..6719478dca 100644 --- a/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java @@ -93,7 +93,10 @@ public class BehaviourCoverTool extends BehaviourNone { private void doCopy(TileEntity aTileEntity, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ, List aList) { aList.add( - "----- X: " + EnumChatFormatting.AQUA + EnumChatFormatting.STRIKETHROUGH + "-----" + + EnumChatFormatting.RESET + + " X: " + + EnumChatFormatting.AQUA + GTUtility.formatNumbers(aX) + EnumChatFormatting.RESET + " Y: " @@ -108,7 +111,9 @@ public class BehaviourCoverTool extends BehaviourNone { + EnumChatFormatting.AQUA + aWorld.provider.dimensionId + EnumChatFormatting.RESET - + " -----"); + + " " + + EnumChatFormatting.STRIKETHROUGH + + "-----"); if (aTileEntity instanceof ICoverable tCoverable) { final ForgeDirection tSide = tCoverable.getCoverItemAtSide(side) != null ? side : tCoverable.getCoverItemAtSide(GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java index ad22dcb958..7a625afc41 100644 --- a/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java @@ -37,7 +37,6 @@ public class BehaviourSprayColorInfinite extends BehaviourSprayColor { private static final List COLOR_SELECTIONS; public static final String COLOR_NBT_TAG = "current_color"; public static final String LOCK_NBT_TAG = "is_locked"; - public static final String SEPARATOR = "-----------------------------------------"; private byte mCurrentColor; @@ -108,25 +107,22 @@ public class BehaviourSprayColorInfinite extends BehaviourSprayColor { final ItemStack itemStack) { aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.infinite")); aList.add(mTooltipChain); - aList.add(SEPARATOR); + aList.add(" "); aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.more_info")); - aList.add(SEPARATOR); aList.add(AuthorQuerns); - return aList; } @Override public List getAdditionalToolTipsWhileSneaking(final MetaBaseItem aItem, final List aList, final ItemStack aStack) { - aList.add(SEPARATOR); + aList.add(" "); aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.switch")); aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.gui")); aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.pick")); aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.lock")); - aList.add(SEPARATOR); + aList.add(" "); aList.add(AuthorQuerns); - return aList; } // endregion diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java index 31224ce604..382400c3b1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java @@ -132,11 +132,9 @@ public class MTEAssemblyLine extends MTEExtendedPowerMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Combustion Generator") - .addInfo("Controller block for the Large Combustion Engine") .addInfo("Supply Diesel Fuels and 1000L of Lubricant per hour to run") .addInfo("Supply 40L/s of Oxygen to boost output (optional)") .addInfo("Default: Produces 2048EU/t at 100% fuel efficiency") .addInfo("Boosted: Produces 6144EU/t at 150% fuel efficiency") .addInfo("You need to wait for it to reach 300% to output full power") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 4, false) .addController("Front center") .addCasingInfoRange("Stable Titanium Machine Casing", 16, 22, false) @@ -117,7 +115,7 @@ public class MTEDieselEngine extends MTEEnhancedMultiBlockBase .addInputHatch("Diesel Fuel, next to a Gear Box", 1) .addInputHatch("Lubricant, next to a Gear Box", 1) .addInputHatch("Oxygen, optional, next to a Gear Box", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java index 9e89ad1a22..2fb630d8f8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java @@ -133,10 +133,8 @@ public class MTEDistillationTower extends MTEEnhancedMultiBlockBase im protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Furnace") - .addInfo("Controller Block for the Multi Smelter") .addInfo("Smelts up to 8-8192 items at once") .addInfo("Items smelted increases with coil tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front bottom") .addCasingInfoRange("Heat Proof Machine Casing", 8, 14, false) @@ -108,7 +106,7 @@ public class MTEMultiFurnace extends MTEAbstractMultiFurnace im .addMufflerHatch("Top Middle", 2) .addInputBus("Any bottom casing", 1) .addOutputBus("Any bottom casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java index c10736c587..e7404dbb09 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java @@ -17,7 +17,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_LATHE_G import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static net.minecraft.util.EnumChatFormatting.BLUE; import static net.minecraft.util.EnumChatFormatting.DARK_AQUA; -import static net.minecraft.util.EnumChatFormatting.GOLD; import java.text.DecimalFormat; import java.util.List; @@ -231,16 +230,10 @@ public class MTEMultiLathe extends MTEExtendedPowerMultiBlockBase return rTexture; } - private static final String TOOLTIP_BAR = GOLD - + "---------------------------------------------------------------------------------------"; - @Override protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Lathe") - .addInfo(TOOLTIP_BAR) - .addInfo("Controller Block for the Industrial Precision Lathe.") - .addInfo(TOOLTIP_BAR) .addInfo(BLUE + "Allows more parallel recipes based on item pipe casing parallel and voltage.") .addInfo("Max Parallel Recipes = Item Pipe Casing Parallel + (Voltage Tier * 2).") .addInfo(BLUE + "Increases processing speed based on item pipe casing speed and voltage.") @@ -251,8 +244,6 @@ public class MTEMultiLathe extends MTEExtendedPowerMultiBlockBase + "For example, using Black Plutonium item pipe casings (boost of 4) and Tier 3 voltage (HV) ") .addInfo(DARK_AQUA + "reduces processing time to 57% of the recipe time, making the machine 175% faster.") .addInfo(BLUE + "Only uses 80% of the EU/T normally required.") - .addInfo(AuthorVolence) - .addSeparator() .beginStructureBlock(7, 5, 5, true) .addController("Front Center") .addCasingInfoMin("Solid Steel Machine Casing", 42, false) @@ -263,7 +254,7 @@ public class MTEMultiLathe extends MTEExtendedPowerMultiBlock