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

Merge 1.19.2 into 1.19.4

Browse Source
This commit is contained in:
embeddedt 2023-06-22 13:42:56 -04:00
commit 5b2e70cda0
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/org/embeddedt/modernfix/resources/CachedResourcePath.java
View File

@ -57,6 +57,13 @@ public class CachedResourcePath {
pathComponents = components; pathComponents = components;
} }
/**
* DOES NOT INTERN!
*/
public CachedResourcePath(String[] pathComponents) {
this.pathComponents = pathComponents;
}
@Override @Override
public int hashCode() { public int hashCode() {
return Arrays.hashCode(pathComponents); return Arrays.hashCode(pathComponents);

5
common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java
View File

@ -133,6 +133,11 @@ public class PackResourcesCacheEngine {
return this.containedPaths.contains(new CachedResourcePath(path)); return this.containedPaths.contains(new CachedResourcePath(path));
} }
public boolean hasResource(String[] paths) {
awaitLoad();
return this.containedPaths.contains(new CachedResourcePath(paths));
}
public Collection<ResourceLocation> getResources(PackType type, String resourceNamespace, String pathIn, int maxDepth, Predicate<ResourceLocation> filter) { public Collection<ResourceLocation> getResources(PackType type, String resourceNamespace, String pathIn, int maxDepth, Predicate<ResourceLocation> filter) {
if(!PackTypeHelper.isVanillaPackType(type)) if(!PackTypeHelper.isVanillaPackType(type))
throw new IllegalArgumentException("Only vanilla PackTypes are supported"); throw new IllegalArgumentException("Only vanilla PackTypes are supported");