Skip to content

Commit d97b18e

Browse files
committed
Merge 1.18 into 1.19.2
2 parents 5bd745a + 6678864 commit d97b18e

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

common/src/main/java/org/embeddedt/modernfix/resources/CachedResourcePath.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ public CachedResourcePath(String[] prefixElements, CachedResourcePath other) {
5757
pathComponents = components;
5858
}
5959

60+
/**
61+
* DOES NOT INTERN!
62+
*/
63+
public CachedResourcePath(String[] pathComponents) {
64+
this.pathComponents = pathComponents;
65+
}
66+
6067
@Override
6168
public int hashCode() {
6269
return Arrays.hashCode(pathComponents);

common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ public boolean hasResource(String path) {
133133
return this.containedPaths.contains(new CachedResourcePath(path));
134134
}
135135

136+
public boolean hasResource(String[] paths) {
137+
awaitLoad();
138+
return this.containedPaths.contains(new CachedResourcePath(paths));
139+
}
140+
136141
public Collection<ResourceLocation> getResources(PackType type, String resourceNamespace, String pathIn, int maxDepth, Predicate<ResourceLocation> filter) {
137142
if(!PackTypeHelper.isVanillaPackType(type))
138143
throw new IllegalArgumentException("Only vanilla PackTypes are supported");

0 commit comments

Comments
 (0)