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 ++---- 59 files changed, 74 insertions(+), 238 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common') 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/MTEAdvFusionMk5.java index 52928268cf..a7d7529f34 100644 --- 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/MTEAdvFusionMk5.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 MTEAdvFusionMk5 extends MTEFusionComputer { @@ -44,12 +43,10 @@ public class MTEAdvFusionMk5 extends MTEFusionComputer { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("HARNESSING THE POWER OF A NEUTRON STAR") - .addInfo("Controller block for the Fusion Reactor Mk V") .addInfo("524,288EU/t and 1.28B 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 IV", 79, false) @@ -59,7 +56,7 @@ public class MTEAdvFusionMk5 extends MTEFusionComputer { .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be UEV 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/MTEAdvHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java index 5ebf5d1659..06314e2f1b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java @@ -41,7 +41,6 @@ import gregtech.common.tileentities.machines.MTEHatchInputME; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -106,7 +105,6 @@ public class MTEAdvHeatExchanger extends GTPPMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the XL Heat Exchanger") .addInfo("More complicated than a Fusion Reactor. Seriously") .addInfo("But you know this by now, right?") .addInfo("Works as fast as 32 Large Heat Exchangers") @@ -118,7 +116,6 @@ public class MTEAdvHeatExchanger extends GTPPMultiBlockBase .addInfo("Lava: 32,000 L/s, maximum 64,000 L/s, max output 5,120,000 SH Steam/s") .addInfo("A circuit in the controller lowers the SH Steam threshold and efficiency") .addInfo("3.75% reduction and 1.5% efficiency loss per circuit config over 1") - .addSeparator() .beginStructureBlock(5, 9, 5, false) .addController("Front bottom") .addCasingInfoMin("Reinforced Heat Exchanger Casing", 90, false) @@ -128,7 +125,7 @@ public class MTEAdvHeatExchanger extends GTPPMultiBlockBase .addInputHatch("Distilled water, any bottom layer casing", 1) .addOutputHatch("Cold fluid, top center", 3) .addOutputHatch("Steam/SH Steam, any bottom layer 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/MTEAdvImplosionCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java index 5590185fb7..6c06f20514 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java @@ -27,7 +27,6 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; 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,7 +61,6 @@ public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase im protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Separator") .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) - .addSeparator() .beginStructureBlock(5, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) .addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -355,8 +353,7 @@ public class MTESteamCentrifuge extends MTESteamMultiBase im .addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing") .addStructureInfo(EnumChatFormatting.GOLD + "3x" + EnumChatFormatting.GRAY + " Steel Firebox Casing") .addStructureInfo(EnumChatFormatting.GOLD + "4x" + EnumChatFormatting.GRAY + " Steel Pipe Casing") - .addStructureInfo("") - .toolTipFinisher(AuthorEvgenWarGold); + .toolTipFinisher(GTValues.AuthorEvgenWarGold); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java index 1ead5a5ce3..bd20334bf5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java @@ -53,7 +53,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gregtech.common.blocks.BlockCasings1; import gregtech.common.blocks.BlockCasings2; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -270,12 +269,10 @@ public class MTESteamCompressor extends MTESteamMultiBase im protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Squasher") .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) - .addSeparator() .beginStructureBlock(3, 3, 4, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) .addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -292,8 +289,7 @@ public class MTESteamCompressor extends MTESteamMultiBase im .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "25-30x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") - .addStructureInfo("") - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java index 2b06c12ece..67f2d7c139 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java @@ -5,7 +5,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.GregTechAPI.sBlockCasings1; import static gregtech.api.GregTechAPI.sBlockCasings2; -import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -37,6 +36,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -320,12 +320,10 @@ public class MTESteamForgeHammer extends MTESteamMultiBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Presser") .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) - .addSeparator() .beginStructureBlock(6, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) .addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -351,8 +349,7 @@ public class MTESteamForgeHammer extends MTESteamMultiBase + " Steel Block" + EnumChatFormatting.RED + " from GregTech") - .addStructureInfo("") - .toolTipFinisher(AuthorEvgenWarGold); + .toolTipFinisher(GTValues.AuthorEvgenWarGold); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java index 7f126efd14..6b3e8b437f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java @@ -52,7 +52,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gregtech.common.blocks.BlockCasings1; import gregtech.common.blocks.BlockCasings2; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -269,12 +268,10 @@ public class MTESteamMacerator extends MTESteamMultiBase impl protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Grinder") .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) - .addSeparator() .beginStructureBlock(3, 3, 3, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) .addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -291,8 +288,7 @@ public class MTESteamMacerator extends MTESteamMultiBase impl .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "14-22x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") - .addStructureInfo("") - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java index 44fd98c06d..a2c4dbd7ec 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java @@ -6,7 +6,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.GregTechAPI.sBlockCasings1; import static gregtech.api.GregTechAPI.sBlockCasings2; -import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; import static gregtech.api.enums.HatchElement.InputHatch; import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; @@ -40,6 +39,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -322,12 +322,10 @@ public class MTESteamMixer extends MTESteamMultiBase implements I protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Blender") .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) - .addSeparator() .beginStructureBlock(7, 6, 7, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) .addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -352,8 +350,7 @@ public class MTESteamMixer extends MTESteamMultiBase implements I .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing") .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Steel Pipe Casing") .addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Block of Iron") - .addStructureInfo("") - .toolTipFinisher(AuthorEvgenWarGold); + .toolTipFinisher(GTValues.AuthorEvgenWarGold); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java index 575db34e79..8257a4a65a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java @@ -2,7 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.GregTechAPI.*; -import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; import static gregtech.api.enums.HatchElement.InputHatch; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; @@ -40,6 +39,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GTUITextures; @@ -345,12 +345,10 @@ public class MTESteamWasher extends MTESteamMultiBase implements protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Purifier") .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) - .addSeparator() .beginStructureBlock(5, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) .addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -374,8 +372,7 @@ public class MTESteamWasher extends MTESteamMultiBase implements .addStructureInfo(EnumChatFormatting.GOLD + "24x" + EnumChatFormatting.GRAY + " Any Glass") .addStructureInfo(EnumChatFormatting.GOLD + "12x" + EnumChatFormatting.GRAY + " Steel Pipe Casing") .addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing") - .addStructureInfo("") - .toolTipFinisher(AuthorEvgenWarGold); + .toolTipFinisher(GTValues.AuthorEvgenWarGold); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java index f8a8384bf1..8765866b68 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java @@ -4,7 +4,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gregtech.api.util.GTStructureUtility.ofFrame; @@ -34,6 +33,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; @@ -233,7 +233,6 @@ public class MTESteamWaterPump extends MTESteamMultiBase impl protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Water Pump") .addInfo("Pumps Water based on humidity") .addInfo("Has 2 tiers: Bronze and Steel") .addInfo("Steel tier extracts 2x Water") @@ -254,7 +253,6 @@ public class MTESteamWaterPump extends MTESteamMultiBase impl + EnumChatFormatting.RED + " of Steam." + EnumChatFormatting.RESET) - .addSeparator() .beginStructureBlock(3, 3, 5, false) .addOutputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) .addStructureInfo( @@ -271,8 +269,7 @@ public class MTESteamWaterPump extends MTESteamMultiBase impl .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) .addStructureInfo(EnumChatFormatting.GOLD + "10" + EnumChatFormatting.GRAY + " Steel Frame Box") .addStructureInfo(EnumChatFormatting.GOLD + "9 " + EnumChatFormatting.GRAY + " Wooden Casing") - .addStructureInfo("") - .toolTipFinisher(AuthorEvgenWarGold); + .toolTipFinisher(GTValues.AuthorEvgenWarGold); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java index 970f975a70..d47953daba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java @@ -37,7 +37,6 @@ import gtPlusPlus.api.objects.Logger; 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; @@ -79,12 +78,10 @@ public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase implements ISurvivalConstructable { @@ -91,7 +90,6 @@ public class MTEAutoCrafter extends GTPPMultiBlockBase implement .addInfo("200% faster than using single block machines of the same voltage") .addInfo("Processes two items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front Center") .addCasingInfoRange("Bulk Production Frame", 10, 25, false) @@ -101,7 +99,7 @@ public class MTEAutoCrafter extends GTPPMultiBlockBase implement .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/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java index 6952dd5c24..fed3767cce 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java @@ -40,7 +40,6 @@ import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.IonParticles; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -179,7 +178,6 @@ public class MTECyclotron extends GTPPMultiBlockBase implements IS .addInfo("Cyclotron Machine Casings around Cyclotron Coil Blocks") .addInfo("All Hatches must be IV or better") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .addCasingInfoMin("Cyclotron Machine Casings", 40, false) .addCasingInfoMin("Cyclotron Coil", 32, false) .addInputBus("Any Casing", 1) @@ -189,7 +187,7 @@ public class MTECyclotron extends GTPPMultiBlockBase implements IS .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/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java index 32ea79cc55..0901c027d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java @@ -37,7 +37,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.MTEHatchElementalDataOrbHolder; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -78,7 +77,6 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase @@ -67,14 +66,12 @@ public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase imp protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Matter Fabricator") .addInfo("Speed: +0% | EU Usage: 80%") .addInfo("Parallel: Scrap = 64 | UU = 8 * Tier") .addInfo("Produces UU-A, UU-M & Scrap") .addInfo("Change mode with screwdriver") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(5, 4, 5, true) .addController("Front Center") .addCasingInfoMin(mCasingName3, 9, false) @@ -124,7 +121,7 @@ public class MTEMassFabricator extends GTPPMultiBlockBase imp .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/production/MTENuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java index 31caefe8f2..5be5801097 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java @@ -49,7 +49,6 @@ import gregtech.api.util.OverclockCalculator; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.material.nuclear.MaterialsNuclides; import gtPlusPlus.core.util.math.MathUtils; @@ -89,7 +88,7 @@ public class MTENuclearReactor extends GTPPMultiBlockBase imp protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.") + .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor") .addInfo("Produces energy and new elements from Radioactive Beta Decay!") .addInfo("Input LFTB and a molten salt as fuel, and match the 4 Buffered Dynamo Hatches:") .addInfo("LFTR Fuel 1 (4 EV Hatches), LFTR Fuel 2 (4 IV Hatches), LFTR Fuel 3 (4 LuV Hatches)") @@ -97,7 +96,6 @@ public class MTENuclearReactor extends GTPPMultiBlockBase imp .addInfo("Outputs U233 every 10 seconds, on average, while the reactor is running") .addInfo("Check NEI to see the other 3 outputs - they differ between fuels") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(7, 4, 7, true) .addController("Bottom Center") .addCasingInfoMin("Hastelloy-N Reactor Casing", 27, false) @@ -110,7 +108,7 @@ public class MTENuclearReactor extends GTPPMultiBlockBase imp .addStructureInfo("All other hatches must be IV+ tier.") .addStructureInfo("4x Output Hatches or 1x Output Hatch (ME), 1+ Input Hatches") .addStructureInfo("4x Dynamo Hatches, 4x Mufflers") - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java index 05a65afaf2..4d1a55a7bb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java @@ -244,7 +244,6 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase implements ISurvivalConstructable { @@ -64,7 +63,6 @@ public class MTERefinery extends GTPPMultiBlockBase implements ISur .addInfo("Only one Energy Hatch is allowed per Processing Unit") .addInfo("All recipe times in this multi are very long, watch out!") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 9, 3, false) .addController("Bottom Center") .addCasingInfoMin("Hastelloy-X Structural Block", 7, false) @@ -79,7 +77,7 @@ public class MTERefinery extends GTPPMultiBlockBase implements ISur .addStructureInfo("Muffler's Tier must be IV+") .addStructureInfo("2-4x Input Hatches, 1-2x Output Hatches") .addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch") - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java index 31ed44d5a3..d76a8993df 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java @@ -41,7 +41,6 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -99,7 +98,6 @@ public class MTESolarTower extends GTPPMultiBlockBase implements .addInfo("Bonus: 1 ring = +1, 2 rings = +2, 3 rings = +4, 4 rings = +8, 5 rings = +16") .addInfo("Total number of reflectors based on how many rings are built:") .addInfo("1 ring = 36, 2 rings = 88, 3 rings = 156, 4 rings = 240, 5 rings = 340") - .addSeparator() .beginVariableStructureBlock(15, 31, 28, 28, 15, 31, false) .addController("Top Middle") .addCasingInfoMin("Structural Solar Casing", 229, false) @@ -109,7 +107,7 @@ public class MTESolarTower extends GTPPMultiBlockBase implements .addInputHatch("Any 2 dot hint(min 1)", 2) .addOutputHatch("Any 2 dot hint(min 1)", 2) .addMaintenanceHatch("Any 2 dot hint", 2) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java index b98d6ab662..ff4dfc2658 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java @@ -46,7 +46,6 @@ import gregtech.api.util.ParallelHelper; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -280,7 +279,6 @@ public class MTEThermalBoiler extends GTPPMultiBlockBase imple protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Thermal Boiler Controller") .addInfo("Converts Water & Heat into Steam") .addInfo("Filters raw materials from lava") .addInfo("Explodes if water is not supplied") @@ -295,7 +293,7 @@ public class MTEThermalBoiler extends GTPPMultiBlockBase imple .addOutputHatch("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/production/MTETreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java index 5478014c62..caecbaea92 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java @@ -77,7 +77,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -119,7 +118,6 @@ public class MTETreeFarm extends GTPPMultiBlockBase implements ISur protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller block for the Tree Growth Simulator") .addInfo("Farms and harvests trees using EU") .addInfo("Place a sapling in the controller slot") .addInfo("Place a tool in an input bus") @@ -135,7 +133,6 @@ public class MTETreeFarm extends GTPPMultiBlockBase implements ISur .addInfo("Energy input tier multiplies output further") .addInfo("Output multiplier is equal to: 2*tier^2 - 2*tier + 5") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfoMin(mCasingName, 8, false) @@ -146,7 +143,7 @@ public class MTETreeFarm extends GTPPMultiBlockBase implements ISur .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/production/algae/MTEAlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java index 01369df1f3..8024078aa6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java @@ -99,14 +99,12 @@ public class MTEAlgaePondBase extends GTPPMultiBlockBase imple MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Grows Algae!") - .addInfo("Controller Block for the Algae Farm") .addInfo("Provide compost to boost production by one tier") .addInfo("Does not require power or maintenance") .addInfo("All Machine Casings must be the same tier, this dictates machine speed.") .addInfo("Requires one Input Hatch that matches the tier of the Casings") .addInfo("Fill Input Hatch with Water to fill the inside of the multiblock.") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(9, 3, 9, true) .addController("Front Center") .addCasingInfoMin("Machine Casings", 64, true) @@ -114,7 +112,7 @@ public class MTEAlgaePondBase extends GTPPMultiBlockBase imple .addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1) .addInputHatch("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/production/chemplant/MTEChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java index f678f084fc..63941f2139 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java @@ -132,10 +132,8 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase imple protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Chemical Plant") .addInfo("Heavy Industry, now right at your doorstep!") .addInfo("Please read the user manual for more information on construction and usage") - .addSeparator() .addController("Bottom Center") .addStructureHint("Catalyst Housing", 1) .addInputBus("Bottom Casing", 1) @@ -148,7 +146,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase imple .addSubChannelUsage("machine", "tier machine casing") .addSubChannelUsage("coil", "heating coil blocks") .addSubChannelUsage("pipe", "pipe casing blocks") - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java index 8e97ae11f3..3d35af461d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java @@ -284,7 +284,6 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase= UHV using MAX tier components.") - .addSeparator() .addController("Bottom Center") .addCasingInfoMin("Sub-Station External Casings", 10, false) .addDynamoHatch("Any Casing", 1) .addEnergyHatch("Any Casing", 1) .addSubChannelUsage("capacitor", "Vanadium Capacitor Cell Tier") .addSubChannelUsage("height", "Height of structure") - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } @@ -704,7 +702,7 @@ public class GregtechMetaTileEntity_PowerSubStationController + errorCode + EnumChatFormatting.RESET + "]", - "----------------------", "Stats for Nerds", + EnumChatFormatting.STRIKETHROUGH + "----------------------", "Stats for Nerds", "Average Input: " + EnumChatFormatting.BLUE + GTUtility.formatNumbers(this.getAverageEuAdded()) + EnumChatFormatting.RESET -- cgit