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/misc/MTEAmazonPackager.java | 4 +--- .../multi/processing/MTEIndustrialAlloySmelter.java | 5 +---- .../multi/processing/MTEIndustrialArcFurnace.java | 5 +---- .../multi/processing/MTEIndustrialCentrifuge.java | 5 +---- .../machines/multi/processing/MTEIndustrialChisel.java | 4 +--- .../multi/processing/MTEIndustrialCokeOven.java | 5 +---- .../multi/processing/MTEIndustrialCuttingMachine.java | 5 +---- .../multi/processing/MTEIndustrialDehydrator.java | 4 +--- .../multi/processing/MTEIndustrialExtruder.java | 5 +---- .../multi/processing/MTEIndustrialFluidHeater.java | 5 +---- .../multi/processing/MTEIndustrialForgeHammer.java | 5 +---- .../multi/processing/MTEIndustrialMacerator.java | 5 +---- .../machines/multi/processing/MTEIndustrialMixer.java | 5 +---- .../processing/MTEIndustrialMolecularTransformer.java | 4 +--- .../multi/processing/MTEIndustrialMultiMachine.java | 5 +---- .../multi/processing/MTEIndustrialPlatePress.java | 5 +---- .../machines/multi/processing/MTEIndustrialSifter.java | 5 +---- .../processing/MTEIndustrialThermalCentrifuge.java | 5 +---- .../multi/processing/MTEIndustrialVacuumFreezer.java | 4 +--- .../multi/processing/MTEIndustrialWashPlant.java | 5 +---- .../multi/processing/MTEIndustrialWireMill.java | 5 +---- .../machines/multi/processing/MTEIsaMill.java | 5 +---- .../processing/MTENuclearSaltProcessingPlant.java | 5 +---- .../machines/multi/processing/MTESpargeTower.java | 5 +---- .../multi/processing/MTEndustrialElectrolyzer.java | 5 +---- .../processing/advanced/MTEAdvDistillationTower.java | 5 +---- .../machines/multi/processing/advanced/MTEAdvEBF.java | 4 +--- .../multi/processing/advanced/MTEAdvFusionMk4.java | 5 +---- .../multi/processing/advanced/MTEAdvFusionMk5.java | 5 +---- .../multi/processing/advanced/MTEAdvHeatExchanger.java | 5 +---- .../processing/advanced/MTEAdvImplosionCompressor.java | 4 +--- .../multi/processing/steam/MTESteamCentrifuge.java | 7 ++----- .../multi/processing/steam/MTESteamCompressor.java | 6 +----- .../multi/processing/steam/MTESteamForgeHammer.java | 7 ++----- .../multi/processing/steam/MTESteamMacerator.java | 6 +----- .../machines/multi/processing/steam/MTESteamMixer.java | 7 ++----- .../multi/processing/steam/MTESteamWasher.java | 7 ++----- .../multi/processing/steam/MTESteamWaterPump.java | 7 ++----- .../multi/production/MTEAlloyBlastSmelter.java | 7 ++----- .../machines/multi/production/MTEAutoCrafter.java | 4 +--- .../machines/multi/production/MTECyclotron.java | 4 +--- .../multi/production/MTEElementalDuplicator.java | 4 +--- .../multi/production/MTEFrothFlotationCell.java | 4 +--- .../multi/production/MTEIndustrialFishingPond.java | 5 +---- .../multi/production/MTEIndustrialRockBreaker.java | 5 +---- .../multi/production/MTELargeRocketEngine.java | 5 +---- .../multi/production/MTELargeSemifluidGenerator.java | 5 +---- .../machines/multi/production/MTEMassFabricator.java | 5 +---- .../machines/multi/production/MTENuclearReactor.java | 6 ++---- .../multi/production/MTEQuantumForceTransformer.java | 9 +-------- .../machines/multi/production/MTERefinery.java | 4 +--- .../machines/multi/production/MTESolarTower.java | 4 +--- .../machines/multi/production/MTEThermalBoiler.java | 4 +--- .../machines/multi/production/MTETreeFarm.java | 5 +---- .../multi/production/algae/MTEAlgaePondBase.java | 4 +--- .../multi/production/chemplant/MTEChemicalPlant.java | 4 +--- .../production/mega/MTEMegaAlloyBlastSmelter.java | 18 ++++++++---------- .../production/turbines/MTELargerTurbineBase.java | 5 +---- ...egtechMetaTileEntity_PowerSubStationController.java | 6 ++---- .../gregtech/GregtechIndustrialCuttingFactory.java | 11 ++--------- .../gregtech/GregtechIndustrialMacerator.java | 9 +-------- .../gregtech/GregtechIndustrialWiremill.java | 9 +-------- 62 files changed, 78 insertions(+), 263 deletions(-) (limited to 'src/main/java/gtPlusPlus') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java index 387475d4f2..ae487fadb6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java @@ -99,7 +99,6 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase imp protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Amazon Warehouse") .addInfo("This Multiblock is used for EXTREME packaging requirements") .addInfo("Can be configured with a screwdriver to work as an Unpackager") .addInfo("Dust Schematics are inserted into the input busses") @@ -109,7 +108,6 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase imp .addInfo("Only uses 75% of the EU/t normally required") .addInfo("Processes 16 items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfoMin("Supply Depot Casings", 10, false) @@ -118,7 +116,7 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase imp .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) .addMufflerHatch("Any casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java index 031e8cfe11..3b626fee5c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java @@ -35,7 +35,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase @@ -116,13 +115,11 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase .addInfo("If no target is provided for common buses, the result of the first chisel is used") .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 16") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfoMin("Sturdy Printer Casing", 6, false) @@ -93,7 +91,7 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) .addMufflerHatch("Any casing", 1) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java index afca39266c..0921d8f3ea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java @@ -32,7 +32,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -67,12 +66,10 @@ public class MTEIndustrialCokeOven extends GTPPMultiBlockBase i protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Mixer") .addInfo("250% faster than using single block machines of the same voltage") .addInfo("Processes eight recipes per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 4, 3, false) .addController("Second Layer Center") .addCasingInfoMin(mCasingName, 6, false) @@ -102,7 +99,7 @@ public class MTEIndustrialMixer extends GTPPMultiBlockBase i .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java index 818ab3674a..d6cef05649 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java @@ -29,7 +29,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -65,7 +64,6 @@ public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Sifter") .addInfo("400% faster than single-block machines of the same voltage") .addInfo("Only uses 75% of the EU/t normally required") .addInfo("Processes four items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(5, 3, 5, false) .addController("Bottom Center") .addCasingInfoMin("Sieve Grate", 18, false) @@ -84,7 +81,7 @@ public class MTEIndustrialSifter extends GTPPMultiBlockBase .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java index f9a366d66c..f4ca5361d9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java @@ -34,7 +34,6 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -66,12 +65,10 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase implements ISurvi protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Large Grinding Machine") .addInfo("Grind ores.") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 7, false) .addController("Front Center") .addCasingInfoMin("IsaMill Exterior Casing", 40, false) @@ -102,7 +99,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java index 86e1c9e624..e74045dfe9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java @@ -33,7 +33,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase @@ -75,7 +74,6 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase implement protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Gas Sparge Tower") - .addInfo("Controller block for the Sparging Tower") .addInfo("Runs gases through depleted molten salts to extract precious fluids") .addInfo("Works the same way as the Distillation Tower, but with a fixed height of 8") .addInfo("Fluids are only put out at the correct height") .addInfo("The correct height equals the slot number in the NEI recipe") - .addSeparator() .beginStructureBlock(3, 8, 3, true) .addController("Front bottom") .addOtherStructurePart("Sparge Tower Exterior Casing", "45 (minimum)") @@ -143,7 +140,7 @@ public class MTESpargeTower extends GTPPMultiBlockBase implement .addMaintenanceHatch("Any casing", 1, 2, 3) .addInputHatch("2x Input Hatches (Any bottom layer casing)", 1) .addOutputHatch("6x Output Hatches (At least one per layer except bottom layer)", 2, 3) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java index e59717127d..1a24320762 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java @@ -30,7 +30,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -62,12 +61,10 @@ public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase implements ISurviva .addInfo("Consumes 10L of " + mHotFuelName + " per second during operation") .addInfo("Constructed exactly the same as a normal EBF") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .addController("Bottom center") .addCasingInfoMin(mCasingName, 8, false) .addInputHatch("Any Casing", 1) @@ -111,7 +109,7 @@ public class MTEAdvEBF extends GTPPMultiBlockBase implements ISurviva .addMufflerHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addOtherStructurePart(mHatchName, "Any Casing", 1) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java index 7c2735c6e1..4477c3b7bc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java @@ -21,7 +21,6 @@ import gregtech.api.util.AdvancedFusionOverclockDescriber; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.multi.MTEFusionComputer; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class MTEAdvFusionMk4 extends MTEFusionComputer { @@ -44,12 +43,10 @@ public class MTEAdvFusionMk4 extends MTEFusionComputer { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("HARNESSING THE POWER OF A BLUE GIANT") - .addInfo("Controller block for the Fusion Reactor Mk IV") .addInfo("131072EU/t and 320M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo("Performs 4/4 overclocks") - .addSeparator() .beginStructureBlock(15, 3, 15, false) .addController("See diagram when placed") .addCasingInfoMin("Fusion Machine Casings MK III", 79, false) @@ -59,7 +56,7 @@ public class MTEAdvFusionMk4 extends MTEFusionComputer { .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be UHV or better") - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusio