Skip to content

Commit 86be7be

Browse files
5673856738
committed
Fix MinecraftComponentSerializer on 1.20.3
1 parent dda3e32 commit 86be7be

File tree

1 file changed

+58
-27
lines changed

1 file changed

+58
-27
lines changed

‎platform-bukkit/src/main/java/net/kyori/adventure/platform/bukkit/MinecraftComponentSerializer.java

+58-27
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.concurrent.atomic.AtomicReference;
3535
import net.kyori.adventure.text.Component;
3636
import net.kyori.adventure.text.serializer.ComponentSerializer;
37-
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
3837
import org.jetbrains.annotations.ApiStatus;
3938
import org.jetbrains.annotations.NotNull;
4039
import org.jetbrains.annotations.Nullable;
@@ -93,11 +92,15 @@ public static boolean isSupported() {
9392
private static final Object MC_TEXT_GSON;
9493
private static final MethodHandle TEXT_SERIALIZER_DESERIALIZE;
9594
private static final MethodHandle TEXT_SERIALIZER_SERIALIZE;
95+
private static final MethodHandle TEXT_SERIALIZER_DESERIALIZE_TREE;
96+
private static final MethodHandle TEXT_SERIALIZER_SERIALIZE_TREE;
9697

9798
static {
9899
Object gson = null;
99100
MethodHandle textSerializerDeserialize = null;
100101
MethodHandle textSerializerSerialize = null;
102+
MethodHandle textSerializerDeserializeTree = null;
103+
MethodHandle textSerializerSerializeTree = null;
101104

102105
try {
103106
if (CLASS_CHAT_COMPONENT != null) {
@@ -126,26 +129,45 @@ public static boolean isSupported() {
126129
if (gsonField != null) {
127130
gsonField.setAccessible(true);
128131
gson = gsonField.get(null);
129-
} else {
130-
final Method[] declaredMethods = chatSerializerClass.getDeclaredMethods();
131-
final Method deserialize = Arrays.stream(declaredMethods)
132-
.filter(m -> Modifier.isStatic(m.getModifiers()))
133-
.filter(m -> CLASS_CHAT_COMPONENT.isAssignableFrom(m.getReturnType()))
134-
.filter(m -> m.getParameterCount() == 1 && m.getParameterTypes()[0].equals(String.class))
135-
.min(Comparator.comparing(Method::getName)) // prefer the #a method
136-
.orElse(null);
137-
final Method serialize = Arrays.stream(declaredMethods)
138-
.filter(m -> Modifier.isStatic(m.getModifiers()))
139-
.filter(m -> m.getReturnType().equals(String.class))
140-
.filter(m -> m.getParameterCount() == 1 && CLASS_CHAT_COMPONENT.isAssignableFrom(m.getParameterTypes()[0]))
141-
.findFirst()
142-
.orElse(null);
143-
if (deserialize != null) {
144-
textSerializerDeserialize = lookup().unreflect(deserialize);
145-
}
146-
if (serialize != null) {
147-
textSerializerSerialize = lookup().unreflect(serialize);
148-
}
132+
}
133+
}
134+
for (final Class<?> serializerClass : CLASS_CHAT_COMPONENT.getClasses()) {
135+
final Method[] declaredMethods = serializerClass.getDeclaredMethods();
136+
final Method deserialize = Arrays.stream(declaredMethods)
137+
.filter(m -> Modifier.isStatic(m.getModifiers()))
138+
.filter(m -> CLASS_CHAT_COMPONENT.isAssignableFrom(m.getReturnType()))
139+
.filter(m -> m.getParameterCount() == 1 && m.getParameterTypes()[0].equals(String.class))
140+
.min(Comparator.comparing(Method::getName)) // prefer the #a method
141+
.orElse(null);
142+
final Method serialize = Arrays.stream(declaredMethods)
143+
.filter(m -> Modifier.isStatic(m.getModifiers()))
144+
.filter(m -> m.getReturnType().equals(String.class))
145+
.filter(m -> m.getParameterCount() == 1 && CLASS_CHAT_COMPONENT.isAssignableFrom(m.getParameterTypes()[0]))
146+
.findFirst()
147+
.orElse(null);
148+
final Method deserializeTree = Arrays.stream(declaredMethods)
149+
.filter(m -> Modifier.isStatic(m.getModifiers()))
150+
.filter(m -> CLASS_CHAT_COMPONENT.isAssignableFrom(m.getReturnType()))
151+
.filter(m -> m.getParameterCount() == 1 && m.getParameterTypes()[0].equals(JsonElement.class))
152+
.findFirst()
153+
.orElse(null);
154+
final Method serializeTree = Arrays.stream(declaredMethods)
155+
.filter(m -> Modifier.isStatic(m.getModifiers()))
156+
.filter(m -> m.getReturnType().equals(JsonElement.class))
157+
.filter(m -> m.getParameterCount() == 1 && CLASS_CHAT_COMPONENT.isAssignableFrom(m.getParameterTypes()[0]))
158+
.findFirst()
159+
.orElse(null);
160+
if (deserialize != null) {
161+
textSerializerDeserialize = lookup().unreflect(deserialize);
162+
}
163+
if (serialize != null) {
164+
textSerializerSerialize = lookup().unreflect(serialize);
165+
}
166+
if (deserializeTree != null) {
167+
textSerializerDeserializeTree = lookup().unreflect(deserializeTree);
168+
}
169+
if (serializeTree != null) {
170+
textSerializerSerializeTree = lookup().unreflect(serializeTree);
149171
}
150172
}
151173
}
@@ -156,20 +178,26 @@ public static boolean isSupported() {
156178
MC_TEXT_GSON = gson;
157179
TEXT_SERIALIZER_DESERIALIZE = textSerializerDeserialize;
158180
TEXT_SERIALIZER_SERIALIZE = textSerializerSerialize;
181+
TEXT_SERIALIZER_DESERIALIZE_TREE = textSerializerDeserializeTree;
182+
TEXT_SERIALIZER_SERIALIZE_TREE = textSerializerSerializeTree;
159183
}
160184

161-
private static final boolean SUPPORTED = MC_TEXT_GSON != null || (TEXT_SERIALIZER_DESERIALIZE != null && TEXT_SERIALIZER_SERIALIZE != null);
185+
private static final boolean SUPPORTED = MC_TEXT_GSON != null || (TEXT_SERIALIZER_DESERIALIZE != null && TEXT_SERIALIZER_SERIALIZE != null) || (TEXT_SERIALIZER_DESERIALIZE_TREE != null && TEXT_SERIALIZER_SERIALIZE_TREE != null);
162186

163187
@Override
164188
public @NotNull Component deserialize(final @NotNull Object input) {
165189
if (!SUPPORTED) throw INITIALIZATION_ERROR.get();
166190

167191
try {
168-
if (MC_TEXT_GSON != null) {
169-
final JsonElement element = ((Gson) MC_TEXT_GSON).toJsonTree(input);
170-
return gson().serializer().fromJson(element, Component.class);
192+
final JsonElement element;
193+
if (TEXT_SERIALIZER_SERIALIZE_TREE != null) {
194+
element = (JsonElement) TEXT_SERIALIZER_SERIALIZE_TREE.invoke(input);
195+
} else if (MC_TEXT_GSON != null) {
196+
element = ((Gson) MC_TEXT_GSON).toJsonTree(input);
197+
} else {
198+
return gson().deserialize((String) TEXT_SERIALIZER_SERIALIZE.invoke(input));
171199
}
172-
return GsonComponentSerializer.gson().deserialize((String) TEXT_SERIALIZER_SERIALIZE.invoke(input));
200+
return gson().serializer().fromJson(element, Component.class);
173201
} catch (final Throwable error) {
174202
throw new UnsupportedOperationException(error);
175203
}
@@ -179,9 +207,12 @@ public static boolean isSupported() {
179207
public @NotNull Object serialize(final @NotNull Component component) {
180208
if (!SUPPORTED) throw INITIALIZATION_ERROR.get();
181209

182-
if (MC_TEXT_GSON != null) {
210+
if (TEXT_SERIALIZER_DESERIALIZE_TREE != null || MC_TEXT_GSON != null) {
183211
final JsonElement json = gson().serializer().toJsonTree(component);
184212
try {
213+
if (TEXT_SERIALIZER_DESERIALIZE_TREE != null) {
214+
return TEXT_SERIALIZER_DESERIALIZE_TREE.invoke(json);
215+
}
185216
return ((Gson) MC_TEXT_GSON).fromJson(json, CLASS_CHAT_COMPONENT);
186217
} catch (final Throwable error) {
187218
throw new UnsupportedOperationException(error);

0 commit comments

Comments
 (0)