Upstream/Mappings
1
0
Fork 0
mirror of https://github.com/ViaVersion/Mappings.git synced 2025-01-06 19:18:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ViaNBT

Browse Source
This commit is contained in:
Nassim Jahnke 2024-02-13 14:50:36 +01:00
parent b4f978b310
commit 0df4bc6bd6
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
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:4.0.0") api("com.viaversion:nbt:4.2.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.2" version = "3.3.3"
description = "MappingsGenerator" description = "MappingsGenerator"
java.sourceCompatibility = JavaVersion.VERSION_17 java.sourceCompatibility = JavaVersion.VERSION_17

4
src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java
View File

@ -37,8 +37,8 @@ public final class ManualRunner {
return; return;
} }
final String from = "1.20.2"; final String from = "1.20.3";
final String to = "1.20.3"; final String to = "1.20.5";
MappingsOptimizer mappingsOptimizer = new MappingsOptimizer(from, to); MappingsOptimizer mappingsOptimizer = new MappingsOptimizer(from, to);
mappingsOptimizer.writeDiffStubs(); mappingsOptimizer.writeDiffStubs();
mappingsOptimizer.optimizeAndWrite(); mappingsOptimizer.optimizeAndWrite();

41
src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java
View File

@ -18,10 +18,8 @@
*/ */
package com.viaversion.mappingsgenerator; package com.viaversion.mappingsgenerator;
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;
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;
@ -84,11 +82,12 @@ public final class MappingsOptimizer {
private static final Set<String> SAVED_IDENTIFIER_FILES = new HashSet<>(); private static final Set<String> SAVED_IDENTIFIER_FILES = new HashSet<>();
private final Set<String> ignoreMissing = new HashSet<>(Arrays.asList("blocks", "statistics")); private final Set<String> ignoreMissing = new HashSet<>(Arrays.asList("blocks", "statistics"));
private final CompoundTag output; private final CompoundTag output = new CompoundTag();
private final String fromVersion; private final String fromVersion;
private final String toVersion; private final String toVersion;
private final JsonObject unmappedObject; private final JsonObject unmappedObject;
private final JsonObject mappedObject; private final JsonObject mappedObject;
private final boolean backwards;
private ErrorStrategy errorStrategy = ErrorStrategy.WARN; private ErrorStrategy errorStrategy = ErrorStrategy.WARN;
private JsonObject diffObject; private JsonObject diffObject;
private boolean keepUnknownFields; private boolean keepUnknownFields;
@ -126,8 +125,8 @@ public final class MappingsOptimizer {
public MappingsOptimizer(final String from, final String to) throws IOException { public MappingsOptimizer(final String from, final String to) throws IOException {
this.fromVersion = from; this.fromVersion = from;
this.toVersion = to; this.toVersion = to;
output = new CompoundTag(); backwards = Version.isBackwards(fromVersion, toVersion);
output.put("version", new IntTag(VERSION)); output.putInt("version", VERSION);
unmappedObject = MappingsLoader.load(MAPPING_FILE_FORMAT.formatted(from)); unmappedObject = MappingsLoader.load(MAPPING_FILE_FORMAT.formatted(from));
if (unmappedObject == null) { if (unmappedObject == null) {
@ -171,7 +170,7 @@ public final class MappingsOptimizer {
names("items", "itemnames"); names("items", "itemnames");
fullNames("entitynames", "entitynames"); fullNames("entitynames", "entitynames");
if (Version.isBackwards(fromVersion, toVersion)) { if (backwards) {
fullNames("sounds", "soundnames"); fullNames("sounds", "soundnames");
} }
@ -180,7 +179,7 @@ public final class MappingsOptimizer {
} }
} }
write(Version.isBackwards(fromVersion, toVersion) ? OUTPUT_BACKWARDS_DIR : OUTPUT_DIR); write(backwards ? OUTPUT_BACKWARDS_DIR : OUTPUT_DIR);
// Save full identifiers to a separate file per version // Save full identifiers to a separate file per version
saveIdentifierFiles(fromVersion, unmappedObject); saveIdentifierFiles(fromVersion, unmappedObject);
@ -314,10 +313,10 @@ public final class MappingsOptimizer {
i++; i++;
} }
changedTag.put("id", new ByteTag(MappingsOptimizer.CHANGES_ID)); changedTag.putByte("id", MappingsOptimizer.CHANGES_ID);
changedTag.put("nofill", new ByteTag((byte) 1)); changedTag.putByte("nofill", (byte) 1);
changedTag.put("size", new IntTag(size)); changedTag.putInt("size", size);
changedTag.put("mappedSize", new IntTag(mappedIdentifiers.size())); changedTag.putInt("mappedSize", mappedIdentifiers.size());
changedTag.put("at", new IntArrayTag(unmapped)); changedTag.put("at", new IntArrayTag(unmapped));
changedTag.put("val", new IntArrayTag(mapped)); changedTag.put("val", new IntArrayTag(mapped));
output.put(outputKey, changedTag); output.put(outputKey, changedTag);
@ -342,7 +341,7 @@ public final class MappingsOptimizer {
for (final Map.Entry<String, JsonElement> entry : nameMappings.entrySet()) { for (final Map.Entry<String, JsonElement> entry : nameMappings.entrySet()) {
// Would be smaller as two arrays, but /shrug // Would be smaller as two arrays, but /shrug
final String idAsString = Integer.toString(identifierMap.getInt(entry.getKey())); final String idAsString = Integer.toString(identifierMap.getInt(entry.getKey()));
tag.put(idAsString, new StringTag(entry.getValue().getAsString())); tag.putString(idAsString, entry.getValue().getAsString());
} }
} }
@ -362,7 +361,7 @@ public final class MappingsOptimizer {
output.put(outputKey, tag); output.put(outputKey, tag);
for (final Map.Entry<String, JsonElement> entry : nameMappings.entrySet()) { for (final Map.Entry<String, JsonElement> entry : nameMappings.entrySet()) {
tag.put(entry.getKey(), new StringTag(entry.getValue().getAsString())); tag.putString(entry.getKey(), entry.getValue().getAsString());
} }
} }
@ -455,11 +454,11 @@ public final class MappingsOptimizer {
final CompoundTag tag = new CompoundTag(); final CompoundTag tag = new CompoundTag();
parent.put(key, tag); parent.put(key, tag);
tag.put("mappedSize", new IntTag(result.mappedSize())); tag.putInt("mappedSize", result.mappedSize());
if (!hasChanges) { if (!hasChanges) {
tag.put("id", new ByteTag(IDENTITY_ID)); tag.putByte("id", IDENTITY_ID);
tag.put("size", new IntTag(mappings.length)); tag.putInt("size", mappings.length);
return; return;
} }
@ -472,7 +471,7 @@ public final class MappingsOptimizer {
writeShiftFormat(tag, result, key); writeShiftFormat(tag, result, key);
} else { } else {
LOGGER.debug("{}: Storing as direct values", key); LOGGER.debug("{}: Storing as direct values", key);
tag.put("id", new ByteTag(DIRECT_ID)); tag.putByte("id", DIRECT_ID);
tag.put("val", new IntArrayTag(mappings)); tag.put("val", new IntArrayTag(mappings));
} }
} }
@ -489,8 +488,8 @@ public final class MappingsOptimizer {
// Put two intarrays of only changed ids instead of adding an entry for every single identifier // Put two intarrays of only changed ids instead of adding an entry for every single identifier
LOGGER.debug("{}: Storing as changed and mapped arrays", key); LOGGER.debug("{}: Storing as changed and mapped arrays", key);
final int[] mappings = result.mappings(); final int[] mappings = result.mappings();
tag.put("id", new ByteTag(CHANGES_ID)); tag.putByte("id", CHANGES_ID);
tag.put("size", new IntTag(mappings.length)); tag.putInt("size", mappings.length);
final int[] unmapped = new int[numberOfChanges]; final int[] unmapped = new int[numberOfChanges];
final int[] mapped = new int[numberOfChanges]; final int[] mapped = new int[numberOfChanges];
@ -522,8 +521,8 @@ public final class MappingsOptimizer {
private static void writeShiftFormat(final CompoundTag tag, final MappingsResult result, final String key) { private static void writeShiftFormat(final CompoundTag tag, final MappingsResult result, final String key) {
LOGGER.debug("{}: Storing as shifts", key); LOGGER.debug("{}: Storing as shifts", key);
final int[] mappings = result.mappings(); final int[] mappings = result.mappings();
tag.put("id", new ByteTag(SHIFTS_ID)); tag.putByte("id", SHIFTS_ID);
tag.put("size", new IntTag(mappings.length)); tag.putInt("size", mappings.length);
final int[] shiftsAt = new int[result.shiftChanges()]; final int[] shiftsAt = new int[result.shiftChanges()];
final int[] shiftsTo = new int[result.shiftChanges()]; final int[] shiftsTo = new int[result.shiftChanges()];