diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 80b937663..542a66202 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -1305,7 +1305,8 @@ public class ForgeHooks } return true; - } + }, + true ); } } diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index b470caf40..df7843380 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java @@ -726,14 +726,21 @@ public class CraftingHelper { public static boolean findFiles(ModContainer mod, String base, Function preprocessor, BiFunction processor) + { + return findFiles(mod, base, preprocessor, processor, false); + } + public static boolean findFiles(ModContainer mod, String base, Function preprocessor, BiFunction processor, boolean defaultUnfoundRoot) { FileSystem fs = null; try { File source = mod.getSource(); - if ("minecraft".equals(mod.getModId()) && DEBUG_LOAD_MINECRAFT) + if ("minecraft".equals(mod.getModId())) { + if (!DEBUG_LOAD_MINECRAFT) + return true; + try { URI tmp = CraftingManager.class.getResource("/assets/.mcassetsroot").toURI(); @@ -766,7 +773,7 @@ public class CraftingHelper { } if (root == null || !Files.exists(root)) - return false; + return defaultUnfoundRoot; if (preprocessor != null) {