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

Merge remote-tracking branch 'origin/1.18' into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-05-05 12:04:43 -04:00
commit 10c95c68d8
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
View File

@ -97,6 +97,12 @@ public class ModelBakeryHelpers {
List<PackResources> allPackResources = new ArrayList<>(manager.listPacks().collect(Collectors.toList())); List<PackResources> allPackResources = new ArrayList<>(manager.listPacks().collect(Collectors.toList()));
Collections.reverse(allPackResources); Collections.reverse(allPackResources);
ObjectOpenHashSet<ResourceLocation> allAvailableModels = new ObjectOpenHashSet<>(), allAvailableStates = new ObjectOpenHashSet<>(); ObjectOpenHashSet<ResourceLocation> allAvailableModels = new ObjectOpenHashSet<>(), allAvailableStates = new ObjectOpenHashSet<>();
/* try to fix CME in some runtime packs by forcing generation */
for(PackResources pack : allPackResources) {
try(InputStream stream = pack.getResource(PackType.CLIENT_RESOURCES, new ResourceLocation("modernfix", "dummy.json"))) {
} catch(Exception ignored) {
}
}
allPackResources.removeIf(pack -> { allPackResources.removeIf(pack -> {
if(isTrustedPack.test(pack)) { if(isTrustedPack.test(pack)) {
for(String namespace : pack.getNamespaces(PackType.CLIENT_RESOURCES)) { for(String namespace : pack.getNamespaces(PackType.CLIENT_RESOURCES)) {
@ -124,10 +130,12 @@ public class ModelBakeryHelpers {
ConcurrentLinkedQueue<Pair<ResourceLocation, JsonElement>> blockStateLoadedFiles = new ConcurrentLinkedQueue<>(); ConcurrentLinkedQueue<Pair<ResourceLocation, JsonElement>> blockStateLoadedFiles = new ConcurrentLinkedQueue<>();
List<CompletableFuture<Void>> blockStateData = new ArrayList<>(); List<CompletableFuture<Void>> blockStateData = new ArrayList<>();
for(ResourceLocation blockstate : blockStateFiles) { for(ResourceLocation blockstate : blockStateFiles) {
ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), "blockstates/" + blockstate.getPath() + ".json");
List<Resource> resources = manager.getResourceStack(fileLocation);
if(resources.isEmpty())
continue;
blockStateData.add(CompletableFuture.runAsync(() -> { blockStateData.add(CompletableFuture.runAsync(() -> {
ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), "blockstates/" + blockstate.getPath() + ".json");
try { try {
List<Resource> resources = manager.getResourceStack(fileLocation);
for(Resource resource : resources) { for(Resource resource : resources) {
JsonParser parser = new JsonParser(); JsonParser parser = new JsonParser();
try(InputStream stream = resource.open()) { try(InputStream stream = resource.open()) {