From 78d61f626328702d1b6c9b937f84e2aa4119b009 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:18:08 -0500 Subject: Add explicit mention of exotic energy hatches (#3491) --- .../multis/MTEElectricImplosionCompressor.java | 3 +-- .../multis/mega/MTEMegaBlastFurnace.java | 2 ++ .../multis/mega/MTEMegaChemicalReactor.java | 2 ++ .../multis/mega/MTEMegaDistillTower.java | 2 ++ .../multis/mega/MTEMegaOilCracker.java | 2 ++ .../multis/mega/MTEMegaVacuumFreezer.java | 2 ++ src/main/java/ggfab/mte/MTEAdvAssLine.java | 5 +++-- .../tileEntity/MTEComponentAssemblyLine.java | 1 + .../blocks/tileEntity/MTEFuelRefineFactory.java | 1 + .../tileEntity/MTELargeEssentiaSmeltery.java | 1 + .../blocks/tileEntity/MTELargeFusionComputer1.java | 8 +------ .../blocks/tileEntity/MTELargeFusionComputer2.java | 8 +------ .../blocks/tileEntity/MTELargeFusionComputer3.java | 8 +------ .../blocks/tileEntity/MTELargeFusionComputer4.java | 8 +------ .../blocks/tileEntity/MTELargeFusionComputer5.java | 8 +------ .../blocks/tileEntity/MTEMultiNqGenerator.java | 1 + .../blocks/tileEntity/MTEPreciseAssembler.java | 3 +-- .../tileEntity/MTEUniversalChemicalFuelEngine.java | 4 ++-- src/main/java/gregtech/api/enums/GTValues.java | 3 +++ .../api/util/MultiblockTooltipBuilder.java | 25 ++++++++++++++++++++++ .../tileentities/machines/multi/MTENanoForge.java | 1 + .../tileentities/machines/multi/MTEPCBFactory.java | 1 + .../machines/multi/MTEWormholeGenerator.java | 4 ++-- .../multi/compressor/MTEBlackHoleCompressor.java | 3 +-- .../multi/purification/MTEPurificationPlant.java | 3 ++- .../multi/production/MTELargeRocketEngine.java | 3 ++- .../production/MTEQuantumForceTransformer.java | 2 +- .../production/mega/MTEMegaAlloyBlastSmelter.java | 4 +++- .../production/turbines/MTELargerTurbineBase.java | 1 + .../tileentities/MTELapotronicSuperCapacitor.java | 1 + .../metaTileEntity/multi/MTEActiveTransformer.java | 1 + .../thing/metaTileEntity/multi/MTEDataBank.java | 2 +- .../metaTileEntity/multi/MTEEnergyInfuser.java | 1 + .../metaTileEntity/multi/MTENetworkSwitch.java | 1 + .../metaTileEntity/multi/MTEQuantumComputer.java | 1 + .../metaTileEntity/multi/MTEResearchStation.java | 1 + .../thing/metaTileEntity/multi/MTETeslaTower.java | 1 + src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ 38 files changed, 78 insertions(+), 52 deletions(-) diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java index 0cbdb70aa5..ff6c0a4eb9 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.TT; import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; @@ -269,7 +268,7 @@ public class MTEElectricImplosionCompressor extends MTEExtendedPowerMultiBlockBa .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") + .addTecTechHatchInfo() .beginStructureBlock(3, 9, 3, false) .addController("Front 3rd layer center") .addCasingInfoMin("Solid Steel Machine Casing", 8, false) 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 9fb028d51c..2aff0e7268 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -172,11 +172,13 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Blast Furnace") + .addParallelInfo(Configuration.Multiblocks.megaMachinesMax) .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") + .addTecTechHatchInfo() .addInfo( GTValues.TIER_COLORS[8] + GTValues.VN[8] + EnumChatFormatting.GRAY 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 2adcae3003..d3d072cbcc 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java @@ -72,6 +72,8 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Distillery") + .addParallelInfo(Configuration.Multiblocks.megaMachinesMax) .addInfo("Fluids are only put out at the correct height") .addInfo("The correct height equals the slot number in the NEI recipe") + .addTecTechHatchInfo() .beginVariableStructureBlock(15, 15, 16, 56, 15, 15, true) .addController("Front bottom") .addOtherStructurePart("Clean Stainless Steel Machine Casing", "15 x h - 5 (minimum)") 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 783d968535..092e62850c 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java @@ -150,6 +150,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp public MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Cracker") + .addParallelInfo(Configuration.Multiblocks.megaMachinesMax) .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:") @@ -157,6 +158,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp .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") + .addTecTechHatchInfo() .addInfo( GTValues.TIER_COLORS[8] + GTValues.VN[8] + EnumChatFormatting.GRAY 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 83251ee40d..5734faeb5e 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java @@ -235,6 +235,8 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase .addInfo("Assembling Line with item pipelining") .addInfo("All fluids are however consumed at start") .addInfo("Use voltage of worst energy hatch for overclocking") - .addInfo("Perform normal overclock with given voltage") - .addInfo("Perform laser overclock with extra amperages from multi-amp energy hatches") + .addInfo("Performs normal overclock with given voltage") + .addTecTechHatchInfo() + .addInfo("Performs laser overclock with extra amperage from multi-amp energy hatches") .addInfo("Each laser overclock reduces recipe time by 50%") .addInfo( "and multiplies power by (4 + " + formatNumbers(LASER_OVERCLOCK_PENALTY_FACTOR) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java index 9318d0d9df..be44ef3112 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java @@ -232,6 +232,7 @@ public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase= 160,000,000 EU: 64x Parallel") - .addInfo( - "Support" + EnumChatFormatting.BLUE - + " Tec" - + EnumChatFormatting.DARK_BLUE - + "Tech" - + EnumChatFormatting.GRAY - + " Energy/Laser Hatches!") + .addTecTechHatchInfo() .addCasingInfoMin("Fusion Machine Casing", 1664, false) .addCasingInfoMin("Compact Fusion Coil", 560, false) .addCasingInfoMin("Duranium Frame Box", 128, false) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java index cd9a21eb73..06f06e7cdd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java @@ -66,13 +66,7 @@ public class MTELargeFusionComputer3 extends MTELargeFusionComputer { .addInfo("Startup < 160,000,000 EU: 192x Parallel") .addInfo("Startup < 320,000,000 EU: 128x Parallel") .addInfo("Startup >= 320,000,000 EU: 64x Parallel") - .addInfo( - "Support" + EnumChatFormatting.BLUE - + " Tec" - + EnumChatFormatting.DARK_BLUE - + "Tech" - + EnumChatFormatting.GRAY - + " Energy/Laser Hatches!") + .addTecTechHatchInfo() .addCasingInfoMin("Fusion Machine Casing MK II", 1664, false) .addCasingInfoMin("Advanced Compact Fusion Coil", 560, false) .addCasingInfoMin("Neutronium Frame Box", 128, false) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java index 9520b647e9..7463519600 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java @@ -65,13 +65,7 @@ public class MTELargeFusionComputer4 extends MTELargeFusionComputerPP { .addInfo("Startup < 320,000,000 EU: 192x Parallel") .addInfo("Startup < 640,000,000 EU: 128x Parallel") .addInfo("Startup >= 640,000,000 EU: 64x Parallel") - .addInfo( - "Support" + EnumChatFormatting.BLUE - + " Tec" - + EnumChatFormatting.DARK_BLUE - + "Tech" - + EnumChatFormatting.GRAY - + " Energy/Laser Hatches!") + .addTecTechHatchInfo() .addCasingInfoMin("Fusion Machine Casing MK III", 1664, false) .addCasingInfoMin("Compact Fusion Coil MK-II Prototype", 560, false) .addCasingInfoMin("Infinity Catalyst Frame Box", 128, false) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java index 6d7d0d4764..52b89d67ad 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java @@ -66,13 +66,7 @@ public class MTELargeFusionComputer5 extends MTELargeFusionComputerPP { .addInfo("Startup < 640,000,000 EU: 192x Parallel") .addInfo("Startup < 1,200,000,000 EU: 128x Parallel") .addInfo("Startup >= 1,200,000,000 EU: 64x Parallel") - .addInfo( - "Support" + EnumChatFormatting.BLUE - + " Tec" - + EnumChatFormatting.DARK_BLUE - + "Tech" - + EnumChatFormatting.GRAY - + " Energy/Laser Hatches!") + .addTecTechHatchInfo() .addCasingInfoMin("Fusion Machine Casing MK IV", 1664, false) .addCasingInfoMin("Compact Fusion Coil MK-II Finaltype", 560, false) .addCasingInfoMin("Infinity Frame Box", 128, false) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java index 936d0776b7..28566da5cf 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java @@ -428,6 +428,7 @@ 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])) + .addTecTechHatchInfo() .beginStructureBlock(7, 8, 7, true) .addController("Front bottom") .addDynamoHatch("Any bottom layer casing, only accept ONE!") diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java index 56f3b6ae0f..815aaeafa6 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java @@ -1,6 +1,5 @@ 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 gregtech.api.enums.HatchElement.*; @@ -342,7 +341,7 @@ public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase + * Supports TecTech Multi-Amp and Laser Hatches! + * + * @return Instance this method was called on. + */ + public MultiblockTooltipBuilder addTecTechHatchInfo() { + iLines.add(EnumChatFormatting.BLUE + TT_tectechhatch); + return this; + } + /** * Add a line of information about the structure:
* (indent)Maintenance Hatch: info 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 218c90c3bd..66bad3d492 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java @@ -371,6 +371,7 @@ public class MTENanoForge extends MTEExtendedPowerMultiBlockBase i .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 + ".") + .addTecTechHatchInfo() .beginStructureBlock(30, 38, 13, false) .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 1 + EnumChatFormatting.GRAY) .addStructureInfo( 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 db564e9db4..603f66c734 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java @@ -859,6 +859,7 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase .addInfo("Liquid Cooling uses 10 L/s of distilled water and enables default overclocks.") .addInfo("Thermosink uses 10 L/s of Super Coolant and enables perfect overclocks.") .addInfo("Trace size can be changed to modify the material usage and machine speed.") + .addTecTechHatchInfo() .beginStructureBlock(30, 38, 13, false) .addMaintenanceHatch(EnumChatFormatting.GOLD + "1", 1) .addEnergyHatch( 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 4c603f7bb4..283aee3c29 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java @@ -666,7 +666,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase