GeyserMC-Mirror/Thunder
1
0
Fork 0
mirror of https://github.com/GeyserMC/PackConverter.git synced 2025-12-28 03:09:21 +00:00
Code Issues Releases Activity

Fix conversion of complex json descriptions

Browse Source
This commit is contained in:
rtm516
2020-10-24 20:01:27 +01:00
parent 9dbb71173c
commit cb8d8ebc7d
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@@ -81,5 +81,23 @@
<artifactId>fastutil-int-object-maps</artifactId>
<version>8.3.1</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

10
src/main/java/org/geysermc/packconverter/api/converters/MetadataConverter.java
View File

@@ -31,7 +31,11 @@ import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.gson.JsonSyntaxException;
import lombok.Getter;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.geysermc.packconverter.api.PackConverter;
import org.geysermc.packconverter.api.utils.ResourcePackManifest;
@@ -76,6 +80,12 @@ public class MetadataConverter extends AbstractConverter {
int packFormat = packmeta.get("pack_format").asInt();
String packDesc = packmeta.get("description").asText();
// Convert the description if needed to make sure its valid on bedrock
try {
Component description = GsonComponentSerializer.colorDownsamplingGson().deserialize(packmeta.get("description").toString());
packDesc = LegacyComponentSerializer.legacySection().serialize(description);
} catch (JsonSyntaxException ignored) { }
if (packFormat != 4 && packFormat != 5 && packFormat != 6) {
throw new AssertionError("Only supports pack_format 4 (v1.13 or v1.14) or 5 (v1.15 or v1.16) or 6 (>= v1.16.2)!");
}