Skip to content

Multiblock tooltip rework #2806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
envoidia wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Multiblock tooltip rework #2806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package gregtech.api.metatileentity.multiblock;

import gregtech.api.GTValues;
import gregtech.api.GregTechAPI;
import gregtech.api.block.VariantActiveBlock;
import gregtech.api.capability.GregtechCapabilities;
Expand All @@ -24,6 +25,7 @@
import gregtech.client.renderer.handler.MultiblockPreviewRenderer;
import gregtech.client.renderer.texture.Textures;
import gregtech.client.renderer.texture.cube.SimpleOrientedCubeRenderer;
import gregtech.client.utils.TooltipHelper;
import gregtech.common.blocks.MetaBlocks;

import net.minecraft.block.Block;
Expand Down Expand Up @@ -189,6 +191,44 @@ public TextureAtlasSprite getFrontDefaultTexture() {
return getFrontOverlay().getParticleSprite();
}

@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced, String energyType, boolean hasPerfectOC, int tierskipLimit,
String... extraInfo) {
super.addInformation(stack, world, tooltip, advanced);
tooltip.add("");
Collections.addAll(tooltip, extraInfo);
tooltip.add("");
tooltip.add(energyType);
if (hasPerfectOC) tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.machine.perfect_oc"));
if (tierskipLimit == 0) {
tooltip.add(I18n.format("gregtech.machine.tierskip.none"));
} else if (tierskipLimit >= GTValues.MAX) {
tooltip.add(I18n.format("gregtech.machine.tierskip.unlimited"));
} else if (tierskipLimit != -1) {
tooltip.add(I18n.format("gregtech.machine.tierskip", tierskipLimit));
}
tooltip.add("");
}

@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced, String energyType, int tierskipLimit, String... extraInfo) {
addInformation(stack, world, tooltip, advanced, energyType, false, tierskipLimit, extraInfo);
}

@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced, String energyType, boolean hasPerfectOC, String... extraInfo) {
addInformation(stack, world, tooltip, advanced, energyType, hasPerfectOC, 0, extraInfo);
}

@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced, String energyType, String... extraInfo) {
addInformation(stack, world, tooltip, advanced, energyType, false, 0, extraInfo);
}

public static TraceabilityPredicate tilePredicate(@NotNull BiFunction<BlockWorldState, MetaTileEntity, Boolean> predicate,
@Nullable Supplier<BlockInfo[]> candidates) {
return new TraceabilityPredicate(blockWorldState -> {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityCleanroom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,10 +539,10 @@ protected void addWarningText(List<ITextComponent> textList) {

@Override
public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, boolean advanced) {
tooltip.add("");
tooltip.add(I18n.format("gregtech.machine.cleanroom.tooltip.1"));
tooltip.add(I18n.format("gregtech.machine.cleanroom.tooltip.2"));
tooltip.add(I18n.format("gregtech.machine.cleanroom.tooltip.3"));
tooltip.add(I18n.format("gregtech.machine.cleanroom.tooltip.4"));

if (TooltipHelper.isCtrlDown()) {
tooltip.add("");
Expand All @@ -558,6 +558,7 @@ public void addInformation(ItemStack stack, @Nullable World player, List<String>
}
tooltip.add("");
} else {
tooltip.add("");
tooltip.add(I18n.format("gregtech.machine.cleanroom.tooltip.hold_ctrl"));
}
}
Expand Down
9 changes: 5 additions & 4 deletions ...a/gregtech/common/metatileentities/multi/electric/MetaTileEntityElectricBlastFurnace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,11 @@ public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) {
@Override
public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
boolean advanced) {
super.addInformation(stack, world, tooltip, advanced);
tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.1"));
tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.2"));
tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.3"));
super.addInformation(stack, world, tooltip, advanced, I18n.format("gregtech.machine.energy.16a"), 1,
I18n.format("gregtech.machine.electric_blast_furnace.tooltip.1"),
I18n.format("gregtech.machine.electric_blast_furnace.tooltip.2"),
I18n.format("gregtech.machine.electric_blast_furnace.tooltip.3"),
I18n.format("gregtech.machine.electric_blast_furnace.tooltip.4"));
}

@Override
Expand Down
Loading
Loading