R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Forge resource finder for directories instead of MF finder

Browse Source
This commit is contained in:
embeddedt 2023-07-27 13:59:13 -04:00
parent 213bcd1b2a
commit 2663f5e3f4
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModernFixResourceFinder.java
View File

@ -92,20 +92,12 @@ public class ModernFixResourceFinder {
} }
public static Enumeration<URL> findAllURLsForResource(String input) { public static Enumeration<URL> findAllURLsForResource(String input) {
// CachedResourcePath normalizes already but we need to strip trailing slash if any // fallback to Forge impl for any paths ending in a slash
// TODO move logic to FileUtil.normalize() char endChar = input.length() > 0 ? input.charAt(input.length() - 1) : '/';
int lastIndex = input.length(); if(endChar == '/' || endChar == '\\') {
boolean strip = false; return LoadingModList.get().findAllURLsForResource(input);
while(lastIndex > 1) {
char c = input.charAt(lastIndex - 1);
if (c == '/' || c == '\\') {
lastIndex--;
strip = true;
} else
break;
} }
if(strip) // CachedResourcePath normalizes already
input = input.substring(0, lastIndex);
Collection<String> urlList = urlsForClass.get(new CachedResourcePath(input)); Collection<String> urlList = urlsForClass.get(new CachedResourcePath(input));
if(!urlList.isEmpty()) { if(!urlList.isEmpty()) {
String pathInput = FileUtil.normalize(input); String pathInput = FileUtil.normalize(input);