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

Fix ModFileResourcePack.getAllResourceLocations ignoring resourceNamespace. (#7562)

Browse source 
Fixes #7405
This commit is contained in:
Take Weiland 2020-12-28 22:39:44 +01:00 committed by GitHub
parent e120b57032
commit 2904772b16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java
View file

@ -82,19 +82,19 @@ public class ModFileResourcePack extends ResourcePack
{ {
try try
{ {
Path root = modFile.getLocator().findPath(modFile, type.getDirectoryName()).toAbsolutePath(); Path root = modFile.getLocator().findPath(modFile, type.getDirectoryName(), resourceNamespace).toAbsolutePath();
Path inputPath = root.getFileSystem().getPath(pathIn); Path inputPath = root.getFileSystem().getPath(pathIn);
return Files.walk(root). return Files.walk(root).
map(path -> root.relativize(path.toAbsolutePath())). map(path -> root.relativize(path.toAbsolutePath())).
filter(path -> path.getNameCount() > 1 && path.getNameCount() - 1 <= maxDepth). // Make sure the depth is within bounds, ignoring domain filter(path -> path.getNameCount() <= maxDepth). // Make sure the depth is within bounds
filter(path -> !path.toString().endsWith(".mcmeta")). // Ignore .mcmeta files filter(path -> !path.toString().endsWith(".mcmeta")). // Ignore .mcmeta files
filter(path -> path.subpath(1, path.getNameCount()).startsWith(inputPath)). // Make sure the target path is inside this one (again ignoring domain) filter(path -> path.startsWith(inputPath)). // Make sure the target path is inside this one
filter(path -> filter.test(path.getFileName().toString())). // Test the file name against the predicate filter(path -> filter.test(path.getFileName().toString())). // Test the file name against the predicate
// Finally we need to form the RL, so use the first name as the domain, and the rest as the path // Finally we need to form the RL, so use the first name as the domain, and the rest as the path
// It is VERY IMPORTANT that we do not rely on Path.toString as this is inconsistent between operating systems // It is VERY IMPORTANT that we do not rely on Path.toString as this is inconsistent between operating systems
// Join the path names ourselves to force forward slashes // Join the path names ourselves to force forward slashes
map(path -> new ResourceLocation(path.getName(0).toString(), Joiner.on('/').join(path.subpath(1,Math.min(maxDepth, path.getNameCount()))))). map(path -> new ResourceLocation(resourceNamespace, Joiner.on('/').join(path))).
collect(Collectors.toList()); collect(Collectors.toList());
} }
catch (IOException e) catch (IOException e)