GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-31 12:46:39 +00:00
Code Issues Releases Activity

Implement attribute modifier display settings

Browse Source
This commit is contained in:
Eclipse
2025-06-13 17:38:26 +00:00
parent ef2cdd0e74
commit e62bed5c4e
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java
View File

@@ -29,6 +29,7 @@ import net.kyori.adventure.key.Key;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.TranslatableComponent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.nbt.NbtList; import org.cloudburstmc.nbt.NbtList;
@@ -82,6 +83,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects;
public final class ItemTranslator { public final class ItemTranslator {
@@ -251,7 +253,7 @@ public final class ItemTranslator {
Map<ItemAttributeModifiers.EquipmentSlotGroup, List<String>> slotsToModifiers = new HashMap<>(); Map<ItemAttributeModifiers.EquipmentSlotGroup, List<String>> slotsToModifiers = new HashMap<>();
for (ItemAttributeModifiers.Entry entry : modifiers.getModifiers()) { for (ItemAttributeModifiers.Entry entry : modifiers.getModifiers()) {
// convert the modifier tag to a lore entry // convert the modifier tag to a lore entry
String loreEntry = attributeToLore(session, entry.getAttribute(), entry.getModifier(), language); String loreEntry = attributeToLore(session, entry.getAttribute(), entry.getModifier(), entry.getDisplay(), language);
if (loreEntry == null) { if (loreEntry == null) {
continue; // invalid or failed continue; // invalid or failed
} }
@@ -282,7 +284,16 @@ public final class ItemTranslator {
} }
@Nullable @Nullable
private static String attributeToLore(GeyserSession session, int attribute, ItemAttributeModifiers.AttributeModifier modifier, String language) { private static String attributeToLore(GeyserSession session, int attribute, ItemAttributeModifiers.AttributeModifier modifier,
ItemAttributeModifiers.Display display, String language) {
if (display.getType() == ItemAttributeModifiers.DisplayType.HIDDEN) {
return null;
} else if (display.getType() == ItemAttributeModifiers.DisplayType.OVERRIDE) {
return MessageTranslator.convertMessage(Objects.requireNonNull(display.getComponent())
.colorIfAbsent(NamedTextColor.WHITE)
.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE), language);
}
double amount = modifier.getAmount(); double amount = modifier.getAmount();
if (amount == 0) { if (amount == 0) {
return null; return null;
@@ -320,7 +331,7 @@ public final class ItemTranslator {
Component attributeComponent = Component.text() Component attributeComponent = Component.text()
.resetStyle() .resetStyle()
.color(baseModifier ? NamedTextColor.DARK_GREEN : amount > 0 ? NamedTextColor.BLUE : NamedTextColor.RED) .color(baseModifier ? NamedTextColor.DARK_GREEN : amount > 0 ? NamedTextColor.BLUE : NamedTextColor.RED)
.append(Component.text(" " + operationTotal + " "), Component.translatable("attribute.name." + name)) .append(Component.text(operationTotal + " "), Component.translatable("attribute.name." + name))
.build(); .build();
return MessageTranslator.convertMessage(attributeComponent, language); return MessageTranslator.convertMessage(attributeComponent, language);