From fa76a4e2bedc1ccfdc66fab822c30035f42ad344 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 20 Jun 2023 14:52:54 -0400
Subject: [PATCH 1/3] Do not run Gradle workflow when pushing a tag

---
 .github/workflows/gradle.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 561195c2..9e4f6a15 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -3,7 +3,11 @@
 
 name: Build mod
 
-on: [push, pull_request]
+on:
+  push:
+    tags-ignore:
+      - '**'
+  pull_request:
 
 jobs:
   build:

From 2fe5c088e3cfa5a5061b6888e6ac19213ca04661 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 20 Jun 2023 14:58:12 -0400
Subject: [PATCH 2/3] Explicitly run it on all branches

---
 .github/workflows/gradle.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 9e4f6a15..1deefcf2 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -5,6 +5,8 @@ name: Build mod
 
 on:
   push:
+    branches:
+      - '**'
     tags-ignore:
       - '**'
   pull_request:

From 19c66877458532eb8d742c55ce06c2e5b322bb7f Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 21 Jun 2023 21:17:11 -0400
Subject: [PATCH 3/3] More aggressively load model files

---
 .../dynamicresources/ModelBakeryHelpers.java  | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
index 49b01c78..e5a2e52c 100644
--- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
+++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
@@ -105,21 +105,21 @@ public class ModelBakeryHelpers {
             }
         }
         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", "")));
+                }
+                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", "")));
                 }
-                return true;
             }
-            ModernFix.LOGGER.debug("Pack with class {} needs manual scan", pack.getClass().getName());
-            return false;
+            if(!isTrustedPack.test(pack)) {
+                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 class ModelBakeryHelpers {
         blockStateData = null;
         blockStateLoadedFiles.clear();
 
+        modelFiles.addAll(allAvailableModels);
         /* figure out which models we should actually load */
         gatherAdditionalViaManualScan(allPackResources, allAvailableModels, modelFiles, "models/");
         modelFiles.retainAll(allAvailableModels);