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

Fix uncaught ClassCastException from invalid recipe file (#4043)

Browse source 
A JsonSyntaxException will now be thrown, caught and logged when the conditions property of a recipe isn't an array
This commit is contained in:
Choonster TheMage 2017-06-24 18:24:54 +10:00 committed by mezz
parent f670ec4f0b
commit cb02f24cf2
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -735,7 +735,7 @@ public class CraftingHelper {
{
reader = Files.newBufferedReader(f);
JsonObject json = JsonUtils.fromJson(GSON, reader, JsonObject.class);
if (json.has("conditions") && !CraftingHelper.processConditions(json.getAsJsonArray("conditions"), ctx))
if (json.has("conditions") && !CraftingHelper.processConditions(JsonUtils.getJsonArray(json, "conditions"), ctx))
continue;
IRecipe recipe = CraftingHelper.getRecipe(json, ctx);
ForgeRegistries.RECIPES.register(recipe.setRegistryName(key));

21
src/test/resources/assets/crafting_system_test/recipes/conditions_property_not_array.json Normal file
View file

@ -0,0 +1,21 @@
{
"conditions": {
"not an array": "conditions property must be an array"
},
"type": "crafting_shaped",
"group": "planks",
"pattern": [
"#"
],
"key": {
"#": {
"item": "minecraft:log2",
"data": 0
}
},
"result": {
"item": "minecraft:planks",
"data": 4,
"count": 4
}
}