Skip to content

Tooltips R' Us #2099

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

Closed
JuiceyBeans wants to merge 17 commits into from
Closed

Tooltips R' Us #2099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cb7a7c5
Gedagedigedagedago
JuiceyBeans Oct 6, 2024
2c8f154
ourgh it begin
JuiceyBeans Oct 7, 2024
bd93946
behaviour -> behavior for consistency
JuiceyBeans Oct 8, 2024
163edb7
Pipe block tooltip fix
JuiceyBeans Oct 9, 2024
b697e3b
Fix optical pipe tooltip
JuiceyBeans Oct 9, 2024
063891d
Update en_us.json
JuiceyBeans Oct 9, 2024
4315f4f
Update ItemLang.java
JuiceyBeans Nov 14, 2024
237af17
Merge branch '1.20.1' into beans/tooltip-deez-nuts
JuiceyBeans Dec 8, 2024
762e439
Prospector tooltip fix
JuiceyBeans Dec 8, 2024
d9e8988
Hazardous materiasl tooltip fix
JuiceyBeans Dec 8, 2024
3a4f0c4
Rename ore veins
JuiceyBeans Dec 9, 2024
5ba3007
committing in case my laptop shuts down and deletes everything :troll…
JuiceyBeans Dec 9, 2024
0975528
Merge branch '1.20.1' into beans/tooltip-deez-nuts
JuiceyBeans Feb 13, 2025
69cafc3
Merge branch '1.20.1' into beans/tooltip-deez-nuts
JuiceyBeans Feb 16, 2025
b33469c
brother.
JuiceyBeans May 1, 2025
bc02f16
Merge branch '1.20.1' into beans/tooltip-deez-nuts
JuiceyBeans May 28, 2025
3fe5fff
Armor langs. god this is gonna be painful
JuiceyBeans May 28, 2025
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
480 changes: 213 additions & 267 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
View file
Open in desktop

Large diffs are not rendered by default.

