diff options
Diffstat (limited to 'src/main/java/gregtech')
74 files changed, 264 insertions, 314 deletions
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( |