Skip to content

Commit ed5195a

Browse files
committed
Fix some instances of enchantment names not deserializing
1 parent 73f7259 commit ed5195a

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525

2626
package org.geysermc.geyser.item.enchantment;
2727

28-
import java.util.List;
29-
import java.util.function.Function;
3028
import net.kyori.adventure.key.Key;
3129
import org.checkerframework.checker.nullness.qual.Nullable;
3230
import org.cloudburstmc.nbt.NbtMap;
@@ -35,11 +33,13 @@
3533
import org.geysermc.geyser.registry.Registries;
3634
import org.geysermc.geyser.session.cache.registry.RegistryEntryContext;
3735
import org.geysermc.geyser.translator.text.MessageTranslator;
36+
import org.geysermc.mcprotocollib.protocol.data.game.item.component.HolderSet;
3837

3938
import java.util.HashSet;
39+
import java.util.List;
4040
import java.util.Map;
4141
import java.util.Set;
42-
import org.geysermc.mcprotocollib.protocol.data.game.item.component.HolderSet;
42+
import java.util.function.Function;
4343

4444
/**
4545
* @param description only populated if {@link #bedrockEnchantment()} is not null.

core/src/main/java/org/geysermc/geyser/translator/text/MessageTranslator.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,25 @@
4040
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
4141
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
4242
import org.cloudburstmc.nbt.NbtMap;
43-
import org.cloudburstmc.nbt.NbtType;
4443
import org.cloudburstmc.protocol.bedrock.packet.TextPacket;
4544
import org.geysermc.geyser.GeyserImpl;
4645
import org.geysermc.geyser.session.GeyserSession;
47-
import org.geysermc.geyser.text.*;
46+
import org.geysermc.geyser.text.ChatColor;
47+
import org.geysermc.geyser.text.ChatDecoration;
48+
import org.geysermc.geyser.text.DummyLegacyHoverEventSerializer;
49+
import org.geysermc.geyser.text.GeyserLocale;
50+
import org.geysermc.geyser.text.GsonComponentSerializerWrapper;
51+
import org.geysermc.geyser.text.MinecraftTranslationRegistry;
4852
import org.geysermc.mcprotocollib.protocol.data.DefaultComponentSerializer;
4953
import org.geysermc.mcprotocollib.protocol.data.game.Holder;
5054
import org.geysermc.mcprotocollib.protocol.data.game.chat.ChatType;
5155
import org.geysermc.mcprotocollib.protocol.data.game.chat.ChatTypeDecoration;
5256
import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.TeamColor;
5357

54-
import java.util.*;
58+
import java.util.ArrayList;
59+
import java.util.EnumMap;
60+
import java.util.List;
61+
import java.util.Map;
5562

5663
public class MessageTranslator {
5764
// These are used for handling the translations of the messages
@@ -434,7 +441,7 @@ public static String normalizeSpace(String string) {
434441
* Deserialize an NbtMap with a description text component (usually provided from a registry) into a Bedrock-formatted string.
435442
*/
436443
public static String deserializeDescription(GeyserSession session, NbtMap tag) {
437-
NbtMap description = tag.getCompound("description");
444+
Object description = tag.get("description");
438445
Component parsed = componentFromNbtTag(description);
439446
return convertMessage(session, parsed);
440447
}
@@ -482,7 +489,8 @@ private static Component componentFromNbtTag(Object nbtTag, Style style) {
482489
}
483490
}
484491

485-
throw new IllegalArgumentException("Expected tag to be a literal string, a list of components, or a component object with a text/translate key");
492+
GeyserImpl.getInstance().getLogger().error("Expected tag to be a literal string, a list of components, or a component object with a text/translate key: " + nbtTag);
493+
return Component.empty();
486494
}
487495

488496
private static List<Component> componentsFromNbtList(List<?> list, Style style) {

0 commit comments

Comments
 (0)