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 --- .../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 +--- 64 files changed, 85 insertions(+), 281 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 MTEExtendedPowerMultiBlockBase .addMaintenanceHatch("Any Solid Steel Casing", 1) .addMufflerHatch("Any Solid Steel Casing", 1) .addOtherStructurePart("4 Item Pipe Casings", "Center of the glass", 4) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorVolence); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java index c2f9893386..80de2e93be 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java @@ -183,7 +183,6 @@ public class MTEMultiSolidifier extends MTEExtendedPowerMultiBlockBase i protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Nanite Fabricator") - .addInfo("Controller block for the Nano Forge") .addInfo("Requires insane amounts of power to create nanites. Each tier") .addInfo("the multi gains a new building next to it. The nanite in the") .addInfo("controller slot controls the tier.") - .addInfo("--------------------------------------------") + .addSeparator() .addInfo("Requires a Carbon Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 1) .addInfo("Requires a Neutronium Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 2) .addInfo("Requires a Transcendent Metal Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 3) - .addInfo("--------------------------------------------") + .addSeparator() .addInfo("If a recipe's tier is lower than the tier of the Nano Forge") .addInfo("it gains " + EnumChatFormatting.RED + "perfect overclock" + EnumChatFormatting.GRAY + ".") - .addInfo(AuthorBlueWeabo) - .addSeparator() .beginStructureBlock(30, 38, 13, false) - .addStructureInfo("Nano Forge Structure is too complex! See schematic for details.") - .addStructureInfo("--------------------------------------------") .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 1 + EnumChatFormatting.GRAY) .addStructureInfo( EnumChatFormatting.GOLD + "527" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing")