From 985a48f02e3d42018e86d7adb6feb44f37af0d14 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 9 Jan 2019 22:59:40 -0600 Subject: [PATCH] Fix datapack walking not working for mod datapacks. Closes #5334 (#5335) --- .../java/net/minecraftforge/fml/packs/ModFileResourcePack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java b/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java index 8894e6c37..94695a954 100644 --- a/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java +++ b/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java @@ -79,7 +79,8 @@ public class ModFileResourcePack extends AbstractResourcePack try { Path root = modFile.getLocator().findPath(modFile, type.getDirectoryName()).toAbsolutePath(); - Path inputPath = root.resolve(pathIn); + Path inputPath = root.getFileSystem().getPath(pathIn); + return Files.walk(root). map(path -> root.relativize(path.toAbsolutePath())). filter(path -> path.getNameCount() > 1 && path.getNameCount() - 1 <= maxDepth). // Make sure the depth is within bounds, ignoring domain