Update ViaNBT

This commit is contained in:
Nassim Jahnke 2023-12-31 13:38:23 +01:00
parent e8e20271d8
commit 60193ccc7d
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
2 changed files with 6 additions and 5 deletions

View File

@ -10,7 +10,7 @@ repositories {
dependencies { dependencies {
api("com.google.code.gson:gson:2.10.1") api("com.google.code.gson:gson:2.10.1")
api("com.viaversion:nbt:3.0.0") api("com.viaversion:nbt:4.0.0")
api("it.unimi.dsi:fastutil:8.5.12") api("it.unimi.dsi:fastutil:8.5.12")
api("ch.qos.logback:logback-classic:1.4.14") api("ch.qos.logback:logback-classic:1.4.14")
compileOnly("org.jetbrains:annotations:24.0.1") compileOnly("org.jetbrains:annotations:24.0.1")
@ -22,7 +22,7 @@ dependencies {
} }
group = "com.viaversion" group = "com.viaversion"
version = "3.3.1" version = "3.3.2"
description = "MappingsGenerator" description = "MappingsGenerator"
java.sourceCompatibility = JavaVersion.VERSION_17 java.sourceCompatibility = JavaVersion.VERSION_17
@ -68,7 +68,6 @@ tasks {
exclude("it/unimi/dsi/fastutil/*/*Big*") exclude("it/unimi/dsi/fastutil/*/*Big*")
exclude("it/unimi/dsi/fastutil/*/*Synchronized*") exclude("it/unimi/dsi/fastutil/*/*Synchronized*")
exclude("it/unimi/dsi/fastutil/*/*Unmodifiable*") exclude("it/unimi/dsi/fastutil/*/*Unmodifiable*")
exclude("it/unimi/dsi/fastutil/io/*")
} }
build { build {
dependsOn(shadowJar) dependsOn(shadowJar)

View File

@ -18,7 +18,6 @@
*/ */
package com.viaversion.mappingsgenerator; package com.viaversion.mappingsgenerator;
import com.github.steveice10.opennbt.NBTIO;
import com.github.steveice10.opennbt.tag.builtin.ByteTag; import com.github.steveice10.opennbt.tag.builtin.ByteTag;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
@ -26,6 +25,8 @@ import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag; import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.github.steveice10.opennbt.tag.io.NBTIO;
import com.github.steveice10.opennbt.tag.io.TagWriter;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -63,6 +64,7 @@ public final class MappingsOptimizer {
public static final String OUTPUT_IDENTIFIERS_FILE_FORMAT = "identifiers-%s.nbt"; public static final String OUTPUT_IDENTIFIERS_FILE_FORMAT = "identifiers-%s.nbt";
private static final Logger LOGGER = LoggerFactory.getLogger(MappingsOptimizer.class.getSimpleName()); private static final Logger LOGGER = LoggerFactory.getLogger(MappingsOptimizer.class.getSimpleName());
private static final TagWriter TAG_WRITER = NBTIO.writer().named();
private static final Set<String> STANDARD_FIELDS = Set.of( private static final Set<String> STANDARD_FIELDS = Set.of(
"blockstates", "blockstates",
"blocks", "blocks",
@ -550,7 +552,7 @@ public final class MappingsOptimizer {
} }
public static void write(final CompoundTag tag, final Path path) throws IOException { public static void write(final CompoundTag tag, final Path path) throws IOException {
NBTIO.writeFile(tag, path.toFile(), false, false); TAG_WRITER.write(path, tag, false);
} }
private static int approximateChangedFormatSize(final MappingsResult result) { private static int approximateChangedFormatSize(final MappingsResult result) {