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 --- .../common/tileentities/multis/MTEBioVat.java | 5 +- .../multis/MTECircuitAssemblyLine.java | 24 +--- .../multis/MTEDeepEarthHeatingPump.java | 6 +- .../multis/MTEElectricImplosionCompressor.java | 5 +- .../multis/MTEHighTempGasCooledReactor.java | 7 +- .../common/tileentities/multis/MTEManualTrafo.java | 8 +- .../multis/MTEThoriumHighTempReactor.java | 5 +- .../common/tileentities/multis/MTEWindmill.java | 7 +- .../multis/mega/MTEMegaBlastFurnace.java | 5 +- .../multis/mega/MTEMegaChemicalReactor.java | 11 +- .../multis/mega/MTEMegaDistillTower.java | 5 +- .../multis/mega/MTEMegaOilCracker.java | 5 +- .../multis/mega/MTEMegaVacuumFreezer.java | 5 +- .../java/bartworks/util/BWTooltipReference.java | 1 + .../bwcrossmod/galacticgreg/MTEVoidMinerBase.java | 5 +- .../behaviours/BehaviourDetravToolProspector.java | 2 +- src/main/java/ggfab/mte/MTEAdvAssLine.java | 5 +- .../blocks/tileEntity/AntimatterForge.java | 3 +- .../blocks/tileEntity/AntimatterGenerator.java | 3 +- .../tileEntity/MTEComponentAssemblyLine.java | 14 +- .../blocks/tileEntity/MTECoolantTower.java | 6 +- .../blocks/tileEntity/MTEExtremeHeatExchanger.java | 6 +- .../blocks/tileEntity/MTEFuelRefineFactory.java | 7 +- .../tileEntity/MTELargeEssentiaGenerator.java | 7 +- .../tileEntity/MTELargeEssentiaSmeltery.java | 9 +- .../blocks/tileEntity/MTELargeFusionComputer1.java | 15 +- .../blocks/tileEntity/MTELargeFusionComputer2.java | 15 +- .../blocks/tileEntity/MTELargeFusionComputer3.java | 15 +- .../blocks/tileEntity/MTELargeFusionComputer4.java | 15 +- .../blocks/tileEntity/MTELargeFusionComputer5.java | 15 +- .../blocks/tileEntity/MTEMultiNqGenerator.java | 7 +- .../blocks/tileEntity/MTENeutronActivator.java | 7 +- .../blocks/tileEntity/MTEPreciseAssembler.java | 7 +- .../tileEntity/MTESupercriticalFluidTurbine.java | 6 +- .../tileEntity/MTEUniversalChemicalFuelEngine.java | 7 +- .../blocks/tileEntity/MTEYottaFluidTank.java | 7 +- .../goodgenerator/util/DescTextLocalization.java | 1 + src/main/java/gregtech/api/enums/GTValues.java | 2 +- src/main/java/gregtech/api/util/GTUtility.java | 9 +- .../api/util/MultiblockTooltipBuilder.java | 157 ++++++++++++++++++--- src/main/java/gregtech/api/util/StringUtils.java | 13 ++ 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 +- .../java/gregtech/loaders/preload/GTPreLoad.java | 1 + .../loaders/preload/LoaderMetaTileEntities.java | 2 +- .../machines/multi/misc/MTEAmazonPackager.java | 4 +- .../processing/MTEIndustrialAlloySmelter.java | 5 +- .../multi/processing/MTEIndustrialArcFurnace.java | 5 +- .../multi/processing/MTEIndustrialCentrifuge.java | 5 +- .../multi/processing/MTEIndustrialChisel.java | 4 +- .../multi/processing/MTEIndustrialCokeOven.java | 5 +- .../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 +- .../multi/processing/MTEIndustrialMixer.java | 5 +- .../MTEIndustrialMolecularTransformer.java | 4 +- .../processing/MTEIndustrialMultiMachine.java | 5 +- .../multi/processing/MTEIndustrialPlatePress.java | 5 +- .../multi/processing/MTEIndustrialSifter.java | 5 +- .../processing/MTEIndustrialThermalCentrifuge.java | 5 +- .../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 +- .../advanced/MTEAdvDistillationTower.java | 5 +- .../multi/processing/advanced/MTEAdvEBF.java | 4 +- .../multi/processing/advanced/MTEAdvFusionMk4.java | 5 +- .../multi/processing/advanced/MTEAdvFusionMk5.java | 5 +- .../processing/advanced/MTEAdvHeatExchanger.java | 5 +- .../advanced/MTEAdvImplosionCompressor.java | 4 +- .../multi/processing/steam/MTESteamCentrifuge.java | 7 +- .../multi/processing/steam/MTESteamCompressor.java | 6 +- .../processing/steam/MTESteamForgeHammer.java | 7 +- .../multi/processing/steam/MTESteamMacerator.java | 6 +- .../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 +- .../production/MTELargeSemifluidGenerator.java | 5 +- .../multi/production/MTEMassFabricator.java | 5 +- .../multi/production/MTENuclearReactor.java | 6 +- .../production/MTEQuantumForceTransformer.java | 9 +- .../machines/multi/production/MTERefinery.java | 4 +- .../machines/multi/production/MTESolarTower.java | 4 +- .../multi/production/MTEThermalBoiler.java | 4 +- .../machines/multi/production/MTETreeFarm.java | 5 +- .../multi/production/algae/MTEAlgaePondBase.java | 4 +- .../production/chemplant/MTEChemicalPlant.java | 4 +- .../production/mega/MTEMegaAlloyBlastSmelter.java | 18 ++- .../production/turbines/MTELargerTurbineBase.java | 5 +- ...chMetaTileEntity_PowerSubStationController.java | 6 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 11 +- .../gregtech/GregtechIndustrialMacerator.java | 9 +- .../gregtech/GregtechIndustrialWiremill.java | 9 +- .../gtnhlanth/common/tileentity/MTEDigester.java | 5 +- .../common/tileentity/MTEDissolutionTank.java | 5 +- .../java/gtnhlanth/common/tileentity/MTELINAC.java | 5 +- .../common/tileentity/MTESourceChamber.java | 6 +- .../common/tileentity/MTESynchrotron.java | 6 +- .../common/tileentity/MTETargetChamber.java | 7 +- .../java/gtnhlanth/util/DescTextLocalization.java | 1 + .../tileentities/MTELapotronicSuperCapacitor.java | 3 +- .../common/tileentities/MTESOFuelCellMK1.java | 3 +- .../common/tileentities/MTESOFuelCellMK2.java | 3 +- .../kekztech/common/tileentities/MTETankTFFT.java | 5 +- src/main/java/kubatech/api/Variables.java | 2 + .../gregtech/multiblock/MTEDEFusionCrafter.java | 10 +- .../multiblock/MTEExtremeEntityCrusher.java | 9 +- .../multiblock/MTEExtremeIndustrialGreenhouse.java | 14 +- .../multiblock/MTEMegaIndustrialApiary.java | 19 +-- .../gregtech/multiblock/eigmodes/EIGIC2Mode.java | 5 +- .../multiblock/eigmodes/EIGNormalMode.java | 5 +- .../java/tectech/thing/item/ItemEuMeterGT.java | 10 +- .../metaTileEntity/multi/MTEActiveTransformer.java | 7 +- .../thing/metaTileEntity/multi/MTEDataBank.java | 6 +- .../metaTileEntity/multi/MTEEnergyInfuser.java | 4 +- .../metaTileEntity/multi/MTEEyeOfHarmony.java | 60 +++++--- .../thing/metaTileEntity/multi/MTEForgeOfGods.java | 22 ++- .../thing/metaTileEntity/multi/MTEMicrowave.java | 4 +- .../metaTileEntity/multi/MTENetworkSwitch.java | 4 +- .../metaTileEntity/multi/MTEQuantumComputer.java | 4 +- .../metaTileEntity/multi/MTEResearchStation.java | 7 +- .../thing/metaTileEntity/multi/MTETeslaTower.java | 5 +- .../multi/base/TTMultiblockBase.java | 6 +- .../multi/godforge_modules/MTEBaseModule.java | 2 - .../multi/godforge_modules/MTEExoticModule.java | 9 +- .../multi/godforge_modules/MTEMoltenModule.java | 9 +- .../multi/godforge_modules/MTEPlasmaModule.java | 9 +- .../multi/godforge_modules/MTESmeltingModule.java | 9 +- .../resources/assets/bartworks/lang/de_DE.lang | 2 - .../resources/assets/bartworks/lang/en_US.lang | 4 +- .../resources/assets/bartworks/lang/fr_FR.lang | 2 - .../resources/assets/bartworks/lang/zh_CN.lang | 2 - src/main/resources/assets/gregtech/lang/en_US.lang | 5 +- src/main/resources/assets/tectech/lang/en_US.lang | 4 - src/main/resources/assets/tectech/lang/zh_CN.lang | 4 - 215 files changed, 529 insertions(+), 986 deletions(-) create mode 100644 src/main/java/gregtech/api/util/StringUtils.java diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java index d3b2aa804b..477089ff21 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static bartworks.util.BWUtil.ofGlassTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; @@ -153,9 +152,7 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase implements I protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Bacterial Vat") - .addInfo("Controller block for the Bacterial Vat") .addInfo("For maximum efficiency boost keep the Output Hatch always half filled!") - .addSeparator() .beginStructureBlock(5, 4, 5, false) .addController("Front bottom center") .addCasingInfoMin("Clean Stainless Steel Casings", 19, false) @@ -169,7 +166,7 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase implements I .addInputHatch("Any casing", 1) .addOutputHatch("Any casing", 1) .addEnergyHatch("Any casing", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java index 63558feb8b..324d041efc 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static bartworks.util.BWUtil.ofGlassTieredMixed; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.HatchElement.Energy; @@ -64,7 +63,6 @@ import bartworks.API.modularUI.BWUITextures; import bartworks.API.recipe.BartWorksRecipeMaps; import bartworks.system.material.CircuitGeneration.BWMetaItems; import bartworks.system.material.CircuitGeneration.CircuitImprintLoader; -import bartworks.util.BWTooltipReference; import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; @@ -158,32 +156,22 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Transformer") - .addInfo("Controller block for the Manual Trafo") .addInfo("Operates in 4 diffrent modes:") .addInfo("Mode 1: Circuit 0 in controller: Direct-Upstep") .addInfo("Mode 2: Circuit 1 in controller: Direct-Downstep") .addInfo("Mode 3: Circuit 2 in controller: Tapped-Upstep (currently disabled)") .addInfo("Mode 4: Circuit 2 in controller: Tapped-Downstep (currently disabled)") - .addSeparator() .beginVariableStructureBlock(3, 3, 3, 10, 3, 3, false) .addController("Front bottom center") .addCasingInfoMin("MV Machine Casing", 0, false) @@ -144,11 +141,12 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase { .addMaintenanceHatch("Any bottom layer casing", 1) .addEnergyHatch("Any bottom layer casing", 1) .addDynamoHatch("Any top layer casing", 2) - .addStructureInfo("---------TAPPED MODE---------") + .addStructureInfo("") + .addStructureInfo("Tapped Mode :") .addEnergyHatch("Touching Transformer-Winding Blocks", 3) .addDynamoHatch("Touching Transformer-Winding Blocks", 3) .addStructureInfo("Hatches touching Transformer-Winding Blocks must be tiered from bottom to top") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java index 04a0b86feb..850884a97c 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; @@ -132,7 +131,6 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Windmill") - .addInfo("Controller block for the Windmill") .addInfo("A primitive Grinder powered by Kinetic energy") .addInfo("Speed and output will be affected by wind speed, recipe and rotor") .addInfo("Please use the Primitive Rotor") .addInfo("Macerates 16 items at a time") - .addInfo("The structure is too complex!") - .addInfo("Follow the StructureLib hologram projector to build the main structure.") - .addSeparator() .beginStructureBlock(7, 12, 7, false) .addController("Front bottom center") .addCasingInfoMin("Hardened Clay block", 40, false) .addOtherStructurePart("Dispenser", "Any Hardened Clay block") .addOtherStructurePart("0-1 Wooden door", "Any Hardened Clay block") .addStructureHint("Primitive Kinetic Shaftbox", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java index 337154953a..7a5e361c8d 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; import static gregtech.api.enums.HatchElement.*; @@ -172,7 +171,6 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Furnace") - .addInfo("Controller block for the Mega Blast Furnace") .addInfo("You can use some fluids to reduce recipe time. Place the circuit in the Input Bus") .addInfo("Each 900K over the min. Heat required reduces power consumption by 5% (multiplicatively)") .addInfo("Each 1800K over the min. Heat allows for an overclock to be upgraded to a perfect overclock.") @@ -189,7 +187,6 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase + EnumChatFormatting.GRAY + " Laser Hatches.") .addPollutionAmount(20 * this.getPollutionPerTick(null)) - .addSeparator() .beginStructureBlock(15, 20, 15, true) .addController("3rd layer center") .addCasingInfoRange("Heat Proof Machine Casing", 0, 279, false) @@ -206,7 +203,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase .addStructureInfo("Recovery amount scales with Muffler Hatch tier") .addOutputHatch("Platline fluids, Any bottom layer casing") .addStructureHint("This Mega Multiblock is too big to have its structure hologram displayed fully.") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java index f1620abebc..2adcae3003 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -71,9 +70,8 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Distillery") - .addInfo("Controller block for the Distillation Tower") .addInfo("Fluids are only put out at the correct height") .addInfo("The correct height equals the slot number in the NEI recipe") - .addSeparator() .beginVariableStructureBlock(15, 15, 16, 56, 15, 15, true) .addController("Front bottom") .addOtherStructurePart("Clean Stainless Steel Machine Casing", "15 x h - 5 (minimum)") @@ -274,7 +271,7 @@ public class MTEMegaDistillTower extends MegaMultiBlockBase .addOutputHatch("2-11x Output Hatches (One per Output Layer except bottom layer)") .addStructureInfo("An \"Output Layer\" consists of 5 layers!") .addStructureHint("The interior of this Mega Multiblock's hologram is empty, it should be all air.") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java index 88159bc2a8..951903cc56 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; @@ -142,7 +141,6 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Cracker") - .addInfo("Controller block for the Mega Oil Cracking") .addInfo("Thermally cracks heavy hydrocarbons into lighter fractions") .addInfo("More efficient than the Chemical Reactor") .addInfo("Gives different benefits whether it hydro or steam-cracks:") @@ -160,7 +158,6 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp + "Tech" + EnumChatFormatting.GRAY + " Laser Hatches.") - .addSeparator() .beginStructureBlock(13, 7, 9, true) .addController("Front bottom") .addStructureInfo("The glass tier limits the Energy Input tier") @@ -171,7 +168,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp .addOutputHatch("Hint block", 2, 3) .addInputHatch("Steam/Hydrogen ONLY, Hint block", 4) .addInputBus("Optional, for programmed circuit automation. Hint block", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java index 753e6a2d7e..83251ee40d 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis.mega; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -235,7 +234,6 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Assembling Line") - .addInfo("Controller block for the Advanced Assembling Line") .addInfo("Built exactly the same as standard Assembling Line") .addInfo("Assembling Line with item pipelining") .addInfo("All fluids are however consumed at start") @@ -321,7 +319,6 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase + " * total laser overclock count)") .addInfo(EnumChatFormatting.BOLD + "Will not overclock beyond 1 tick.") .addInfo("EU/t is (number of slices working) * (overclocked EU/t)") - .addSeparator() .beginVariableStructureBlock(5, 16, 4, 4, 3, 3, false) .addStructureInfo("From Bottom to Top, Left to Right") .addStructureInfo( @@ -338,7 +335,7 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase .addInputHatch("Any layer 1 casing", 3) .addOutputBus("Replaces Input Bus on final slice or on any solid steel casing on layer 1", 4) .addOtherStructurePart("Data Access Hatch", "Optional, next to controller", 2) - .toolTipFinisher(GGConstants.GGMARK); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java index 36c4605dfc..9380ea349a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java @@ -307,7 +307,6 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase tList, TileEntity tTileEntity, Block tBlock) { tList.add( - "----- X: " + EnumChatFormatting.AQUA + EnumChatFormatting.STRIKETHROUGH + "-----" + + EnumChatFormatting.RESET + + " X: " + + EnumChatFormatting.AQUA + formatNumbers(aX) + EnumChatFormatting.RESET + " Y: " @@ -3321,7 +3324,9 @@ public class GTUtility { + EnumChatFormatting.AQUA + aWorld.provider.dimensionId + EnumChatFormatting.RESET - + " -----"); + + " " + + EnumChatFormatting.STRIKETHROUGH + + "-----"); try { tList.add( GTUtility.trans("162", "Name: ") + EnumChatFormatting.BLUE diff --git a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java index dd142fdf9f..5b858a426a 100644 --- a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java +++ b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java @@ -8,6 +8,8 @@ import java.util.List; import java.util.stream.IntStream; import java.util.stream.Stream; +import javax.annotation.Nullable; + import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -15,6 +17,8 @@ import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; import com.gtnewhorizon.structurelib.StructureLibAPI; +import gregtech.GTMod; + /** * This makes it easier to build multi tooltips, with a standardized format.
* Info section order should be:
@@ -42,17 +46,6 @@ public class MultiblockTooltipBuilder { private static final String TAB = " "; private static final String COLON = ": "; private static final String SEPARATOR = ", "; - - private final List iLines; - private final List sLines; - private final List hLines; - private final SetMultimap hBlocks; - - private String[] iArray; - private String[] sArray; - private String[] hArray; - - // Localized tooltips private static final String TT_machineType = StatCollector.translateToLocal("GT5U.MBTT.MachineType"); private static final String TT_dimensions = StatCollector.translateToLocal("GT5U.MBTT.Dimensions"); private static final String TT_hollow = StatCollector.translateToLocal("GT5U.MBTT.Hollow"); @@ -73,12 +66,24 @@ public class MultiblockTooltipBuilder { private static final String TT_hold = StatCollector.translateToLocal("GT5U.MBTT.Hold"); private static final String TT_todisplay = StatCollector.translateToLocal("GT5U.MBTT.Display"); private static final String TT_structurehint = StatCollector.translateToLocal("GT5U.MBTT.StructureHint"); - private static final String TT_mod = StatCollector.translateToLocal("GT5U.MBTT.Mod"); + private static final String TT_addedBy = StatCollector.translateToLocal("GT5U.MBTT.Mod"); private static final String TT_air = StatCollector.translateToLocal("GT5U.MBTT.Air"); + private static final String TT_StructureComplex = StatCollector.translateToLocal("GT5U.MBTT.Structure.Complex"); + private static final String TT_SeeStructure1 = StatCollector.translateToLocal("GT5U.MBTT.Structure.SeeStructure1"); + private static final String TT_SeeStructure2 = StatCollector.translateToLocal("GT5U.MBTT.Structure.SeeStructure2"); private static final String[] TT_dots = IntStream.range(0, 16) .mapToObj(i -> StatCollector.translateToLocal("structurelib.blockhint." + i + ".name")) .toArray(String[]::new); + private List iLines; + private List sLines; + private List hLines; + private SetMultimap hBlocks; + + private String[] iArray; + private String[] sArray; + private String[] hArray; + public MultiblockTooltipBuilder() { iLines = new LinkedList<>(); sLines = new LinkedList<>(); @@ -117,20 +122,38 @@ public class MultiblockTooltipBuilder { * @param infoStrings The lines to be added. * @return Instance this method was called on. */ - public MultiblockTooltipBuilder addInfoAll(String... infoStrings) { iLines.addAll(Arrays.asList(infoStrings)); return this; } /** - * Add a separator line like this:
- * ----------------------------------------- + * Add a separator line * * @return Instance this method was called on. */ public MultiblockTooltipBuilder addSeparator() { - iLines.add("-----------------------------------------"); + switch (GTMod.gregtechproxy.separatorStyle) { + case 0 -> iLines.add(" "); + case 1 -> iLines.add(EnumChatFormatting.GRAY + StringUtils.getRepetitionOf('-', 41)); + default -> iLines.add( + EnumChatFormatting.GRAY.toString() + EnumChatFormatting.STRIKETHROUGH + + StringUtils.getRepetitionOf('-', 41)); + } + return this; + } + + /** + * Add a colored separator line with specified length + * + * @return Instance this method was called on. + */ + public MultiblockTooltipBuilder addLineSeparator(EnumChatFormatting color, int length) { + if (GTMod.gregtechproxy.separatorStyle == 1) { + iLines.add(color + StringUtils.getRepetitionOf('-', length)); + } else { + iLines.add(color.toString() + EnumChatFormatting.STRIKETHROUGH + StringUtils.getRepetitionOf('-', length)); + } return this; } @@ -142,6 +165,7 @@ public class MultiblockTooltipBuilder { * @return Instance this method was called on. */ public MultiblockTooltipBuilder addPollutionAmount(int pollution) { + if (pollution == 0) return this; iLines.add( TT_causes + COLON + EnumChatFormatting.DARK_PURPLE + pollution + " " + EnumChatFormatting.GRAY + TT_pps); return this; @@ -652,6 +676,36 @@ public class MultiblockTooltipBuilder { return this; } + /** + * Add a colored separator line with specified length to structure info.
+ * + * @return Instance this method was called on. + */ + public MultiblockTooltipBuilder addStructureInfoLineSeparator(EnumChatFormatting color, int length) { + if (GTMod.gregtechproxy.separatorStyle == 1) { + sLines.add(color + StringUtils.getRepetitionOf('-', length)); + } else { + sLines.add(color.toString() + EnumChatFormatting.STRIKETHROUGH + StringUtils.getRepetitionOf('-', length)); + } + return this; + } + + /** + * Add a separator line to structure info.
+ * + * @return Instance this method was called on. + */ + public MultiblockTooltipBuilder addStructureInfoSeparator() { + switch (GTMod.gregtechproxy.separatorStyle) { + case 0 -> sLines.add(" "); + case 1 -> sLines.add(EnumChatFormatting.GRAY + StringUtils.getRepetitionOf('-', 30)); + default -> sLines.add( + EnumChatFormatting.GRAY.toString() + EnumChatFormatting.STRIKETHROUGH + + StringUtils.getRepetitionOf('-', 30)); + } + return this; + } + /** * Use this method to add non-standard structural info.
* (indent)info @@ -691,12 +745,36 @@ public class MultiblockTooltipBuilder { /** * Call at the very end.
- * Adds a final line with the mod name and information on how to display the structure guidelines.
+ * Adds a line jump.
+ * Adds information on how to display the structure guidelines.
+ * Adds credit for creators of this multi, if any.
+ *

* Ends the building process. * - * @param mod Name of the mod that adds this multiblock machine + * @param authors Formatted names of the creators of this multiblock machine - if any */ - public MultiblockTooltipBuilder toolTipFinisher(String mod) { + public MultiblockTooltipBuilder toolTipFinisher(@Nullable String... authors) { + iLines.add(" "); + return toolTipFinisher0(authors); + } + + /** + * Call at the very end.
+ * Adds a line jump with configurable color and length.
+ * Adds information on how to display the structure guidelines.
+ * Adds credit for creators of this multi, if any.
+ *

+ * Ends the building process. + * + * @param authors Formatted names of the creators of this multiblock machine - if any + */ + public MultiblockTooltipBuilder toolTipFinisher(EnumChatFormatting separatorColor, int separatorLength, + @Nullable String... authors) { + this.addLineSeparator(separatorColor, separatorLength); + return toolTipFinisher0(authors); + } + + private MultiblockTooltipBuilder toolTipFinisher0(@Nullable String... authors) { iLines.add( TT_hold + " " + EnumChatFormatting.BOLD @@ -705,8 +783,42 @@ public class MultiblockTooltipBuilder { + EnumChatFormatting.GRAY + " " + TT_todisplay); - iLines.add(TT_mod + COLON + EnumChatFormatting.GREEN + mod + EnumChatFormatting.GRAY); + if (authors != null && authors.length > 0) { + final String authorTag = "Author: "; + final StringBuilder sb = new StringBuilder(); + sb.append(TT_addedBy); + sb.append(COLON); + for (int i = 0; i < authors.length; i++) { + String author = authors[i]; + if (author.startsWith(authorTag)) { + // to support all the values in GTValues + // that already have Author at the start + sb.append(author.substring(authorTag.length())); + } else { + sb.append(author); + } + if (i != authors.length - 1) { + sb.append(EnumChatFormatting.RESET); + sb.append(EnumChatFormatting.GRAY); + sb.append(" & "); + sb.append(EnumChatFormatting.GREEN); + } + } + iLines.add(sb.toString()); + } hLines.add(TT_structurehint); + sLines.add(" "); + sLines.add(EnumChatFormatting.WHITE + TT_StructureComplex); + sLines.add( + EnumChatFormatting.WHITE + TT_SeeStructure1 + + EnumChatFormatting.BLUE + + " Structure" + + EnumChatFormatting.DARK_BLUE + + "Lib " + + EnumChatFormatting.RESET + + EnumChatFormatting.WHITE + + TT_SeeStructure2); + // create the final arrays iArray = iLines.toArray(new String[0]); sArray = sLines.toArray(new String[0]); // e.getKey() - 1 because 1 dot is meta 0. @@ -717,6 +829,11 @@ public class MultiblockTooltipBuilder { .stream() .map(e -> TT_dots[e.getKey() - 1] + COLON + String.join(SEPARATOR, e.getValue()))) .toArray(String[]::new); + // free memory + iLines = null; + sLines = null; + hLines = null; + hBlocks = null; return this; } diff --git a/src/main/java/gregtech/api/util/StringUtils.java b/src/main/java/gregtech/api/util/StringUtils.java new file mode 100644 index 0000000000..74c11f9ae4 --- /dev/null +++ b/src/main/java/gregtech/api/util/StringUtils.java @@ -0,0 +1,13 @@ +package gregtech.api.util; + +import java.util.Arrays; + +public class StringUtils { + + public static String getRepetitionOf(char c, int length) { + final char[] chars = new char[length]; + Arrays.fill(chars, c); + return new String(chars); + } + +} 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 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") .addStructureInfo(EnumChatFormatting.GOLD + "171" + EnumChatFormatting.GRAY + " Stellar Alloy Frame Box") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 2 + EnumChatFormatting.GRAY) .addStructureInfo( EnumChatFormatting.GOLD + "148" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 3 + EnumChatFormatting.GRAY) .addStructureInfo( EnumChatFormatting.GOLD + "228" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") .addStructureInfo(EnumChatFormatting.GOLD + "84" + EnumChatFormatting.GRAY + " Stellar Alloy Frame Box") .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo( "Requires " + EnumChatFormatting.GOLD + "1" @@ -436,8 +431,7 @@ public class MTENanoForge extends MTEExtendedPowerMultiBlockBase i + "+" + EnumChatFormatting.GRAY + " output busses.") - .addStructureInfo("--------------------------------------------") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorBlueWeabo); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java index b84640c7da..32651313a3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilCracker.java @@ -113,7 +113,6 @@ public class MTEOilCracker extends MTEEnhancedMultiBlockBase impl protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Cracker") - .addInfo("Controller block for the Oil Cracking Unit") .addInfo("Thermally cracks heavy hydrocarbons into lighter fractions") .addInfo("More efficient than the Chemical Reactor") .addInfo("Gives different benefits whether it hydro or steam-cracks:") @@ -121,7 +120,6 @@ public class MTEOilCracker extends MTEEnhancedMultiBlockBase impl .addInfo("Steam - Outputs 50% more cracked fluid") .addInfo("(Values compared to cracking in the Chemical Reactor)") .addInfo("Place the appropriate circuit in the controller or an input bus") - .addSeparator() .beginStructureBlock(5, 3, 3, true) .addController("Front center") .addCasingInfoRange("Clean Stainless Steel Machine Casing", 18, 21, false) @@ -135,7 +133,7 @@ public class MTEOilCracker extends MTEEnhancedMultiBlockBase impl .addStructureInfo("Input/Output Hatches must be on opposite sides!") .addInputBus("Any middle ring casing, optional for programmed circuit automation") .addStructureHint("GT5U.cracker.io_side") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java index 721097d1c4..8e1c170fb4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java @@ -121,13 +121,11 @@ public abstract class MTEOilDrillBase extends MTEDrillerBase implements IMetrics final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Pump") - .addInfo("Controller Block for the Oil/Gas/Fluid Drilling Rig " + (tierSuffix != null ? tierSuffix : "")) .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks") .addInfo("Use a Screwdriver to configure range") .addInfo("Use Programmed Circuits to ignore near exhausted oil field") .addInfo("If total circuit # is greater than output amount it will halt. If it worked right.") // doesn't // work - .addSeparator() .beginStructureBlock(3, 7, 3, false) .addController("Front bottom") .addOtherStructurePart(casings, "form the 3x1x3 Base") @@ -137,7 +135,7 @@ public abstract class MTEOilDrillBase extends MTEDrillerBase implements IMetrics .addMaintenanceHatch("Any base casing", 1) .addInputBus("Mining Pipes or Circuits, optional, any base casing", 1) .addOutputHatch("Any base casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillInfinite.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillInfinite.java index 25870cc798..c722c819b1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillInfinite.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillInfinite.java @@ -28,9 +28,7 @@ public class MTEOilDrillInfinite extends MTEOilDrillBase { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Pump") - .addInfo("Controller Block for the Infinite Oil/Gas/Fluid Drilling Rig ") .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks") - .addSeparator() .beginStructureBlock(3, 7, 3, false) .addController("Front bottom") .addOtherStructurePart(casings, "form the 3x1x3 Base") @@ -40,7 +38,7 @@ public class MTEOilDrillInfinite extends MTEOilDrillBase { .addMaintenanceHatch("Any base casing", 1) .addInputBus("Mining Pipes or Circuits, optional, any base casing", 1) .addOutputHatch("Any base casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java index 116ab720f9..13a7396b8b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOreDrillingPlantBase.java @@ -613,7 +613,6 @@ public abstract class MTEOreDrillingPlantBase extends MTEDrillerBase implements final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); final int baseCycleTime = calculateMaxProgressTime(getMinTier()); tt.addMachineType("Miner") - .addInfo("Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : "")) .addInfo("Use a Screwdriver to configure block radius") .addInfo("Maximum radius is " + GTUtility.formatNumbers((long) getRadiusInChunks() << 4) + " blocks") .addInfo("Use Soldering iron to turn off chunk mode") @@ -625,7 +624,6 @@ public abstract class MTEOreDrillingPlantBase extends MTEDrillerBase implements .addInfo( "Base cycle time: " + (baseCycleTime < 20 ? GTUtility.formatNumbers(baseCycleTime) + " ticks" : GTUtility.formatNumbers(baseCycleTime / 20) + " seconds")) - .addSeparator() .beginStructureBlock(3, 7, 3, false) .addController("Front bottom") .addOtherStructurePart(casings, "form the 3x1x3 Base") @@ -636,7 +634,7 @@ public abstract class MTEOreDrillingPlantBase extends MTEDrillerBase implements .addInputBus("Mining Pipes, optional, any base casing", 1) .addInputHatch("Drilling Fluid, any base casing", 1) .addOutputBus("Any base casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java index 21c913e486..db564e9db4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java @@ -843,7 +843,6 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Circuit Board Fabricator") - .addInfo("Controller for the PCB Factory") .addInfo( EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD + "IMPORTANT!" @@ -860,9 +859,7 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase .addInfo("Liquid Cooling uses 10 L/s of distilled water and enables default overclocks.") .addInfo("Thermosink uses 10 L/s of Super Coolant and enables perfect overclocks.") .addInfo("Trace size can be changed to modify the material usage and machine speed.") - .addInfo(AuthorBlueWeabo) .beginStructureBlock(30, 38, 13, false) - .addSeparator() .addMaintenanceHatch(EnumChatFormatting.GOLD + "1", 1) .addEnergyHatch( EnumChatFormatting.GOLD + "1" @@ -956,7 +953,7 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase .addStructureInfo(EnumChatFormatting.GOLD + "8" + EnumChatFormatting.GRAY + " Superconducting Coil Block") .addStructureInfo(EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY + " Tungstensteel Pipe Casing") .addStructureInfo(EnumChatFormatting.GOLD + "48" + EnumChatFormatting.GRAY + " Infinity Cooled Casing") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorBlueWeabo); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java index 5f45139e1e..69a9401288 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java @@ -618,10 +618,7 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Coke Oven") - .addInfo("Controller block for the Pyrolyse Oven") .addInfo("Industrial Charcoal producer") .addInfo("Processing speed scales linearly with Coil tier:") .addInfo("CuNi: 50%, FeAlCr: 100%, Ni4Cr: 150%, TPV: 200%, etc.") .addInfo("EU/t is not affected by Coil tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(5, 4, 5, true) .addController("Front center") .addCasingInfoRange("Pyrolyse Oven Casing", 60, 80, false) @@ -114,7 +112,7 @@ public class MTEPyrolyseOven extends MTEEnhancedMultiBlockBase .addInputHatch("Center 3x1x3 area in top layer", 2) .addOutputBus("Any bottom layer casing", 1) .addOutputHatch("Any bottom layer casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java index 292cfe9a78..d0262198fa 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTETranscendentPlasmaMixer.java @@ -120,13 +120,11 @@ public class MTETranscendentPlasmaMixer extends MTEEnhancedMultiBlockBase { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Vacuum Freezer") - .addInfo("Controller Block for the Vacuum Freezer") .addInfo("Cools hot ingots and cells") - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfoRange("Frost Proof Machine Casing", 16, 24, false) @@ -67,7 +65,7 @@ public class MTEVacuumFreezer extends MTECubicMultiBlockBase { .addOutputHatch("Any casing", 1) .addInputBus("Any casing", 1) .addOutputBus("Any casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java index 5438f3daa5..8d47092c02 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java @@ -4,7 +4,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.GTValues.V; import static gregtech.api.enums.GTValues.VN; import static gregtech.api.enums.HatchElement.InputBus; @@ -32,6 +31,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -933,7 +933,6 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase data = new ArrayList<>(Arrays.asList(super.getInfoData())); - data.add("-----------------------"); + data.add(EnumChatFormatting.STRIKETHROUGH + "-----------------------"); data.add("Wormhole Generator Info"); if (mStructureBadGlassTier) { data.add("§cStructure errors:§r"); - - if (mStructureBadGlassTier) { - data.add("§cGlass tier must be greater than or equal to the energy hatch tiers.§r"); - } + data.add("§cGlass tier must be greater than or equal to the energy hatch tiers.§r"); } if (mLink == null) { @@ -1049,7 +1042,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase 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 diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index 172881ebd8..c63fe0fd2a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -2,24 +2,17 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CuttingFactoryController; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCuttingMachine; public class GregtechIndustrialCuttingFactory { public static void run() { - Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); - run1(); - - } - - private static void run1() { - // Industrial Wire Factory Multiblock GregtechItemList.Industrial_CuttingFactoryController.set( new MTEIndustrialCuttingMachine( Industrial_CuttingFactoryController.ID, "industrialcuttingmachine.controller.tier.01", - "Cutting Factory Controller").getStackForm(1L)); + "Industrial Cutting Factory").getStackForm(1L)); } + } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index a53a63b377..617b1c525c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -2,23 +2,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MacerationStack; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMacerator; public class GregtechIndustrialMacerator { public static void run() { - Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); - run1(); - } - - private static void run1() { - // Industrial Maceration Stack Multiblock GregtechItemList.Industrial_MacerationStack.set( new MTEIndustrialMacerator( Industrial_MacerationStack.ID, "industrialmacerator.controller.tier.single", - "Maceration Stack Controller").getStackForm(1L)); + "Industrial Maceration Stack").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index ca6e0db141..6f5c4da96e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -2,23 +2,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WireFactory; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWireMill; public class GregtechIndustrialWiremill { public static void run() { - Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); - run1(); - } - - private static void run1() { - // Industrial Wire Factory Multiblock GregtechItemList.Industrial_WireFactory.set( new MTEIndustrialWireMill( Industrial_WireFactory.ID, "industrialwiremill.controller.tier.single", - "Wire Factory Controller").getStackForm(1L)); + "Industrial Wire Factory").getStackForm(1L)); } } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java b/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java index 9e1fc65c1b..d6bf06a4e9 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTEDigester.java @@ -206,10 +206,7 @@ public class MTEDigester extends MTEEnhancedMultiBlockBase implemen protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Digester") - .addInfo("Controller block for the Digester") .addInfo("Input ores and fluid, output water.") - .addInfo(DescTextLocalization.BLUEPRINT_INFO) - .addSeparator() .addController("Front bottom") .addInputHatch("Hint block with dot 1") .addInputBus("Hint block with dot 1") @@ -217,7 +214,7 @@ public class MTEDigester extends MTEEnhancedMultiBlockBase implemen .addOutputBus("Hint block with dot 1") .addMaintenanceHatch("Hint block with dot 1") .addMufflerHatch("Hint block with dot 1") - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java b/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java index 7d5a64b579..1031d05dba 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTEDissolutionTank.java @@ -236,18 +236,15 @@ public class MTEDissolutionTank extends MTEEnhancedMultiBlockBase implements ISu .addInfo("Use a lower temperature coolant to improve output focus") .addInfo("Output energy does not scale for input energies higher than 7500 keV") // .addInfo("Extendable, with a minimum length of 18 blocks") - .addInfo(DescTextLocalization.BLUEPRINT_INFO) .addInfo(DescTextLocalization.BEAMLINE_SCANNER_INFO) .addInfo("Valid Coolants:"); @@ -197,7 +196,6 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase implements ISu } tt.addInfo("Requires (length + 1)kL/s of coolant") - .addSeparator() .beginVariableStructureBlock(7, 7, 7, 7, 19, 83, false) .addController("Front bottom") .addCasingInfoRange(LanthItemList.SHIELDED_ACCELERATOR_CASING.getLocalizedName(), 325, 1285, false) @@ -213,8 +211,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase implements ISu .addOutputHatch(addDotText(2)) .addOtherStructurePart("Beamline Input Hatch", addDotText(3)) .addOtherStructurePart("Beamline Output Hatch", addDotText(4)) - - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java index 3c1984171f..8fb94d505c 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java @@ -12,7 +12,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_A import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_GLOW; import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static gtnhlanth.util.DescTextLocalization.BLUEPRINT_INFO; import static gtnhlanth.util.DescTextLocalization.addDotText; import java.util.ArrayList; @@ -125,11 +124,8 @@ public class MTESourceChamber extends MTEEnhancedMultiBlockBase im protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Particle Accelerator") - .addInfo("Controller block for the Synchrotron") .addInfo("Torus-shaped, accelerates electrons to produce high-energy electromagnetic radiation,") .addInfo("in the form of photons") .addInfo("Antenna Casings can be one of two tiers, upgrade them to improve output rate and energy scaling") .addInfo("Minimum input focus: " + MIN_INPUT_FOCUS) - .addInfo(DescTextLocalization.BLUEPRINT_INFO) .addInfo(DescTextLocalization.BEAMLINE_SCANNER_INFO) .addInfo("Use a lower temperature coolant to improve output focus") @@ -513,7 +511,6 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase im } tt.addInfo("Requires 32 kL/s of coolant") - .addSeparator() .beginStructureBlock(36, 7, 34, true) .addController("Front middle") .addCasingInfoExactly(LanthItemList.SHIELDED_ACCELERATOR_CASING.getLocalizedName(), 676, false) @@ -528,8 +525,7 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase im .addInputHatch(addDotText(4)) .addOutputHatch(addDotText(5)) .addEnergyHatch(addDotText(6)) - - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java index 12be87754b..ffc16fddf0 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java @@ -13,7 +13,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_A import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_GLOW; import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static gtnhlanth.util.DescTextLocalization.BLUEPRINT_INFO; import static gtnhlanth.util.DescTextLocalization.addDotText; import java.util.ArrayList; @@ -183,12 +182,8 @@ public class MTETargetChamber extends MTEEnhancedMultiBlockBase implemen .addInfo("Note on hatch locking:") .addInfo("Use an Integrated Circuit in the GUI slot to limit which fluid is output.") .addInfo("The index of a stored fluid can be obtained through the Tricorder.") - .addSeparator() .beginVariableStructureBlock(5, 5, 5, 15, 5, 5, false) .addController("Top Center") .addCasingInfoMin("T.F.F.T Casing", MIN_CASING_AMOUNT, false) @@ -354,7 +353,7 @@ public class MTETankTFFT extends MTEEnhancedMultiBlockBase implemen .addStructureInfo("Use MIOH with conduits or fluid storage busses to see all fluids at once.") .addSubChannelUsage("field", "Maximum Field Tier") .addSubChannelUsage("height", "Height of structure") - .toolTipFinisher("KekzTech"); + .toolTipFinisher(); return tt; } @@ -544,7 +543,7 @@ public class MTETankTFFT extends MTEEnhancedMultiBlockBase implemen "Maintenance Status: " + ((getRepairStatus() == getIdealStatus()) ? EnumChatFormatting.GREEN + "Working perfectly" + EnumChatFormatting.RESET : EnumChatFormatting.RED + "Has Problems" + EnumChatFormatting.RESET)); - ll.add("---------------------------------------------"); + ll.add(EnumChatFormatting.STRIKETHROUGH + "---------------------------------------------"); return ll.toArray(new String[0]); } diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java index ee17a1a1b1..3b59d35ba1 100644 --- a/src/main/java/kubatech/api/Variables.java +++ b/src/main/java/kubatech/api/Variables.java @@ -29,6 +29,7 @@ import kubatech.api.utils.StringUtils; public class Variables { + @Deprecated // use GTValues.authorkuba public static final String Author = "Author: " + StringUtils.applyRainbow("kuba6000", 0, EnumChatFormatting.BOLD.toString()); @@ -46,6 +47,7 @@ public class Variables { return b.toString(); } + @Deprecated public static final String StructureHologram = "To see the structure, use a " + EnumChatFormatting.BLUE + "Structure" + EnumChatFormatting.DARK_BLUE diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java index 22098fb788..a361bf7108 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java @@ -19,8 +19,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_GLOW; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static kubatech.api.Variables.StructureHologram; -import static kubatech.api.Variables.buildAuthorList; import java.util.Arrays; import java.util.List; @@ -38,6 +36,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -49,7 +48,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; -import kubatech.Tags; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.loaders.BlockLoader; import kubatech.loaders.DEFCRecipes; @@ -140,13 +138,9 @@ public class MTEDEFusionCrafter extends KubaTechGTMultiBlockBase str = new ArrayList<>(Arrays.asList(super.getInfoData())); - str.add(GOLD + "---------------- Control Block Statistics ----------------"); + str.add( + GOLD.toString() + STRIKETHROUGH + + "-------------" + + RESET + + GOLD + + " Control Block Statistics " + + STRIKETHROUGH + + "-------------"); if (spacetimeCompressionFieldMetadata < 0) { str.add("Spacetime Compression Field Grade: None"); } else { @@ -1586,12 +1588,26 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, + RESET + ")"); } - str.add(GOLD + "----------------- Internal Storage ----------------"); + str.add( + GOLD.toString() + STRIKETHROUGH + + "-----------------" + + RESET + + GOLD + + " Internal Storage " + + STRIKETHROUGH + + "----------------"); validFluidMap.forEach( (key, value) -> str.add(BLUE + key.getLocalizedName() + RESET + " : " + RED + formatNumbers(value))); str.add(BLUE + "Astral Array Fabricators" + RESET + " : " + RED + formatNumbers(astralArrayAmount)); if (recipeRunning) { - str.add(GOLD + "---------------------- Other Stats ---------------"); + str.add( + GOLD.toString() + STRIKETHROUGH + + "-----------------" + + RESET + + GOLD + + " Other Stats " + + STRIKETHROUGH + + "-----------------"); str.add("Recipe Success Chance: " + RED + formatNumbers(100 * successChance) + RESET + "%"); str.add("Recipe Yield: " + RED + formatNumbers(100 * yield) + RESET + "%"); str.add( @@ -1637,7 +1653,7 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, str.add("Estimated EU/t: " + RED + toStandardForm(euPerTick) + RESET + " EU/t"); } - str.add(GOLD + "-----------------------------------------------------"); + str.add(GOLD.toString() + STRIKETHROUGH + "-----------------------------------------------------"); return str.toArray(new String[0]); } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java index 5157987628..30173ef91f 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java @@ -118,7 +118,6 @@ import tectech.thing.metaTileEntity.multi.godforge_modules.MTEExoticModule; import tectech.thing.metaTileEntity.multi.godforge_modules.MTEMoltenModule; import tectech.thing.metaTileEntity.multi.godforge_modules.MTEPlasmaModule; import tectech.thing.metaTileEntity.multi.godforge_modules.MTESmeltingModule; -import tectech.util.CommonValues; public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, ISurvivalConstructable { @@ -195,10 +194,8 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, protected static final String STRUCTURE_PIECE_SECOND_RING_AIR = "second_ring_air"; protected static final String STRUCTURE_PIECE_THIRD_RING = "third_ring"; protected static final String STRUCTURE_PIECE_THIRD_RING_AIR = "third_ring_air"; - private static final String SCANNER_INFO_BAR = EnumChatFormatting.BLUE + private static final String SCANNER_INFO_BAR = EnumChatFormatting.BLUE.toString() + EnumChatFormatting.STRIKETHROUGH + "--------------------------------------------"; - private static final String TOOLTIP_BAR = EnumChatFormatting.AQUA - + "--------------------------------------------------------------------------"; private static final ItemStack STELLAR_FUEL = Avaritia.isModLoaded() ? getModItem(Avaritia.ID, "Resource", 1, 8) : GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 1); @@ -3068,9 +3065,9 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Stellar Forge") .addInfo(EnumChatFormatting.ITALIC + "Also known as Godforge or Gorge for short.") - .addInfo(TOOLTIP_BAR) - .addInfo("Controller block for the Godforge, a massive structure harnessing the thermal,") - .addInfo("gravitational and kinetic energy of a stabilised neutron star for material processing.") + .addLineSeparator(EnumChatFormatting.AQUA, 74) + .addInfo("A massive structure harnessing the thermal, gravitational and") + .addInfo("kinetic energy of a stabilised neutron star for material processing.") .addInfo( "This multiblock can house " + EnumChatFormatting.RED + "up to 16 modules " @@ -3078,7 +3075,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, + "which utilize the star to energize materials") .addInfo("to varying degrees, ranging from regular smelting to matter degeneration.") .addInfo("EU requirements for all modules are handled via wireless energy directly.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo( "This multiblock has an " + EnumChatFormatting.GOLD + "extensive upgrade tree " @@ -3096,14 +3093,12 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, + EnumChatFormatting.GRAY + "These upgrades can be unlocked by reaching") .addInfo("certain milestones and/or spending materials.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo( EnumChatFormatting.GREEN + "Clicking on the logo in the controller gui opens an extensive information window,") .addInfo("explaining everything there is to know about this multiblock.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(127, 29, 186, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( "Total blocks needed for the structure with " + EnumChatFormatting.DARK_PURPLE + "1" @@ -3201,12 +3196,11 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, + " Graviton Flow Modulator") .addStructureInfo( EnumChatFormatting.GOLD + "36" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Input Hatch") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Output Bus (ME)") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Input Bus") - .addStructureInfo("--------------------------------------------") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java index f8f0ad2cbe..63be95eaa5 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEMicrowave.java @@ -46,7 +46,6 @@ import tectech.thing.metaTileEntity.multi.base.LedStatus; import tectech.thing.metaTileEntity.multi.base.Parameters; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -232,7 +231,6 @@ public class MTEMicrowave extends TTMultiblockBase implements IConstructable { // with a Parametrizer .addInfo(translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.5")) // (Do not insert a // Wither) - .addSeparator() .beginStructureBlock(5, 4, 5, true) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfoMin(translateToLocal("tt.keyword.Structure.StainlessSteelCasing"), 60, false) // 60x @@ -256,7 +254,7 @@ public class MTEMicrowave extends TTMultiblockBase implements IConstructable { // outer casing // on the // bottom layer - .toolTipFinisher(CommonValues.THETA_MOVEMENT); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java index 690aed254f..40ef11bfe0 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java @@ -35,7 +35,6 @@ import tectech.thing.metaTileEntity.multi.base.LedStatus; import tectech.thing.metaTileEntity.multi.base.Parameters; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -209,7 +208,6 @@ public class MTENetworkSwitch extends TTMultiblockBase implements IConstructable // distribute computation .addInfo(translateToLocal("gt.blockmachines.multimachine.em.switch.desc.2")) // Needs a Parametrizer to // be configured - .addSeparator() .beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.1.name"), 0, false) // 0x Computer Casing @@ -230,7 +228,7 @@ public class MTENetworkSwitch extends TTMultiblockBase implements IConstructable .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyComputerCasing"), 1) // Maintenance // Hatch: Any // Computer Casing - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java index 787a8f4ea5..ebf96e26a6 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java @@ -354,8 +354,6 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon // computation (and heat) .addInfo(translateToLocal("gt.blockmachines.multimachine.em.computer.desc.2")) // Use screwdriver to toggle // wireless mode - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginVariableStructureBlock(2, 2, 4, 4, 5, 16, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.certain.tier.07.name"), @@ -394,7 +392,7 @@ public class MTEQuantumComputer extends TTMultiblockBase implements ISurvivalCon // or // last // slice - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java index f797304fa6..2c5e5105cf 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java @@ -72,7 +72,6 @@ import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; import tectech.thing.metaTileEntity.hatch.MTEHatchObjectHolder; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -276,8 +275,6 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.research.type")) // Machine Type: Research // Station, Scanner - .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.0")) // Controller block of - // the Research Station .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.1")) // Used to scan Data // Sticks for // Assembling Line Recipes @@ -288,8 +285,6 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon // the Data Stick is written .addInfo(translateToLocal("gt.blockmachines.multimachine.em.research.desc.4")) // Use screwdriver to change // mode - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginStructureBlock(3, 7, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.holder.tier.09.name"), @@ -313,7 +308,7 @@ public class MTEResearchStation extends TTMultiblockBase implements ISurvivalCon // backside // of the // main body - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java index 505f93c357..7aa31d9dc4 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java @@ -79,7 +79,6 @@ import tectech.thing.metaTileEntity.multi.base.LedStatus; import tectech.thing.metaTileEntity.multi.base.Parameters; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstructable, ITeslaConnectable { @@ -550,8 +549,6 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc // Windings need to // be at least the same tier as // the Tesla Capacitor - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginStructureBlock(7, 17, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.capacitor.tier.03.name"), @@ -564,7 +561,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc // Hatch: Any // outer Tesla // Base Casing - .toolTipFinisher(CommonValues.THETA_MOVEMENT); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index e2825f3824..d5d5a92ad3 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -377,10 +377,8 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase