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) --- 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 ++- 7 files changed, 35 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/enums/GTValues.java b/src/main/java/gregtech/api/enums/GTValues.java index ad09c2b98a..4223a7ed3f 100644 --- a/src/main/java/gregtech/api/enums/GTValues.java +++ b/src/main/java/gregtech/api/enums/GTValues.java @@ -1,5 +1,6 @@ package gregtech.api.enums; +import static bartworks.util.BWTooltipReference.TT; import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.AQUA; import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.BOLD; import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.DARK_AQUA; @@ -685,6 +686,8 @@ public class GTValues { public static final String AuthorPineapple = "Author: " + EnumChatFormatting.BLUE + "Recursive Pineapple"; + public static final String TecTechHatches = "Supports " + TT + " laser and multi-amp hatches"; + // 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now. public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) { return (5F + (7.5F + material.mToolQuality)) / 10.0; diff --git a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java index 007a73d588..30abba0fdd 100644 --- a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java +++ b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java @@ -47,6 +47,7 @@ public class MultiblockTooltipBuilder { private static final String COLON = ": "; private static final String SEPARATOR = ", "; private static final String TT_machineType = StatCollector.translateToLocal("GT5U.MBTT.MachineType"); + private static final String TT_Parallels = StatCollector.translateToLocal("GT5U.MBTT.Parallels"); private static final String TT_dimensions = StatCollector.translateToLocal("GT5U.MBTT.Dimensions"); private static final String TT_hollow = StatCollector.translateToLocal("GT5U.MBTT.Hollow"); private static final String TT_structure = StatCollector.translateToLocal("GT5U.MBTT.Structure"); @@ -61,6 +62,7 @@ public class MultiblockTooltipBuilder { private static final String TT_inputhatch = StatCollector.translateToLocal("GT5U.MBTT.InputHatch"); private static final String TT_outputbus = StatCollector.translateToLocal("GT5U.MBTT.OutputBus"); private static final String TT_outputhatch = StatCollector.translateToLocal("GT5U.MBTT.OutputHatch"); + private static final String TT_tectechhatch = StatCollector.translateToLocal("GT5U.MBTT.TecTechHatch"); private static final String TT_causes = StatCollector.translateToLocal("GT5U.MBTT.Causes"); private static final String TT_pps = StatCollector.translateToLocal("GT5U.MBTT.PPS"); private static final String TT_hold = StatCollector.translateToLocal("GT5U.MBTT.Hold"); @@ -116,6 +118,18 @@ public class MultiblockTooltipBuilder { return this; } + /** + * Add a line for static parallel count + * Processes up to {parallels} recipes at once + * + * @param parallels Maximum parallels + * @returnInstance this method was called on. + */ + public MultiblockTooltipBuilder addParallelInfo(Integer parallels) { + iLines.add(String.format(TT_Parallels, parallels)); + return this; + } + /** * Add a number of basic lines of information about this structure * @@ -546,6 +560,17 @@ public class MultiblockTooltipBuilder { return this; } + /** + * Add a line of information about the structure:
+ * 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