From ebbfd349f2dee5e64acc352a00b96d18a7fabed3 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 13 Feb 2021 14:10:56 -0800 Subject: [PATCH] Custom NBT <> JSON Encoder - Fix bookmark saving of items that require escaping --- build.properties | 2 +- resources/nei_at.cfg | 2 + src/codechicken/nei/BookmarkPanel.java | 14 +-- src/codechicken/nei/util/NBTJson.java | 142 +++++++++++++++++++++++++ 4 files changed, 153 insertions(+), 7 deletions(-) create mode 100644 src/codechicken/nei/util/NBTJson.java diff --git a/build.properties b/build.properties index 5123b4bc..7c21b03f 100644 --- a/build.properties +++ b/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.0.9-GTNH +mod_version=2.0.10-GTNH diff --git a/resources/nei_at.cfg b/resources/nei_at.cfg index aa65c54b..04bc0c60 100644 --- a/resources/nei_at.cfg +++ b/resources/nei_at.cfg @@ -11,3 +11,5 @@ public net.minecraft.client.gui.GuiScreen field_146292_n #buttonList public net.minecraft.entity.EntityList field_75624_e #classToIDMapping public net.minecraft.client.renderer.Tessellator field_78415_z #isDrawing public net.minecraft.client.multiplayer.PlayerControllerMP field_78779_k #currentGameType +public net.minecraft.nbt.NBTTagCompound field_74784_a #tagMap +public net.minecraft.nbt.NBTTagList field_74747_a #taglist diff --git a/src/codechicken/nei/BookmarkPanel.java b/src/codechicken/nei/BookmarkPanel.java index 1dfb21e1..d299cae4 100644 --- a/src/codechicken/nei/BookmarkPanel.java +++ b/src/codechicken/nei/BookmarkPanel.java @@ -1,11 +1,12 @@ package codechicken.nei; +import codechicken.nei.util.NBTJson; +import com.google.gson.JsonParser; +import com.google.gson.JsonSyntaxException; import cpw.mods.fml.common.registry.GameData; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.JsonToNBT; -import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import org.apache.commons.io.IOUtils; @@ -71,7 +72,7 @@ public class BookmarkPanel extends ItemPanel { public void saveBookmarks() { List strings = new ArrayList<>(); for (ItemStack item:_items) { - strings.add(itemStackToNBT(item, new NBTTagCompound()).toString()); + strings.add(NBTJson.toJson(itemStackToNBT(item, new NBTTagCompound()))); } File file = NEIClientConfig.bookmarkFile; if(file != null) { @@ -97,17 +98,18 @@ public class BookmarkPanel extends ItemPanel { return; } _items.clear(); + JsonParser parser = new JsonParser(); for (String itemStr: itemStrings) { try { - NBTTagCompound itemStackNBT = (NBTTagCompound)JsonToNBT.func_150315_a(itemStr); + NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(parser.parse(itemStr)); ItemStack itemStack = loadFromNBT(itemStackNBT); if (itemStack != null) { _items.add(itemStack); } else { NEIClientConfig.logger.warn("Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}", itemStr); } - } catch (NBTException e) { - NEIClientConfig.logger.error("Failed to load bookmarked ItemStack from json string:\n{}", itemStr, e); + } catch (IllegalArgumentException | JsonSyntaxException e) { + NEIClientConfig.logger.error("Failed to load bookmarked ItemStack from json string:\n{}", itemStr); } } } diff --git a/src/codechicken/nei/util/NBTJson.java b/src/codechicken/nei/util/NBTJson.java new file mode 100644 index 00000000..6c47cbd8 --- /dev/null +++ b/src/codechicken/nei/util/NBTJson.java @@ -0,0 +1,142 @@ +package codechicken.nei.util; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.gson.JsonPrimitive; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.nbt.NBTTagString; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class NBTJson { + private static final Pattern numberPattern = Pattern.compile("^([-+]?[\\d]+\\.?[0-9]*)([bBsSlLfFdD]?)$"); + private static final JsonParser parser = new JsonParser(); + private static final Gson gson = new GsonBuilder().create(); + + public static String toJson(NBTTagCompound tag) { + final String jsonString = toJsonObject(tag).toString(); + return gson.toJson(parser.parse(jsonString)); + } + + @SuppressWarnings("unchecked") + public static JsonElement toJsonObject(NBTBase nbt) { + if (nbt instanceof NBTTagCompound) { + // NBTTagCompound + final NBTTagCompound nbtTagCompound = (NBTTagCompound) nbt; + final Map tagMap = (Map)nbtTagCompound.tagMap; + + JsonObject root = new JsonObject(); + for (Map.Entry nbtEntry : tagMap.entrySet() ) { + root.add(nbtEntry.getKey(), toJsonObject(nbtEntry.getValue())); + } + return root; + } else if (nbt instanceof NBTBase.NBTPrimitive) { + // Number + return new JsonPrimitive(((NBTBase.NBTPrimitive) nbt).func_150286_g()); + } else if (nbt instanceof NBTTagString) { + // String + return new JsonPrimitive(((NBTTagString) nbt).func_150285_a_()); + } else if (nbt instanceof NBTTagList) { + // Tag List + JsonArray arr = new JsonArray(); + ((NBTTagList) nbt).tagList.forEach(c -> arr.add(toJsonObject((NBTBase) c))); + return arr; + } else if (nbt instanceof NBTTagIntArray) { + // Int Array + JsonArray arr = new JsonArray(); + for(int i : ((NBTTagIntArray) nbt).func_150302_c()) { + arr.add(new JsonPrimitive(i)); + } + return arr; + } else { + throw new IllegalArgumentException("Unsupported NBT Tag: " + NBTBase.NBTTypes[nbt.getId()] + " - " + nbt); + } + } + + public static NBTBase toNbt(JsonElement jsonElement) { + if (jsonElement instanceof JsonPrimitive) { + // Number or String + final JsonPrimitive jsonPrimitive = (JsonPrimitive) jsonElement; + final String jsonString = jsonPrimitive.getAsString(); + final Matcher m = numberPattern.matcher(jsonString); + if(m.find()) { + // Number + final String numberString = m.group(1); + if (m.groupCount() == 2 && m.group(2).length() > 0) { + final char numberType = m.group(2).charAt(0); + switch(numberType) { + case 'b': + case 'B': + return new NBTTagByte(Byte.parseByte(numberString)); + case 's': + case 'S': + return new NBTTagShort(Short.parseShort(numberString)); + case 'l': + case 'L': + return new NBTTagLong(Long.parseLong(numberString)); + case 'f': + case 'F': + return new NBTTagFloat(Float.parseFloat(numberString)); + case 'd': + case 'D': + return new NBTTagDouble(Double.parseDouble(numberString)); + } + } else { + if (numberString.contains(".")) + return new NBTTagDouble(Double.parseDouble(numberString)); + else + return new NBTTagInt(Integer.parseInt(numberString)); + } + } else { + // String + return new NBTTagString(jsonString); + } + } else if (jsonElement instanceof JsonArray) { + // NBTTagIntArray or NBTTagList + final JsonArray jsonArray = (JsonArray) jsonElement; + final List nbtList = new ArrayList<>(); + + for (JsonElement element : jsonArray) { + nbtList.add(toNbt(element)); + } + + if (nbtList.stream().allMatch(n -> n instanceof NBTTagInt)) { + return new NBTTagIntArray(nbtList.stream().mapToInt(i -> ((NBTTagInt)i).func_150287_d() ).toArray()); + } else { + NBTTagList nbtTagList = new NBTTagList(); + nbtList.forEach(nbtTagList::appendTag); + + return nbtTagList; + + } + } else if (jsonElement instanceof JsonObject) { + // NBTTagCompound + final JsonObject jsonObject = (JsonObject) jsonElement; + NBTTagCompound nbtTagCompound = new NBTTagCompound(); + for (Map.Entry jsonEntry : jsonObject.entrySet()) { + nbtTagCompound.setTag(jsonEntry.getKey(), toNbt(jsonEntry.getValue())); + } + return nbtTagCompound; + } + + throw new IllegalArgumentException("Unhandled element " + jsonElement); + } + +}