Merge 1.16 into 1.18

Author: embeddedt

.github/workflows/gradle.yml

@@ -3,7 +3,13 @@
 
 name: Build mod
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - '**'
+    tags-ignore:
+      - '**'
+  pull_request:
 
 jobs:
   build:

common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java

@@ -105,21 +105,21 @@ public static void gatherModelMaterials(ResourceManager manager, Predicate<PackR
             }
         }
         allPackResources.removeIf(pack -> {
-            if(isTrustedPack.test(pack)) {
-                for(String namespace : pack.getNamespaces(PackType.CLIENT_RESOURCES)) {
-                    Collection<ResourceLocation> allBlockstates = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "blockstates", Integer.MAX_VALUE, p -> p.endsWith(".json"));
-                    for(ResourceLocation blockstate : allBlockstates) {
-                        allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("blockstates/", "").replace(".json", "")));
-                    }
-                    Collection<ResourceLocation> allModels = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "models", Integer.MAX_VALUE, p -> p.endsWith(".json"));
-                    for(ResourceLocation blockstate : allModels) {
-                        allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("models/", "").replace(".json", "")));
-                    }
+            for(String namespace : pack.getNamespaces(PackType.CLIENT_RESOURCES)) {
+                Collection<ResourceLocation> allBlockstates = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "blockstates", Integer.MAX_VALUE, p -> p.endsWith(".json"));
+                for(ResourceLocation blockstate : allBlockstates) {
+                    allAvailableStates.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("blockstates/", "").replace(".json", "")));
                 }
-                return true;
+                Collection<ResourceLocation> allModels = pack.getResources(PackType.CLIENT_RESOURCES, namespace, "models", Integer.MAX_VALUE, p -> p.endsWith(".json"));
+                for(ResourceLocation blockstate : allModels) {
+                    allAvailableModels.add(new ResourceLocation(blockstate.getNamespace(), blockstate.getPath().replace("models/", "").replace(".json", "")));
+                }
+            }
+            if(!isTrustedPack.test(pack)) {
+                ModernFix.LOGGER.debug("Pack with class {} needs manual scan", pack.getClass().getName());
+                return false;
             }
-            ModernFix.LOGGER.debug("Pack with class {} needs manual scan", pack.getClass().getName());
-            return false;
+            return true;
         });
 
         gatherAdditionalViaManualScan(allPackResources, allAvailableStates, blockStateFiles, "blockstates/");
@@ -215,6 +215,7 @@ public static void gatherModelMaterials(ResourceManager manager, Predicate<PackR
         blockStateData = null;
         blockStateLoadedFiles.clear();
 
+        modelFiles.addAll(allAvailableModels);
         /* figure out which models we should actually load */
         gatherAdditionalViaManualScan(allPackResources, allAvailableModels, modelFiles, "models/");
         modelFiles.retainAll(allAvailableModels);