480 changes: 213 additions & 267 deletions src/generated/resources/assets/gtceu/lang/en_us.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public boolean isEmpty() {
.unificationEnabled(true)
.generateItem(true)
.generationCondition(hasOreProperty)
.tooltip((mat, tooltips) -> tooltips.add(Component.translatable("metaitem.crushed.tooltip.purify")));
.tooltip((mat, tooltips) -> tooltips.add(Component.translatable("gtceu.item.crushed.tooltip.purify")));

// A hot Ingot, which has to be cooled down by a Vacuum Freezer.
public static final TagPrefix ingotHot = new TagPrefix("hotIngot")
Expand Down Expand Up @@ -377,7 +377,7 @@ public boolean isEmpty() {
.unificationEnabled(true)
.generateItem(true)
.generationCondition(hasOreProperty)
.tooltip((mat, tooltips) -> tooltips.add(Component.translatable("metaitem.dust.tooltip.purify")));
.tooltip((mat, tooltips) -> tooltips.add(Component.translatable("gtceu.item.dust.tooltip.purify")));

// Pure Dust worth of one Ingot or Gem.
public static final TagPrefix dustPure = new TagPrefix("pureDust")
Expand All @@ -390,7 +390,7 @@ public boolean isEmpty() {
.unificationEnabled(true)
.generateItem(true)
.generationCondition(hasOreProperty)
.tooltip((mat, tooltips) -> tooltips.add(Component.translatable("metaitem.dust.tooltip.purify")));
.tooltip((mat, tooltips) -> tooltips.add(Component.translatable("gtceu.item.dust.tooltip.purify")));

public static final TagPrefix dust = new TagPrefix("dust")
.defaultTagPath("dusts/%s")
Expand Down
14 changes: 11 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/item/PipeBlockItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,18 @@ public PipeBlock getBlock() {
public void appendHoverText(ItemStack stack, @Nullable Level level, List<Component> tooltip,
TooltipFlag isAdvanced) {
super.appendHoverText(stack, level, tooltip, isAdvanced);
if (GTUtil.isShiftDown()) {
tooltip.add(Component.translatable("gtceu.tool_action.wire_cutter.connect"));
if (this instanceof OpticalPipeBlockItem) {
if (GTUtil.isShiftDown()) {
tooltip.add(Component.translatable("gtceu.tool_action.wire_cutter.connect"));
} else {
tooltip.add(Component.translatable("gtceu.tool_action.show_tooltips"));
}
Comment on lines +45 to +50
Copy link
Copy Markdown
Contributor

@screret screret Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just override it in OpticalPipeBlockItem?

Copy link
Copy Markdown
Contributor

@krossgg krossgg Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you override it, then you have to call super().
But if you call super() it'll add the wrench tooltip.
But if you don't call super then you don't get the block tooltip unless you manually call this.getBlock().appendHoverText() in the override for this tooltip.
image
It's a mess overall D:

} else {
tooltip.add(Component.translatable("gtceu.tool_action.show_tooltips"));
if (GTUtil.isShiftDown()) {
tooltip.add(Component.translatable("gtceu.tool_action.wrench.connect"));
} else {
tooltip.add(Component.translatable("gtceu.tool_action.show_tooltips"));
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorLogicSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ protected static void addCapacityHUD(ItemStack stack, ArmorUtils.ModularHUD hud)
if (cont.getCharge() == 0) return;
float energyMultiplier = cont.getCharge() * 100.0F / cont.getMaxCharge();
hud.newString(
Component.translatable("metaarmor.hud.energy_lvl", String.format("%.1f", energyMultiplier) + "%"));
Component.translatable("armor.gtceu.hud.energy_lvl", String.format("%.1f", energyMultiplier) + "%"));
}

@OnlyIn(Dist.CLIENT)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public static void addCurrentChargeTooltip(List<Component> tooltip, long current
unit)
.withStyle(color));
} else {
tooltip.add(Component.translatable("metaitem.generic.electric_item.tooltip",
tooltip.add(Component.translatable("gtceu.item.electric.tooltip",
FormattingUtil.formatNumbers(currentCharge), FormattingUtil.formatNumbers(maxCharge),
GTValues.VNF[tier]).withStyle(color));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/machine/feature/IFancyUIMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ default void attachConfigurators(ConfiguratorPanel configuratorPanel) {
controllable::isWorkingEnabled, (clickData, pressed) -> controllable.setWorkingEnabled(pressed))
.setTooltipsSupplier(pressed -> List.of(
Component.translatable(
pressed ? "behaviour.soft_hammer.enabled" : "behaviour.soft_hammer.disabled"))));
pressed ? "behavior.soft_hammer.enabled" : "behavior.soft_hammer.disabled"))));
}
if (this instanceof IOverclockMachine overclockMachine) {
configuratorPanel.attachConfigurators(new OverclockFancyConfigurator(overclockMachine));
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2297,8 +2297,7 @@ public static ItemEntry<ComponentItem> createFluidCell(Material mat, int capacit
.tag(Tags.Items.ARMORS_HELMETS)
.tag(CustomTags.PPE_ARMOR)
.onRegister(attach(new TooltipBehavior(tooltips -> {
tooltips.add(Component.translatable("gtceu.hazard_trigger.protection.description"));
tooltips.add(Component.translatable("gtceu.hazard_trigger.inhalation"));
tooltips.add(Component.translatable("gtceu.hazard_trigger.protection.description").append(Component.translatable("gtceu.hazard_trigger.inhalation")));
})))
.register();
public static ItemEntry<ArmorComponentItem> RUBBER_GLOVES = REGISTRATE
Expand All @@ -2309,8 +2308,7 @@ public static ItemEntry<ComponentItem> createFluidCell(Material mat, int capacit
.tag(Tags.Items.ARMORS_CHESTPLATES)
.tag(CustomTags.PPE_ARMOR)
.onRegister(attach(new TooltipBehavior(tooltips -> {
tooltips.add(Component.translatable("gtceu.hazard_trigger.protection.description"));
tooltips.add(Component.translatable("gtceu.hazard_trigger.skin_contact"));
tooltips.add(Component.translatable("gtceu.hazard_trigger.protection.description").append(Component.translatable("gtceu.hazard_trigger.skin_contact")));
})))
.register();
public static ItemEntry<ArmorComponentItem> HAZMAT_CHESTPLATE = REGISTRATE
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTOres.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public class GTOres {
.surfaceRock(CertusQuartz)
.placement(SurfaceIndicatorGenerator.IndicatorPlacement.BELOW)));

public static final GTOreDefinition MANGANESE_VEIN = create("manganese_vein", vein -> vein
public static final GTOreDefinition MANGANESE_VEIN_NETHER = create("manganese_vein_nether", vein -> vein
.clusterSize(UniformInt.of(50, 64)).density(0.75f).weight(20)
.layer(WorldGenLayers.NETHERRACK)
.heightRangeUniform(20, 30)
Expand Down Expand Up @@ -255,7 +255,7 @@ public class GTOres {
.surfaceRock(NetherQuartz)
.placement(SurfaceIndicatorGenerator.IndicatorPlacement.ABOVE)));

public static final GTOreDefinition REDSTONE_VEIN = create("redstone_vein", vein -> vein
public static final GTOreDefinition REDSTONE_VEIN_NETHER = create("redstone_vein_nether", vein -> vein
.clusterSize(UniformInt.of(32, 40)).density(0.2f).weight(60)
.layer(WorldGenLayers.NETHERRACK)
.heightRangeUniform(5, 40)
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/common/item/ColorSprayBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,12 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List<Compone
int remainingUses = getUsesLeft(stack);
if (color != null) {
tooltipComponents
.add(Component.translatable("behaviour.paintspray." + this.color.getSerializedName() + ".tooltip"));
.add(Component.translatable("behavior.paintspray." + this.color.getSerializedName() + ".tooltip"));
} else {
tooltipComponents.add(Component.translatable("behaviour.paintspray.solvent.tooltip"));
tooltipComponents.add(Component.translatable("behavior.paintspray.solvent.tooltip"));
}
tooltipComponents.add(Component.translatable("behaviour.paintspray.uses", remainingUses));
tooltipComponents.add(Component.translatable("behavior.paintspray.uses", remainingUses));
tooltipComponents.add(Component.translatable("behavior.paintspray.offhand"));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/item/IntCircuitBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static void adjustConfiguration(ItemStack stack, int amount) {
public void appendHoverText(ItemStack stack, @Nullable Level level, List<Component> tooltipComponents,
TooltipFlag isAdvanced) {
int configuration = getCircuitConfiguration(stack);
tooltipComponents.add(Component.translatable("metaitem.int_circuit.configuration", configuration));
tooltipComponents.add(Component.translatable("gtceu.item.int_circuit.configuration", configuration));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/item/ProspectorScannerBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List<Compone
tooltipComponents.add(Component.translatable("metaitem.prospector.tooltip.radius", radius));
tooltipComponents.add(Component.translatable("metaitem.prospector.tooltip.modes"));
for (ProspectorMode<?> mode : modes) {
tooltipComponents.add(Component.literal(" -").append(Component.translatable(mode.unlocalizedName))
tooltipComponents.add(Component.literal(" - ").append(Component.translatable(mode.unlocalizedName))
.withStyle(Style.EMPTY.withColor(ChatFormatting.RED)));
}
}
Expand Down
52 changes: 26 additions & 26 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ public void onArmorTick(Level world, Player player, @NotNull ItemStack item) {
if (toggleTimer == 0) {
if (KeyBind.JETPACK_ENABLE.isKeyDown(player)) {
jetpackEnabled = !jetpackEnabled;
messageKey = "metaarmor.jetpack.flight." + (jetpackEnabled ? "enable" : "disable");
messageKey = "armor.gtceu.jetpack.flight." + (jetpackEnabled ? "enable" : "disable");
data.putBoolean("enabled", jetpackEnabled);
} else if (KeyBind.ARMOR_HOVER.isKeyDown(player)) {
hoverMode = !hoverMode;
messageKey = "metaarmor.jetpack.hover." + (hoverMode ? "enable" : "disable");
messageKey = "armor.gtceu.jetpack.hover." + (hoverMode ? "enable" : "disable");
data.putBoolean("hover", hoverMode);
} else if (KeyBind.ARMOR_CHARGING.isKeyDown(player)) {
canShare = !canShare;
if (canShare && cont.getCharge() == 0) { // Only allow for charging to be enabled if charge is nonzero
messageKey = "metaarmor.nms.share.error";
messageKey = "armor.gtceu.nms.share.error";
canShare = false;
} else {
messageKey = "metaarmor.nms.share." + (canShare ? "enable" : "disable");
messageKey = "armor.gtceu.nms.share." + (canShare ? "enable" : "disable");
}
data.putBoolean("canShare", canShare);
}
Expand Down Expand Up @@ -147,20 +147,20 @@ public void addInfo(ItemStack itemStack, List<Component> lines) {
CompoundTag data = itemStack.getOrCreateTag();
Component state;
boolean enabled = !data.contains("enabled") || data.getBoolean("enabled");
state = enabled ? Component.translatable("metaarmor.hud.status.enabled") :
Component.translatable("metaarmor.hud.status.disabled");
lines.add(Component.translatable("metaarmor.hud.engine_enabled", state));
state = enabled ? Component.translatable("armor.gtceu.hud.status.enabled") :
Component.translatable("armor.gtceu.hud.status.disabled");
lines.add(Component.translatable("armor.gtceu.hud.engine_enabled", state));

boolean canShare = data.contains("canShare") && data.getBoolean("canShare");
state = canShare ? Component.translatable("metaarmor.hud.status.enabled") :
Component.translatable("metaarmor.hud.status.disabled");
lines.add(Component.translatable("metaarmor.energy_share.tooltip", state));
lines.add(Component.translatable("metaarmor.energy_share.tooltip.guide"));
state = canShare ? Component.translatable("armor.gtceu.hud.status.enabled") :
Component.translatable("armor.gtceu.hud.status.disabled");
lines.add(Component.translatable("armor.gtceu.energy_share.tooltip", state));
lines.add(Component.translatable("armor.gtceu.energy_share.tooltip.guide"));

boolean hover = data.contains("hover") && data.getBoolean("hover");
state = hover ? Component.translatable("metaarmor.hud.status.enabled") :
Component.translatable("metaarmor.hud.status.disabled");
lines.add(Component.translatable("metaarmor.hud.hover_mode", state));
state = hover ? Component.translatable("armor.gtceu.hud.status.enabled") :
Component.translatable("armor.gtceu.hud.status.disabled");
lines.add(Component.translatable("armor.gtceu.hud.hover_mode", state));
}

@Override
Expand All @@ -178,11 +178,11 @@ public InteractionResultHolder<ItemStack> onRightClick(Level world, @NotNull Pla
canShare = !canShare;
if (!world.isClientSide) {
if (canShare && cont.getCharge() == 0) {
player.sendSystemMessage(Component.translatable("metaarmor.energy_share.error"));
player.sendSystemMessage(Component.translatable("armor.gtceu.energy_share.error"));
} else if (canShare) {
player.sendSystemMessage(Component.translatable("metaarmor.energy_share.enable"));
player.sendSystemMessage(Component.translatable("armor.gtceu.energy_share.enable"));
} else {
player.sendSystemMessage(Component.translatable("metaarmor.energy_share.disable"));
player.sendSystemMessage(Component.translatable("armor.gtceu.energy_share.disable"));
}
}

Expand All @@ -205,21 +205,21 @@ public void drawHUD(ItemStack item, GuiGraphics guiGraphics) {
if (data != null) {
if (data.contains("enabled")) {
Component status = (data.getBoolean("enabled") ?
Component.translatable("metaarmor.hud.status.enabled") :
Component.translatable("metaarmor.hud.status.disabled"));
Component result = Component.translatable("metaarmor.hud.engine_enabled", status);
Component.translatable("armor.gtceu.hud.status.enabled") :
Component.translatable("armor.gtceu.hud.status.disabled"));
Component result = Component.translatable("armor.gtceu.hud.engine_enabled", status);
this.HUD.newString(result);
}
if (data.contains("canShare")) {
String status = data.getBoolean("canShare") ? "metaarmor.hud.status.enabled" :
"metaarmor.hud.status.disabled";
this.HUD.newString(Component.translatable("mataarmor.hud.supply_mode", Component.translatable(status)));
String status = data.getBoolean("canShare") ? "armor.gtceu.hud.status.enabled" :
"armor.gtceu.hud.status.disabled";
this.HUD.newString(Component.translatable("armor.gtceu.hud.supply_mode", Component.translatable(status)));
}

if (data.contains("hover")) {
String status = data.getBoolean("hover") ? "metaarmor.hud.status.enabled" :
"metaarmor.hud.status.disabled";
this.HUD.newString(Component.translatable("metaarmor.hud.hover_mode", Component.translatable(status)));
String status = data.getBoolean("hover") ? "armor.gtceu.hud.status.enabled" :
"armor.gtceu.hud.status.disabled";
this.HUD.newString(Component.translatable("armor.gtceu.hud.hover_mode", Component.translatable(status)));
}
}
this.HUD.draw(guiGraphics);
Expand Down
Loading
Loading