keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Catch json parsing errors from constants/factories files (#5258)

Browse source
This commit is contained in:
Ben Staddon 2019-04-11 13:52:23 +01:00 committed by tterrag
parent 931105123e
commit 45902676fd
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java
View file

@ -237,7 +237,7 @@ public class CraftingHelper
if(element.isJsonObject()) if(element.isJsonObject())
nbt = JsonToNBT.getTagFromJson(GSON.toJson(element)); nbt = JsonToNBT.getTagFromJson(GSON.toJson(element));
else else
nbt = JsonToNBT.getTagFromJson(element.getAsString()); nbt = JsonToNBT.getTagFromJson(JsonUtils.getString(element, "nbt"));
NBTTagCompound tmp = new NBTTagCompound(); NBTTagCompound tmp = new NBTTagCompound();
if (nbt.hasKey("ForgeCaps")) if (nbt.hasKey("ForgeCaps"))
@ -261,6 +261,11 @@ public class CraftingHelper
return new ItemStack(item, JsonUtils.getInt(json, "count", 1)); return new ItemStack(item, JsonUtils.getInt(json, "count", 1));
} }
public static boolean processConditions(JsonObject json, String memberName)
{
return !json.has(memberName) || processConditions(JsonUtils.getJsonArray(json, memberName));
}
public static boolean processConditions(JsonArray conditions) public static boolean processConditions(JsonArray conditions)
{ {
for (int x = 0; x < conditions.size(); x++) for (int x = 0; x < conditions.size(); x++)
@ -312,7 +317,7 @@ public class CraftingHelper
if (json == null || json.size() == 0) if (json == null || json.size() == 0)
LOGGER.error(CRAFTHELPER, "Couldn't load constant #{} from {} as it's null or empty", x, key); LOGGER.error(CRAFTHELPER, "Couldn't load constant #{} from {} as it's null or empty", x, key);
else if (json.has("conditions") && !processConditions(JsonUtils.getJsonArray(json, "conditions"))) else if (!processConditions(json, "conditions"))
LOGGER.info(CRAFTHELPER, "Skipping loading constant #{} from {} as it's conditions were not met", x, key); LOGGER.info(CRAFTHELPER, "Skipping loading constant #{} from {} as it's conditions were not met", x, key);
else if (name == null) else if (name == null)
LOGGER.error(CRAFTHELPER, "Couldn't load constant #{} from {} as it's missing `name`", x, key); LOGGER.error(CRAFTHELPER, "Couldn't load constant #{} from {} as it's missing `name`", x, key);