diff options
author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-11-14 09:18:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-11-14 14:18:08 +0000 |
commit | 78d61f626328702d1b6c9b937f84e2aa4119b009 (patch) | |
tree | 5d90a7d17d8f10c7b6c71a9f8eef0de57833c396 /src/main/java/gregtech | |
parent | a35585567574ee0d5dc4a7e0942df41346a7b809 (diff) | |
download | GT5-Unofficial-78d61f626328702d1b6c9b937f84e2aa4119b009.tar.gz GT5-Unofficial-78d61f626328702d1b6c9b937f84e2aa4119b009.tar.bz2 GT5-Unofficial-78d61f626328702d1b6c9b937f84e2aa4119b009.zip |
Add explicit mention of exotic energy hatches (#3491)
Diffstat (limited to 'src/main/java/gregtech')
7 files changed, 35 insertions, 5 deletions
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"); @@ -117,6 +119,18 @@ public class MultiblockTooltipBuilder { } /** + * 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 * * @param infoStrings The lines to be added. @@ -548,6 +562,17 @@ public class MultiblockTooltipBuilder { /** * Add a line of information about the structure:<br> + * 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:<br> * (indent)Maintenance Hatch: info * * @param info Positional information. 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<MTENanoForge> 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<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.") + .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<MTEWormholeG long toSend = GTUtility.min(available, empty, maxSend, maxReceive, maxIO); double overclocks = 0; - + if (mAllowOverclocks) { overclocks = Math.log((double)toSend / (double)optimal) / Math.log(4.0); overclocks = MathHelper.clamp_double(overclocks, 0, MAX_OVERCLOCKS); @@ -998,7 +998,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG .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("Right click the controller with a screwdriver to disable overclocking.") - .addInfo("Works with low power lasers.") + .addTecTechHatchInfo() .beginStructureBlock(7, 9, 7, false) .addCasingInfoExactly("Molecular Casing", 2 * 12, false) .addCasingInfoExactly("Europium Reinforced Radiation Proof Machine Casing", 4, false) 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 d945dde089..ae52600f5c 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 @@ -1,6 +1,5 @@ package gregtech.common.tileentities.machines.multi.compressor; -import static bartworks.util.BWTooltipReference.TT; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -373,7 +372,7 @@ public class MTEBlackHoleCompressor extends MTEExtendedPowerMultiBlockBase<MTEBl + " parallels when stability is BELOW " + EnumChatFormatting.RED + "50/20") - .addInfo("Accepts " + TT + " energy hatches") + .addTecTechHatchInfo() .addInfo( EnumChatFormatting.RED + "Recipe tier is limited to hatch tier + 1. Will not perform overclocks above the hatch tier.") 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 dd30052d91..a3b89adcf6 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 @@ -188,7 +188,8 @@ public class MTEPurificationPlant extends MTEExtendedPowerMultiBlockBase<MTEPuri + EnumChatFormatting.GRAY + " blocks along each axis.") .addInfo("Left click this controller with a data stick, then right click a purification unit to link.") - .addInfo("Supplies power to linked purification units. This multiblock accepts TecTech energy hatches.") + .addInfo("Supplies power to linked purification units.") + .addTecTechHatchInfo() .addSeparator() .addInfo( "Works in fixed time processing cycles of " + EnumChatFormatting.RED |