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

Validate model JSON paths before preloading them

Browse Source 
Fixes #1
This commit is contained in:
embeddedt 2023-01-03 13:52:07 -05:00
parent 26915c6af4
commit 0a8fbf9114
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/embeddedt/modernfix/mixin/ModelBakeryMixin.java
View File

@ -78,7 +78,15 @@ public abstract class ModelBakeryMixin {
ModernFix.LOGGER.warn("Preloading JSONs in parallel..."); ModernFix.LOGGER.warn("Preloading JSONs in parallel...");
Stopwatch stopwatch = Stopwatch.createStarted(); Stopwatch stopwatch = Stopwatch.createStarted();
useModelCache = false; useModelCache = false;
deserializedModelCache = Minecraft.getInstance().getResourceManager().getAllResourceLocations("models", p -> p.endsWith(".json")) deserializedModelCache = Minecraft.getInstance().getResourceManager().getAllResourceLocations("models", p -> {
if(!p.endsWith(".json"))
return false;
for(int i = 0; i < p.length(); i++) {
if(!ResourceLocation.validatePathChar(p.charAt(i)))
return false;
}
return true;
})
.parallelStream() .parallelStream()
.map(location -> new ResourceLocation(location.getNamespace(), location.getPath().substring(7, location.getPath().length() - 5))) .map(location -> new ResourceLocation(location.getNamespace(), location.getPath().substring(7, location.getPath().length() - 5)))
.map(location -> Pair.of(location, this.loadModelSafely(location))) .map(location -> Pair.of(location, this.loadModelSafely(location)))