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

Clean up scanner + abstract pack scanning to separate function

Browse Source
This commit is contained in:
embeddedt 2023-04-29 09:38:13 -04:00
parent 9b50a50bad
commit 960dd4074e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -222,6 +222,26 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
pack instanceof FilePackResources; pack instanceof FilePackResources;
} }
private void gatherAdditionalViaManualScan(List<PackResources> untrustedPacks, Set<ResourceLocation> knownLocations,
Collection<ResourceLocation> uncertainLocations, String filePrefix) {
if(untrustedPacks.size() > 0) {
/* Now make a fallback resource manager and use it on the remaining packs to see if they actually contain these files */
FallbackResourceManager frm = new FallbackResourceManager(PackType.CLIENT_RESOURCES, "dummy");
for (int i = untrustedPacks.size() - 1; i >= 0; i--) {
frm.add(untrustedPacks.get(i));
}
for (ResourceLocation blockstate : uncertainLocations) {
if (knownLocations.contains(blockstate))
continue; // don't check ones we know exist
ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), filePrefix + blockstate.getPath() + ".json");
try (Resource resource = frm.getResource(fileLocation)) {
knownLocations.add(blockstate);
} catch (IOException ignored) {
}
}
}
}
/** /**
* Load all blockstate JSONs and model files, collect textures. * Load all blockstate JSONs and model files, collect textures.
*/ */
@ -253,38 +273,14 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
ModernFix.LOGGER.debug("Pack with class {} needs manual scan", pack.getClass().getName()); ModernFix.LOGGER.debug("Pack with class {} needs manual scan", pack.getClass().getName());
return false; return false;
}); });
if(allPackResources.size() > 0) {
/* Now make a fallback resource manager and use it on the remaining packs to see if they actually contain these files */ gatherAdditionalViaManualScan(allPackResources, allAvailableStates, blockStateFiles, "blockstates/");
FallbackResourceManager frm = new FallbackResourceManager(PackType.CLIENT_RESOURCES, "dummy"); // We now have a list of all blockstates known to exist. Delete anything that we don't have
for(int i = allPackResources.size() - 1; i >= 0; i--) {
frm.add(allPackResources.get(i));
}
for(ResourceLocation blockstate : blockStateFiles) {
if(allAvailableStates.contains(blockstate))
continue; // don't check ones we know exist
ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), "blockstates/" + blockstate.getPath() + ".json");
try(Resource resource = frm.getResource(fileLocation)) {
allAvailableStates.add(blockstate);
} catch(IOException ignored) {
}
}
for(ResourceLocation model : modelFiles) {
if(allAvailableModels.contains(model))
continue; // don't check ones we know exist
ResourceLocation fileLocation = new ResourceLocation(model.getNamespace(), "models/" + model.getPath() + ".json");
try(Resource resource = frm.getResource(fileLocation)) {
allAvailableModels.add(model);
} catch(IOException ignored) {
}
}
}
// We now have a list of all vanilla resources known to exist. Delete anything that we don't have
blockStateFiles.retainAll(allAvailableStates); blockStateFiles.retainAll(allAvailableStates);
modelFiles.retainAll(allAvailableModels);
allAvailableModels.clear();
allAvailableModels.trim();
allAvailableStates.clear(); allAvailableStates.clear();
allAvailableStates.trim(); allAvailableStates.trim();
for(ResourceLocation blockstate : blockStateFiles) { for(ResourceLocation blockstate : blockStateFiles) {
blockStateData.add(CompletableFuture.supplyAsync(() -> { blockStateData.add(CompletableFuture.supplyAsync(() -> {
ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), "blockstates/" + blockstate.getPath() + ".json"); ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), "blockstates/" + blockstate.getPath() + ".json");
@ -353,6 +349,13 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
}); });
blockstateErrors.clear(); blockstateErrors.clear();
blockStateData = null; blockStateData = null;
/* figure out which models we should actually load */
gatherAdditionalViaManualScan(allPackResources, allAvailableModels, modelFiles, "models/");
modelFiles.retainAll(allAvailableModels);
allAvailableModels.clear();
allAvailableModels.trim();
Map<ResourceLocation, BlockModel> basicModels = new HashMap<>(); Map<ResourceLocation, BlockModel> basicModels = new HashMap<>();
basicModels.put(MISSING_MODEL_LOCATION, (BlockModel)missingModel); basicModels.put(MISSING_MODEL_LOCATION, (BlockModel)missingModel);
basicModels.put(new ResourceLocation("builtin/generated"), GENERATION_MARKER); basicModels.put(new ResourceLocation("builtin/generated"), GENERATION_MARKER);