fix: mocked material properties are no longer delayed if not neccessery

Valheim-Modding · Sep 21, 2022 · cdadc0e · cdadc0e
1 parent 00d7d8e
commit cdadc0e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ## Version 2.7.9
 * Added ZoneManager.OnVanillaClutterAvailable event
 * Added CustomClutter to ModRegistry
+* Fixed mocked material textures/shaders where not directly fixed after they were injected. Properties that are not available at this time are still delayed
 * Fixed connection issues with the upcoming cross play update
 * Fixed admin checks for the upcoming cross play update
 

diff --git a/JotunnLib/Managers/MockSystem/MockManager.cs b/JotunnLib/Managers/MockSystem/MockManager.cs
@@ -45,7 +45,7 @@ private MockManager() {}
         private Dictionary<string, GameObject> mockedPrefabs = new Dictionary<string, GameObject>();
         private static HashSet<Material> fixedMaterials = new HashSet<Material>();
         private static HashSet<Material> queuedToFixMaterials = new HashSet<Material>();
-        private static bool canFixMaterials;
+        private static bool allVanillaObjectsAvailable;
 
         /// <summary>
         ///     Creates the container and registers all hooks
@@ -330,21 +330,14 @@ private static void TryFixMaterial(Material material)
                 return;
             }
 
-            if (canFixMaterials)
-            {
-                FixMaterial(material);
-            }
-            else
-            {
-                queuedToFixMaterials.Add(material);
-            }
+            FixMaterial(material);
         }
 
         private static void FixQueuedMaterials()
         {
             // if the cache is already initialized, some later loaded textures are not found
             PrefabManager.Cache.ClearCache<Texture>();
-            canFixMaterials = true;
+            allVanillaObjectsAvailable = true;
 
             foreach (var material in new HashSet<Material>(queuedToFixMaterials))
             {
@@ -360,7 +353,7 @@ private static void FixMaterial(Material material)
                 return;
             }
 
-            fixedMaterials.Add(material);
+            bool everythingFixed = true;
 
             foreach (int prop in material.GetTexturePropertyNameIDs())
             {
@@ -379,7 +372,12 @@ private static void FixMaterial(Material material)
                 }
                 catch (MockResolveException ex)
                 {
-                    Logger.LogWarning(ex.Message);
+                    if (allVanillaObjectsAvailable)
+                    {
+                        Logger.LogWarning(ex.Message);
+                    }
+
+                    everythingFixed = false;
                     continue;
                 }
 
@@ -399,6 +397,25 @@ private static void FixMaterial(Material material)
                 {
                     material.shader = realShader;
                 }
+                else
+                {
+                    if (allVanillaObjectsAvailable)
+                    {
+                        Logger.LogWarning($"Could not find shader {usedShader.name}");
+                    }
+
+                    everythingFixed = false;
+                }
+            }
+
+            if (everythingFixed && !fixedMaterials.Contains(material))
+            {
+                fixedMaterials.Add(material);
+            }
+
+            if (!everythingFixed && !queuedToFixMaterials.Contains(material))
+            {
+                queuedToFixMaterials.Add(material);
             }
         }
     }