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

Filter any recipe starting with _, Such names are reserved for metadata. 

Actually implement conditions for recipes.
This commit is contained in:
LexManos 2017-06-15 19:30:05 -07:00
parent 65ec1f5d54
commit b5260a386d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java
View File

@ -710,9 +710,7 @@ public class CraftingHelper {
while (itr != null && itr.hasNext()) while (itr != null && itr.hasNext())
{ {
Path f = itr.next(); Path f = itr.next();
if (!"json".equals(FilenameUtils.getExtension(f.toString())) || if (!"json".equals(FilenameUtils.getExtension(f.toString())) || root.relativize(f).toString().startsWith("_"))
"_factories.json".equals(FilenameUtils.getName(f.toString())) ||
"_constants.json".equals(FilenameUtils.getName(f.toString())))
continue; continue;
String name = FilenameUtils.removeExtension(root.relativize(f).toString()).replaceAll("\\\\", "/"); String name = FilenameUtils.removeExtension(root.relativize(f).toString()).replaceAll("\\\\", "/");
@ -723,6 +721,8 @@ public class CraftingHelper {
{ {
reader = Files.newBufferedReader(f); reader = Files.newBufferedReader(f);
JsonObject json = JsonUtils.func_193839_a(GSON, reader, JsonObject.class); JsonObject json = JsonUtils.func_193839_a(GSON, reader, JsonObject.class);
if (json.has("conditions") && !CraftingHelper.processConditions(json.getAsJsonArray("conditions"), ctx))
continue;
IRecipe recipe = CraftingHelper.getRecipe(json, ctx); IRecipe recipe = CraftingHelper.getRecipe(json, ctx);
ForgeRegistries.RECIPES.register(recipe.setRegistryName(key)); ForgeRegistries.RECIPES.register(recipe.setRegistryName(key));
} }