From d63ceb33cb6324a608bafa5781b946bc8459e27a Mon Sep 17 00:00:00 2001 From: Xalcon Date: Thu, 20 Jul 2017 23:28:39 +0200 Subject: [PATCH] Added support for vanilla "nbt strings" in json recipes (#4113) --- .../minecraftforge/common/crafting/CraftingHelper.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index df78433808..0c4bdb819f 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java @@ -218,7 +218,13 @@ public class CraftingHelper { // Lets hope this works? Needs test try { - NBTTagCompound nbt = JsonToNBT.getTagFromJson(GSON.toJson(json.get("nbt"))); + JsonElement element = json.get("nbt"); + NBTTagCompound nbt; + if(element.isJsonObject()) + nbt = JsonToNBT.getTagFromJson(GSON.toJson(element)); + else + nbt = JsonToNBT.getTagFromJson(element.getAsString()); + NBTTagCompound tmp = new NBTTagCompound(); if (nbt.hasKey("ForgeCaps")) {