mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 08:17:35 +00:00
Filter any recipe starting with _, Such names are reserved for metadata.
Actually implement conditions for recipes.
This commit is contained in:
1 parent
65ec1f5d54
commit
b5260a386d
1 file changed
+3
-3
@@ -710,9 +710,7 @@ public class CraftingHelper {
|
||||
while (itr != null && itr.hasNext())
|
||||
{
|
||||
Path f = itr.next();
|
||||
if (!"json".equals(FilenameUtils.getExtension(f.toString())) ||
|
||||
"_factories.json".equals(FilenameUtils.getName(f.toString())) ||
|
||||
"_constants.json".equals(FilenameUtils.getName(f.toString())))
|
||||
if (!"json".equals(FilenameUtils.getExtension(f.toString())) || root.relativize(f).toString().startsWith("_"))
|
||||
continue;
|
||||
|
||||
String name = FilenameUtils.removeExtension(root.relativize(f).toString()).replaceAll("\\\\", "/");
|
||||
@@ -723,6 +721,8 @@ public class CraftingHelper {
|
||||
{
|
||||
reader = Files.newBufferedReader(f);
|
||||
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);
|
||||
ForgeRegistries.RECIPES.register(recipe.setRegistryName(key));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user