Skip to content

Some fixes for potion items #5555

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

Open
BUGTeas wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Some fixes for potion items #5555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb98765
Add some code comments, remove the incorrect prefix correctly in poti…
BUGTeas May 17, 2025
989eb71
Fix tipped arrow always using name "Tipped Arrow" and not affected by…
BUGTeas May 17, 2025
d038c66
Fix the wrong Bedrock ID of tipped arrows in the tooltip of shulker box
BUGTeas May 17, 2025
c002361
Is necessary to check the type of Item to improve performance, like g…
BUGTeas May 17, 2025
02666f6
Revert "Is necessary to check the type of Item to improve performance…
BUGTeas May 18, 2025
abf57ca
Able to display custom potion effects in all items; Optimize potion n…
BUGTeas May 18, 2025
f804eb1
Ensure potion displays the same name both its own tooltip and shulker…
BUGTeas May 22, 2025
19f202a
Add `minecraft:potion_duration_scale` component support (new feature …
BUGTeas May 23, 2025
1f53fdf
Merge branch 'master' of https://github.com/GeyserMC/Geyser into fix-…
BUGTeas May 23, 2025
22e8f32
Merge branch 'master' of github.com:GeyserMC/Geyser into fix-potion-c…
BUGTeas Aug 5, 2025
31259a2
Improve access to potion names
BUGTeas Aug 5, 2025
e313a7a
Improve a little of code
BUGTeas Aug 5, 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
4 changes: 2 additions & 2 deletions core/src/main/java/org/geysermc/geyser/item/type/ShulkerBoxItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNul
bedrockData = 0;
} else {
// Manual checks for potions/tipped arrows
if (boxMapping.getJavaItem() instanceof PotionItem || boxMapping.getJavaItem() instanceof ArrowItem) {
if (boxMapping.getJavaItem() instanceof PotionItem || boxMapping.getJavaItem() instanceof TippedArrowItem) {
PotionContents potionContents = boxComponents.get(DataComponentTypes.POTION_CONTENTS);
if (potionContents != null) {
Potion potion = Potion.getByJavaId(potionContents.getPotionId());
if (potion != null) {
bedrockData = potion.getBedrockId();
bedrockData = boxMapping.getJavaItem() instanceof TippedArrowItem ? potion.tippedArrowId() : potion.getBedrockId();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public static void populate() {

Set<Item> javaOnlyItems = new ObjectOpenHashSet<>();
Collections.addAll(javaOnlyItems, Items.SPECTRAL_ARROW, Items.DEBUG_STICK,
Items.KNOWLEDGE_BOOK, Items.TIPPED_ARROW);
Copy link
Copy Markdown
Member

@onebeastchris onebeastchris Mar 24, 2026

Choose a reason for hiding this comment

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

To my knowledge, this item still doesn't exist - at least not the base tipped arrow. Can we account for that?

Items.KNOWLEDGE_BOOK);
if (!customItemsAllowed) {
javaOnlyItems.add(Items.FURNACE_MINECART);
}
Expand Down
70 changes: 49 additions & 21 deletions core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.geysermc.geyser.item.components.Rarity;
import org.geysermc.geyser.item.type.Item;
import org.geysermc.geyser.item.type.PotionItem;
import org.geysermc.geyser.item.type.TippedArrowItem;
import org.geysermc.geyser.level.block.type.Block;
import org.geysermc.geyser.registry.BlockRegistries;
import org.geysermc.geyser.registry.Registries;
Expand Down Expand Up @@ -201,7 +202,9 @@ public static ItemData translateToBedrock(GeyserSession session, @NonNull Geyser
PotionContents potionContents = components.get(DataComponentTypes.POTION_CONTENTS);
// Make custom effect information visible when shown in tooltip
if (potionContents != null && tooltip.showInTooltip(DataComponentTypes.POTION_CONTENTS)) {
customName += getPotionEffectInfo(potionContents, session.locale()); // TODO should this be done with lore instead?
// Add to the name (use '\n' to wrap lines) instead of the lore
// to make it show in HUD like the effect information of vanilla Bedrock potion
customName += getPotionEffectInfo(potionContents, components.getOrDefault(DataComponentTypes.POTION_DURATION_SCALE, 1f), session.locale());
}

nbtBuilder.setCustomName(customName);
Expand Down Expand Up @@ -372,22 +375,23 @@ private static String attributeToLore(GeyserSession session, int attribute, Item
Effect.INFESTED
);

public static String getPotionEffectInfo(PotionContents contents, String language) {
public static String getPotionEffectInfo(PotionContents contents, float durationScale, String language) {
StringBuilder finalText = new StringBuilder();
List<MobEffectInstance> effectInstanceList = contents.getCustomEffects();
for (MobEffectInstance effectInstance : effectInstanceList) {
Effect effect = effectInstance.getEffect();
MobEffectDetails details = effectInstance.getDetails();
int amplifier = details.getAmplifier();
int durations = details.getDuration();
TranslatableComponent appendTranslatable = Component.translatable("effect.minecraft." + effect.toString().toLowerCase(Locale.ROOT));
int duration = details.getDuration();
TranslatableComponent appendTranslatable = Component.translatable("effect.minecraft." + effect.name().toLowerCase(Locale.ROOT));
if (amplifier != 0) {
appendTranslatable = Component.translatable("potion.withAmplifier",
appendTranslatable,
Component.translatable("potion.potency." + amplifier));
}
if (durations > 20) {
int seconds = durations / 20;
if (duration > 20) {
int scaledDuration = (int) (duration * durationScale);
int seconds = scaledDuration / 20;
int secondsFormat = seconds % 60;
int minutes = seconds / 60;
int minutesFormat = minutes % 60;
Expand All @@ -399,13 +403,14 @@ public static String getPotionEffectInfo(PotionContents contents, String languag
appendTranslatable = Component.translatable("potion.withDuration",
appendTranslatable,
Component.text(text));
} else if (durations == -1) {
} else if (duration == -1) {
appendTranslatable = Component.translatable("potion.withDuration",
appendTranslatable,
Component.translatable("effect.duration.infinite"));
}
Component component = Component.text()
.resetStyle()
// Use blue to distinguish the gray vanilla Bedrock effect
.color((negativeEffectList.contains(effect)) ? NamedTextColor.RED : NamedTextColor.BLUE)
.append(appendTranslatable)
.build();
Expand All @@ -415,21 +420,34 @@ public static String getPotionEffectInfo(PotionContents contents, String languag
return finalText.toString();
}

public static String getPotionName(PotionContents contents, ItemMapping mapping, String language) {
public static String getPotionName(PotionContents contents, ItemMapping mapping, boolean includeDefault, String language) {
String customPotionName = contents.getCustomName();
Potion potion = Potion.getByJavaId(contents.getPotionId());

if (customPotionName != null) {
// "custom_name" tag in "potion_contents" component
return MessageTranslator.convertMessage(
Component.translatable(mapping.getJavaItem().translationKey() + ".effect." + customPotionName),
language);
return MinecraftLocale.getLocaleString(mapping.getJavaItem().translationKey() + ".effect." + customPotionName, language);
}
if (!contents.getCustomEffects().isEmpty()) {

if (includeDefault) {
// Make a name when has custom effects
String potionName = potion == null ? "empty" : potion.toString().toLowerCase(Locale.ROOT);
return MessageTranslator.convertMessage(Component.translatable(mapping.getJavaItem().translationKey() + ".effect." + potionName), language);
// because the custom effect information is display from the second line of the name.
Copy link
Copy Markdown
Member

@onebeastchris onebeastchris Mar 24, 2026

Choose a reason for hiding this comment

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

Suggested change
// because the custom effect information is display from the second line of the name.
// The custom effect information is displayed in the second line of the name.

// if name is not set, the custom effect information will not be displayed.
Copy link
Copy Markdown
Member

@onebeastchris onebeastchris Mar 24, 2026

Choose a reason for hiding this comment

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

Suggested change
// if name is not set, the custom effect information will not be displayed.
// If a name is not set, the custom effect information will not be displayed.

String potionName;
Potion potion = Potion.getByJavaId(contents.getPotionId());
if (potion != null) {
potionName = potion.name().toLowerCase(Locale.ROOT);
// Remove the incorrect prefix
// for example, potion "long_leaping" should use "leaping" in translatable name
if (potionName.startsWith("strong_")) {
potionName = potionName.substring(7);
} else if (potionName.startsWith("long_")) {
potionName = potionName.substring(5);
}
} else {
potionName = "empty";
}
return MinecraftLocale.getLocaleString(mapping.getJavaItem().translationKey() + ".effect." + potionName, language);
}

return null;
}

Expand Down Expand Up @@ -565,17 +583,22 @@ public static String getCustomName(GeyserSession session, DataComponents compone
}

if (!customNameOnly) {
if (mapping.getJavaItem() instanceof PotionItem) {
PotionContents potionContents = components.get(DataComponentTypes.POTION_CONTENTS);
if (potionContents != null) {
String potionName = getPotionName(potionContents, mapping, session.locale()); // TODO also test this
boolean forceName = false;
PotionContents potionContents = components.get(DataComponentTypes.POTION_CONTENTS);
if (potionContents != null) {
// hold the custom effect information (reason for this is mentioned in getPotionName method)
forceName = TooltipOptions.fromComponents(components).showInTooltip(DataComponentTypes.POTION_CONTENTS)
&& !potionContents.getCustomEffects().isEmpty();
// Get name in "potion_contents" component for vanilla potion items
if (mapping.getJavaItem() instanceof PotionItem || mapping.getJavaItem() instanceof TippedArrowItem) {
String potionName = getPotionName(potionContents, mapping, forceName, session.locale());
if (potionName != null) {
return ChatColor.RESET + ChatColor.ESCAPE + translationColor + potionName;
}
}
}

if (includeAll) {
if (includeAll || forceName) {
// Fix book title display in tooltips of shulker box
WrittenBookContent bookContent = components.get(DataComponentTypes.WRITTEN_BOOK_CONTENT);
if (bookContent != null) {
Expand All @@ -589,6 +612,11 @@ public static String getCustomName(GeyserSession session, DataComponents compone
// behavior as of 1.21
return ChatColor.RESET + ChatColor.ESCAPE + translationColor + MessageTranslator.convertMessage(customName, session.locale());
}

if (forceName) {
String translationKey = mapping.getJavaItem().translationKey();
return ChatColor.RESET + ChatColor.ESCAPE + translationColor + MinecraftLocale.getLocaleString(translationKey, session.locale());
}
}
}

Expand Down