diff options
| author | Alexdoru <57050655+Alexdoru@users.noreply.github.com> | 2024-10-14 14:46:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-14 12:46:59 +0000 |
| commit | e6c8d35894d561e6aea1cfb7450f00a70c9e01d8 (patch) | |
| tree | 700dec83ddcd7f7b9b8f0b90cad30cc2cb33b38f /src | |
| parent | d3a4a52483aa8b069925dc55fd680f965b59f133 (diff) | |
| download | GT5-Unofficial-e6c8d35894d561e6aea1cfb7450f00a70c9e01d8.tar.gz GT5-Unofficial-e6c8d35894d561e6aea1cfb7450f00a70c9e01d8.tar.bz2 GT5-Unofficial-e6c8d35894d561e6aea1cfb7450f00a70c9e01d8.zip | |
Multi ToolTip unification (#3343)
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
Co-authored-by: GDCloud <gdcloudstrike@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src')
215 files changed, 529 insertions, 986 deletions
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<MTEBioVat> 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<MTEBioVat> 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<MTECircuit @Override protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); - tt.addMachineType("Circuit Assembler/Circuit Assembly Line") - .addInfo("Controller block for the Circuit Assembly Line") + tt.addMachineType("Circuit Assembler") .addInfo("Change Mode with Screwdriver") .addInfo("Does not lose efficiency when overclocked") - .addInfo( - "--------- " + EnumChatFormatting.GOLD - + StatCollector.translateToLocal("chat.cal.mode.0") - + EnumChatFormatting.GRAY - + " --------") + .addSeparator() + .addInfo(EnumChatFormatting.GOLD + StatCollector.translateToLocal("chat.cal.mode.0") + ":") .addInfo("Imprint this machine with a Circuit Imprint,") .addInfo("by putting the imprint in the controller") .addInfo("Every Circuit Assembly Line can only be imprinted ONCE") - .addInfo( - "--------- " + EnumChatFormatting.GOLD - + StatCollector.translateToLocal("chat.cal.mode.1") - + EnumChatFormatting.GRAY - + " --------") + .addSeparator() + .addInfo(EnumChatFormatting.GOLD + StatCollector.translateToLocal("chat.cal.mode.1") + ":") .addInfo( "Does Circuit Assembler recipes, Minimum Length: " + EnumChatFormatting.RED + MINIMUM_CIRCUIT_ASSEMBLER_LENGTH + EnumChatFormatting.GRAY) .addInfo("Recipe tier in Circuit Assembler mode is at most Energy Hatch tier - 1.") .addInfo("This mode supports Crafting Input Buffer/Bus and allows bus separation") - .addInfo("") - .addSeparator() - .addInfo(BWTooltipReference.TT_BLUEPRINT) .beginVariableStructureBlock(2, 7, 3, 3, 3, 3, false) .addStructureInfo("From Bottom to Top, Left to Right") .addStructureInfo( @@ -205,7 +193,7 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase<MTECircuit .addOutputBus("As specified in final slice on layer 1", 4) .addOtherStructurePart(getColoredTierNameFromTier((byte) 4) + "+ Tier Glass", "As specified on layer 2", 5) .addMaintenanceHatch("Any layer 1 casing", 2) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java b/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java index b9ab023dae..68988e52fa 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java @@ -13,7 +13,6 @@ package bartworks.common.tileentities.multis; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static gregtech.api.enums.GTValues.VN; import java.lang.reflect.Field; @@ -115,8 +114,7 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase { "Heats up " + (long) (this.mTier * 24 * (double) MTEDeepEarthHeatingPump.nulearHeatMod) * 20 + "L/s Coolant(minus 10% per Maintenance Problem)"); } - tt.addSeparator() - .beginStructureBlock(3, 7, 3, false) + tt.beginStructureBlock(3, 7, 3, false) .addController("Front bottom") .addOtherStructurePart(casings, "form the 3x1x3 Base") .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)") @@ -128,7 +126,7 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase { .addInputBus("Mining Pipes, optional, any base casing") .addInputHatch("Any base casing") .addOutputHatch("Any base casing") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java index dcb1a7586e..0cbdb70aa5 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java @@ -14,7 +14,6 @@ package bartworks.common.tileentities.multis; import static bartworks.common.loaders.ItemRegistry.BW_BLOCKS; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTWORKS; import static bartworks.util.BWTooltipReference.TT; import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; @@ -265,14 +264,12 @@ public class MTEElectricImplosionCompressor extends MTEExtendedPowerMultiBlockBa MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Implosion Compressor") .addInfo("Explosions are fun") - .addInfo("Controller block for the Electric Implosion Compressor") .addInfo("Uses electricity instead of Explosives") .addInfo("Can parallel up to 4^(Tier - 1)") .addInfo("Tier is determined by containment block") .addInfo("Valid blocks: Neutronium, Infinity, Transcendent Metal, Spacetime, Universium") .addInfo("Minimum allowed energy hatch tier is one below recipe tier") .addInfo("Supports " + TT + " energy hatches") - .addSeparator() .beginStructureBlock(3, 9, 3, false) .addController("Front 3rd layer center") .addCasingInfoMin("Solid Steel Machine Casing", 8, false) @@ -285,7 +282,7 @@ public class MTEElectricImplosionCompressor extends MTEExtendedPowerMultiBlockBa .addInputHatch("Any bottom casing", 1) .addOutputBus("Any bottom casing", 1) .addEnergyHatch("Bottom middle and/or top middle", 2) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java index 22143ad543..2fbc1a9562 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java @@ -10,7 +10,6 @@ package bartworks.common.tileentities.multis; import static bartworks.API.recipe.BartWorksRecipeMaps.htgrFakeRecipes; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_VIA_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; @@ -27,7 +26,6 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -143,8 +141,6 @@ public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase<MTEHi protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Breeder Reactor") - .addInfo("Controller block for the High Temperature Gas-cooled Reactor (HTGR)") - .addInfo(AuthorKuba) .addInfo("You can clear internal buffer by changing the mode with a screwdriver") .addInfo("Needs a constant supply of coolant while running") .addInfo("Needs at least 72k Fuel pebbles to start operation (can hold up to 720k pebbles)") @@ -155,7 +151,6 @@ public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase<MTEHi "Reactor will take 4 000L/s of coolant multiplied by efficiency and by fuel coolant value (check tooltips)") .addInfo("Uses " + GTUtility.formatNumbers(powerUsage) + " EU/t") .addInfo("One Operation takes 1 hour") - .addSeparator() .beginStructureBlock(11, 12, 11, true) .addController("Front bottom center") .addCasingInfoMin("Europium Reinforced Radiation Proof Casings", 500, false) @@ -166,7 +161,7 @@ public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase<MTEHi .addOutputHatch("Any bottom layer casing", 1) .addEnergyHatch("Any bottom layer casing", 1) .addMaintenanceHatch("Any bottom layer casing", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_VIA_BARTWORKS.apply(EnumChatFormatting.GOLD + "kuba6000")); + .toolTipFinisher(AuthorKuba); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java b/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java index d6306badee..9c51659b78 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java @@ -14,7 +14,6 @@ package bartworks.common.tileentities.multis; import static bartworks.common.loaders.ItemRegistry.BW_BLOCKS; -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; @@ -129,13 +128,11 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase<MTEManualTrafo> { 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<MTEManualTrafo> { .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<MTEThor protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("High Temperature Reactor") - .addInfo("Controller block for the Thorium High Temperature Reactor (THTR)") .addInfo("Needs to be primed with " + GTUtility.formatNumbers(HELIUM_NEEDED) + " of helium") .addInfo("Needs a constant supply of coolant while running") .addInfo("Needs at least 100k Fuel pebbles to start operation (can hold up to 675k pebbles)") @@ -141,7 +139,6 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase<MTEThor .addInfo("Reactor will take 4 800L/t of coolant multiplied by efficiency") .addInfo("Uses " + GTUtility.formatNumbers(powerUsage) + " EU/t") .addInfo("One Operation takes 9 hours") - .addSeparator() .beginStructureBlock(11, 12, 11, true) .addController("Front bottom center") .addCasingInfoMin("Radiation Proof Casings", 500, false) @@ -152,7 +149,7 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase<MTEThor .addOutputHatch("Any bottom layer casing", 1) .addEnergyHatch("Any bottom layer casing", 1) .addMaintenanceHatch("Any bottom layer casing", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.java b/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.java index 23b865da2b..b6636f97c3 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.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.ofBlockAnyMeta; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; @@ -187,21 +186,17 @@ public class MTEWindmill extends MTEEnhancedMultiBlockBase<MTEWindmill> 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<MTEMegaBlastFurnace> 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<MTEMegaBlastFurnace> + 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<MTEMegaBlastFurnace> .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<MTEMegaChemicalRe public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Chemical Reactor") - .addInfo("Controller block for the Chemical Reactor") - .addInfo("What molecule do you want to synthesize") - .addInfo("Or you want to replace something in this molecule") + .addInfo("What molecule do you want to synthesize ?") + .addInfo("Or you want to replace something in this molecule ?") .addInfo( GTValues.TIER_COLORS[8] + GTValues.VN[8] + EnumChatFormatting.GRAY @@ -84,9 +82,6 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase<MTEMegaChemicalRe + "Tech" + EnumChatFormatting.GRAY + " Laser Hatches.") - .addInfo("The structure is too complex!") - .addInfo("Follow the Structure Lib hologram projector to build the main structure.") - .addSeparator() .beginStructureBlock(5, 5, 9, false) .addController("Front center") .addStructureInfo("46x Chemically Inert Machine Casing (minimum)") @@ -100,7 +95,7 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase<MTEMegaChemicalRe .addInputBus("Hint block ", 1) .addOutputBus("Hint block ", 1) .addOutputHatch("Hint block ", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java index 112205efe7..dec5ff55da 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.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.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -260,10 +259,8 @@ public class MTEMegaDistillTower extends MegaMultiBlockBase<MTEMegaDistillTower> 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<MTEMegaDistillTower> .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<MTEMegaOilCracker> 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<MTEMegaOilCracker> 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<MTEMegaOilCracker> 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<MTEMegaVacuumFreeze protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Vacuum Freezer") - .addInfo("Controller Block for the Mega Vacuum Freezer") .addInfo("Cools hot ingots and cells") .addSeparator() .addInfo("Upgrade to Tier 2 to unlock " + EnumChatFormatting.LIGHT_PURPLE + "Subspace Cooling.") @@ -281,7 +279,6 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase<MTEMegaVacuumFreeze EnumChatFormatting.LIGHT_PURPLE + "enabling the capture of heat energy in miniature tears in spacetime,") .addInfo(EnumChatFormatting.LIGHT_PURPLE + "massively increasing the efficiency of the cooling process.") - .addSeparator() .beginStructureBlock(15, 15, 15, true) .addController("Front center") .addEnergyHatch("Any Frost Proof Machine Casing", 1) @@ -324,7 +321,7 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase<MTEMegaVacuumFreeze 384, EnumChatFormatting.GOLD, false) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/bartworks/util/BWTooltipReference.java b/src/main/java/bartworks/util/BWTooltipReference.java index 1c9e32e5e6..74b1afe326 100644 --- a/src/main/java/bartworks/util/BWTooltipReference.java +++ b/src/main/java/bartworks/util/BWTooltipReference.java @@ -40,6 +40,7 @@ public class BWTooltipReference { public static final String MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS = MULTIBLOCK_ADDED_VIA_BARTWORKS .apply(GREEN + "bartimaeusnek"); + @Deprecated public static final String TT_BLUEPRINT = "To see the structure, use a " + TT + " Blueprint on the Controller!"; } diff --git a/src/main/java/bwcrossmod/galacticgreg/MTEVoidMinerBase.java b/src/main/java/bwcrossmod/galacticgreg/MTEVoidMinerBase.java index 3744d26aa4..8e5b4a7521 100644 --- a/src/main/java/bwcrossmod/galacticgreg/MTEVoidMinerBase.java +++ b/src/main/java/bwcrossmod/galacticgreg/MTEVoidMinerBase.java @@ -13,7 +13,6 @@ package bwcrossmod.galacticgreg; -import static bartworks.util.BWTooltipReference.MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS; import static gregtech.api.enums.GTValues.VN; import static gregtech.api.enums.HatchElement.Energy; import static gregtech.api.enums.HatchElement.InputBus; @@ -135,7 +134,6 @@ public abstract class MTEVoidMinerBase extends MTEDrillerBase { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Miner") - .addInfo("Controller Block for the Void Miner " + GTValues.VN[this.getMinTier()]) .addInfo("Consumes " + GTValues.V[this.getMinTier()] + "EU/t") .addInfo( "Can be supplied with 2L/s of Neon(x4), Krypton(x8), Xenon(x16) or Oganesson(x64) for higher outputs.") @@ -149,7 +147,6 @@ public abstract class MTEVoidMinerBase extends MTEDrillerBase { + "VOIDED" + EnumChatFormatting.RESET + ".") - .addSeparator() .beginStructureBlock(3, 7, 3, false) .addController("Front bottom") .addOtherStructurePart(casings, "form the 3x1x3 Base") @@ -162,7 +159,7 @@ public abstract class MTEVoidMinerBase extends MTEDrillerBase { .addInputBus("Mining Pipes or Ores, optional, any base casing") .addInputHatch("Optional noble gas, any base casing") .addOutputBus("Any base casing") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java index a21896e8ee..79da529aeb 100644 --- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -55,7 +55,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { protected final int mCosts; - static final String CHAT_MSG_SEPARATOR = "--------------------"; + static final String CHAT_MSG_SEPARATOR = EnumChatFormatting.STRIKETHROUGH + "--------------------"; public BehaviourDetravToolProspector(int aCosts) { mCosts = aCosts; diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java index 5d89311a37..c3cf42146f 100644 --- a/src/main/java/ggfab/mte/MTEAdvAssLine.java +++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java @@ -66,7 +66,6 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; import ggfab.ConfigurationHandler; -import ggfab.GGConstants; import ggfab.mui.ClickableTextWidget; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; @@ -308,7 +307,6 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine> 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<MTEAdvAssLine> + " * 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<MTEAdvAssLine> .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<AntimatterFo + "+0.10" + EnumChatFormatting.GRAY) .addInfo("Each stabilization can only use one of the fluids at a time") - .addSeparator() .addCasingInfoMin("Antimatter Containment Casing", 512, false) .addCasingInfoMin("Magnetic Flux Casing", 2274, false) .addCasingInfoMin("Gravity Stabilization Casing", 623, false) @@ -315,7 +314,7 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo .addInputHatch("1-6, Hint block with dot 1", 1) .addEnergyHatch("1-9, Hint block with dot 2", 2) .addOtherStructurePart("Antimatter Hatch", "16, Hint Block with dot 3", 3) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java index 9925ff7529..92b9539bf8 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java @@ -351,7 +351,6 @@ public class AntimatterGenerator extends MTEExtendedPowerMultiBlockBase .addInfo("Enable wireless EU mode with screwdriver") .addInfo("Wireless mode requires SC UMV Base or better") .addInfo("Wireless mode uses hatch capacity limit") - .addSeparator() .addCasingInfoMin("Transcendentally Reinforced Borosilicate Glass", 1008, false) .addCasingInfoMin("Magnetic Flux Casing", 4122, false) .addCasingInfoMin("Gravity Stabilization Casing", 2418, false) @@ -361,7 +360,7 @@ public class AntimatterGenerator extends MTEExtendedPowerMultiBlockBase .addCasingInfoMin("Advanced Filter Casing", 209, false) .addInputHatch("2, Hint block with dot 1", 1) .addOtherStructurePart("Laser Source Hatch", "1-64, Hint Block with dot 2", 2) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java index 6485f0769a..5d17832cb5 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java @@ -1,7 +1,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.HatchElement.*; import static gregtech.api.enums.Textures.BlockIcons.*; @@ -214,7 +213,6 @@ public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTE protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("High-Capacity Component Assembler") - .addInfo("Controller block for the Component Assembly Line.") .addInfo("Assembles basic components (motors, pumps, etc.) in large batches.") .addInfo( "The " + EnumChatFormatting.BOLD @@ -234,24 +232,14 @@ public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTE + " laser and multi-amp hatches!") .addInfo("Supports overclocking beyond MAX!") .addInfo(EnumChatFormatting.ITALIC + "Much more efficient than other competing brands!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .beginStructureBlock(9, 10, 33, false) - .addStructureInfo("This structure is too complex! See schematic for details.") .addOtherStructurePart("Borosilicate Glass", "Can be UV tier or higher") .addInputBus("Start of conveyor belt", 1) .addOutputBus("End of conveyor belt", 2) .addEnergyHatch("Second-top layer", 3) .addMaintenanceHatch("Around the controller", 4) .addInputHatch("Bottom left and right corners", 5) - .toolTipFinisher( - EnumChatFormatting.AQUA + "MadMan310" - + EnumChatFormatting.GRAY - + " via " - + EnumChatFormatting.GREEN - + "Good Generator"); - + .toolTipFinisher(EnumChatFormatting.AQUA + "MadMan310"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java index b9c03aef0c..82747e895d 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java @@ -1,7 +1,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GTStructureUtility.*; import static gregtech.api.util.GTUtility.validMTEList; @@ -107,14 +106,11 @@ public class MTECoolantTower extends MTETooltipMultiBlockBaseEM implements ICons protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Coolant Tower") - .addInfo("Controller block for the Coolant Tower.") .addInfo("Turn Steam back to Distilled Water.") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .addController("Mid of the second layer.") .addInputHatch("Input Hatch", 1) .addOutputHatch("Output Hatch", 1) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java index 45f5bafca1..9a251daf36 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java @@ -1,7 +1,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.GTValues.V; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; @@ -205,12 +204,9 @@ public class MTEExtremeHeatExchanger extends MTETooltipMultiBlockBaseEM protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Heat Exchanger/Plasma Heat Exchanger") - .addInfo("Controller block for the Extreme Heat Exchanger.") .addInfo("Accept Hot fluid like lava, hot coolant or plasma.") .addInfo("Output SC Steam/SH Steam/Steam.") .addInfo("Check NEI for more info.") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .addController("Front bottom") .addOtherStructurePart("Input Hatch", "distilled water", 1) .addOtherStructurePart("Output Hatch", "SC Steam/SH Steam/Steam", 2) @@ -218,7 +214,7 @@ public class MTEExtremeHeatExchanger extends MTETooltipMultiBlockBaseEM .addOtherStructurePart("Output Hatch", "Cold fluid", 4) .addMaintenanceHatch("Any Casing", 1, 2, 5) .addCasingInfoMin("Robust Tungstensteel Machine Casings", 25, false) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java index f855a864a6..e7ba056ad7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.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 goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; @@ -181,20 +180,16 @@ public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Naquadah Fuel Refinery") - .addInfo("Controller block for the Naquadah Fuel Refinery") .addInfo("But at what cost?") .addInfo("Produces naquadah fuels.") .addInfo("Needs field restriction coils to control the fatal radiation.") .addInfo("Use higher tier coils to unlock more fuel types and reduce the processing times.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .beginStructureBlock(3, 15, 15, false) .addInputHatch("The casings adjacent to field restriction glass.") .addInputBus("The casings adjacent to field restriction glass.", 1) .addOutputHatch("The casings adjacent to field restriction glass.", 1) .addEnergyHatch("The casings adjacent to field restriction glass.", 1) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java index bff8da6fa2..1546a85383 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java @@ -1,7 +1,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -466,20 +465,16 @@ public class MTELargeEssentiaGenerator extends MTETooltipMultiBlockBaseEM protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Essentia Generator") - .addInfo("Controller block for the Large Essentia Generator") .addInfo("Maybe some Thaumaturges are upset by it. . .") .addInfo("Transform Essentia into energy!") .addInfo("The Diffusion Cell determines the highest hatch tier that the LEG can accept.") .addInfo("Supports normal Dynamo Hatches or TecTech ones for up to 64A, but no Laser Hatches.") .addInfo("You can find more information about this generator in the Thaumonomicon.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .addMaintenanceHatch("Hint block with dot 1", 1) .addInputHatch("Hint block with dot 1", 1) .addDynamoHatch("Hint block with dot 1", 1) .addOtherStructurePart("Essentia Input Hatch", "Essentia Input", 1) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java index 8b69ee5e0a..54ff09d563 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java @@ -1,7 +1,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Mods.ThaumicBases; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; @@ -193,25 +192,21 @@ public class MTELargeEssentiaSmeltery extends MTETooltipMultiBlockBaseEM protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Essentia Smeltery") - .addInfo("Controller block for the Large Essentia Smeltery") .addInfo("Necessary evil.") .addInfo("Advanced Essentia smelting technology.") .addInfo("Max parallel dictated by structure size and Essentia Diffusion Cell tier") .addInfo("Energy Hatch tier: HV+") .addInfo("You can find more information about this machine in the Thaumonomicon.") .addPollutionAmount(getPollutionPerSecond(null)) - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .addController("Front center") - .addCasingInfo("Magic Casing", 24) + .addCasingInfoMin("Magic Casing", 24, false) .addMaintenanceHatch("Hint block with dot 1") .addInputBus("Hint block with dot 1") .addInputHatch("Hint block with dot 1") .addEnergyHatch("Hint block with dot 1") .addOtherStructurePart("Essentia Output Hatch", "Hint block with dot 1") .addMufflerHatch("Hint block with dot 2") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java index 536ec4b39c..d6bdebf5a0 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java @@ -1,6 +1,5 @@ package goodgenerator.blocks.tileEntity; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1_GLOW; @@ -47,7 +46,6 @@ public class MTELargeFusionComputer1 extends MTELargeFusionComputer { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") - .addInfo("Controller block for the Compact Fusion Reactor MK-I Prototype.") .addInfo( EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY @@ -73,13 +71,10 @@ public class MTELargeFusionComputer1 extends MTELargeFusionComputer { + "Tech" + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("LuV Machine Casing", 1664) - .addCasingInfo("Ameliorated Superconduct Coil", 560) - .addCasingInfo("Naquadah Alloy Frame Boxes", 128) - .addCasingInfo("Rhodium-Plated Palladium Reinforced Borosilicate Glass Block", 63) + .addCasingInfoMin("LuV Machine Casing", 1664, false) + .addCasingInfoMin("Ameliorated Superconduct Coil", 560, false) + .addCasingInfoMin("Naquadah Alloy Frame Boxes", 128, false) + .addCasingInfoMin("Rhodium-Plated Palladium Reinforced Borosilicate Glass Block", 63, false) .addEnergyHatch("1-32, Hint block with dot 2", 2) .addInputHatch("1-16, Hint block with dot 1", 1) .addOutputHatch("1-16, Hint block with dot 1", 1) @@ -88,7 +83,7 @@ public class MTELargeFusionComputer1 extends MTELargeFusionComputer { "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java index e8840d6446..d185538bdf 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java @@ -1,6 +1,5 @@ package goodgenerator.blocks.tileEntity; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION2; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION2_GLOW; @@ -47,7 +46,6 @@ public class MTELargeFusionComputer2 extends MTELargeFusionComputer { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") - .addInfo("Controller block for the Compact Fusion Reactor MK-II.") .addInfo( EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY @@ -74,13 +72,10 @@ public class MTELargeFusionComputer2 extends MTELargeFusionComputer { + "Tech" + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("Fusion Machine Casing", 1664) - .addCasingInfo("Compact Fusion Coil", 560) - .addCasingInfo("Duranium Frame Box", 128) - .addCasingInfo("Iridium Reinforced Borosilicate Glass Block", 63) + .addCasingInfoMin("Fusion Machine Casing", 1664, false) + .addCasingInfoMin("Compact Fusion Coil", 560, false) + .addCasingInfoMin("Duranium Frame Box", 128, false) + .addCasingInfoMin("Iridium Reinforced Borosilicate Glass Block", 63, false) .addEnergyHatch("1-32, Hint block with dot 2", 2) .addInputHatch("1-16, Hint block with dot 1", 1) .addOutputHatch("1-16, Hint block with dot 1", 1) @@ -89,7 +84,7 @@ public class MTELargeFusionComputer2 extends MTELargeFusionComputer { "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java index 94d98c3484..cd9a21eb73 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java @@ -1,6 +1,5 @@ package goodgenerator.blocks.tileEntity; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION3; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION3_GLOW; @@ -47,7 +46,6 @@ public class MTELargeFusionComputer3 extends MTELargeFusionComputer { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") - .addInfo("Controller block for the Compact Fusion Reactor MK-III.") .addInfo( EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY @@ -75,13 +73,10 @@ public class MTELargeFusionComputer3 extends MTELargeFusionComputer { + "Tech" + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("Fusion Machine Casing MK II", 1664) - .addCasingInfo("Advanced Compact Fusion Coil", 560) - .addCasingInfo("Neutronium Frame Box", 128) - .addCasingInfo("Osmium Reinforced Borosilicate Glass Block", 63) + .addCasingInfoMin("Fusion Machine Casing MK II", 1664, false) + .addCasingInfoMin("Advanced Compact Fusion Coil", 560, false) + .addCasingInfoMin("Neutronium Frame Box", 128, false) + .addCasingInfoMin("Osmium Reinforced Borosilicate Glass Block", 63, false) .addEnergyHatch("1-32, Hint block with dot 2", 2) .addInputHatch("1-16, Hint block with dot 1", 1) .addOutputHatch("1-16, Hint block with dot 1", 1) @@ -90,7 +85,7 @@ public class MTELargeFusionComputer3 extends MTELargeFusionComputer { "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java index c10747cad0..9520b647e9 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java @@ -1,6 +1,5 @@ package goodgenerator.blocks.tileEntity; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; import net.minecraft.block.Block; @@ -44,7 +43,6 @@ public class MTELargeFusionComputer4 extends MTELargeFusionComputerPP { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Galaxy Collapse.") - .addInfo("Controller block for the Compact Fusion Reactor MK-IV Prototype.") .addInfo( EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY @@ -74,13 +72,10 @@ public class MTELargeFusionComputer4 extends MTELargeFusionComputerPP { + "Tech" + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("Fusion Machine Casing MK III", 1664) - .addCasingInfo("Compact Fusion Coil MK-II Prototype", 560) - .addCasingInfo("Infinity Catalyst Frame Box", 128) - .addCasingInfo("Neutronium Reinforced Borosilicate Glass Block", 63) + .addCasingInfoMin("Fusion Machine Casing MK III", 1664, false) + .addCasingInfoMin("Compact Fusion Coil MK-II Prototype", 560, false) + .addCasingInfoMin("Infinity Catalyst Frame Box", 128, false) + .addCasingInfoMin("Neutronium Reinforced Borosilicate Glass Block", 63, false) .addEnergyHatch("1-32, Hint block with dot 2", 2) .addInputHatch("1-16, Hint block with dot 1", 1) .addOutputHatch("1-16, Hint block with dot 1", 1) @@ -89,7 +84,7 @@ public class MTELargeFusionComputer4 extends MTELargeFusionComputerPP { "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java index 8ed9e27f13..6d7d0d4764 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java @@ -1,6 +1,5 @@ package goodgenerator.blocks.tileEntity; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; import net.minecraft.block.Block; @@ -44,7 +43,6 @@ public class MTELargeFusionComputer5 extends MTELargeFusionComputerPP { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Galaxy Collapse.") - .addInfo("Controller block for the Compact Fusion Reactor MK-V.") .addInfo( EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY @@ -75,13 +73,10 @@ public class MTELargeFusionComputer5 extends MTELargeFusionComputerPP { + "Tech" + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("Fusion Machine Casing MK IV", 1664) - .addCasingInfo("Compact Fusion Coil MK-II Finaltype", 560) - .addCasingInfo("Infinity Frame Box", 128) - .addCasingInfo("Cosmic Neutronium Reinforced Borosilicate Glass Block", 63) + .addCasingInfoMin("Fusion Machine Casing MK IV", 1664, false) + .addCasingInfoMin("Compact Fusion Coil MK-II Finaltype", 560, false) + .addCasingInfoMin("Infinity Frame Box", 128, false) + .addCasingInfoMin("Cosmic Neutronium Reinforced Borosilicate Glass Block", 63, false) .addEnergyHatch("1-32, Hint block with dot 2", 2) .addInputHatch("1-16, Hint block with dot 1", 1) .addOutputHatch("1-16, Hint block with dot 1", 1) @@ -90,7 +85,7 @@ public class MTELargeFusionComputer5 extends MTELargeFusionComputerPP { "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java index 6050cdce54..936d0776b7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java @@ -2,7 +2,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.main.GGConfigLoader.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -403,7 +402,6 @@ public class MTEMultiNqGenerator extends MTETooltipMultiBlockBaseEM implements I protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Naquadah Reactor") - .addInfo("Controller block for the Naquadah Reactor") .addInfo("Environmentally Friendly!") .addInfo("Generate power from high-energy liquids.") .addInfo( @@ -430,16 +428,13 @@ public class MTEMultiNqGenerator extends MTETooltipMultiBlockBaseEM implements I .addInfo(String.format("Molten Naquadah | %dx power | 20 L/s", ExcitedLiquidCoe[2])) .addInfo(String.format("Molten Atomic Separation Catalyst | %dx power | 20 L/s", ExcitedLiquidCoe[1])) .addInfo(String.format("Spatially Enlarged Fluid | %dx power | 20 L/s", ExcitedLiquidCoe[0])) - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .beginStructureBlock(7, 8, 7, true) .addController("Front bottom") .addDynamoHatch("Any bottom layer casing, only accept ONE!") .addInputHatch("Any bottom layer casing") .addOutputHatch("Any bottom layer casing") .addMaintenanceHatch("Any bottom layer casing") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java index 97efc45ba7..2935d4b6b4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java @@ -1,7 +1,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gregtech.api.util.GTStructureUtility.ofFrame; @@ -182,7 +181,6 @@ public class MTENeutronActivator extends MTETooltipMultiBlockBaseEM implements I protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Neutron Activator") - .addInfo("Controller block for the Neutron Activator") .addInfo("Superluminal-velocity Motion.") .addInfo("The minimum height of the Speeding Pipe Casing is 4.") .addInfo("Per extra Speeding Pipe Casing will give time discount.") @@ -197,9 +195,6 @@ public class MTENeutronActivator extends MTETooltipMultiBlockBaseEM implements I + EnumChatFormatting.GRAY + ".") .addInfo("Inputting Graphite/Beryllium dust can reduce 10MeV per dust immediately.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .addController("Front bottom") .addInputHatch("Hint block with dot 1") .addInputBus("Hint block with dot 1") @@ -213,7 +208,7 @@ public class MTENeutronActivator extends MTETooltipMultiBlockBaseEM implements I .addCasingInfoMin("Steel Frame Box", 16, false) .addCasingInfoMin("Speeding Pipe Casing", 4, false) .addCasingInfoMin("EV+ Glass", 32, false) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java index cac24ea97c..f732fb76a8 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java @@ -3,7 +3,6 @@ package goodgenerator.blocks.tileEntity; import static bartworks.util.BWTooltipReference.TT; import static bartworks.util.BWUtil.ofGlassTieredMixed; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.HatchElement.*; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.util.GTStructureUtility.ofFrame; @@ -333,7 +332,6 @@ public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreci protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Precise Assembler/Assembler") - .addInfo("Controller block for the Precise Assembler") .addInfo("The error is no more than 7nm.") .addInfo("Can assemble precise component in Precise Mode.") .addInfo("Can work like a normal assembler in Normal Mode.") @@ -346,9 +344,6 @@ public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreci .addInfo("Imprecise (MK-0) = 16x, MK-I = 32x, MK-II = 64x, MK-III = 128x, MK-IV = 256x") .addInfo("Supports " + TT + " energy hatches") .addPollutionAmount(getPollutionPerSecond(null)) - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .beginStructureBlock(9, 5, 5, true) .addController("Front bottom") .addCasingInfoExactly("Machine Casing", 21, true) @@ -361,7 +356,7 @@ public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreci .addEnergyHatch("Any Casing") .addMufflerHatch("Any Casing") .addMaintenanceHatch("Any Casing") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java index 3c44da9ca3..0a3ec6fc1a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java @@ -142,21 +142,19 @@ public class MTESupercriticalFluidTurbine extends MTELargeTurbineBase { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Supercritical Steam Turbine") - .addInfo("Controller block for Large Supercritical Fluid Turbine") .addInfo("Needs a Turbine, place inside controller") .addInfo("Use Supercritical Steam to generate power.") .addInfo("Outputs 1L of Steam per 1L of SC Steam as well as producing power") .addInfo("Power output depends on turbine and fitting") .addInfo("Use screwdriver to adjust fitting of turbine") - .addSeparator() .beginStructureBlock(3, 3, 4, true) .addController("Front center") - .addCasingInfo("SC Turbine Casing", 24) + .addCasingInfoMin("SC Turbine Casing", 24, false) .addDynamoHatch("Back center", 1) .addMaintenanceHatch("Side centered", 2) .addInputHatch("Supercritical Fluid, Side centered", 2) .addOutputHatch("Superheated Steam, Side centered", 3) - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java index 666c89aa48..9845488e2f 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java @@ -2,7 +2,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.ArrayList; @@ -182,7 +181,6 @@ public class MTEUniversalChemicalFuelEngine extends MTETooltipMultiBlockBaseEM protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Chemical Engine") - .addInfo("Controller block for the Chemical Engine") .addInfo("BURNING BURNING BURNING") .addInfo("Use combustible liquid to generate power.") .addInfo("You need to supply Combustion Promoter to keep it running.") @@ -201,15 +199,12 @@ public class MTEUniversalChemicalFuelEngine extends MTETooltipMultiBlockBaseEM + EnumChatFormatting.GRAY + ".") .addInfo("The efficiency is up to 150%.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .beginStructureBlock(5, 4, 9, false) .addMaintenanceHatch("Hint block with dot 1") .addMufflerHatch("Hint block with dot 2 (fill all slots with mufflers)") .addInputHatch("Hint block with dot 3 (fill all slots with input hatches)") .addDynamoHatch("Hint block with dot 4") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java index ccac1e3fb6..9a304a82d2 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java @@ -1,7 +1,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.util.GTStructureUtility.*; import static net.minecraft.util.StatCollector.translateToLocal; @@ -418,14 +417,10 @@ public class MTEYottaFluidTank extends MTETooltipMultiBlockBaseEM implements ICo protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fluid Tank") - .addInfo("Controller block for the YOTTank.") .addInfo("The max output speed is decided by the amount of stored liquid and the output hatch's capacity.") .addInfo("The max fluid cell tier is limited by the glass tier.") .addInfo("HV glass for T1, EV glass for T2, IV glass for T3. . .") .addInfo("The max height of the cell blocks is 15.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() .beginVariableStructureBlock(5, 5, 1, 15, 5, 5, false) .addController("Front of the second layer") .addCasingInfoExactly("Steel Frame Box", 16, false) @@ -434,7 +429,7 @@ public class MTEYottaFluidTank extends MTETooltipMultiBlockBaseEM implements ICo .addCasingInfoRange("YOTTank Casing", 25, 43, false) .addInputHatch("Hint block with dot 1") .addOutputHatch("Hint block with dot 3") - .toolTipFinisher("Good Generator"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/goodgenerator/util/DescTextLocalization.java b/src/main/java/goodgenerator/util/DescTextLocalization.java index 3470737d6b..8c912c10a9 100644 --- a/src/main/java/goodgenerator/util/DescTextLocalization.java +++ b/src/main/java/goodgenerator/util/DescTextLocalization.java @@ -5,6 +5,7 @@ import net.minecraft.util.StatCollector; public class DescTextLocalization { + @Deprecated public static final String BLUE_PRINT_INFO = "Follow the" + EnumChatFormatting.BLUE + " Structure" + EnumChatFormatting.DARK_BLUE diff --git a/src/main/java/gregtech/api/enums/GTValues.java b/src/main/java/gregtech/api/enums/GTValues.java index 388e2aec76..c91800933f 100644 --- a/src/main/java/gregtech/api/enums/GTValues.java +++ b/src/main/java/gregtech/api/enums/GTValues.java @@ -650,7 +650,7 @@ public class GTValues { + EnumChatFormatting.WHITE + EnumChatFormatting.ITALIC + "Number"; - public static final String Ollie = "" + EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + "Ollie"; + public static final String Ollie = EnumChatFormatting.GREEN.toString() + EnumChatFormatting.BOLD + "Ollie"; public static final String authorBaps = "Author: " + EnumChatFormatting.GOLD + "Ba" + EnumChatFormatting.LIGHT_PURPLE diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index bb31b86ef0..1d75772803 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -3306,7 +3306,10 @@ public class GTUtility { private static void addBaseInfo(EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ArrayList<String> 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. <br> * Info section order should be:<br> @@ -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<String> iLines; - private final List<String> sLines; - private final List<String> hLines; - private final SetMultimap<Integer, String> 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<String> iLines; + private List<String> sLines; + private List<String> hLines; + private SetMultimap<Integer, String> 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:<br> - * ----------------------------------------- + * 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; @@ -653,6 +677,36 @@ public class MultiblockTooltipBuilder { } /** + * Add a colored separator line with specified length to structure info.<br> + * + * @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.<br> + * + * @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.<br> * (indent)info * @@ -691,12 +745,36 @@ public class MultiblockTooltipBuilder { /** * Call at the very end.<br> - * Adds a final line with the mod name and information on how to display the structure guidelines.<br> + * Adds a line jump.<br> + * Adds information on how to display the structure guidelines.<br> + * Adds credit for creators of this multi, if any.<br> + * <p> * 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.<br> + * Adds a line jump with configurable color and length.<br> + * Adds information on how to display the structure guidelines.<br> + * Adds credit for creators of this multi, if any.<br> + * <p> + * 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 @@ -687,6 +687,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 */ public boolean mNEIRecipeSecondMode = true; 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<ItemStack> 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<String> getAdditionalToolTipsWhileSneaking(final MetaBaseItem aItem, final List<String> 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<MTEAssemblyL protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Assembling Line") - .addInfo("Controller block for the Assembling Line") .addInfo("Used to make complex machine parts (LuV+)") .addInfo("Does not make Assembler items") .addInfo("Recipe tier is at most Energy Hatch tier + 1.") - .addSeparator() .beginVariableStructureBlock(5, 16, 4, 4, 3, 3, false) // ? .addStructureInfo("From Bottom to Top, Left to Right") .addStructureInfo( @@ -153,7 +151,7 @@ public class MTEAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTEAssemblyL .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("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEBrickedBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEBrickedBlastFurnace.java index f37b5e3e81..6bd9cb66c8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEBrickedBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEBrickedBlastFurnace.java @@ -70,18 +70,16 @@ public class MTEBrickedBlastFurnace extends MTEPrimitiveBlastFurnace implements if (tooltipBuilder == null) { tooltipBuilder = new MultiblockTooltipBuilder(); tooltipBuilder.addMachineType("Blast Furnace") - .addInfo("Controller Block for the Bricked Blast Furnace") .addInfo("Usable for Steel and general Pyrometallurgy") .addInfo("Has a useful interface, unlike other gregtech multis") .addPollutionAmount(GTMod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond) - .addSeparator() .beginStructureBlock(3, 4, 3, true) .addController("Front center") .addOtherStructurePart("Firebricks", "Everything except the controller") .addStructureInfo("The top block is also empty") .addStructureInfo("You can share the walls of GT multis, so") .addStructureInfo("each additional one costs less, up to 4") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); } return tooltipBuilder; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java index 268ef069a7..bfa672577d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java @@ -245,11 +245,9 @@ public class MTECharcoalPit extends MTETooltipMultiBlockBase implements ISeconda protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Charcoal Pile Igniter") - .addInfo("Controller for the Charcoal Pit") .addInfo("Converts Logs into Brittle Charcoal blocks") .addInfo("Will automatically start when valid") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginVariableStructureBlock(3, 13, 3, 7, 3, 13, false) .addStructureInfo("Can be up to 13x7x13 in size, including the dirt; shape doesn't matter") .addOtherStructurePart("Controller", "Top layer, directly touching a wood log") @@ -259,7 +257,7 @@ public class MTECharcoalPit extends MTETooltipMultiBlockBase implements ISeconda .addStructureInfo("No air between logs allowed.") .addStructureInfo( "All logs must be within 6 x/z of the controller, so it must be dead-center for a full 11x11 square of wood.") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTECleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTECleanroom.java index 99a256e3f8..bf5b6dbb10 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTECleanroom.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTECleanroom.java @@ -87,7 +87,6 @@ public class MTECleanroom extends MTETooltipMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Cleanroom") - .addInfo("Controller block for the Cleanroom") .addInfo("Consumes 40 EU/t when first turned on") .addInfo("and 4 EU/t once at 100% efficiency") .addInfo("If you use an LV energy hatch, it will actually accept 2A instead of just 1A.") @@ -96,7 +95,6 @@ public class MTECleanroom extends MTETooltipMultiBlockBase .addInfo("Time required to reach full efficiency is proportional to") .addInfo("the height of empty space within") .addInfo("Machines that cause pollution aren't allowed to be put in.") - .addSeparator() .beginVariableStructureBlock(3, 15, 4, 15, 3, 15, true) .addController("Top center") .addCasingInfoRange("Plascrete", 20, 1007, false) @@ -113,7 +111,7 @@ public class MTECleanroom extends MTETooltipMultiBlockBase .addStructureInfo("Up to 10 Machine Hulls for Item & Energy transfer through walls") .addStructureInfo("You can also use Diodes for more power") .addStructureInfo("Diodes also count towards 10 Machine Hulls count limit") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfillerBase.java index 2671db1e8c..ce336b62ae 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEConcreteBackfillerBase.java @@ -93,12 +93,10 @@ public abstract class MTEConcreteBackfillerBase extends MTEDrillerBase { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Concrete Backfiller") - .addInfo("Controller Block for the " + aStructureName) .addInfo("Will fill in areas below it with light concrete. This goes through walls") .addInfo("Use it to remove any spawning locations beneath your base to reduce lag") .addInfo("Will pull back the pipes after it finishes that layer") .addInfo("Radius is " + getRadius() + " blocks") - .addSeparator() .beginStructureBlock(3, 7, 3, false) .addController("Front bottom") .addOtherStructurePart(casings, "form the 3x1x3 Base") @@ -109,7 +107,7 @@ public abstract class MTEConcreteBackfillerBase extends MTEDrillerBase { .addInputBus("Mining Pipes, optional, any base casing", 1) .addInputHatch("GT Concrete, any base casing", 1) .addOutputBus("Mining Pipes, optional, any base casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java index 40b1dfd0d8..0003c98876 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDieselEngine.java @@ -97,14 +97,12 @@ public class MTEDieselEngine extends MTEEnhancedMultiBlockBase<MTEDieselEngine> 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<MTEDieselEngine> .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<MTEDistillat 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(3, 3, 3, 12, 3, 3, true) .addController("Front bottom") .addOtherStructurePart("Clean Stainless Steel Machine Casing", "7 x h - 5 (minimum)") @@ -145,7 +143,7 @@ public class MTEDistillationTower extends MTEEnhancedMultiBlockBase<MTEDistillat .addInputHatch("Any bottom layer casing", 1) .addOutputBus("Any bottom layer casing", 1) .addOutputHatch("2-11x Output Hatches (At least one per layer except bottom layer)", 2, 3) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java index 47e4b75cad..cc62dd11de 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java @@ -119,14 +119,12 @@ public class MTEElectricBlastFurnace extends MTEAbstractMultiFurnace<MTEElectric protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Furnace") - .addInfo("Controller block for the Electric 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.") .addInfo("That means the EBF will reduce recipe time by a factor 4 instead of 2 (giving 100% efficiency).") .addInfo("Additionally gives +100K for every tier past MV") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 4, 3, true) .addController("Front bottom") .addCasingInfoRange("Heat Proof Machine Casing", 0, 15, false) @@ -140,7 +138,7 @@ public class MTEElectricBlastFurnace extends MTEAbstractMultiFurnace<MTEElectric .addOutputHatch("Fluid outputs, Any bottom layer casing") .addOutputHatch("Pollution gases (CO2/CO/SO2), Any top layer casing", 1) .addStructureInfo("Pollution gas output amount scales with Muffler Hatch tier") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java index 1d983f90b6..d0ed92d0fc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEExtremeDieselEngine.java @@ -42,14 +42,12 @@ public class MTEExtremeDieselEngine extends MTEDieselEngine { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Combustion Generator") - .addInfo("Controller block for the Extreme Combustion Engine") .addInfo("Supply high rating fuel and 8000L of Lubricant per hour to run") .addInfo("Supply 40L/s of Liquid Oxygen to boost output (optional)") .addInfo("Default: Produces 10900EU/t at 100% fuel efficiency") .addInfo("Boosted: Produces 32700EU/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("Robust Tungstensteel Machine Casing", 16, 22, false) @@ -62,7 +60,7 @@ public class MTEExtremeDieselEngine extends MTEDieselEngine { .addInputHatch("HOG, next to a Gear Box", 1) .addInputHatch("Lubricant, next to a Gear Box", 1) .addInputHatch("Liquid Oxygen, optional, next to a Gear Box", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java index c35761c736..ea9036577a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java @@ -222,11 +222,9 @@ public abstract class MTEFusionComputer extends MTEEnhancedMultiBlockBase<MTEFus MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addController("Fusion Reactor") .addInfo("Some kind of fusion reactor, maybe") - .addSeparator() - .addInfo("Some kind of fusion reactor, maybe") .addStructureInfo("Should probably be built similar to other fusions") .addStructureInfo("See controller tooltip for details") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer1.java index e0976106e5..4490a7c102 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer1.java @@ -78,11 +78,9 @@ public class MTEFusionComputer1 extends MTEFusionComputer { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("It's over 9000!!!") - .addInfo("Controller block for the Fusion Reactor Mk I") .addInfo("2048EU/t and 10M 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") - .addSeparator() .beginStructureBlock(15, 3, 15, false) .addController("See diagram when placed") .addCasingInfoRange("LuV Machine Casing", 79, 123, false) @@ -92,7 +90,7 @@ public class MTEFusionComputer1 extends MTEFusionComputer { .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be LuV or better") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer2.java index ee67b74bf8..8bfdd0c369 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer2.java @@ -78,11 +78,9 @@ public class MTEFusionComputer2 extends MTEFusionComputer { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("It's over 9000!!!") - .addInfo("Controller block for the Fusion Reactor Mk II") .addInfo("8192EU/t and 20M 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") - .addSeparator() .beginStructureBlock(15, 3, 15, false) .addController("See diagram when placed") .addCasingInfoRange("Fusion Machine Casing", 79, 123, false) @@ -92,7 +90,7 @@ public class MTEFusionComputer2 extends MTEFusionComputer { .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be ZPM or better") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer3.java index 3e4f431351..daba3da4d1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer3.java @@ -78,11 +78,9 @@ public class MTEFusionComputer3 extends MTEFusionComputer { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("A SUN DOWN ON EARTH") - .addInfo("Controller block for the Fusion Reactor Mk III") .addInfo("32768EU/t and 40M 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") - .addSeparator() .beginStructureBlock(15, 3, 15, false) .addController("See diagram when placed") .addCasingInfoRange("Fusion Machine Casing Mk II", 79, 123, false) @@ -92,7 +90,7 @@ public class MTEFusionComputer3 extends MTEFusionComputer { .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be UV or better") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEHeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEHeatExchanger.java index 688fa3e706..ab5fcd65f5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEHeatExchanger.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEHeatExchanger.java @@ -108,13 +108,11 @@ public class MTEHeatExchanger extends MTEEnhancedMultiBlockBase<MTEHeatExchanger protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Heat Exchanger") - .addInfo("Controller Block for the Large Heat Exchanger") .addInfo("More complicated than a Fusion Reactor. Seriously") .addInfo("Inputs are Hot Coolant or Lava") .addInfo("Outputs Coolant or Pahoehoe Lava and SH Steam/Steam") .addInfo("Read the wiki article to understand how it works") .addInfo("Then go to the Discord to understand the wiki") - .addSeparator() .beginStructureBlock(3, 4, 3, false) .addController("Front bottom") .addCasingInfoRange("Stable Titanium Machine Casing", 20, 32, false) @@ -124,7 +122,7 @@ public class MTEHeatExchanger extends MTEEnhancedMultiBlockBase<MTEHeatExchanger .addInputHatch("Distilled water, any casing", 1) .addOutputHatch("Cold fluid, top center", 3) .addOutputHatch("Steam/SH Steam, any casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEImplosionCompressor.java index a9c96266da..742ff79ff6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEImplosionCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEImplosionCompressor.java @@ -47,9 +47,7 @@ public class MTEImplosionCompressor extends MTECubicMultiBlockBase<MTEImplosionC final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Implosion Compressor") .addInfo("Explosions are fun") - .addInfo("Controller block for the Implosion Compressor") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfoRange("Solid Steel Machine Casing", 16, 24, false) @@ -59,7 +57,7 @@ public class MTEImplosionCompressor extends MTECubicMultiBlockBase<MTEImplosionC .addMufflerHatch("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/MTEIndustrialBrewery.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialBrewery.java index b0f4b98d46..e7fb810226 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialBrewery.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialBrewery.java @@ -147,11 +147,8 @@ public class MTEIndustrialBrewery extends MTEExtendedPowerMultiBlockBase<MTEIndu protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Brewery") - .addInfo("Controller Block for the Big Barrel Brewery") .addInfo("50% faster than singleblock machines of the same voltage") .addInfo("Gains 4 parallels per voltage tier") - .addInfo(AuthorFourIsTheNumber) - .addSeparator() .beginStructureBlock(3, 5, 3, true) .addController("Front Center") .addCasingInfoMin("Reinforced Wooden Casing", 14, false) @@ -163,7 +160,7 @@ public class MTEIndustrialBrewery extends MTEExtendedPowerMultiBlockBase<MTEIndu .addOutputHatch("Any Wooden Casing", 1) .addEnergyHatch("Any Wooden Casing", 1) .addMaintenanceHatch("Any Wooden Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java index 43c383a102..e0a3178e57 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java @@ -1,7 +1,6 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.GTValues.AuthorFourIsTheNumber; import static gregtech.api.enums.HatchElement.*; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EMS; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_EMS_ACTIVE; @@ -34,6 +33,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.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GTUITextures; @@ -211,19 +211,10 @@ public class MTEIndustrialElectromagneticSeparator protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Electromagnetic Separator/Polarizer") - .addInfo("Controller Block for the Magnetic Flux Exhibitor") .addInfo("Use screwdriver to switch mode") .addInfo("Insert an electromagnet into the electromagnet housing to use") .addInfo("Better electromagnets give further bonuses") .addInfo("With Tengam electromagnet, multiamp (NOT laser) hatches are allowed") - .addInfo( - AuthorFourIsTheNumber + EnumChatFormatting.GRAY - + " & " - + EnumChatFormatting.GOLD - + "Ba" - + EnumChatFormatting.LIGHT_PURPLE - + "ps") - .addSeparator() .beginStructureBlock(7, 6, 7, false) .addController("Front Center") .addCasingInfoMin("MagTech Casings", MIN_CASING, false) @@ -234,7 +225,7 @@ public class MTEIndustrialElectromagneticSeparator .addOutputBus("Any Casing", 1) .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(GTValues.AuthorFourIsTheNumber, GTValues.authorBaps); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialExtractor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialExtractor.java index ae36921870..40a87eecd7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialExtractor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialExtractor.java @@ -163,12 +163,9 @@ public class MTEIndustrialExtractor extends MTEExtendedPowerMultiBlockBase<MTEIn protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Extractor") - .addInfo("Controller Block for the Dissection Apparatus") .addInfo("200% faster than single block machines of the same voltage") .addInfo("Only uses 85% of the EU/t normally required") .addInfo("Gains 8 parallels per tier of Item Pipe Casing") - .addInfo(AuthorFourIsTheNumber) - .addSeparator() .beginStructureBlock(5, 4, 5, true) .addController("Front Center") .addCasingInfoMin("Stainless Steel Machine Casing", 22, false) @@ -177,7 +174,7 @@ public class MTEIndustrialExtractor extends MTEExtendedPowerMultiBlockBase<MTEIn .addOutputBus("Any Stainless Steel Casing", 1) .addEnergyHatch("Any Stainless Steel Casing", 1) .addMaintenanceHatch("Any Stainless Steel Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java index 8efb36a5ed..e8785bc7f4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java @@ -241,7 +241,6 @@ public class MTEIndustrialLaserEngraver extends MTEExtendedPowerMultiBlockBase<M protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Laser Engraver") - .addInfo("Controller Block for the Hyper-Intensity Laser Engraver") .addInfo("200% faster than single block machines of the same voltage") .addInfo("Uses 80% of the EU normally required") .addInfo("Laser source hatch determines maximum recipe tier and parallels") @@ -252,8 +251,6 @@ public class MTEIndustrialLaserEngraver extends MTEExtendedPowerMultiBlockBase<M .addInfo("UMV glass accepts all laser source hatches") .addInfo("Use screwdriver to disable laser rendering") .addInfo("Use wire cutter to toggle realism mode if you hate angled lasers") - .addInfo(AuthorFourIsTheNumber) - .addSeparator() .beginStructureBlock(5, 5, 5, false) .addController("Front Center") .addCasingInfoMin("Laser Containment Casing", 35, false) @@ -267,7 +264,7 @@ public class MTEIndustrialLaserEngraver extends MTEExtendedPowerMultiBlockBase<M .addOutputHatch("Any Casing", 1) .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java index 187bf4ed69..e369126895 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java @@ -187,7 +187,6 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Ore Processor") - .addInfo("Controller Block for the Integrated Ore Factory") .addInfo("It is OP. I mean ore processor.") .addInfo("Do all ore processing in one step.") .addInfo("Can process up to 1024 ores at a time.") @@ -195,7 +194,6 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI .addInfo("Processing time is dependent on mode.") .addInfo("Use a screwdriver to switch mode.") .addInfo("Sneak click with screwdriver to void the stone dust.") - .addSeparator() .beginStructureBlock(6, 12, 11, false) .addController("The third layer") .addStructureInfo("128 Advanced Iridium Plated Machine Casing") @@ -210,7 +208,7 @@ public class MTEIntegratedOreFactory extends MTEExtendedPowerMultiBlockBase<MTEI .addInputHatch("Input lubricant/distilled water/washing chemicals", 3) .addMufflerHatch("Output Pollution", 3) .addOutputBus("Output products", 4) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoiler.java index da7af756de..6f8f2076a6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeBoiler.java @@ -115,8 +115,7 @@ public abstract class MTELargeBoiler extends MTEEnhancedMultiBlockBase<MTELargeB protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); - tt.addMachineType("Boiler") - .addInfo("Controller block for the Large " + getCasingMaterial() + " Boiler"); + tt.addMachineType("Boiler"); // Tooltip differs between the boilers that output Superheated Steam (Titanium and Tungstensteel) and the ones // that do not (Bronze and Steel) if (isSuperheated()) { @@ -142,7 +141,6 @@ public abstract class MTELargeBoiler extends MTEEnhancedMultiBlockBase<MTELargeB "Diesel fuels have 1/4 efficiency - Takes %s seconds to heat up", formatNumbers(500.0 / getEfficiencyIncrease()))) // ? check semifluid again .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 5, 3, false) .addController("Front bottom") .addCasingInfoRange(getCasingMaterial() + " " + getCasingBlockType() + " Casing", 24, 31, false) // ? @@ -155,7 +153,7 @@ public abstract class MTELargeBoiler extends MTEEnhancedMultiBlockBase<MTELargeB .addStructureInfo("You can use either, or both") .addInputHatch("Water, Any firebox", 1) .addOutputHatch("Steam, any casing", 2) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeChemicalReactor.java index 7279bf1107..4f76d46d2d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeChemicalReactor.java @@ -101,10 +101,8 @@ public class MTELargeChemicalReactor extends MTEEnhancedMultiBlockBase<MTELargeC public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Chemical Reactor") - .addInfo("Controller block for the Large Chemical Reactor") .addInfo("Does not lose efficiency when overclocked") .addInfo("Accepts fluids instead of fluid cells") - .addSeparator() .beginStructureBlock(3, 3, 3, false) .addController("Front center") .addCasingInfoRange("Chemically Inert Machine Casing", 8, 22, false) @@ -117,7 +115,7 @@ public class MTELargeChemicalReactor extends MTEEnhancedMultiBlockBase<MTELargeC .addOutputBus("Any casing", 1, 2) .addOutputHatch("Any casing", 1, 2) .addStructureInfo("You can have multiple hatches/busses") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java index 16a89bcb93..fc248564fc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java @@ -272,7 +272,6 @@ public class MTELargeFluidExtractor extends MTEExtendedPowerMultiBlockBase<MTELa // spotless:off tt.addMachineType("Fluid Extractor") - .addInfo("Controller block for the Large Fluid Extractor") .addInfo(String.format( "%d%% faster than single block machines of the same voltage", (int) Math.round((BASE_SPEED_BONUS - 1) * 100) @@ -300,7 +299,6 @@ public class MTELargeFluidExtractor extends MTEExtendedPowerMultiBlockBase<MTELa EnumChatFormatting.GRAY )) .addInfo("The energy hatch tier is limited by the glass tier. UEV glass unlocks all tiers.") - .addSeparator() .beginStructureBlock(5, 9, 5, false) .addController("Front Center (Bottom Layer)") .addCasingInfoMin("Robust Tungstensteel Machine Casing", BASE_CASING_COUNT - MAX_HATCHES_ALLOWED, false) @@ -313,7 +311,7 @@ public class MTELargeFluidExtractor extends MTEExtendedPowerMultiBlockBase<MTELa .addOutputHatch("Any Robust Tungstensteel Machine Casing", 1) .addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1) .addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(); // spotless:on return tt; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java index 50bb13d003..a125b5bf33 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java @@ -56,13 +56,11 @@ public class MTELargeTurbineGas extends MTELargeTurbine { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Gas Turbine") - .addInfo("Controller block for the Large Gas Turbine") .addInfo("Needs a Turbine, place inside controller") .addInfo("Warning: Will be capped at 8192 EU/t in a future update") .addInfo("See the Advanced Large Gas Turbine as the next, uncapped, option") // .addInfo("The excess fuel that gets consumed will be voided!") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfoRange("Stainless Steel Turbine Casing", 8, 30, false) @@ -71,7 +69,7 @@ public class MTELargeTurbineGas extends MTELargeTurbine { .addMufflerHatch("Side centered", 2) .addInputHatch("Gas Fuel, Side centered", 2) .addOtherStructurePart("Air", "3x3 area in front of controller") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java index 0eceb2cf8a..b17c8b325a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -56,13 +57,11 @@ public class MTELargeTurbineGasAdvanced extends MTELargeTurbine { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Gas Turbine") - .addInfo("Warning: This is an experimental multiblock, subject to changes ") - .addInfo("Controller block for the Large Advanced Gas Turbine") + .addInfo(EnumChatFormatting.DARK_RED + "Warning: This is an experimental multiblock, subject to changes ") .addInfo("Needs a Turbine, place inside controller") .addInfo("Only accepts gases above 800k EU/bucket") .addInfo("Has no maximum EU/t output, only depends on the Dynamo Hatch") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfoRange("Advanced Gas Turbine Casing", 8, 30, false) @@ -70,7 +69,7 @@ public class MTELargeTurbineGasAdvanced extends MTELargeTurbine { .addMaintenanceHatch("Side centered", 2) .addMufflerHatch("Side centered", 2) .addInputHatch("Gas Fuel, Side centered", 2) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java index 6b9f555b34..731d6daeb9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java @@ -59,12 +59,10 @@ public class MTELargeTurbineHPSteam extends MTELargeTurbine { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Steam Turbine") - .addInfo("Controller block for the Large High Pressure Steam Turbine") .addInfo("Needs a Turbine, place inside controller") .addInfo("Outputs Steam as well as producing power") .addInfo("Power output depends on turbine and fitting") .addInfo("Use screwdriver to adjust fitting of turbine") - .addSeparator() .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfoRange("Titanium Turbine Casing", 8, 31, false) @@ -72,7 +70,7 @@ public class MTELargeTurbineHPSteam extends MTELargeTurbine { .addMaintenanceHatch("Side centered", 2) .addInputHatch("Superheated Steam, Side centered", 2) .addOutputHatch("Steam, Side centered", 2) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java index 1a8b6c173c..41f3b74c49 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java @@ -59,10 +59,8 @@ public class MTELargeTurbinePlasma extends MTELargeTurbine { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Plasma Turbine") - .addInfo("Controller block for the Large Plasma Turbine") .addInfo("Needs a Turbine, place inside controller") .addInfo("Use your Fusion Reactor to produce the Plasma") - .addSeparator() .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfoRange("Tungstensteel Turbine Casing", 8, 31, false) @@ -70,7 +68,7 @@ public class MTELargeTurbinePlasma extends MTELargeTurbine { .addMaintenanceHatch("Side centered", 2) .addInputHatch("Plasma Fluid, Side centered", 2) .addOutputHatch("Molten Fluid, optional, Side centered", 2) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java index 37b6f281e2..28d8a21e83 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java @@ -60,12 +60,10 @@ public class MTELargeTurbineSteam extends MTELargeTurbine { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Steam Turbine") - .addInfo("Controller block for the Large Steam Turbine") .addInfo("Needs a Turbine, place inside controller") .addInfo("Outputs Distilled Water as well as producing power") .addInfo("Power output depends on turbine and fitting") .addInfo("Use screwdriver to adjust fitting of turbine") - .addSeparator() .beginStructureBlock(3, 3, 4, true) .addController("Front center") .addCasingInfoRange("Turbine Casing", 8, 31, false) @@ -73,7 +71,7 @@ public class MTELargeTurbineSteam extends MTELargeTurbine { .addMaintenanceHatch("Side centered", 2) .addInputHatch("Steam, Side centered", 2) .addOutputHatch("Distilled Water, Side centered", 2) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java index 1d82114ad8..90ee606997 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java @@ -21,7 +21,6 @@ import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gregtech.api.util.GTStructureUtility.ofCoil; import static gregtech.api.util.GTStructureUtility.ofFrame; import static net.minecraft.util.EnumChatFormatting.BLUE; -import static net.minecraft.util.EnumChatFormatting.GOLD; import java.text.DecimalFormat; import java.util.List; @@ -194,22 +193,14 @@ public class MTEMultiAutoclave extends MTEExtendedPowerMultiBlockBase<MTEMultiAu return STRUCTURE_DEFINITION; } - private static final String TOOLTIP_BAR = GOLD - + "---------------------------------------------------------------------------------------"; - @Override protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Autoclave") - .addInfo(TOOLTIP_BAR) - .addInfo("Controller Block for the Industrial Autoclave.") - .addInfo(TOOLTIP_BAR) .addInfo("Processes 12 items per Item Pipe Casing Tier.") .addInfo("Energy consumption is reduced with higher fluid pipe tiers.") .addInfo(BLUE + "Energy consumption = Recipe Consumption * (12 - Pipe Casing Tier) / 12.") .addInfo("Each coil level makes the machine 25% faster than singleblock machines of the same voltage.") - .addInfo(AuthorVolence) - .addSeparator() .beginStructureBlock(7, 7, 9, true) .addController("Front Center") .addCasingInfoMin("Pressure Containment Casings", 128, false) @@ -222,7 +213,7 @@ public class MTEMultiAutoclave extends MTEExtendedPowerMultiBlockBase<MTEMultiAu .addEnergyHatch("Any of the Pressure Containment Casings", 1) .addMaintenanceHatch("Any of the Pressure Containment Casings", 1) .addMufflerHatch("Any of the Pressure Containment Casings", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorVolence); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java index 7d26a18a81..bf5ed7ac42 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java @@ -140,13 +140,10 @@ public class MTEMultiCanner extends MTEExtendedPowerMultiBlockBase<MTEMultiCanne protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Canner/Fluid Canner") - .addInfo("Controller Block for the TurboCan Pro") .addInfo("Use screwdriver to switch mode") .addInfo("100% faster than single block machines of the same voltage") .addInfo("Gains 8 parallels per voltage tier") .addInfo(EnumChatFormatting.BLUE + "It's uncanny!") - .addInfo(AuthorFourIsTheNumber) - .addSeparator() .beginStructureBlock(7, 5, 7, true) .addController("Front Center") .addCasingInfoMin("Solid Steel Machine Casing", 85, false) @@ -157,7 +154,7 @@ public class MTEMultiCanner extends MTEExtendedPowerMultiBlockBase<MTEMultiCanne .addOutputHatch("Any Solid Steel Casing", 1) .addEnergyHatch("Any Solid Steel Casing", 1) .addMaintenanceHatch("Any Solid Steel Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java index a409410717..5a425b79d2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiFurnace.java @@ -94,11 +94,9 @@ public class MTEMultiFurnace extends MTEAbstractMultiFurnace<MTEMultiFurnace> 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<MTEMultiFurnace> 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<MTEMultiLathe> 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<MTEMultiLathe> + "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<MTEMultiLathe> .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<MTEMultiS protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fluid Solidifier") - .addInfo("Controller Block for the Fluid Shaper") .addInfo("Speeds up to a maximum of 200% faster than singleblock machines while running") .addInfo("Decays at double the Rate that it Speeds up at") .addInfo("Only uses 80% of the EU/t normally required") @@ -191,26 +190,6 @@ public class MTEMultiSolidifier extends MTEExtendedPowerMultiBlockBase<MTEMultiS .addInfo("Gain " + PARALLELS_PER_WIDTH + " Parallels per Width Expansion and Multiplied by Voltage Tier") .addInfo("Energy Hatch Based on Glass Tier, UMV Glass Unlocks all") .addInfo(EnumChatFormatting.BLUE + "Pretty Ⱄⱁⰾⰻⰴ, isn't it") - .addInfo(AuthorOmdaCZ) - .addInfo( - "With the Help Of" + " " - + EnumChatFormatting.LIGHT_PURPLE - + "Four" - + EnumChatFormatting.RESET - + ", " - + EnumChatFormatting.AQUA - + "GDCloud" - + EnumChatFormatting.RESET - + ", " - + EnumChatFormatting.GOLD - + "Ba" - + EnumChatFormatting.LIGHT_PURPLE - + "ps" - + EnumChatFormatting.RESET - + " & " - + EnumChatFormatting.DARK_AQUA - + "TheEpicGamer274") - .addSeparator() .beginVariableStructureBlock(17, 33, 5, 5, 5, 5, true) .addController("Front Center bottom") .addCasingInfoMin("Solidifier Casing", 146, false) @@ -222,7 +201,7 @@ public class MTEMultiSolidifier extends MTEExtendedPowerMultiBlockBase<MTEMultiS .addInputHatch("Any Casing", 1) .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorOmdaCZ); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java index b6dc31e943..fb4a11c8d9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java @@ -361,38 +361,33 @@ public class MTENanoForge extends MTEExtendedPowerMultiBlockBase<MTENanoForge> 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<MTENanoForge> 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<MTEOilCracker> 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<MTEOilCracker> 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<MTEOilCracker> 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<MTEPCBFactory> 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<MTEPCBFactory> .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<MTEPCBFactory> .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<MTEPlasmaForg + GTUtility.formatNumbers(efficiency_decay_rate) + EnumChatFormatting.GRAY + " as fast as it builds up.") - .addInfo(AuthorColen) - .addSeparator() .beginStructureBlock(33, 24, 33, false) - .addStructureInfo("DTPF Structure is too complex! See schematic for details.") .addStructureInfo(EnumChatFormatting.GOLD + "2,112" + EnumChatFormatting.GRAY + " Heating coils required.") .addStructureInfo( EnumChatFormatting.GOLD + "120" + EnumChatFormatting.GRAY + " Dimensional bridge blocks required.") @@ -633,7 +630,7 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase<MTEPlasmaForg EnumChatFormatting.GOLD + "2,121" + EnumChatFormatting.GRAY + " Dimensionally transcendent casings required.") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo( "Requires " + EnumChatFormatting.GOLD + "1" @@ -683,8 +680,8 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase<MTEPlasmaForg + max_input_bus + EnumChatFormatting.GRAY + " output busses.") - .addStructureInfo("--------------------------------------------") - .toolTipFinisher("Gregtech"); + .addStructureInfo("") + .toolTipFinisher(AuthorColen); return tt; } @@ -918,7 +915,12 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase<MTEPlasmaForg // Calculate discount to make sure it is shown properly even when machine is off but decaying recalculateDiscount(); - return new String[] { "------------ Critical Information ------------", + return new String[] { + EnumChatFormatting.STRIKETHROUGH + "------------" + + EnumChatFormatting.RESET + + " Critical Information " + + EnumChatFormatting.STRIKETHROUGH + + "------------", StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(mProgresstime) @@ -970,7 +972,7 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase<MTEPlasmaForg + EnumChatFormatting.RESET + "%", "Convergence: " + (convergence ? EnumChatFormatting.GREEN + "Active" : EnumChatFormatting.RED + "Inactive"), - "-----------------------------------------" }; + EnumChatFormatting.STRIKETHROUGH + "-----------------------------------------" }; } private void recalculateDiscount() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java index a4ff3275ea..9ac39cdec3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEProcessingArray.java @@ -138,7 +138,6 @@ public class MTEProcessingArray extends MTEExtendedPowerMultiBlockBase<MTEProces .addInfo( EnumChatFormatting.GOLD + "On the way to be slowly removed. Use it strictly if you have no alternative.") - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfoRange("Robust Tungstensteel Machine Casing", 14, 24, false) @@ -148,7 +147,7 @@ public class MTEProcessingArray extends MTEExtendedPowerMultiBlockBase<MTEProces .addInputHatch("Any casing", 1) .addOutputBus("Any casing", 1) .addOutputHatch("Any casing", 1) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPyrolyseOven.java index 9044c0b6e9..0c2c17d8ae 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPyrolyseOven.java @@ -96,13 +96,11 @@ public class MTEPyrolyseOven extends MTEEnhancedMultiBlockBase<MTEPyrolyseOven> 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<MTEPyrolyseOven> .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<MTETra .addInfo("This multiblock will run in parallel according to the amount set") .addInfo("in the parallel menu. All inputs will scale, except time.") .addInfo("All EU is deducted from wireless EU networks only.") - .addInfo(AuthorColen) - .addSeparator() .beginStructureBlock(5, 7, 5, false) .addStructureInfo(GOLD + "1+ " + GRAY + "Input Hatch") .addStructureInfo(GOLD + "1+ " + GRAY + "Output Hatch") .addStructureInfo(GOLD + "1+ " + GRAY + "Input Bus") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(AuthorColen); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEVacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEVacuumFreezer.java index 520351729b..76d36bbe73 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEVacuumFreezer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEVacuumFreezer.java @@ -55,9 +55,7 @@ public class MTEVacuumFreezer extends MTECubicMultiBlockBase<MTEVacuumFreezer> { 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<MTEVacuumFreezer> { .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<MTEWormholeG // spotless:off tt.addMachineType("Wormhole Generator") - .addInfo("Controller for the Miniature Wormhole Generator.") .addInfo("Transfers EU between two wormhole generators.") .addInfo("Wormholes are linked by placing an AE2 Entangled Singularity in each controller slot.") .addInfo("The transfer rate is limited by the wormhole size, and the wormhole size is governed by the transfer rate.") @@ -941,10 +940,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG .addInfo("EU will only be transferred if there is space in the laser source hatch.") .addInfo("Each laser target must have a laser source on the §oother§7 controller, on the §oopposite§7 side.") .addInfo("Consumes an AE2 Singularity from an input bus each time the wormhole is kick-started.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) .beginStructureBlock(7, 9, 7, false) - .addSeparator() .addCasingInfoExactly("Molecular Casing", 2 * 12, false) .addCasingInfoExactly("Europium Reinforced Radiation Proof Machine Casing", 4, false) .addCasingInfoExactly("Fusion Coil Block", 3 * 4 + 5 * 2, false) @@ -956,7 +952,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG .addEnergyHatch("§60§r - §64§r (laser only, dot 2)") .addStructureInfo("§rThe glass tier limits the hatch tier.") .addSubChannelUsage("glass", "Borosilicate Glass Tier") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(); // spotless:on return tt; @@ -967,15 +963,12 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG List<String> 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<MTEWormholeG // spotless:on } - data.add("-----------------------"); + data.add(EnumChatFormatting.STRIKETHROUGH + "-----------------------"); return data.toArray(new String[0]); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java index 09dbf808fd..13d6f7c1bb 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java @@ -313,7 +313,6 @@ public class MTEBlackHoleCompressor extends MTEExtendedPowerMultiBlockBase<MTEBl protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Compressor/Advanced Neutronium Compressor") - .addInfo("Controller Block for the Pseudostable Black Hole Containment Field") .addInfo(EnumChatFormatting.LIGHT_PURPLE + "Uses the immense power of the event horizon to compress things") .addInfo( EnumChatFormatting.LIGHT_PURPLE @@ -375,14 +374,6 @@ public class MTEBlackHoleCompressor extends MTEExtendedPowerMultiBlockBase<MTEBl .addInfo( EnumChatFormatting.RED + "Recipe tier is limited to hatch tier + 1. Will not perform overclocks above the hatch tier.") - .addInfo( - AuthorFourIsTheNumber + EnumChatFormatting.RESET - + " & " - + Ollie - + " & " - + EnumChatFormatting.WHITE - + "BucketBrigade") - .addSeparator() .beginStructureBlock(35, 33, 35, false) .addCasingInfoMin("Background Radiation Absorbent Casing", 950, false) .addCasingInfoExactly("Extreme Density Space-Bending Casing", 3667, false) @@ -393,7 +384,7 @@ public class MTEBlackHoleCompressor extends MTEExtendedPowerMultiBlockBase<MTEBl .addOutputBus("Any Radiation Absorbent Casing", 1) .addInputHatch("Any Radiation Absorbent Casing", 1) .addEnergyHatch("Any Radiation Absorbent Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber, Ollie, "BucketBrigade"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHIPCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHIPCompressor.java index cef6db5ba4..90fdde81ea 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHIPCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEHIPCompressor.java @@ -199,7 +199,6 @@ public class MTEHIPCompressor extends MTEExtendedPowerMultiBlockBase<MTEHIPCompr protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Compressor") - .addInfo("Controller Block for the Hot Isostatic Pressurization Unit") .addInfo("HIP Unit heats up while running") .addInfo( "When it reaches maximum heat, it becomes " + EnumChatFormatting.DARK_RED @@ -264,8 +263,6 @@ public class MTEHIPCompressor extends MTEExtendedPowerMultiBlockBase<MTEHIPCompr + "1" + EnumChatFormatting.GRAY + " parallels per voltage tier") - .addInfo(AuthorFourIsTheNumber + EnumChatFormatting.RESET + " & " + Ollie) - .addSeparator() .beginStructureBlock(7, 5, 7, true) .addController("Front Center") .addCasingInfoMin("Electric Compressor Casing", 95, false) @@ -280,7 +277,7 @@ public class MTEHIPCompressor extends MTEExtendedPowerMultiBlockBase<MTEHIPCompr .addOutputBus("Pipe Casings on Side", 2) .addEnergyHatch("Any Electric Compressor Casing", 1) .addMaintenanceHatch("Any Electric Compressor Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber, Ollie); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEIndustrialCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEIndustrialCompressor.java index 70d3ec7024..313f24f41d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEIndustrialCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEIndustrialCompressor.java @@ -11,7 +11,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_MULTI_COMPRES import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.NotNull; @@ -144,12 +143,9 @@ public class MTEIndustrialCompressor extends MTEExtendedPowerMultiBlockBase<MTEI protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Compressor") - .addInfo("Controller Block for the Large Electric Compressor") .addInfo("100% faster than singleblock machines of the same voltage") .addInfo("Only uses 90% of the EU/t normally required") .addInfo("Gains 2 parallels per voltage tier") - .addInfo(AuthorFourIsTheNumber + EnumChatFormatting.RESET + " & " + Ollie) - .addSeparator() .beginStructureBlock(7, 5, 7, true) .addController("Front Center") .addCasingInfoMin("Electric Compressor Casing", 95, false) @@ -160,7 +156,7 @@ public class MTEIndustrialCompressor extends MTEExtendedPowerMultiBlockBase<MTEI .addOutputBus("Pipe Casings on Side", 2) .addEnergyHatch("Any Electric Compressor Casing", 1) .addMaintenanceHatch("Any Electric Compressor Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber, Ollie); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTENeutroniumCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTENeutroniumCompressor.java index 5f5f2e5fb6..abc80a74b6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTENeutroniumCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTENeutroniumCompressor.java @@ -149,12 +149,9 @@ public class MTENeutroniumCompressor extends MTEExtendedPowerMultiBlockBase<MTEN protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Neutronium Compressor") - .addInfo("Controller Block for the Neutronium Compressor") .addInfo("Has a static 8 parallels") .addInfo("Capable of compressing matter into " + EnumChatFormatting.GOLD + "singularities") .addInfo("More advanced singularities will require even stronger compression...") - .addInfo(AuthorFourIsTheNumber + EnumChatFormatting.RESET + " & " + Ollie) - .addSeparator() .beginStructureBlock(11, 11, 11, true) .addController("Front Center") .addCasingInfoMin("Neutronium Casing", 220, false) @@ -166,7 +163,7 @@ public class MTENeutroniumCompressor extends MTEExtendedPowerMultiBlockBase<MTEN .addOutputBus("Any Neutronium Casing", 1) .addEnergyHatch("Any Neutronium Casing", 1) .addMaintenanceHatch("Any Neutronium Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorFourIsTheNumber, Ollie); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java index f84e2a7af0..4e75ffba5f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java @@ -177,7 +177,6 @@ public class MTEDroneCentre extends MTEExtendedPowerMultiBlockBase<MTEDroneCentr protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Drone Centre") - .addInfo("Drone Center Controller") .addInfo(EnumChatFormatting.AQUA + "Drone #10032, cleared for takeoff!") .addInfo("Monitors multiblock machines in range.") .addInfo("Replace maintenance hatch on other multi with drone downlink module.") @@ -188,8 +187,6 @@ public class MTEDroneCentre extends MTEExtendedPowerMultiBlockBase<MTEDroneCentr .addInfo("There is a chance per second that the drone will crash.") .addInfo("Chance is determined by drone tier: T1-1/28800, T2-1/172800, T3-0") .addInfo("If machine is too far, remote control would not available") - .addInfo(AuthorSilverMoon) - .addSeparator() .beginStructureBlock(5, 4, 9, false) .addController("Front center") .addCasingInfoRange("Stable Titanium Machine Casing", CASINGS_MIN, 91, false) @@ -198,8 +195,7 @@ public class MTEDroneCentre extends MTEExtendedPowerMultiBlockBase<MTEDroneCentr .addCasingInfoExactly("Any tiered glass", 6, false) .addInputBus("Any Titanium Casing", 1) .addStructureInfo("No maintenance hatch needed") - .addSeparator() - .toolTipFinisher("Gregtech"); + .toolTipFinisher(AuthorSilverMoon); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java index 21351e0cc5..916e24d1fb 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java @@ -235,7 +235,6 @@ public class MTEPurificationPlant extends MTEExtendedPowerMultiBlockBase<MTEPuri EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "purification processes, and this multiblock is the heart of the operation.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(7, 9, 8, false) .addCasingInfoExactlyColored( "Superplasticizer-Treated High Strength Concrete", @@ -273,8 +272,7 @@ public class MTEPurificationPlant extends MTEExtendedPowerMultiBlockBase<MTEPuri .addEnergyHatch(EnumChatFormatting.GOLD + "1", 1) .addMaintenanceHatch(EnumChatFormatting.GOLD + "1", 1) .addStructureInfo("Requires water to be placed in the tank.") - .addStructureInfo("Use the StructureLib Hologram Projector to build the structure.") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java index 8ca8576cc9..21fc5d97ff 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java @@ -260,7 +260,6 @@ public class MTEPurificationUnitBaryonicPerfection + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the Absolute Baryonic Perfection Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( @@ -333,7 +332,6 @@ public class MTEPurificationUnitBaryonicPerfection EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "This ultimately creates both Stabilised Baryonic Matter and, most importantly, absolutely perfectly purified water.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(17, 17, 17, false) .addCasingInfoMinColored( "Quark Exclusion Casing", @@ -370,7 +368,7 @@ public class MTEPurificationUnitBaryonicPerfection .addInputHatch("Any Quark Exclusion Casing", 1) .addOutputBus("Any Quark Exclusion Casing", 1) .addOutputHatch("Any Quark Exclusion Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java index c35511d951..ed6f6d6c40 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java @@ -183,7 +183,6 @@ public class MTEPurificationUnitClarifier extends MTEPurificationUnitBase<MTEPur + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the Clarifier Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo("Requires a filter made of Activated Carbon to work.") @@ -206,9 +205,7 @@ public class MTEPurificationUnitClarifier extends MTEPurificationUnitBase<MTEPur EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "decreases so continual replacements must be supplied to maintain full function of the Clarifier.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(11, 4, 11, false) - .addSeparator() .addCasingInfoRangeColored( "Reinforced Sterile Water Plant Casing", EnumChatFormatting.GRAY, @@ -241,8 +238,7 @@ public class MTEPurificationUnitClarifier extends MTEPurificationUnitBase<MTEPur .addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) .addOutputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) .addStructureInfo("Requires water to be placed in the structure.") - .addStructureInfo("Use the StructureLib Hologram Projector to build the structure.") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java index 05e8c9282d..603fa32b0d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java @@ -292,7 +292,6 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the Residual Decontaminant Degasser Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( @@ -458,7 +457,6 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "detects in the water, it will request various materials to complete the processes listed above.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(17, 25, 17, false) .addCasingInfoRangeColored( "Heat-Resistant Trinium Plated Casing", @@ -486,7 +484,7 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri "Degasser Control Hatch", EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + ", Any Trinium Casing", 1) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java index 02324ede4d..b19cd134c2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java @@ -265,7 +265,6 @@ public class MTEPurificationUnitFlocculation extends MTEPurificationUnitBase<MTE + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the Flocculation Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( @@ -320,7 +319,6 @@ public class MTEPurificationUnitFlocculation extends MTEPurificationUnitBase<MTE EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "of aggregating dispersed suspended particles from a solution into larger clumps for further filtration.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(7, 4, 7, false) .addCasingInfoRangeColored( "Slick Sterile Flocculation Casing", @@ -367,8 +365,7 @@ public class MTEPurificationUnitFlocculation extends MTEPurificationUnitBase<MTE .addOutputHatch( EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "-" + EnumChatFormatting.GOLD + "2", 1) - .addStructureInfo("Use the StructureLib Hologram Projector to build the structure.") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java index bae99e306b..d5611ee312 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java @@ -180,7 +180,6 @@ public class MTEPurificationUnitOzonation extends MTEPurificationUnitBase<MTEPur + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the Ozonation Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( @@ -209,7 +208,6 @@ public class MTEPurificationUnitOzonation extends MTEPurificationUnitBase<MTEPur EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "sulfur, iron and manganese, creating insoluble oxide compounds which are then filtered out.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(9, 10, 5, false) .addCasingInfoRangeColored( "Inert Filtration Casing", @@ -241,7 +239,7 @@ public class MTEPurificationUnitOzonation extends MTEPurificationUnitBase<MTEPur .addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) .addOutputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) .addOtherStructurePart("Input Hatch (Ozone)", EnumChatFormatting.GOLD + "1", 2) - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java index 464d740648..034cda743d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java @@ -320,7 +320,6 @@ public class MTEPurificationUnitPhAdjustment extends MTEPurificationUnitBase<MTE + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the pH Neutralization Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( @@ -405,7 +404,6 @@ public class MTEPurificationUnitPhAdjustment extends MTEPurificationUnitBase<MTE EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "materials. This necessitates the use of the corresponding neutralizing agents to pH balance the water.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(7, 4, 7, false) .addCasingInfoExactlyColored( "Stabilized Naquadah Water Plant Casing", @@ -437,8 +435,7 @@ public class MTEPurificationUnitPhAdjustment extends MTEPurificationUnitBase<MTE .addOtherStructurePart("pH Sensor Hatch", EnumChatFormatting.GOLD + "2", 2) .addOtherStructurePart("Input Bus (Sodium Hydroxide)", EnumChatFormatting.GOLD + "1", 3) .addOtherStructurePart("Input Hatch (Hydrochloric Acid)", EnumChatFormatting.GOLD + "1", 4) - .addStructureInfo("Use the StructureLib Hologram Projector to build the structure.") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java index 3f61f02cf0..4b81835d37 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java @@ -281,7 +281,6 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTE + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the Extreme Temperature Fluctuation Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( @@ -359,7 +358,6 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTE EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "supercritical while evaporating any remaining contaminants, ready for filtration.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(23, 15, 15, false) .addCasingInfoExactlyColored( "Reinforced Sterile Water Plant Casing", @@ -397,8 +395,7 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTE .addOtherStructurePart("Output Hatch", EnumChatFormatting.GOLD + "1", 1) .addOtherStructurePart("Input Hatch (Coolant)", EnumChatFormatting.GOLD + "1", 2) .addOtherStructurePart("Input Hatch (Plasma)", EnumChatFormatting.GOLD + "1", 3) - .addStructureInfo("Use the StructureLib Hologram Projector to build the structure.") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java index e79fb96509..511da85fd7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java @@ -225,7 +225,6 @@ public class MTEPurificationUnitUVTreatment extends MTEPurificationUnitBase<MTEP + EnumChatFormatting.WHITE + GTUtility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) - .addInfo("Controller block for the High Energy Laser Purification Unit.") .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( @@ -272,7 +271,6 @@ public class MTEPurificationUnitUVTreatment extends MTEPurificationUnitBase<MTEP EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + "atoms themselves and pass through the walls of the tank, ensuring the water is perfectly electrically polar.") - .addInfo(AuthorNotAPenguin) .beginStructureBlock(13, 9, 9, true) .addCasingInfoRangeColored( "Naquadria-Reinforced Water Plant Casing", @@ -303,8 +301,7 @@ public class MTEPurificationUnitUVTreatment extends MTEPurificationUnitBase<MTEP .addOtherStructurePart("Input Hatch, Output Hatch", EnumChatFormatting.GOLD + "1+", 1) .addOtherStructurePart("Lens Housing", EnumChatFormatting.GOLD + "1", 2) .addOtherStructurePart("Lens Indicator", EnumChatFormatting.GOLD + "1", 3) - .addStructureInfo("Use the StructureLib Hologram Projector to build the structure.") - .toolTipFinisher("GregTech"); + .toolTipFinisher(AuthorNotAPenguin); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java index b553849d3a..0d86b67dc2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalProcessor.java @@ -181,15 +181,12 @@ public class AdvChemicalProcessor public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Chemical Reactor") - .addInfo("Controller block for the Advanced Chemical Processor") .addInfo("Does not lose efficiency when overclocked") .addInfo("Accepts fluids instead of fluid cells") .addInfo("Can do multiple different recipes at once") .addInfo("By using the whitelist filter a recipe can push its output") .addInfo("to a different recipes input to chain them") .addInfo("Disclaimer: Still WIP - Use at your own risk") - .addInfo(GTValues.Authorminecraft7771) - .addSeparator() .beginStructureBlock(5, 3, 3, false) .addController("Front center") .addCasingInfoExactly("PTFE Pipe Machine Casing", 8, false) @@ -197,7 +194,7 @@ public class AdvChemicalProcessor .addCasingInfoExactly("EV+ Glass", 3, true) .addCasingInfoExactly("Motor Casing", 3, true) .addCasingInfoExactly("Chemical Casing", 27, false) - .toolTipFinisher("Gregtech"); + .toolTipFinisher(GTValues.Authorminecraft7771); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java index e3a97cfebc..438ab34533 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java @@ -48,13 +48,10 @@ public class DistillationTower extends StackableController<DistillationTower, Di public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Distillation Tower") - .addInfo("Controller block for the Distillation Tower") .addInfo("Can be specialised to be a mega structure") - .addInfo(GTValues.Authorminecraft7771) - .addSeparator() .beginStructureBlock(5, 3, 3, false) .addController("Front center") - .toolTipFinisher("Gregtech"); + .toolTipFinisher(GTValues.Authorminecraft7771); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java index 36a1271e0d..39be3a10de 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/LaserEngraver.java @@ -289,7 +289,6 @@ public class LaserEngraver extends ComplexParallelController<LaserEngraver, Lase final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Laser Engraver") .addInfo("Used for Engraving") - .addSeparator() .beginStructureBlock(3, 3, 5, true) .addController("Front right center") .toolTipFinisher(GTValues.AuthorTheEpicGamer274); diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java index 18ad381477..8590c803e4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java @@ -241,8 +241,6 @@ public class LayeredCokeBattery protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Coke Oven") - .addInfo("Controller for the Layered Coke Battery") - .addSeparator() .beginVariableStructureBlock(7, 9, 2 + getMinStacks(), 2 + getMaxStacks(), 7, 9, true) .addController("Bottom Front Center") .addCasingInfoExactly("Test Casing", 60, false) @@ -253,7 +251,7 @@ public class LayeredCokeBattery .addOutputBus("Any non-optional external facing casing on the stacks") .addStructureInfo( String.format("Stackable middle stacks between %d-%d time(s).", getMinStacks(), getMaxStacks())) - .toolTipFinisher("Wildcard"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java index 7273ac8b8b..e7791efb7f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/Macerator.java @@ -78,8 +78,6 @@ public class Macerator extends StackableController<Macerator, MaceratorProcessin protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Macerator") - .addInfo("Controller for the Macerator") - .addSeparator() .beginVariableStructureBlock(7, 9, 2 + getMinStacks(), 2 + getMaxStacks(), 7, 9, true) .addController("Bottom Front Center") .addCasingInfoExactly("Test Casing", 60, false) @@ -90,7 +88,7 @@ public class Macerator extends StackableController<Macerator, MaceratorProcessin .addOutputBus("Any non-optional external facing casing on the stacks") .addStructureInfo( String.format("Stackable middle stacks between %d-%d time(s).", getMinStacks(), getMaxStacks())) - .toolTipFinisher("Wildcard"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gregtech/loaders/preload/GTPreLoad.java b/src/main/java/gregtech/loaders/preload/GTPreLoad.java index b3c4c48095..12c3294153 100644 --- a/src/main/java/gregtech/loaders/preload/GTPreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GTPreLoad.java @@ -587,6 +587,7 @@ public class GTPreLoad { GTMod.gregtechproxy.mTooltipVerbosity = Client.iface.tooltipVerbosity; GTMod.gregtechproxy.mTooltipShiftVerbosity = Client.iface.tooltipShiftVerbosity; GTMod.gregtechproxy.mTitleTabStyle = Client.iface.titleTabStyle; + GTMod.gregtechproxy.separatorStyle = Client.iface.separatorStyle; GTMod.gregtechproxy.mNEIRecipeSecondMode = Client.nei.NEIRecipeSecondMode; GTMod.gregtechproxy.mNEIRecipeOwner = Client.nei.NEIRecipeOwner; diff --git a/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java index e1a86405bd..bfddb49278 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java @@ -1542,7 +1542,7 @@ public class LoaderMetaTileEntities implements Runnable { // TODO CHECK CIRCUIT new MTEAssemblyLine(ASSEMBLING_LINE_CONTROLLER.ID, "multimachine.assemblyline", "Assembling Line") .getStackForm(1L)); ItemList.Machine_Multi_DieselEngine.set( - new MTEDieselEngine(COMBUSTION_ENGINE_CONTROLLER.ID, "multimachine.dieselengine", "Combustion Engine") + new MTEDieselEngine(COMBUSTION_ENGINE_CONTROLLER.ID, "multimachine.dieselengine", "Large Combustion Engine") .getStackForm(1L)); ItemList.Machine_Multi_ExtremeDieselEngine.set( new MTEExtremeDieselEngine( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java index 387475d4f2..ae487fadb6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java @@ -99,7 +99,6 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase<MTEAmazonPackager> 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<MTEAmazonPackager> 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<MTEAmazonPackager> 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<MTEIndustrialAlloySmelter> @@ -116,13 +115,11 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialA protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Alloy Smelter") .addInfo("Gains one parallel per voltage tier") .addInfo("Gains one multiplier per coil tier") .addInfo("Parallel = Tier * Coil Tier") .addInfo("Gains 5% speed bonus per coil tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 5, 3, true) .addController("Bottom center") .addCasingInfoMin("Inconel Reinforced Casings", 8, false) @@ -133,7 +130,7 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialA .addEnergyHatch("Any Inconel Reinforced Casing", 1) .addMaintenanceHatch("Any Inconel Reinforced Casing", 1) .addMufflerHatch("Any Inconel Reinforced 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/MTEIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java index 28e32e1ab7..95a6c68df1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java @@ -47,7 +47,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.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -88,13 +87,11 @@ public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArc protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for Industrial Arc Furnace") .addInfo("250% faster than using single block machines of the same voltage") .addInfo("Processes 8 * voltage tier * W items") .addInfo("Right-click controller with a Screwdriver to change modes") .addInfo("Max Size required to process Plasma recipes") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .addController("Top center") .addStructureInfo("Size: nxnx3 [WxHxL] (Hollow)") .addStructureInfo("n can be 3, 5 or 7") @@ -106,7 +103,7 @@ public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArc .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/MTEIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java index b840cd9a08..02015b20eb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java @@ -35,7 +35,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.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; @@ -74,13 +73,11 @@ public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCen protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Centrifuge") .addInfo("125% faster than using single block machines of the same voltage") .addInfo("Disable animations with a screwdriver") .addInfo("Only uses 90% of the EU/t normally required") .addInfo("Processes six items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front Center") .addCasingInfoMin("Centrifuge Casings", 6, false) @@ -91,7 +88,7 @@ public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCen .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/MTEIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java index d68fe3f8c7..214d118a60 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java @@ -39,7 +39,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.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -84,7 +83,6 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel> .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<MTEIndustrialChisel> .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<MTEIndustrialCokeO MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Processes Logs and Coal into Charcoal and Coal Coke.") - .addInfo("Controller Block for the Industrial Coke Oven") .addInfo("Gain 4% energy discount per voltage tier") .addInfo("Process 12x materials with Heat Resistant Casings") .addInfo("Or 24x materials with Heat Proof Casings") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front middle at bottom") .addCasingInfoMin("Structural Coke Oven Casings", 8, false) @@ -84,7 +81,7 @@ public class MTEIndustrialCokeOven extends GTPPMultiBlockBase<MTEIndustrialCokeO .addEnergyHatch("Any Structural Coke Oven Casing", 1) .addMaintenanceHatch("Any Structural Coke Oven Casing", 1) .addMufflerHatch("Any Structural Coke Oven 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/MTEIndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java index cd488cd6af..2652479801 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java @@ -48,7 +48,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.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -86,12 +85,10 @@ public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustria protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Cutting Factory") .addInfo("200% faster than using 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(3, 3, 5, true) .addController("Front Center") .addCasingInfoMin("Cutting Factory Frames", 14, false) @@ -101,7 +98,7 @@ public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustria .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/MTEIndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java index 8b63f34edb..96eaf9c33f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java @@ -51,7 +51,6 @@ import gregtech.api.util.OverclockCalculator; 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.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -95,7 +94,6 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh .addInfo("Each 1800K over the min. Heat Capacity allows for one upgraded overclock") .addInfo("Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 5, 3, true) .addController("Bottom Center") .addCasingInfoMin(mCasingName, 5, false) @@ -106,7 +104,7 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh .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/MTEIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java index 69b7330901..7badb903f1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java @@ -30,7 +30,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; @@ -61,14 +60,12 @@ public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtru protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Material Extruder") .addInfo("250% faster than using single block machines of the same voltage") .addInfo("Processes four items per voltage tier") .addInfo("Extrusion Shape for recipe goes in the Input Bus") .addInfo("Each Input Bus can have a different shape!") .addInfo("You can use several input buses per multiblock") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 5, true) .addController("Front Center") .addCasingInfoMin("Inconel Reinforced Casings", 14, false) @@ -77,7 +74,7 @@ public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtru .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/MTEIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java index 8dd62202b3..364b8195e1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java @@ -31,7 +31,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; @@ -63,12 +62,10 @@ public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFl protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Fluid Heater") .addInfo("120% faster than using single block machines of the same voltage") .addInfo("Only uses 90% of the EU/t normally required") .addInfo("Processes eight items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(5, 6, 5, true) .addController("Front Center") .addCasingInfoMin("Top/Bottom layer: Multi-use Casings", 34, false) @@ -80,7 +77,7 @@ public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFl .addEnergyHatch("Any Multi-use Casing", 1) .addMaintenanceHatch("Any Multi-use Casing", 1) .addMufflerHatch("Any Multi-use 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/MTEIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java index a8bf12bfa0..8176db29d6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java @@ -46,7 +46,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; @@ -80,7 +79,6 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Forge Hammer") .addInfo("Speed: +100% | EU Usage: 100% | Parallel: Tier x Anvil Tier x 8") .addInfo("T1 - Vanilla Anvil"); if (Railcraft.isModLoaded()) { @@ -95,7 +93,6 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo } tt.addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front Center") .addCasingInfoMin("Forge Casing", 6, false) @@ -107,7 +104,7 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) .addOtherStructurePart("Anvil", "In the center of 3x3x3 structure", 2) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java index 4df9c8ce78..7896dfb73c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java @@ -48,7 +48,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; 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.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -98,12 +97,10 @@ public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMace protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller block for the Industrial Maceration Stack") .addInfo("60% faster than using single block machines of the same voltage") .addInfo("Maximum of n*tier parallels, LV = Tier 1, MV = Tier 2, etc.") .addInfo("n=2 initially. n=8 after inserting Maceration Upgrade Chip.") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 6, 3, true) .addController("Bottom center") .addCasingInfoMin("Maceration Stack Casings (After upgrade)", 26, false) @@ -113,7 +110,7 @@ public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMace .addMaintenanceHatch("Any casing", 1) .addOutputBus("One per layer except bottom layer", 2) .addMufflerHatch("Any casing except bottom layer", 2) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java index 3526146ab6..9d62d6a420 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java @@ -36,7 +36,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; @@ -86,11 +85,9 @@ public class MTEIndustrialMixer extends GTPPMultiBlockBase<MTEIndustrialMixer> 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<MTEIndustrialMixer> 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<MTEInd .addInfo("Changes the structure of items to produce new ones") .addInfo("Maximum 1x of each bus/hatch.") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(7, 7, 7, false) .addController("Top Center") .addCasingInfoMin("Robust Tungstensteel Machine Casing", 40, false) @@ -80,7 +78,7 @@ public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase<MTEInd .addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1) .addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1) .addMufflerHatch("Any Robust Tungstensteel Machine 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/MTEIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java index f4df2c3c1c..24a245833f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java @@ -64,7 +64,6 @@ import gregtech.common.tileentities.machines.MTEHatchCraftingInputME; import gregtech.common.tileentities.machines.MTEHatchInputME; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -130,7 +129,6 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Multi-Machine") .addInfo(EnumChatFormatting.RED + "DEPRECATED! This machine will be removed in the next major update.") .addInfo(EnumChatFormatting.RED + "A variety of multiblocks have been added to replace these machines!") .addInfo("250% faster than using single block machines of the same voltage") @@ -144,7 +142,6 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM EnumChatFormatting.AQUA + "You can use Solidifier Hatch to solidify multiple liquids." + EnumChatFormatting.RESET) .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front Center") .addCasingInfoMin("Multi-Use Casings", 6, false) @@ -155,7 +152,7 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM .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/MTEIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java index 75d3e6df6f..20f56c56cb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java @@ -43,7 +43,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.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -82,13 +81,11 @@ public class MTEIndustrialPlatePress extends GTPPMultiBlockBase<MTEIndustrialPla protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for Advanced Bending & Forming") .addInfo("500% faster than using single block machines of the same voltage") .addInfo("Processes four items per voltage tier") .addInfo("Circuit for recipe goes in the Input Bus") .addInfo("Each Input Bus can have a different Circuit/Shape!") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front Center") .addCasingInfoMin("Material Press Machine Casings", 6, false) @@ -97,7 +94,7 @@ public class MTEIndustrialPlatePress extends GTPPMultiBlockBase<MTEIndustrialPla .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/MTEIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java index d79c6150e7..2e8d742135 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java @@ -36,7 +36,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; @@ -67,12 +66,10 @@ public class MTEIndustrialSifter extends GTPPMultiBlockBase<MTEIndustrialSifter> 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<MTEIndustrialSifter> .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<MTEIndust protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Thermal Centrifuge") .addInfo("150% faster than using single block machines of the same voltage") .addInfo("Only uses 80% of the EU/t normally required") .addInfo("Processes eight items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 2, 3, false) .addController("Front Center") .addCasingInfoMin("Thermal Processing Casings/Noise Hazard Sign Blocks", 8, false) @@ -80,7 +77,7 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase<MTEIndust .addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1) .addMufflerHatch("Bottom 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/MTEIndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java index 563b844574..1a20e07ab6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java @@ -39,7 +39,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry; 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.api.metatileentity.implementations.base.MTEHatchCustomFluidBase; @@ -89,7 +88,6 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial .addInfo("Consumes 10L of " + mCryoFuelName + "/s during operation") .addInfo("Constructed exactly the same as a normal Vacuum Freezer") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front Center") .addCasingInfoMin(mCasingName, 10, false) @@ -101,7 +99,7 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial .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/MTEIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java index 89a1b0c102..6db9b8466e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java @@ -66,7 +66,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.FluidUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -109,7 +108,6 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Wash Plant") .addInfo("Can be configured with a screwdriver to also do Simple Washer and process Chemical Bathing") .addInfo("400% faster than using single block machines of the same voltage") .addInfo("Processes four item per voltage tier") @@ -117,7 +115,6 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash .addInfo("Need to be filled with water.") .addInfo("Will automatically fill water from input hatch.") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(5, 3, 7, true) .addController("Front Center") .addCasingInfoMin("Wash Plant Casings", 40, false) @@ -128,7 +125,7 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash .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/MTEIndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java index 8ceb3e8162..215db1a745 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.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; @@ -65,12 +64,10 @@ public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireM protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Wire Factory") .addInfo("200% faster than using 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(3, 3, 5, true) .addController("Front Center") .addCasingInfoMin("Wire Factory Casings", 14, false) @@ -79,7 +76,7 @@ public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireM .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/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index 5634b5f1d6..667582d60b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -53,7 +53,6 @@ import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -86,10 +85,8 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> 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<MTEIsaMill> 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<MTENuclearSaltProcessingPlant> @@ -75,7 +74,6 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclear protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Nuclear Salt Processing Plant") .addInfo("Processes depleted nuclear salts that come from the LFTR") .addInfo("Handles the recipes of the Reactor Processor Unit and Cold Trap") .addInfo("Only Thermally Insulated Casings can be replaced with hatches") @@ -85,7 +83,6 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclear .addInfo("150% 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") .addCasingInfoMin("IV Machine Casing", 58, false) @@ -97,7 +94,7 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclear .addMufflerHatch("Top Side, 2 Required", 4) .addEnergyHatch("Bottom Side, 2 Required", 5) .addMaintenanceHatch("Back Side, Opposite of Controller", 6) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java index e401e907bb..f8e60dd677 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java @@ -48,7 +48,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -130,12 +129,10 @@ public class MTESpargeTower extends GTPPMultiBlockBase<MTESpargeTower> 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<MTESpargeTower> 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<MTEndustrialEle protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Electrolyzer") .addInfo("180% faster than using single block machines of the same voltage") .addInfo("Only uses 90% of the EU/t normally required") .addInfo("Processes two items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front Center") .addCasingInfoMin("Electrolyzer Casings", 6, false) @@ -78,7 +75,7 @@ public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase<MTEndustrialEle .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/advanced/MTEAdvDistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java index c74eb89a07..c602e8f41f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java @@ -54,7 +54,6 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.MTEHatchOutputME; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -176,7 +175,6 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Advanced Distillation Tower") .addInfo("Use 85% less energy in distillery mode") .addInfo("250%/100% faster in DT/distillery mode") .addInfo("Right click the controller with screwdriver to change mode.") @@ -185,7 +183,6 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati .addInfo("Distillery Mode: Tower Tier * (4*InputTier)") .addInfo("Distillery Mode require a full height tower") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .addCasingInfoMin("Clean Stainless Steel Machine Casing", 7, false) .addInputBus("Bottom Casing", 1) .addOutputBus("Bottom Casing", 1) @@ -194,7 +191,7 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati .addEnergyHatch("Any Casing", 1) .addOutputHatch("One per layer except bottom", 2) .addMufflerHatch("Top Casing", 3) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java index 3645556583..dccf03487e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java @@ -53,7 +53,6 @@ import gregtech.api.util.OverclockCalculator; import gregtech.api.util.shutdown.ShutDownReasonRegistry; 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.api.metatileentity.implementations.base.MTEHatchCustomFluidBase; @@ -100,7 +99,6 @@ public class MTEAdvEBF extends GTPPMultiBlockBase<MTEAdvEBF> 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<MTEAdvEBF> 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<MTEAdvHeatExchanger> 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<MTEAdvHeatExchanger> .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<MTEAdvHeatExchanger> .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<MTEAdvImplosio .addInfo("Speed: +100% | EU Usage: 100% | Parallel: ((Tier/2)+1)") .addInfo("Constructed exactly the same as a normal Implosion Compressor") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 3, true) .addController("Front center") .addCasingInfoMin("Robust TungstenSteel Casing", 10, false) @@ -71,7 +69,7 @@ public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase<MTEAdvImplosio .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/steam/MTESteamCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java index fa2bc634d8..740a71e589 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.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.OutputHatch; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; @@ -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.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -326,12 +326,10 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> 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<MTESteamCentrifuge> 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<MTESteamCompressor> 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<MTESteamCompressor> 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<MTESteamForgeHammer> 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<MTESteamForgeHammer> + " 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<MTESteamMacerator> 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<MTESteamMacerator> 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<MTESteamMixer> 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<MTESteamMixer> 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<MTESteamWasher> 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<MTESteamWasher> 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<MTESteamWaterPump> 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<MTESteamWaterPump> 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<MTESteamWaterPump> 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<MTEAlloyBlastSmelte protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Alloy Blast Smelter") - .addInfo("Allows Complex GT++ alloys to be created") + .addInfo("Allows Complex alloys to be created") .addInfo("Accepts only one Energy Hatch") .addInfo("Circuit for recipe goes in the Input Bus or GUI slot") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 4, 3, true) .addController("Bottom Center") .addCasingInfoMin("Blast Smelter Casings", 5, false) @@ -95,7 +92,7 @@ public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase<MTEAlloyBlastSmelte .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/MTEAutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java index 2fb4a7b5c7..3a216b20ef 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java @@ -31,7 +31,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; public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> implements ISurvivalConstructable { @@ -91,7 +90,6 @@ public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> 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<MTEAutoCrafter> 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<MTECyclotron> 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<MTECyclotron> 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<MTEElementalDupli .addInfo("Requires circuit 1-16 in your Data Orb Repository") .addInfo("depending on what Data Orb you want to prioritize") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(9, 6, 9, true) .addController("Top Center") .addCasingInfoMin("Elemental Confinement Shell", 138, false) @@ -95,7 +93,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli .addEnergyHatch("Any 1 dot hint", 1) .addMaintenanceHatch("Any 1 dot hint", 1) .addMufflerHatch("Any 1 dot hint", 1) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java index bbcbfc1322..ff530a9ff9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java @@ -44,7 +44,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.core.material.Material; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -80,7 +79,6 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC .addInfo("Process that milled ore!") .addInfo("You can only ever process one type of material per controller") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(7, 9, 7, true) .addController("Front Center") .addCasingInfoMin("Inconel Reinforced Casing", 68, false) @@ -90,7 +88,7 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC .addOutputHatch("Bottom Casing", 1) .addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom 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/MTEIndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java index 7d42c94f3e..8c72a027e6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java @@ -50,7 +50,6 @@ import gregtech.api.util.ReflectionUtil; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -101,7 +100,6 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Fishing Pond") .addInfo("Can process (Tier + 1) * 2 recipes") .addInfo("Put a numbered circuit into the input bus.") .addInfo("Circuit " + FISH_MODE + " for Fish") @@ -110,7 +108,6 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi .addInfo("Need to be filled with water.") .addInfo("Will automatically fill water from input hatch.") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(9, 3, 9, true) .addController("Front Center") .addCasingInfoMin("Aquatic Casings", 64, false) @@ -120,7 +117,7 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi .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/MTEIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java index ee62f45ef8..ac993e73e5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java @@ -46,7 +46,6 @@ import gregtech.api.util.OverclockCalculator; import gregtech.api.util.ParallelHelper; 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; @@ -84,13 +83,11 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Industrial Rock Breaker") .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8") .addInfo("Circuit goes in the GUI slot") .addInfo("1 = cobble, 2 = stone, 3 = obsidian") .addInfo("Needs Water and Lava in input hatch") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 4, 3, true) .addController("Bottom Center") .addCasingInfoMin(casingBaseName, 9, false) @@ -101,7 +98,7 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo .addEnergyHatch(anyBaseCasing, 1) .addMaintenanceHatch(anyBaseCasing, 1) .addMufflerHatch(anyBaseCasing, 1) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java index b9e1d7858c..59ef34d5f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java @@ -45,7 +45,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.RocketFuels; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; @@ -98,7 +97,6 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Large Rocket Engine") .addInfo("Generating Power from Rocket Fuels - Supports TecTech Multi-Amp Dynamos!") .addInfo("Supply GT++ Rocket Fuels and 1000L of " + mLubricantName + " per hour") .addInfo("Produces as much energy as you put fuel in, with optional boosting") @@ -115,7 +113,6 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin .addInfo("- 50% of max fuel efficiency at 69k or 207k EU/t output energy") .addInfo("- 25% of max fuel efficiency at 98k or 294k EU/t output energy") .addInfo("formula: x = input of energy (30000^(1/3)/ x^(1/3)) * (80000^(1/3)/ x^(1/3))") - .addSeparator() .beginStructureBlock(3, 3, 10, false) .addController("Front Center") .addCasingInfoMin(mCasingName, 64, false) @@ -126,7 +123,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin .addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1) .addDynamoHatch("Top center line", 2) .addMufflerHatch("Back Center", 3) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java index 9b4dc8ee47..c28973e457 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java @@ -41,7 +41,6 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.config.Configuration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemifluidGenerator> @@ -67,14 +66,12 @@ public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemif protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Large Semifluid Generator") .addInfo("Engine Intake Casings must not be obstructed in front (only air blocks)") .addInfo("Supply Semifluid Fuels and 2000L of Lubricant per hour to run.") .addInfo("Supply 80L of Oxygen per second to boost output (optional).") .addInfo("Default: Produces 2048EU/t at 100% efficiency") .addInfo("Boosted: Produces 6144EU/t at 150% efficiency") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(3, 3, 4, false) .addController("Front Center") .addCasingInfoMin("Stable Titanium Machine Casing", 16, false) @@ -84,7 +81,7 @@ public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemif .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) .addDynamoHatch("Back Center", 2) - .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java index 913a54eea5..7a4eefb0a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java @@ -58,7 +58,6 @@ import gregtech.common.config.MachineStats; 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.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -105,13 +104,11 @@ public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> 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<MTEMassFabricator> 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<MTENuclearReactor> 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<MTENuclearReactor> 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<MTENuclearReactor> 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<M protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Quantum Force Transformer") - .addInfo("Controller Block for the Quantum Force Transformer") .addInfo("Allows Complex chemical lines to be performed instantly in one step") .addInfo("Every recipe requires a catalyst, each catalyst adds 1 parallel and lasts forever") .addInfo("Accepts TecTech Energy and Laser Hatches") @@ -262,7 +261,6 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<M .addInfo("Pulse Manipulators: Recipe Tier Allowed (check NEI for the tier of each recipe)") .addInfo("Shielding Cores: Focusing Tier (equal to or higher than recipe tier to allow focus)") .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(15, 21, 15, true) .addController("Bottom Center") .addCasingInfoMin("Bulk Production Frame", 80, false) @@ -287,12 +285,7 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<M + "Right" + EnumChatFormatting.GRAY + " side of Controller") - .toolTipFinisher( - GTValues.AuthorBlueWeabo + EnumChatFormatting.RESET - + EnumChatFormatting.GREEN - + " + Steelux" - + EnumChatFormatting.RESET - + " - [GT++]"); + .toolTipFinisher(GTValues.AuthorBlueWeabo, EnumChatFormatting.GREEN + "Steelux"); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java index 9b28387849..5f5735a777 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.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; public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISurvivalConstructable { @@ -64,7 +63,6 @@ public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> 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<MTERefinery> 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<MTESolarTower> 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<MTESolarTower> 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<MTEThermalBoiler> 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<MTEThermalBoiler> 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<MTETreeFarm> 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<MTETreeFarm> 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<MTETreeFarm> 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<MTEAlgaePondBase> 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<MTEAlgaePondBase> 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<MTEChemicalPlant> 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<MTEChemicalPlant> 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<MTE protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fluid Alloy Cooker") - .addInfo("Controller block for the Mega Alloy Blast Smelter") .addInfo( "Runs the same recipes as the normal ABS, except with up to " + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE @@ -315,16 +314,10 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE + EnumChatFormatting.RESET + EnumChatFormatting.GRAY) .beginStructureBlock(11, 20, 11, false) - .addStructureInfo("This structure is too complex! See schematic for details.") .addMaintenanceHatch("Around the controller", 2) .addOtherStructurePart("Input Bus, Output Bus, Input Hatch, Output Bus, Energy Hatch", "Bottom Casing", 1) .addMufflerHatch("1 in the center of the top layer", 3) - .toolTipFinisher( - EnumChatFormatting.AQUA + "MadMan310 " - + EnumChatFormatting.GRAY - + "via " - + EnumChatFormatting.RED - + "GT++"); + .toolTipFinisher(EnumChatFormatting.AQUA + "MadMan310"); return tt; } @@ -342,7 +335,12 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE .getEUCapacity(); } - return new String[] { "------------ Critical Information ------------", + return new String[] { + EnumChatFormatting.STRIKETHROUGH + "------------" + + EnumChatFormatting.RESET + + " Critical Information " + + EnumChatFormatting.STRIKETHROUGH + + "------------", StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN + GTUtility.formatNumbers(mProgresstime) @@ -383,7 +381,7 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE "Parallels: " + EnumChatFormatting.BLUE + paras + EnumChatFormatting.RESET, "Speed Bonus: " + EnumChatFormatting.BLUE + moreSpeed + "%" + EnumChatFormatting.RESET, "Energy Discount: " + EnumChatFormatting.BLUE + lessEnergy + "%" + EnumChatFormatting.RESET, - "-----------------------------------------" }; + EnumChatFormatting.STRIKETHROUGH + "-----------------------------------------" }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index fa9d60fb11..0a305bcf1f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -52,7 +52,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; @@ -149,7 +148,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT protected final MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the XL " + getTurbineType() + " Turbine") .addInfo("Runs as fast as 16 Large Turbines of the same type, takes the space of 12") .addInfo("Right-click with screwdriver to enable loose fit") .addInfo("Optimal flow will increase or decrease depending on fitting") @@ -162,7 +160,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT .addInfo("Efficiency = ((FuelValue / 200,000)^2) / (EU per Turbine)"); } tt.addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() .beginStructureBlock(7, 9, 7, false) .addController("Top Middle") .addCasingInfoMin(getCasingName(), 360, false) @@ -178,7 +175,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT if (requiresMufflers()) { tt.addMufflerHatch("Any 7 dot hint (x4)", 7); } - tt.toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); + tt.toolTipFinisher(); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 241b970ae8..0cbf255fa5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -70,7 +70,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.config.ASMConfiguration; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.MovingAverageLong; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -128,14 +127,13 @@ public class GregtechMetaTileEntity_PowerSubStationController .addInfo("Hatches can be placed nearly anywhere") .addInfo("HV Energy/Dynamo Hatches are the lowest tier you can use") .addInfo("Supports voltages >= 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<MTEDigester> 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<MTEDigester> 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<MTEDissolution protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Dissolution Tank") - .addInfo("Controller block for the Dissolution Tank") .addInfo("Input Water and Fluid, output Fluid") .addInfo("You must input the Fluids at the correct Ratio") - .addInfo(DescTextLocalization.BLUEPRINT_INFO) - .addSeparator() .addController("Front bottom") .addInputHatch("Hint block with dot 1") .addInputBus("Hint block with dot 1") .addOutputHatch("Hint block with dot 1") .addOutputBus("Hint block with dot 1") .addMaintenanceHatch("Hint block with dot 1") - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java b/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java index 652529c303..7ae15db3aa 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java @@ -183,7 +183,6 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> 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<MTELINAC> 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<MTELINAC> 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<MTESourceChamber protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Particle Source") - .addInfo("Controller block for the Source Chamber") .addInfo("Output energy scales with EU/t up to the point shown in the recipe") - .addInfo(BLUEPRINT_INFO) .addInfo(DescTextLocalization.BEAMLINE_SCANNER_INFO) - .addSeparator() .beginStructureBlock(5, 5, 6, true) .addController("Front bottom") .addCasingInfoExactly(LanthItemList.SHIELDED_ACCELERATOR_CASING.getLocalizedName(), 56, false) @@ -140,7 +136,7 @@ public class MTESourceChamber extends MTEEnhancedMultiBlockBase<MTESourceChamber .addMaintenanceHatch(addDotText(3)) .addInputBus(addDotText(1)) .addOutputBus(addDotText(2)) - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java b/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java index 0aae0f0f7b..dfecdcd71e 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java @@ -492,12 +492,10 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> 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<MTESynchrotron> 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<MTESynchrotron> 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<MTETargetChamber protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Collision Chamber") - .addInfo("Controller block for the Target Chamber") .addInfo("Hitting things with other things") - - .addInfo(BLUEPRINT_INFO) .addInfo(DescTextLocalization.BEAMLINE_SCANNER_INFO) - .addSeparator() .beginStructureBlock(5, 5, 6, true) .addController("Front bottom") .addCasingInfoExactly("Grate Machine Casing", 29, false) @@ -205,7 +200,7 @@ public class MTETargetChamber extends MTEEnhancedMultiBlockBase<MTETargetChamber .addInputBus(addDotText(3)) .addOutputBus(addDotText(4)) .addOtherStructurePart("Beamline Input Hatch", addDotText(5)) - .toolTipFinisher("GTNH: Lanthanides"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/gtnhlanth/util/DescTextLocalization.java b/src/main/java/gtnhlanth/util/DescTextLocalization.java index f736e466e0..34f405995c 100644 --- a/src/main/java/gtnhlanth/util/DescTextLocalization.java +++ b/src/main/java/gtnhlanth/util/DescTextLocalization.java @@ -4,6 +4,7 @@ import net.minecraft.util.StatCollector; public class DescTextLocalization { + @Deprecated public static final String BLUEPRINT_INFO = StatCollector.translateToLocal("gtnhlanth.tt.blueprint"); public static final String BEAMLINE_SCANNER_INFO = StatCollector.translateToLocal("gtnhlanth.tt.beaminfo"); diff --git a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java index eed5b32820..2485dc635c 100644 --- a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java +++ b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java @@ -453,7 +453,6 @@ public class MTELapotronicSuperCapacitor extends MTEEnhancedMultiBlockBase<MTELa + EnumChatFormatting.GRAY + "-fold" + " for every capacitor tier above.") - .addSeparator() .beginVariableStructureBlock(5, 5, 4, 50, 5, 5, false) .addStructureInfo("Modular height of 4-50 blocks.") .addController("Front center bottom") @@ -492,7 +491,7 @@ public class MTELapotronicSuperCapacitor extends MTEEnhancedMultiBlockBase<MTELa .addSubChannelUsage("capacitor", "Maximum Capacitor Tier") .addSubChannelUsage("height", "Height of structure") .addMaintenanceHatch("Any casing") - .toolTipFinisher("KekzTech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK1.java b/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK1.java index e70e45f899..869059017a 100644 --- a/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK1.java +++ b/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK1.java @@ -98,7 +98,6 @@ public class MTESOFuelCellMK1 extends MTEEnhancedMultiBlockBase<MTESOFuelCellMK1 .addInfo("Steam production requires the SOFC to heat up completely first") .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam") .addInfo("Additionally, requires " + OXYGEN_PER_SEC + "L/s Oxygen gas") - .addSeparator() .beginStructureBlock(3, 3, 5, false) .addController("Front center") .addCasingInfoMin("Clean Stainless Steel Casing", 12, false) @@ -109,7 +108,7 @@ public class MTESOFuelCellMK1 extends MTEEnhancedMultiBlockBase<MTESOFuelCellMK1 .addInputHatch("Fuel, any casing") .addInputHatch("Oxygen, any casing") .addOutputHatch("Steam, any casing") - .toolTipFinisher("KekzTech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK2.java b/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK2.java index abf5b9af39..b7dd5b5652 100644 --- a/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK2.java +++ b/src/main/java/kekztech/common/tileentities/MTESOFuelCellMK2.java @@ -99,7 +99,6 @@ public class MTESOFuelCellMK2 extends MTEEnhancedMultiBlockBase<MTESOFuelCellMK2 .addInfo("Steam production requires the SOFC to heat up completely first") .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam") .addInfo("Additionally, requires " + OXYGEN_PER_SEC + "L/s Oxygen gas") - .addSeparator() .beginStructureBlock(3, 3, 5, false) .addController("Front center") .addCasingInfoMin("Robust Tungstensteel Machine Casing", 12, false) @@ -110,7 +109,7 @@ public class MTESOFuelCellMK2 extends MTEEnhancedMultiBlockBase<MTESOFuelCellMK2 .addInputHatch("Fuel, any casing") .addInputHatch("Oxygen, any casing") .addOutputHatch("Superheated Steam, any casing") - .toolTipFinisher("KekzTech"); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/kekztech/common/tileentities/MTETankTFFT.java b/src/main/java/kekztech/common/tileentities/MTETankTFFT.java index 49b195dea8..41ea39427f 100644 --- a/src/main/java/kekztech/common/tileentities/MTETankTFFT.java +++ b/src/main/java/kekztech/common/tileentities/MTETankTFFT.java @@ -336,7 +336,6 @@ public class MTETankTFFT extends MTEEnhancedMultiBlockBase<MTETankTFFT> 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<MTETankTFFT> 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<MTETankTFFT> 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<MTEDEFusionCraf protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Crafter") - .addInfo("Controller Block for the Draconic Evolution Fusion Crafter") - .addInfo(buildAuthorList("kuba6000", "Prometheus0000")) .addInfo("Machine can be overclocked by using casings above the recipe tier:") .addInfo("Recipe time is divided by number of tiers above the recipe") .addInfo("Normal EU OC still applies !") - .addInfo(StructureHologram) - .addSeparator() .beginStructureBlock(5, 10, 5, false) .addController("Front bottom center") .addCasingInfoMin("Naquadah Alloy Fusion Casing", 19, false) @@ -161,7 +155,7 @@ public class MTEDEFusionCrafter extends KubaTechGTMultiBlockBase<MTEDEFusionCraf .addOutputHatch("Any bottom casing", 1) .addEnergyHatch("Any bottom casing", 1) .addMaintenanceHatch("Any bottom casing", 1) - .toolTipFinisher(Tags.MODNAME); + .toolTipFinisher(GTValues.AuthorKuba, "Prometheus0000"); return tt; } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java index eb5b80176a..ad4ad7ab44 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java @@ -39,8 +39,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_ import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gregtech.api.util.GTStructureUtility.ofFrame; -import static kubatech.api.Variables.Author; -import static kubatech.api.Variables.StructureHologram; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -104,6 +102,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.enums.SoundResource; @@ -261,8 +260,6 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Powered Spawner, EEC") - .addInfo("Controller block for the Extreme Entity Crusher") - .addInfo(Author) .addInfo("Spawns and kills monsters for you.") .addInfo("You have to insert the powered spawner in the controller.") .addInfo("Base energy usage: 2,000 EU/t") @@ -279,8 +276,6 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme .addInfo("When in ritual mode and the Well Of Suffering ritual is built directly centered on the machine,") .addInfo("the mobs will start to buffer and die very slowly by the ritual.") .addInfo("You can disable mob animation with a soldering iron.") - .addInfo(StructureHologram) - .addSeparator() .beginStructureBlock(5, 7, 5, true) .addController("Front Bottom Center") .addCasingInfoMin("Solid Steel Machine Casing", 35, false) @@ -292,7 +287,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme .addOutputHatch("Any bottom casing", 1) .addEnergyHatch("Any bottom casing", 1) .addMaintenanceHatch("Any bottom casing", 1) - .toolTipFinisher(Tags.MODNAME); + .toolTipFinisher(GTValues.AuthorKuba); return tt; } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java index 0f0c03484d..e75c7dc112 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java @@ -32,8 +32,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW; import static gregtech.api.util.GTStructureUtility.ofHatchAdder; import static gregtech.api.util.GTUtility.validMTEList; -import static kubatech.api.Variables.Author; -import static kubatech.api.Variables.StructureHologram; import static kubatech.api.utils.ItemUtils.readItemStackFromNBT; import java.io.IOException; @@ -115,7 +113,6 @@ import gregtech.api.util.VoidProtectionHelper; import gregtech.common.tileentities.machines.MTEHatchOutputBusME; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; -import kubatech.Tags; import kubatech.api.EIGDynamicInventory; import kubatech.api.eig.EIGBucket; import kubatech.api.eig.EIGDropTable; @@ -295,8 +292,6 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); String fertilizerBoostMax = String.format("%.0f", EIG_BALANCE_MAX_FERTILIZER_BOOST * 100); tt.addMachineType("Crop Farm") - .addInfo("Controller block for the Extreme Industrial Greenhouse") - .addInfo(Author) .addInfo("Grow your crops like a chad!") .addInfo("Use screwdriver to enable/change/disable setup mode") .addInfo("Use screwdriver while sneaking to enable/disable IC2 mode") @@ -309,16 +304,15 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE + " seeds") .addInfo("Otherwise, around 1% of seeds will be voided each operation") .addInfo("You can insert fertilizer each operation to get more drops (max + " + fertilizerBoostMax + ")") - .addInfo("--------------------- SETUP MODE ---------------------") + .addSeparator() + .addInfo(EnumChatFormatting.GOLD + "Setup Mode:") .addInfo("Does not take power") .addInfo("There are two modes: input / output") .addInfo("Input mode: machine will take seeds from input bus and plant them") .addInfo("[IC2] You need to also input block that is required under the crop") .addInfo("Output mode: machine will take planted seeds and output them"); EIGModes.addTooltipInfo(tt); - tt.addInfo(StructureHologram) - .addSeparator() - .beginStructureBlock(5, 6, 5, false) + tt.beginStructureBlock(5, 6, 5, false) .addController("Front bottom center") .addCasingInfoMin("Clean Stainless Steel Casings", 70, false) .addOtherStructurePart("Borosilicate Glass", "Hollow two middle layers") @@ -331,7 +325,7 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE .addOutputBus("Any casing (Except inner bottom ones)", 1) .addInputHatch("Any casing (Except inner bottom ones)", 1) .addEnergyHatch("Any casing (Except inner bottom ones)", 1) - .toolTipFinisher(Tags.MODNAME); + .toolTipFinisher(GTValues.AuthorKuba); return tt; } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java index 0de075f497..7ae4adf1da 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java @@ -36,8 +36,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; -import static kubatech.api.Variables.StructureHologram; -import static kubatech.api.Variables.buildAuthorList; import static kubatech.api.utils.ItemUtils.readItemStackFromNBT; import static kubatech.api.utils.ItemUtils.writeItemStackToNBT; @@ -126,7 +124,6 @@ import gregtech.api.util.GTUtility.ItemId; import gregtech.api.util.MultiblockTooltipBuilder; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; -import kubatech.Tags; import kubatech.api.DynamicInventory; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.client.effect.MegaApiaryBeesRenderer; @@ -235,7 +232,6 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd }) .build(); - @SuppressWarnings("unused") public MTEMegaIndustrialApiary(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @@ -294,18 +290,19 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Mega Apiary") - .addInfo("Controller block for Industrial Apicultural Acclimatiser and Drone Domestication Station") - .addInfo(buildAuthorList("kuba6000", "Runakai")) .addInfo("The ideal home for your bees") .addInfo("Use screwdriver to change primary mode (INPUT/OUTPUT/OPERATING)") .addInfo("Use screwdriver + shift to change operation mode (NORMAL/SWARMER)") - .addInfo("--------------------- INPUT MODE ---------------------") + .addSeparator() + .addInfo(EnumChatFormatting.GOLD + "Input Mode:") .addInfo("- Does not take power") .addInfo("- Put your queens in the input bus to put them in the internal buffer") - .addInfo("-------------------- OUTPUT MODE ---------------------") + .addSeparator() + .addInfo(EnumChatFormatting.GOLD + "Output Mode:") .addInfo("- Does not take power") .addInfo("- Will give your bees back to output bus") - .addInfo("------------------- OPERATING MODE -------------------") + .addSeparator() + .addInfo(EnumChatFormatting.GOLD + "Operating Mode:") .addInfo("- NORMAL:") .addInfo(" - For each " + voltageTooltipFormatted(6) + " amp you can insert 1 bee") .addInfo(" - Processing time: 5 seconds") @@ -326,8 +323,6 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd .addInfo(" - Base processing time: 1 minute") .addInfo(" - Uses 1 amp " + voltageTooltipFormatted(5)) .addInfo(" - Can overclock") - .addInfo(StructureHologram) - .addSeparator() .beginStructureBlock(15, 17, 15, false) .addController("Front Bottom Center") .addCasingInfoMin("Bronze Plated Bricks", 190, false) @@ -339,7 +334,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd .addOutputBus("Any casing", 1) .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) - .toolTipFinisher(Tags.MODNAME); + .toolTipFinisher(GTValues.AuthorKuba, "Runakai"); return tt; } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java index 1d10a2aa92..d19474db16 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java @@ -3,6 +3,8 @@ package kubatech.tileentity.gregtech.multiblock.eigmodes; import static kubatech.api.utils.StringUtils.voltageTooltipFormatted; import static kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_ACCELERATOR_TIER; +import net.minecraft.util.EnumChatFormatting; + import gregtech.api.util.MultiblockTooltipBuilder; import kubatech.api.eig.EIGMode; import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; @@ -71,7 +73,8 @@ public class EIGIC2Mode extends EIGMode { double fertilizerBonusMultiplier = this.getFertilizerBoost() * 100; String fertilizerBonus = String.format("%.0f%%", fertilizerBonusMultiplier); - return builder.addInfo("---------------------- IC2 CROPS ---------------------") + return builder.addSeparator() + .addInfo(EnumChatFormatting.GOLD + "IC2 Crops:") .addInfo("Minimal voltage tier: " + minVoltageTier) .addInfo("Minimal glass tier: " + minGlassTier) .addInfo("Starting with " + this.getStartingSlotCount() + " slot") diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java index c639b9750d..bfd545b653 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java @@ -2,6 +2,8 @@ package kubatech.tileentity.gregtech.multiblock.eigmodes; import static kubatech.api.utils.StringUtils.voltageTooltipFormatted; +import net.minecraft.util.EnumChatFormatting; + import gregtech.api.util.MultiblockTooltipBuilder; import kubatech.api.eig.EIGMode; import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; @@ -68,7 +70,8 @@ public class EIGNormalMode extends EIGMode { double fertilizerBonusMultiplier = this.getFertilizerBoost() * 100; String fertilizerBonus = String.format("%.0f%%", fertilizerBonusMultiplier); - return builder.addInfo("-------------------- NORMAL CROPS --------------------") + return builder.addSeparator() + .addInfo(EnumChatFormatting.GOLD + "Normal Crops:") .addInfo("Minimal voltage tier: " + minVoltageTier) .addInfo("Starting with " + this.getStartingSlotCount() + " slot") .addInfo( diff --git a/src/main/java/tectech/thing/item/ItemEuMeterGT.java b/src/main/java/tectech/thing/item/ItemEuMeterGT.java index ccc9bdb608..84b59f6d76 100644 --- a/src/main/java/tectech/thing/item/ItemEuMeterGT.java +++ b/src/main/java/tectech/thing/item/ItemEuMeterGT.java @@ -58,7 +58,11 @@ public class ItemEuMeterGT extends Item { if (tTileEntity instanceof BaseMetaTileEntity) { GTUtility.sendChatToPlayer( aPlayer, - EnumChatFormatting.AQUA + "----- X:" + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.STRIKETHROUGH + + "-----" + + EnumChatFormatting.RESET + + EnumChatFormatting.AQUA + + " X:" + aX + " Y:" + aY @@ -68,7 +72,9 @@ public class ItemEuMeterGT extends Item { + aWorld.provider.dimensionId + " S:" + ordinalSide - + " -----"); + + " " + + EnumChatFormatting.STRIKETHROUGH + + "-----"); GTUtility.sendChatToPlayer( aPlayer, translateToLocalFormatted("tt.keyphrase.Stored_energy", clientLocale) + ": " diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java index bf353799dc..a77675a804 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java @@ -31,7 +31,6 @@ import tectech.thing.casing.BlockGTCasingsTT; import tectech.thing.casing.TTCasingsContainer; 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. @@ -128,9 +127,6 @@ public class MTEActiveTransformer extends TTMultiblockBase implements ISurvivalC final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(translateToLocal("gt.blockmachines.multimachine.em.transformer.name")) // Machine Type: // Transformer - .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.0")) // Controller block of - // the - // Active Transformer .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.1")) // Can transform to // and from any // voltage @@ -139,7 +135,6 @@ public class MTEActiveTransformer extends TTMultiblockBase implements ISurvivalC .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.3")) // Will explode if // broken while // running - .addSeparator() .beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.0.name"), 5, false) // 5x High Power Casing @@ -151,7 +146,7 @@ public class MTEActiveTransformer extends TTMultiblockBase implements ISurvivalC // High Power Casing .addDynamoHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Dynamo Hatch: Any // High Power Casing - .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java index 9bec05fa27..88cab07f31 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java @@ -48,7 +48,6 @@ import tectech.thing.metaTileEntity.hatch.MTEHatchDataItemsOutput; import tectech.thing.metaTileEntity.hatch.MTEHatchWirelessDataItemsOutput; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -import tectech.util.CommonValues; public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructable { @@ -123,9 +122,6 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa .addInfo(translateToLocal("gt.blockmachines.multimachine.em.databank.desc.3")) // Use screwdriver to toggle // wireless mode - // Stick - .addInfo(translateToLocal("tt.keyword.Structure.StructureTooComplex")) // The structure is too complex! - .addSeparator() .beginStructureBlock(5, 3, 3, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.DataAccessHatch"), @@ -140,7 +136,7 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance // Hatch: Any High // Power Casing - .toolTipFinisher(CommonValues.TEC_MARK_EM); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java index e40e18f944..09b2da03de 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java @@ -33,7 +33,6 @@ import tectech.loader.ConfigHandler; import tectech.thing.casing.BlockGTCasingsTT; import tectech.thing.casing.TTCasingsContainer; import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; -import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. @@ -243,7 +242,6 @@ public class MTEEnergyInfuser extends TTMultiblockBase implements IConstructable .addInfo(translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.2")) // Stocking Bus is not supported .addInfo(translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.3")) - .addSeparator() .beginStructureBlock(3, 5, 3, false) // Controller: Front 3rd layer center .addController(translateToLocal("tt.keyword.Structure.FrontCenter3rd")) @@ -268,7 +266,7 @@ public class MTEEnergyInfuser extends TTMultiblockBase implements IConstructable .addEnergyHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) // Maintenance Hatch: Any High Power Casing .addMaintenanceHatch(translateToLocal("tt.keyword.Structure.AnyHighPowerCasing"), 1) - .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); + .toolTipFinisher(); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java index 21d175c837..bb798b9b2c 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java @@ -4,7 +4,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GTValues.AuthorColen; import static gregtech.api.enums.HatchElement.InputBus; import static gregtech.api.enums.HatchElement.InputHatch; import static gregtech.api.enums.HatchElement.OutputBus; @@ -25,6 +24,7 @@ import static net.minecraft.util.EnumChatFormatting.GRAY; import static net.minecraft.util.EnumChatFormatting.GREEN; import static net.minecraft.util.EnumChatFormatting.RED; import static net.minecraft.util.EnumChatFormatting.RESET; +import static net.minecraft.util.EnumChatFormatting.STRIKETHROUGH; import static net.minecraft.util.EnumChatFormatting.YELLOW; import java.math.BigInteger; @@ -61,6 +61,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.SoundResource; @@ -101,8 +102,6 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, public static final boolean EOH_DEBUG_MODE = false; private static final long MOLTEN_SPACETIME_PER_FAILURE_TIER = 14_400L; private static final double SPACETIME_FAILURE_BASE = 2; - private static final String TOOLTIP_BAR = GOLD - + "---------------------------------------------------------------------------------------"; // Region variables. private static Textures.BlockIcons.CustomIcon ScreenOFF; @@ -973,12 +972,11 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Spacetime Manipulator, EOH") - .addInfo(TOOLTIP_BAR) .addInfo("Creates a pocket of spacetime that is bigger on the inside using transdimensional") .addInfo("engineering. Certified Time Lord regulation compliant. This multi uses too much EU") .addInfo("to be handled with conventional means. All EU requirements are handled directly by") .addInfo("your wireless EU network.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("This multiblock will constantly consume hydrogen and helium when it is not running a") .addInfo("recipe once per second. It will store this internally, you can see the totals by") .addInfo("using a scanner. This multi also has three tiered blocks with " + RED + 9 + GRAY + " tiers") @@ -1032,24 +1030,24 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, + "%" + GRAY + " per tier (additive).") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("Going over a recipe requirement on hydrogen or helium has a penalty on yield and recipe chance.") .addInfo("All stored hydrogen and helium is consumed during a craft. The associated formulas are:") .addInfo(GREEN + "Overflow ratio = (Stored fluid / Recipe requirement) - 1") .addInfo(GREEN + "Adjustment value = 1 - exp(-(30 * Overflow ratio)^2)") .addInfo("The Adjustment value is then subtracted from the total yield and recipe chance.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("It should be noted that base recipe chance is determined per recipe and yield always starts") .addInfo("at 1 and subtracts depending on penalties. All fluid/item outputs are multiplied by the") .addInfo("yield. Failure fluid is exempt.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("This multiblock can only output to ME output buses/hatches.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("This multiblock can be overclocked by placing a programmed circuit into the input bus.") .addInfo( "E.g. A circuit of 2 will provide 2 OCs, 16x EU input and 0.25x the time. EU output is unaffected.") .addInfo("All outputs are equal. All item and fluid output chances & amounts per recipe are unaffected.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo( "If a recipe fails the EOH will output " + GREEN + "Success chance * " @@ -1062,7 +1060,7 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, .addInfo( MaterialsUEVplus.SpaceTime.getLocalizedNameForItem("%material") + " instead of fluid/item outputs and output as much EU as a successful recipe.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo( "This multiblock can perform parallel processing by placing Astral Array Fabricators into the input bus.") .addInfo( @@ -1097,11 +1095,10 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, + GRAY + ".") .addInfo("The success or failure of each parallel is determined independently.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.GOLD, 87) .addInfo("Animations can be disabled by using a screwdriver on the multiblock.") .addInfo("Planet block can be inserted directly by right-clicking the controller with planet block.") - .addSeparator() - .addStructureInfo("Eye of Harmony structure is too complex! See schematic for details.") + .beginStructureBlock(33, 33, 33, false) .addStructureInfo( EnumChatFormatting.GOLD + "896" + EnumChatFormatting.GRAY + " Reinforced Spatial Structure Casing.") .addStructureInfo( @@ -1116,14 +1113,12 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, EnumChatFormatting.GOLD + "48" + EnumChatFormatting.GRAY + " Stabilisation Field Generator.") .addStructureInfo( EnumChatFormatting.GOLD + "138" + EnumChatFormatting.GRAY + " Spacetime Compression Field Generator.") - .addStructureInfo("--------------------------------------------") + .addStructureInfo("") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 2 + EnumChatFormatting.GRAY + " input hatches.") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " ME output hatch.") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " input bus.") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " ME output bus.") - .addStructureInfo("--------------------------------------------") - .beginStructureBlock(33, 33, 33, false) - .toolTipFinisher(AuthorColen.substring(8) + EnumChatFormatting.GRAY + "&" + CommonValues.TEC_MARK_EM); + .toolTipFinisher(EnumChatFormatting.GOLD, 87, GTValues.AuthorColen); return tt; } @@ -1548,7 +1543,14 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, @Override public String[] getInfoData() { ArrayList<String> 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<TT @Override protected MultiblockTooltipBuilder createTooltip() { - final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); - tt.addInfo("Nothing special just override me") - .toolTipFinisher(CommonValues.TEC_MARK_GENERAL); - return tt; + return new MultiblockTooltipBuilder().addInfo("MISSING TOOLTIP") + .toolTipFinisher(); } /** diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java index f8920d4f78..eb89e8bf6c 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java @@ -85,8 +85,6 @@ public class MTEBaseModule extends TTMultiblockBase { private static final int VOLTAGE_WINDOW_ID = 9; private static final int GENERAL_INFO_WINDOW_ID = 10; private static final int TEXTURE_INDEX = 960; - protected static final String TOOLTIP_BAR = EnumChatFormatting.AQUA - + "--------------------------------------------------------------------------"; public MTEBaseModule(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java index c09f497e62..ea75f67cba 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java @@ -73,7 +73,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import tectech.recipe.TecTechRecipeMaps; import tectech.thing.gui.TecTechUITextures; -import tectech.util.CommonValues; import tectech.util.GodforgeMath; public class MTEExoticModule extends MTEBaseModule { @@ -644,18 +643,16 @@ public class MTEExoticModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Exotic Matter Producer") - .addInfo("Controller block for the Heliofusion Exoticizer, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for ultra high temperature matter degeneration.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("The fourth and final module of the Godforge, this module breaks apart the very") .addInfo("building blocks of matter, producing exotic mixtures in the process. Quark-Gluon Plasma") .addInfo("can be manufactured right away, but production of Magnetic Monopole Matter (Magmatter)") .addInfo("requires a fully upgraded Godforge.") .addInfo("This module is specialized towards acquisition of unique materials.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -671,7 +668,7 @@ public class MTEExoticModule extends MTEBaseModule { .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Output Hatch") .addStructureInfo("Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " Output Bus") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java index 3f42d34f0a..933983178a 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEMoltenModule.java @@ -27,7 +27,6 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import tectech.recipe.TecTechRecipeMaps; -import tectech.util.CommonValues; public class MTEMoltenModule extends MTEBaseModule { @@ -151,17 +150,15 @@ public class MTEMoltenModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Smelter") - .addInfo("Controller block for the Helioflux Melting Core, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for high temperature material liquefaction.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("The second module of the Godforge, this module melts materials directly into") .addInfo("their liquid form. If an output material does not have a liquid form, it will be output") .addInfo("as a regular solid instead.") .addInfo("This module is specialized towards parallel processing.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -175,7 +172,7 @@ public class MTEMoltenModule extends MTEBaseModule { .addStructureInfo( EnumChatFormatting.GOLD + "5" + EnumChatFormatting.GRAY + " Celestial Matter Guidance Casing") .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java index 8a66736726..8169849639 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEPlasmaModule.java @@ -45,7 +45,6 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import tectech.loader.ConfigHandler; import tectech.recipe.TecTechRecipeMaps; -import tectech.util.CommonValues; public class MTEPlasmaModule extends MTEBaseModule { @@ -222,17 +221,15 @@ public class MTEPlasmaModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Plasma Fabricator") - .addInfo("Controller block for the Heliothermal Plasma Fabricator, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for extreme temperature matter ionization.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("The third module of the Godforge, this module infuses materials with extreme amounts") .addInfo("of heat, ionizing and turning them into plasma directly. Not all plasmas can be produced") .addInfo("right away, some of them require certain upgrades to be unlocked.") .addInfo("This module is specialized towards energy and overclock efficiency.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -246,7 +243,7 @@ public class MTEPlasmaModule extends MTEBaseModule { .addStructureInfo( EnumChatFormatting.GOLD + "5" + EnumChatFormatting.GRAY + " Celestial Matter Guidance Casing") .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java index 5f6bb2534d..dbf1e621d5 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTESmeltingModule.java @@ -43,7 +43,6 @@ import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; -import tectech.util.CommonValues; public class MTESmeltingModule extends MTEBaseModule { @@ -231,17 +230,15 @@ public class MTESmeltingModule extends MTEBaseModule { public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Furnace, Furnace") - .addInfo("Controller block for the Helioflare Power Forge, a module of the Godforge.") + .addInfo("This is a module of the Godforge.") .addInfo("Must be part of a Godforge to function.") .addInfo("Used for basic smelting operations at various temperatures.") - .addInfo(TOOLTIP_BAR) + .addLineSeparator(EnumChatFormatting.AQUA, 74) .addInfo("As the first of the Godforge modules, this module performs the most basic") .addInfo("thermal processing, namely smelting materials identically to a furnace or blast furnace.") .addInfo("The desired method of processing can be selected in the gui.") .addInfo("This module is specialized towards speed and high heat levels.") - .addInfo(TOOLTIP_BAR) .beginStructureBlock(7, 7, 13, false) - .addStructureInfo("The structure is too complex! See schematic for details.") .addStructureInfo( EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY @@ -254,7 +251,7 @@ public class MTESmeltingModule extends MTEBaseModule { .addStructureInfo( EnumChatFormatting.GOLD + "5" + EnumChatFormatting.GRAY + " Celestial Matter Guidance Casing") .addStructureInfo(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Stellar Energy Siphon Casing") - .toolTipFinisher(CommonValues.GODFORGE_MARK); + .toolTipFinisher(EnumChatFormatting.AQUA, 74); return tt; } diff --git a/src/main/resources/assets/bartworks/lang/de_DE.lang b/src/main/resources/assets/bartworks/lang/de_DE.lang index e235b69987..10dc2feab6 100644 --- a/src/main/resources/assets/bartworks/lang/de_DE.lang +++ b/src/main/resources/assets/bartworks/lang/de_DE.lang @@ -115,8 +115,6 @@ tooltip.tile.lesu.0.name=Controller Block for the GT2-Styled L.E.S.U.;Size: ANY tooltip.tile.lesu.1.name=Storage per LESU Casing: tooltip.tile.lesu.2.name=Output EU: LESU Casings amount;Input EU: Next Voltage Tier to Output EU;Input/Output Amps can be configured via 4 Circuits in GUI;Output Side has a dot on it. tooltip.tile.lesu.3.name=Only one Controller allowed, no Wallsharing! -tooltip.tile.manualtravo.0.name=Controller Block for the Manual Trafo;Operates in 4 different Modes:;Mode 1: Circuit 0 in controller: Direct-Upstep;Mode 2: Circuit 1 in controller: Direct-Downstep;Mode 3: Circuit 2 in controller: Tapped-Upstep;Mode 4: Circuit 3 in controller: Tapped-Downstep;For direct Modes: 3xHx3;Base Contains at least 1 Energy Hatch;1 Layer of Transformer-Winding Blocks for each Tier transformed;Middle of Transformer-Winding Blocks needs to be a Nickel-Zinc Ferrite Block;Top Contains at least 1 Dynamo Hatch;Maintenance Hatch can be placed anywhere;Tapped Mode is disabled at the Moment. -tooltip.tile.mbf.0.name=Controller Block for the Mega Blast Furnace;Size(WxHxD): 15x20x15 (Hollow);Controller: 3nd Layer Middle Center;Inner 13x18x13 Heating Coils (Hollow);Outer 15x18x15 Borosilicate Glass;The glass limits the Energy Input tier;1+ Input Hatch/Bus (Any casing);1+ Output Bus (Any casing);1+ Energy Hatch (Any casing);1x Maintenance Hatch (Any casing);13x13 Muffler Hatches (Top middle);Heat Proof Machine Casings for the outer 15x15 (Layer 20);1+ Output Hatch to recover CO2/CO/SO2 (optional, any top layer casing); Recovery scales with Muffler Hatch tier;Heat Proof Machine Casings for Base;Each 900K over the min. Heat Capacity grants 5% speedup (multiplicatively);Each 1800K over the min. Heat Capacity allows for one upgraded overclock;Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%;Causes maximum tooltip.tile.mbf.1.name=Pollution per second tooltip.tile.radhatch.0.name=Radioactive Item Chamber for Multiblocks tooltip.tile.radhatch.1.name=Use a screwdriver to set the containment level diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang index e5c1a36027..4e50c9b4d5 100644 --- a/src/main/resources/assets/bartworks/lang/en_US.lang +++ b/src/main/resources/assets/bartworks/lang/en_US.lang @@ -145,14 +145,12 @@ tooltip.tile.waterpump.0.name=Produces tooltip.tile.waterpump.1.name=L/s Water when fueled. Causes %d Pollution per second. tooltip.tile.waterpump.2.name=Must be placed on the Ground. -tooltip.tile.mbf.0.name=Controller Block for the Mega Blast Furnace;Size(WxHxD): 15x20x15 (Hollow);Controller: 3rd Layer Middle Center;Inner 13x18x13 Heating Coils (Hollow);Outer 15x18x15 Borosilicate Glass;The glass tier limits the Energy Input tier;1+ Input Hatch/Bus (Any casing);1+ Output Hatch/Bus (Any casing);1+ Energy Hatch (Any casing);1x Maintenance Hatch (Any casing);13x13 Muffler Hatches (Top middle);Heat Proof Machine Casings for the outer 15x15 (Layer 20);1+ Output Hatch to recover CO2/CO/SO2 (optional, any top layer casing); Recovery scales with Muffler Hatch tier;Heat Proof Machine Casings for Base;Each 900K over the min. Heat Capacity grants 5% speedup (multiplicatively);Each 1800K over the min. Heat Capacity allows for one upgraded overclock;Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%;Causes maximum tooltip.tile.mbf.1.name=Pollution per second tooltip.tile.windmill.0.name=A primitive Grinder powered by Kinetic energy.;Size(WxHxD): 7x12x7;Layer 1: 7x7 Bricks, corners are air, controller at front centered.;Layer 2-5: 5x5 Hardened Clay, corners are air, can contain one door,;hollow, Wall must contain at least one Dispenser;Layer 6: 5x5 Wood Planks. Corners are filled, hollow.;Layer 7: 7x7 Wood Planks. Corners are air, hollow.;Layer 8: 7x7 Wood Planks. Corners are air, hollow,;front centered must be a Primitive Kinetic Shaftbox;Layer 9: 7x7 Wood Planks. Corners are air, hollow.;Layer 10: 5x5 Wood Planks. Corners are filled, hollow.;Layer 11: 3x3 Wood Planks. Corners are filled, hollow.;Layer 12: 1x1 Wood Plank.;Needs a Wind Mill Rotor in the Shaftbox to operate;Input items in Controller;Output items will appear in the dispensers;It is faster in regions with more wind (like IC2 Windmills) tooltip.tile.lesu.0.name=Controller Block for the GT2-Styled L.E.S.U.;Size: ANY tooltip.tile.lesu.1.name=Storage per LESU Casing: tooltip.tile.lesu.2.name=Output EU: LESU Casings amount;Input EU: Next Voltage Tier to Output EU;Input/Output Amps can be configured via 4 Circuits in GUI;Output Side has a dot on it. tooltip.tile.lesu.3.name=Only one Controller allowed, no Wallsharing! -tooltip.tile.manualtravo.0.name=Controller Block for the Manual Trafo;Operates in 4 different Modes:;Mode 1: Circuit 0 in controller: Direct-Upstep;Mode 2: Circuit 1 in controller: Direct-Downstep;Mode 3: Circuit 2 in controller: Tapped-Upstep;Mode 4: Circuit 3 in controller: Tapped-Downstep;For direct Modes: 3xHx3;Base Contains at least 1 Energy Hatch;1 Layer of Transformer-Winding Blocks for each Tier transformed;Middle of Transformer-Winding Blocks needs to be a Nickel-Zinc Ferrite Block;Top Contains at least 1 Dynamo Hatch;Maintenance Hatch can be placed anywhere;Tapped Mode is disabled at the Moment. tooltip.tile.tiereddsc.0.name=Voltage: tooltip.tile.tiereddsc.1.name=Amperage IN: tooltip.tile.tiereddsc.2.name=Amperage OUT: @@ -198,7 +196,7 @@ tile.biolab.name=Bio Lab tile.biovat.name=Bacterial Vat tile.radiohatch.name=Radio Hatch tile.bw.windmill.name=Windmill -tile.manutrafo.name=Manual Trafo +tile.manutrafo.name=Manual Transformer tile.BioFluidBlock.name=Bio Fluid Block item.TRISOPellet.name=TRISO pebble diff --git a/src/main/resources/assets/bartworks/lang/fr_FR.lang b/src/main/resources/assets/bartworks/lang/fr_FR.lang index a9f4964759..aa132af43b 100644 --- a/src/main/resources/assets/bartworks/lang/fr_FR.lang +++ b/src/main/resources/assets/bartworks/lang/fr_FR.lang @@ -100,14 +100,12 @@ tooltip.tile.waterpump.0.name=Produit tooltip.tile.waterpump.1.name=L/s Water quand il est alimenté. tooltip.tile.waterpump.2.name=Doit être placé sur le sol. -tooltip.tile.mbf.0.name=Bloc contrôleur pour le haut fourneau;Taille(LxHxP): 15x20x15 (creux);Contrôleur: 3ème couche centré au milieu;Intérieur 13x18x13 bobines de chauffage (creux);Extérieur 15x18x15 Verre Borosilicate;Le verre limite le tier d'énergie en entrée;1+ Trappe/Bus d'entrée (n'importe quel bloc carter);1+ bus de sortie(n'importe quel bloc carter);1+ trappe d'énergie (n'importe quel bloc carter);1x trappe de maintenance (n'importe quel bloc carter);Blocs carter de machine résistant à la chaleur pour l'extérieur 15x15 (couche 20);La récupération se câle sur le tier de la trappe d'échappement;Blocs carter de machine résistant à la chaleur pour la base;Chaque 900K supérieur à la température de base donne 5% de rapidité (multiplicativement);Chaque 1800k supérieur à la température de base donne un overclock gratuit;Chaque overclock reduit le temps de craft de 25% et augmente la consommation d'EU/t de 400%;Cause une pollution maximale. tooltip.tile.mbf.1.name=Pollution par seconde tooltip.tile.windmill.0.name=Un broyeur primitif fonctionnant a l'énergie cinétique.;Taille(LxHxP): 7x12x7;Couche 1: 7x7 Briques, les coins sont laissés vide,le contrôleur est centré devant.;(creux), les mur doivent contenir au moins un Dispenseur;Couche 7: 7x7 Planches de Bois. les coins sont laissés vide, (creux).;Couche 8: 7x7 Planches de Bois. les coins sont laissés vide, (creux),;le bloc centré devant doit être une Boîte d'arbre de transmission primitive.;Couche 9: 7x7 Planches de Bois. les coins sont laissés vide, (creux).;Couche 11: 3x3 Planches de Bois. les coins sont pleins, (creux).;A besoin d'un Rotor d'éolienne dans la Boîte d'arbre de transmission pour fonctionner.;Les objets d'entrée doivent aller dans le contrôleur.;Les objets de sortie apparaîtront dans les Dispenseurs.;C'est plus rapide dans les régions venteuses (comme les éoliennes IC2). tooltip.tile.lesu.0.name=Bloc contrôleur pour le GT2-Stylé L.E.S.U.;Taille: n'importe; tooltip.tile.lesu.1.name=Stockage par carter du LESU: tooltip.tile.lesu.2.name=EU de sortie: le nombre de blocs carter LESU;EU d'entrée: prochain Tier de voltage après les EU de sortie;l'ampérage d'entrée/sortie peut être configurée via 4 Circuits dans le GUI;La face de sortie à un point dessus. tooltip.tile.lesu.3.name=Seulement un seul contrôleur autorisé, pas de partage des murs! -tooltip.tile.manualtravo.0.name=Bloc contrôleur pour le Transformateur Manuel;4 modes de fonctionnement;Fonctionne avec 2 modes en ce moment:;Mode 1: Circuit 0 dans le contrôleur: unique source et ascendant;Mode 2: Circuit 1 dans le contrôleur: unique source et descendant;Mode 3: Circuit 2 dans le contrôleur: plusieurs sources et ascendant;Mode 4: Circuit 3 dans le contrôleur: plusieurs sources et descendant;Pour les modes directs: 3xHx3;La base doit contenir au moins une trappe d'énergie;1 Couche de Blocs de bobinage de Transformateur pour chaque tier converti;Au milieu des Blocs de bobinage de Transformeur il doit y avoir un Bloc de Ferrite en Nickel-Zinc;Le haut doit contenir au moins une Trappe Dynamo;La trappe de maintenance peut être placée n'importe où;Les modes avec plusieurs sources sont désactivés pour le moment. tooltip.tile.tiereddsc.0.name=Voltage: tooltip.tile.tiereddsc.1.name=Ampérage d'entrée: tooltip.tile.tiereddsc.2.name=Ampérage de sortie: diff --git a/src/main/resources/assets/bartworks/lang/zh_CN.lang b/src/main/resources/assets/bartworks/lang/zh_CN.lang index f3a9ca534d..f31d81e563 100644 --- a/src/main/resources/assets/bartworks/lang/zh_CN.lang +++ b/src/main/resources/assets/bartworks/lang/zh_CN.lang @@ -100,14 +100,12 @@ tooltip.tile.waterpump.0.name=在有燃料时,产出 tooltip.tile.waterpump.1.name=L/s水. tooltip.tile.waterpump.2.name=必须放在地上. -tooltip.tile.mbf.0.name=巨型工业高炉的控制器方块;大小(宽x高x长):15x20x15(中空);控制器方块在第三层正面中央;内层13x18x13加热线圈(中空);外层15x18x15硼硅酸盐玻璃方块;玻璃等级限制了能源仓等级;1+输入仓/总线(任意机械方块);1+输出总线(任意机械方块);1+能源仓(任意机械方块);1x维护仓(任意机械方块)(注:所有底层仓室必须置于边缘);13x1x13消声仓(顶层中央);外部15x15的防热机械方块(第20层);1+输出仓以回收CO2/CO/SO2(可选,任意顶层机械方块);回收比例取决于消声仓等级;底层为隔热机械方块;自物品配方的最小炉温起,每高出900K会减少5%的能耗,使用乘法叠加;自物品配方的最小所需炉温起,每高出1800K将允许一次无损的超频;无损超频将减少加工时间至25%并提升功率至400%;每秒造成最大 tooltip.tile.mbf.1.name=污染每秒 tooltip.tile.windmill.0.name=由动能驱动的原始磨床;大小(宽x高x长):7x12x7;第1层:7x7砖块,角落空置,控制器方块在正面中央;第2-5层:5x5硬化粘土,角落空置,可包含一扇门,;中空,墙必须至少包含一个发射器;第6层:5x5木板.角落填充,中空.;第7层:7x7木板.角落空置,中空.;第8层:7x7木板.角落空置,中空,;正面中央必须是原始动力轴箱;第9层:7x7木板.角落空置,中空.;第10层:5x5木板.角落填充,中空.;第11层:3x3木板.角落填充,中空.;第12层:1x1木板;需要在轴箱中放入风车转子才可运行;在控制器中输入物品;输出物品将出现在发射器中;在风大的地区运行较快(像IC2风机一样) tooltip.tile.lesu.0.name=用于GT2风格的L.E.S.U.的控制器方块;尺寸:任意 tooltip.tile.lesu.1.name=每个LESU机械方块存储: tooltip.tile.lesu.2.name=输出EU:LESU机械方块数量; 输入EU:输出EU的下一电压等级;输入/输出安培可通过GUI中的4个编程电路进行调整;输出端只有一个点. tooltip.tile.lesu.3.name=只允许一个控制器,不允许墙壁共享! -tooltip.tile.manualtravo.0.name=手动变压器的控制器方块;可在4种不同的模式下运行:;模式1:控制器内放入编程电路0:直接升压;模式2:控制器内放入编程电路1:直接降压;模式3:控制器内放入编程电路2:Tapped升压;模式4:控制器内放入编程电路3:Tapped降压;直接模式(长x高x宽):3xHx3;底层至少包含一个能源仓;每1级变压器需要一层变压器线圈方块;变压器线圈方块中心需为镍锌铁氧体块;顶部至少包含一个动力仓;维护仓可置于任意位置;Tapped模式暂不可用.(Tapped模式为在变压时获得多个电压)(译注) tooltip.tile.tiereddsc.0.name=电压: tooltip.tile.tiereddsc.1.name=输入安培: tooltip.tile.tiereddsc.2.name=输出安培: diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 54d38fed7e..d76bdfdefc 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -16,7 +16,7 @@ GT5U.autoplace.error.no_mte.id=§cSuggested to place machine with meta ID §4%s GT5U.autoplace.error.no_mte.class_name=§cSuggested to place machine with class name §4%d§c but none was found # Multiblock Tooltip Builder Keywords -# Context can be found in the class gregtech.api.util.GT_Multiblock_Tooltip_Builder +# Context can be found in the class gregtech.api.util.MultiblockTooltipBuilder GT5U.MBTT.MachineType=Machine Type GT5U.MBTT.Dimensions=Dimensions GT5U.MBTT.Hollow=(Hollow) @@ -39,6 +39,9 @@ GT5U.MBTT.Display=to display structure guidelines GT5U.MBTT.StructureHint=Some blocks have multiple candidates or can use any tier GT5U.MBTT.Mod=Added by GT5U.MBTT.Air=Mandatory Air +GT5U.MBTT.Structure.Complex=Structure is too complex! +GT5U.MBTT.Structure.SeeStructure1=To see the structure, use a +GT5U.MBTT.Structure.SeeStructure2=Hologram Projector on the Controller! GT5U.MBTT.subchannel=Uses sub channel §6%s§r§7 for §6%s diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 723b47a145..eceda5a5c1 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -645,7 +645,6 @@ gt.blockcasingsBA0.8.desc.1=Who wouldn't want a 32k epoxy multi? #Multiblocks gt.blockmachines.multimachine.em.transformer.name=Active Transformer gt.blockmachines.multimachine.em.transformer.hint=1 - Energy IO Hatches or High Power Casing -gt.blockmachines.multimachine.em.transformer.desc.0=Controller block of the Active Transformer gt.blockmachines.multimachine.em.transformer.desc.1=Can transform to and from any voltage gt.blockmachines.multimachine.em.transformer.desc.2=Only 0.004% power loss, HAYO! gt.blockmachines.multimachine.em.transformer.desc.3=Will explode if broken while running @@ -767,7 +766,6 @@ gt.blockmachines.multimachine.em.scanner.desc.0=Controller block of the Elementa gt.blockmachines.multimachine.em.research.type=Research Station, Scanner gt.blockmachines.multimachine.em.research.hint.0=1 - Classic/Data Hatches or Computer casing gt.blockmachines.multimachine.em.research.hint.1=2 - Holder Hatch -gt.blockmachines.multimachine.em.research.desc.0=Controller block of the Research Station gt.blockmachines.multimachine.em.research.desc.1=Used to scan Data Sticks for Assembling Line Recipes gt.blockmachines.multimachine.em.research.desc.2=Needs to be fed with computation to work gt.blockmachines.multimachine.em.research.desc.3=Does not consume the item until the Data Stick is written @@ -1305,8 +1303,6 @@ tt.nei.research.min_computation=Min Computation: %s /s tt.keyword.ID=ID #Example: 32EU at 1A tt.keyword.at=at -# Structure is too complex -tt.keyword.Structure.StructureTooComplex=The structure is too complex! # Any X tt.keyword.Structure.AnyComputerCasing=Any Computer Casing tt.keyword.Structure.AnyHighPowerCasing=Any High Power Casing diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang index 9a64ade7c7..ac33177b27 100644 --- a/src/main/resources/assets/tectech/lang/zh_CN.lang +++ b/src/main/resources/assets/tectech/lang/zh_CN.lang @@ -539,7 +539,6 @@ gt.blockcasingsBA0.8.desc.1=谁不想要32k的环氧树脂? #Multiblocks gt.blockmachines.multimachine.em.transformer.name=有源变压器 gt.blockmachines.multimachine.em.transformer.hint=1 - 能源仓、动力仓或超能机械方块 -gt.blockmachines.multimachine.em.transformer.desc.0=有源变压器的控制器方块 gt.blockmachines.multimachine.em.transformer.desc.1=任意电压间的相互转换! gt.blockmachines.multimachine.em.transformer.desc.2=只有0.004%的能量损失, HAYO! gt.blockmachines.multimachine.em.transformer.desc.3=运行时被破坏会发生爆炸 @@ -659,7 +658,6 @@ gt.blockmachines.multimachine.em.scanner.desc.0=元物质扫描仪的控制器 gt.blockmachines.multimachine.em.research.name=研究站 gt.blockmachines.multimachine.em.research.hint.0=1 - 基础仓室、光学接口或电子计算机械方块 gt.blockmachines.multimachine.em.research.hint.1=2 - 物品固定容器 -gt.blockmachines.multimachine.em.research.desc.0=研究站的控制器方块 gt.blockmachines.multimachine.em.research.desc.1=用于扫描物品, 生成装配线配方闪存 gt.blockmachines.multimachine.em.research.desc.2=需要为其提供算力 gt.blockmachines.multimachine.em.research.desc.3=在完成闪存写入之前不会消耗物品 @@ -808,8 +806,6 @@ gt.blockmachines.debug.tt.writer.desc.2=ABC轴沿机器正面确定 tt.keyword.ID=ID #Example: 32EU at 1A tt.keyword.at= -# Structure is too complex -tt.keyword.Structure.StructureTooComplex=结构太复杂了！ # Any X tt.keyword.Structure.AnyComputerCasing=任意电子计算机械方块 tt.keyword.Structure.AnyHighPowerCasing=任意超能机械方块 |