diff options
Diffstat (limited to 'src/main')
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<MTEMegaBlastFurnace> 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<MTEMegaChemicalRe tt.addMachineType("Chemical Reactor") .addInfo("What molecule do you want to synthesize ?") .addInfo("Or you want to replace something in this molecule ?") + .addParallelInfo(Configuration.Multiblocks.megaMachinesMax) + .addTecTechHatchInfo() .addInfo( GTValues.TIER_COLORS[8] + GTValues.VN[8] + EnumChatFormatting.GRAY 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 2158436f1e..4c3199f33f 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java @@ -259,8 +259,10 @@ public class MTEMegaDistillTower extends MegaMultiBlockBase<MTEMegaDistillTower> 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<MTEMegaOilCracker> 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<MTEMegaOilCracker> 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<MTEMegaVacuumFreeze MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Vacuum Freezer") .addInfo("Cools hot ingots and cells") + .addParallelInfo(Configuration.Multiblocks.megaMachinesMax) + .addTecTechHatchInfo() .addSeparator() .addInfo("Upgrade to Tier 2 to unlock " + EnumChatFormatting.LIGHT_PURPLE + "Subspace Cooling.") .addInfo( diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java index 0414d8213e..f9874efd79 100644 --- a/src/main/java/ggfab/mte/MTEAdvAssLine.java +++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java @@ -309,8 +309,9 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine> .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<MTE + " laser and multi-amp hatches!") .addInfo("Supports overclocking beyond MAX!") .addInfo(EnumChatFormatting.ITALIC + "Much more efficient than other competing brands!") + .addTecTechHatchInfo() .beginStructureBlock(9, 10, 33, false) .addOtherStructurePart("Borosilicate Glass", "Can be UV tier or higher") .addInputBus("Start of conveyor belt", 1) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java index c2376e7b63..8feb131c45 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java @@ -186,6 +186,7 @@ public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements .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.") + .addTecTechHatchInfo() .beginStructureBlock(3, 15, 15, false) .addInputHatch("The casings adjacent to field restriction glass.") .addInputBus("The casings adjacent to field restriction glass.", 1) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java index 54ff09d563..b89b3b9676 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java @@ -197,6 +197,7 @@ public class MTELargeEssentiaSmeltery extends MTETooltipMultiBlockBaseEM .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.") + .addTecTechHatchInfo() .addPollutionAmount(getPollutionPerSecond(null)) .addController("Front center") .addCasingInfoMin("Magic Casing", 24, false) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java index d6bdebf5a0..633bd9a72b 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java @@ -64,13 +64,7 @@ public class MTELargeFusionComputer1 extends MTELargeFusionComputer { .addInfo("Make sure the whole structure is built in the 3x3") .addInfo("chunk area of the ring center (not controller).") .addInfo("It can run 64x recipes at most.") - .addInfo( - "Support" + EnumChatFormatting.BLUE - + " Tec" - + EnumChatFormatting.DARK_BLUE - + "Tech" - + EnumChatFormatting.GRAY - + " Energy/Laser Hatches!") + .addTecTechHatchInfo() .addCasingInfoMin("LuV Machine Casing", 1664, false) .addCasingInfoMin("Ameliorated Superconduct Coil", 560, false) .addCasingInfoMin("Naquadah Alloy Frame Boxes", 128, false) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java index d185538bdf..e702e694eb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java @@ -65,13 +65,7 @@ public class MTELargeFusionComputer2 extends MTELargeFusionComputer { .addInfo("chunk area of the ring center (not controller).") .addInfo("Startup < 160,000,000 EU: 128x Parallel") .addInfo("Startup >= 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<MTEPreci .addInfo("But gives more parallel with more advanced one.") .addInfo("It is 100% faster in Normal Mode.") .addInfo("Imprecise (MK-0) = 16x, MK-I = 32x, MK-II = 64x, MK-III = 128x, MK-IV = 256x") - .addInfo("Supports " + TT + " energy hatches") + .addTecTechHatchInfo() .addPollutionAmount(getPollutionPerSecond(null)) .beginStructureBlock(9, 5, 5, true) .addController("Front bottom") diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java index 9845488e2f..0b6e958689 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java @@ -186,11 +186,10 @@ public class MTEUniversalChemicalFuelEngine extends MTETooltipMultiBlockBaseEM .addInfo("You need to supply Combustion Promoter to keep it running.") .addInfo("It will consume all the fuel and promoter in the hatch every second.") .addInfo("If the Dynamo Hatch's buffer fills up, the machine will stop.") - .addInfo("When turned on, there's 10-second period where the machine will not stop.") + .addInfo("When turned on, there is a 10-second period where the machine will not stop.") .addInfo("Even if it doesn't stop, all the fuel in the hatch will be consumed.") .addInfo("The efficiency is determined by the proportion of Combustion Promoter to fuel.") .addInfo("The proportion is bigger, and the efficiency will be higher.") - .addInfo("Start machine with power button to force structure check.") .addInfo("It creates sqrt(Current Output Power) pollution every second") .addInfo( "If you forget to supply Combustion Promoter, this engine will swallow all the fuel " @@ -199,6 +198,7 @@ public class MTEUniversalChemicalFuelEngine extends MTETooltipMultiBlockBaseEM + EnumChatFormatting.GRAY + ".") .addInfo("The efficiency is up to 150%.") + .addTecTechHatchInfo() .beginStructureBlock(5, 4, 9, false) .addMaintenanceHatch("Hint block with dot 1") .addMufflerHatch("Hint block with dot 2 (fill all slots with mufflers)") 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 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 59ef34d5f2..c9247de4b7 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 @@ -97,7 +97,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Generating Power from Rocket Fuels - Supports TecTech Multi-Amp Dynamos!") + .addInfo("Generating Power from Rocket Fuels") .addInfo("Supply GT++ Rocket Fuels and 1000L of " + mLubricantName + " per hour") .addInfo("Produces as much energy as you put fuel in, with optional boosting") .addInfo("This multi doesn't accept fluids if not enabled - enable it first!") @@ -113,6 +113,7 @@ 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))") + .addTecTechHatchInfo() .beginStructureBlock(3, 3, 10, false) .addController("Front Center") .addCasingInfoMin(mCasingName, 64, false) 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 35c09be046..fdb4b52c3b 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 @@ -246,7 +246,6 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<M tt.addMachineType("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") .addInfo("All inputs go on the bottom, all outputs go on the top") .addInfo("Put a circuit in the controller to specify the focused output") .addInfo("Check NEI to see the order of outputs, and which circuit number you need.") @@ -260,6 +259,7 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<M .addInfo("Casing functions:") .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)") + .addTecTechHatchInfo() .addPollutionAmount(getPollutionPerSecond(null)) .beginStructureBlock(15, 21, 15, true) .addController("Bottom Center") 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 61b9f237ed..1f98e164b8 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 @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega; +import static bartworks.util.BWTooltipReference.TT; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; @@ -297,7 +298,8 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE + EnumChatFormatting.RESET + EnumChatFormatting.GRAY) .addInfo("The glass limits the tier of the energy hatch. UEV glass unlocks all tiers.") - .addInfo("UV glass required for TecTech laser hatches.") + .addTecTechHatchInfo() + .addInfo("UV glass required for " + TT + " laser hatches.") .addInfo( EnumChatFormatting.ITALIC + "\"all it does is make metals hot\"" + EnumChatFormatting.RESET 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 a8c504b51a..fa3e43d8d4 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 @@ -156,6 +156,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT tt.addInfo("Plasma fuel efficiency is lower for high tier turbines when using low-grade plasmas") .addInfo("Efficiency = ((FuelValue / 200,000)^2) / (EU per Turbine)"); } + tt.addTecTechHatchInfo(); tt.addPollutionAmount(getPollutionPerSecond(null)) .beginStructureBlock(7, 9, 7, false) .addController("Top Middle") diff --git a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java index fce4ab7504..45e6ed1e52 100644 --- a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java +++ b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java @@ -428,6 +428,7 @@ public class MTELapotronicSuperCapacitor extends MTEEnhancedMultiBlockBase<MTELa .addInfo("Passive loss is multiplied by the number of maintenance issues present.") .addSeparator() .addInfo("Glass shell has to be Tier - 3 of the highest capacitor tier.") + .addTecTechHatchInfo() .addInfo( GTValues.TIER_COLORS[8] + GTValues.VN[8] + EnumChatFormatting.GRAY diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java index a77675a804..7c2963a30a 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEActiveTransformer.java @@ -135,6 +135,7 @@ public class MTEActiveTransformer extends TTMultiblockBase implements ISurvivalC .addInfo(translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.3")) // Will explode if // broken while // running + .addTecTechHatchInfo() .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 diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java index 88cab07f31..e218bb0c89 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java @@ -121,7 +121,7 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa // the same Data .addInfo(translateToLocal("gt.blockmachines.multimachine.em.databank.desc.3")) // Use screwdriver to toggle // wireless mode - + .addTecTechHatchInfo() .beginStructureBlock(5, 3, 3, false) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.DataAccessHatch"), diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java index 09b2da03de..24a00e1c7c 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEnergyInfuser.java @@ -242,6 +242,7 @@ 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")) + .addTecTechHatchInfo() .beginStructureBlock(3, 5, 3, false) // Controller: Front 3rd layer center .addController(translateToLocal("tt.keyword.Structure.FrontCenter3rd")) diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java index 40ef11bfe0..b9b80912d0 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTENetworkSwitch.java @@ -208,6 +208,7 @@ public class MTENetworkSwitch extends TTMultiblockBase implements IConstructable // distribute computation .addInfo(translateToLocal("gt.blockmachines.multimachine.em.switch.desc.2")) // Needs a Parametrizer to // be configured + .addTecTechHatchInfo() .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 diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java index ebf96e26a6..cbe9fc8332 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java @@ -354,6 +354,7 @@ 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 + .addTecTechHatchInfo() .beginVariableStructureBlock(2, 2, 4, 4, 5, 16, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.certain.tier.07.name"), diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java index 2c5e5105cf..ae0f636ecc 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java @@ -285,6 +285,7 @@ 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 + .addTecTechHatchInfo() .beginStructureBlock(3, 7, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.holder.tier.09.name"), diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java index 7aa31d9dc4..e5e65c43b9 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTETeslaTower.java @@ -549,6 +549,7 @@ public class MTETeslaTower extends TTMultiblockBase implements ISurvivalConstruc // Windings need to // be at least the same tier as // the Tesla Capacitor + .addTecTechHatchInfo() .beginStructureBlock(7, 17, 7, false) .addOtherStructurePart( translateToLocal("gt.blockmachines.hatch.capacitor.tier.03.name"), diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index f1a359b6a0..eac9f279ff 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -18,6 +18,7 @@ GT5U.autoplace.error.no_mte.class_name=§cSuggested to place machine with class # Multiblock Tooltip Builder Keywords # Context can be found in the class gregtech.api.util.MultiblockTooltipBuilder GT5U.MBTT.MachineType=Machine Type +GT5U.MBTT.Parallels=Processes up to %d recipes at once GT5U.MBTT.Dimensions=Dimensions GT5U.MBTT.Hollow=(Hollow) GT5U.MBTT.Structure=Structure @@ -32,6 +33,7 @@ GT5U.MBTT.InputBus=Input Bus GT5U.MBTT.InputHatch=Input Hatch GT5U.MBTT.OutputBus=Output Bus GT5U.MBTT.OutputHatch=Output Hatch +GT5U.MBTT.TecTechHatch=Supports TecTech Multi-Amp and Laser Hatches! GT5U.MBTT.Causes=Causes GT5U.MBTT.PPS=pollution per second GT5U.MBTT.Hold=Hold |