Skip to content
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

Jump to bottom

Fix writing to immutable nbt lists #803

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Fix writing to immutable nbt lists #803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 34 additions & 21 deletions protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/NbtComponentSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
import com.google.gson.JsonPrimitive;
import com.google.gson.internal.LazilyParsedNumber;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.cloudburstmc.nbt.NbtList;
import org.cloudburstmc.nbt.NbtMap;
import org.cloudburstmc.nbt.NbtMapBuilder;
import org.cloudburstmc.nbt.NbtType;
import org.jetbrains.annotations.Contract;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -101,41 +103,33 @@ private static Object convertToTag(final @Nullable JsonElement element) {
throw new IllegalArgumentException("Unhandled json type " + element.getClass().getSimpleName() + " with value " + element.getAsString());
}

private static <T> void addToListOrFail(final NbtList<T> list, final Object tag) {
Class<T> listClass = list.getType().getTagClass();

if (listClass.isInstance(tag)) {
list.add(listClass.cast(tag));
} else {
throw new IllegalArgumentException("Cannot add " + tag.getClass().getSimpleName() + " to list of " + listClass.getSimpleName());
}
}

private static NbtList<?> convertJsonArray(final JsonArray array) {
// TODO Number arrays?
NbtList<?> listTag = null;
boolean singleType = true;
NbtListBuilder<?> listBuilder = null;
for (final JsonElement entry : array) {
final Object convertedEntryTag = convertToTag(entry);
if (listTag == null) {
listTag = new NbtList<>(NbtType.byClass(convertedEntryTag.getClass()));
NbtType<?> convertedTagType = NbtType.byClass(convertedEntryTag.getClass());

if (listBuilder == null) {
listBuilder = new NbtListBuilder<>(convertedTagType);
}

if (listTag.getType() != NbtType.byClass(convertedEntryTag.getClass())) {
singleType = false;
// If we have different types mixed, fallback to compounds below.
if (listBuilder.type != convertedTagType) {
listBuilder = null;
break;
}

addToListOrFail(listTag, convertedEntryTag);
listBuilder.addUnsafe(convertedEntryTag);
}

if (singleType) {
return listTag;
if (listBuilder != null) {
return listBuilder.build();
}

// Generally, vanilla-esque serializers should not produce this format, so it should be rare
// Lists are only used for lists of components ("extra" and "with")
final NbtList<NbtMap> processedListTag = new NbtList<>(NbtType.COMPOUND);
final NbtListBuilder<NbtMap> processedListTag = new NbtListBuilder<>(NbtType.COMPOUND);
for (final JsonElement entry : array) {
final Object convertedTag = convertToTag(entry);
if (convertedTag instanceof NbtMap nbtMap) {
Expand All @@ -154,7 +148,8 @@ private static NbtList<?> convertJsonArray(final JsonArray array) {
}
processedListTag.add(compoundTag.build());
}
return processedListTag;

return processedListTag.build();
}

/**
Expand Down Expand Up @@ -336,4 +331,22 @@ private static class Pair<K, V> {
private final K key;
private final V value;
}

@RequiredArgsConstructor
private static class NbtListBuilder<T> {
private final NbtType<T> type;
private final List<T> list = new ArrayList<>();

public void add(T value) {
list.add(value);
}

public void addUnsafe(Object value) {
add(type.getTagClass().cast(value));
}

public NbtList<T> build() {
return new NbtList<>(type, list);
}
}
}
Loading