101 lines
5.0 KiB
Diff
101 lines
5.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 29 Jun 2020 03:26:17 -0400
|
|
Subject: [PATCH] Support old UUID format for NBT
|
|
|
|
We have stored UUID in plenty of places that did not get DFU'd
|
|
|
|
So just look for old format and load it if it exists.
|
|
|
|
diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
index 1aa3af8c7714b2c850fb4264c863db8e639e6284..2a805d6bbeede50898d36258976ff25ee0aea165 100644
|
|
--- a/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
+++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
@@ -121,6 +121,12 @@ public class CompoundTag implements Tag {
|
|
|
|
public void setUUID(String prefix, UUID uuid) { putUUID(prefix, uuid); } // Paper - OBFHELPER
|
|
public void putUUID(String key, UUID value) {
|
|
+ // Paper start - support old format
|
|
+ if (this.contains(key + "Most", 99) && this.contains(key + "Least", 99)) {
|
|
+ this.tags.remove(key + "Most");
|
|
+ this.tags.remove(key + "Least");
|
|
+ }
|
|
+ // Paper end
|
|
this.tags.put(key, NbtUtils.createUUID(value));
|
|
}
|
|
|
|
@@ -129,10 +135,20 @@ public class CompoundTag implements Tag {
|
|
* You must use {@link #hasUUID(String)} before or else it <b>will</b> throw an NPE.
|
|
*/
|
|
public UUID getUUID(String key) {
|
|
+ // Paper start - support old format
|
|
+ if (!contains(key, 11) && this.contains(key + "Most", 99) && this.contains(key + "Least", 99)) {
|
|
+ return new UUID(this.getLong(key + "Most"), this.getLong(key + "Least"));
|
|
+ }
|
|
+ // Paper end
|
|
return NbtUtils.loadUUID(this.get(key));
|
|
}
|
|
|
|
public boolean hasUUID(String key) {
|
|
+ // Paper start - support old format
|
|
+ if (this.contains(key + "Most", 99) && this.contains(key + "Least", 99)) {
|
|
+ return true;
|
|
+ }
|
|
+ // Paper end
|
|
Tag tag = this.get(key);
|
|
return tag != null && tag.getType() == IntArrayTag.TYPE && ((IntArrayTag)tag).getAsIntArray().length == 4;
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
index 57c9575a9714acb95d9dced672955a96d71dfd1e..06fe97e05608fc21f90c9884d745d910beb6883d 100644
|
|
--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
@@ -40,14 +40,14 @@ import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
public final class NbtUtils {
|
|
- private static final Comparator<ListTag> YXZ_LISTTAG_INT_COMPARATOR = Comparator.comparingInt((listTag) -> {
|
|
+ private static final Comparator<ListTag> YXZ_LISTTAG_INT_COMPARATOR = Comparator.<ListTag>comparingInt((listTag) -> { // Paper - decompile fix
|
|
return listTag.getInt(1);
|
|
}).thenComparingInt((listTag) -> {
|
|
return listTag.getInt(0);
|
|
}).thenComparingInt((listTag) -> {
|
|
return listTag.getInt(2);
|
|
});
|
|
- private static final Comparator<ListTag> YXZ_LISTTAG_DOUBLE_COMPARATOR = Comparator.comparingDouble((listTag) -> {
|
|
+ private static final Comparator<ListTag> YXZ_LISTTAG_DOUBLE_COMPARATOR = Comparator.<ListTag>comparingDouble((listTag) -> { // Paper - decompile fix
|
|
return listTag.getDouble(1);
|
|
}).thenComparingDouble((listTag) -> {
|
|
return listTag.getDouble(0);
|
|
@@ -76,6 +76,11 @@ public final class NbtUtils {
|
|
string = compound.getString("Name");
|
|
}
|
|
|
|
+ // Paper start - support string UUID's
|
|
+ if (compound.contains("Id", 8)) {
|
|
+ uUID = UUID.fromString(compound.getString("Id"));
|
|
+ }
|
|
+ // Paper end
|
|
if (compound.hasUUID("Id")) {
|
|
uUID = compound.getUUID("Id");
|
|
}
|
|
@@ -495,7 +500,7 @@ public final class NbtUtils {
|
|
}
|
|
|
|
public static CompoundTag update(DataFixer fixer, DataFixTypes fixTypes, CompoundTag compound, int oldVersion, int targetVersion) {
|
|
- return fixer.update(fixTypes.getType(), new Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue();
|
|
+ return (CompoundTag) fixer.update(fixTypes.getType(), new com.mojang.serialization.Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue(); // Paper - decompile fix
|
|
}
|
|
|
|
public static Component toPrettyComponent(Tag element) {
|
|
@@ -620,8 +625,8 @@ public final class NbtUtils {
|
|
CompoundTag compoundTag2 = new CompoundTag();
|
|
if (i + 2 <= string.length()) {
|
|
String string3 = string.substring(i + 1, string.indexOf(125, i));
|
|
- COMMA_SPLITTER.split(string3).forEach((string2) -> {
|
|
- List<String> list = COLON_SPLITTER.splitToList(string2);
|
|
+ COMMA_SPLITTER.split(string3).forEach(it -> { // Paper - decompile fix
|
|
+ List<String> list = COLON_SPLITTER.splitToList(it); // Paper - decompile fix
|
|
if (list.size() == 2) {
|
|
compoundTag2.putString(list.get(0), list.get(1));
|
|
} else {
|