Further fix ApplyOutLineShader

gurrenm3 · Aug 13, 2024 · 4bcd0ef · 4bcd0ef
1 parent e97563b
commit 4bcd0ef
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/BloonsTD6 Mod Helper/Extensions/Il2CppSystemExtensions/Il2CppSystemDictionaryExt.cs b/BloonsTD6 Mod Helper/Extensions/Il2CppSystemExtensions/Il2CppSystemDictionaryExt.cs
@@ -12,7 +12,7 @@ public static class Il2CppSystemDictionaryExt
     /// </summary>
     public static List<TValue> GetValues<TKey, TValue>(this Dictionary<TKey, TValue> keyValuePairs)
     {
-        return keyValuePairs._entries.Select(entry => entry.value).ToIl2CppList();
+        return keyValuePairs._entries.Select(entry => entry.value).Take(keyValuePairs.Count).ToIl2CppList();
     }
 
 

diff --git a/BloonsTD6 Mod Helper/Extensions/UnityExtensions/RendererExt.cs b/BloonsTD6 Mod Helper/Extensions/UnityExtensions/RendererExt.cs
@@ -1,6 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Il2CppAssets.Scripts.Models.GenericBehaviors;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Unity;
+using Il2CppAssets.Scripts.Unity.Display;
+using Il2CppNinjaKiwi.Common.ResourceUtils;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -126,8 +131,17 @@ public static int GetBoneIndex(this SkinnedMeshRenderer skinnedMeshRenderer, str
     /// </summary>
     public static void ApplyOutlineShader(this Renderer renderer)
     {
-        var shader = Resources.FindObjectsOfTypeAll<Shader>().First(shader => shader.name == DefaultShader);
-        renderer.material.shader = shader;
+        var shader = Resources.FindObjectsOfTypeAll<Shader>().FirstOrDefault(shader => shader.name == DefaultShader);
+        if (shader == null)
+        {
+            var dummyDisplay = Game.instance.model.GetTowerWithName(TowerType.DartMonkey).display;
+            Game.instance.GetDisplayFactory().FindAndSetupPrototypeAsync(dummyDisplay, DisplayCategory.Default,
+                new Action<UnityDisplayNode>(udn => renderer.material.shader = udn.GetRenderers().First().material.shader));
+        }
+        else
+        {
+            renderer.material.shader = shader;
+        }
         renderer.gameObject.layer = LayerMask.NameToLayer("Towers");
     }
 }
diff --git a/BloonsTD6 Mod Helper/LATEST.md b/BloonsTD6 Mod Helper/LATEST.md
@@ -1,3 +1,2 @@
-- An error indicator will now show on the main menu Mods Button if any mods have load errors
-- Added a new load error for not being on MelonLoader 0.6.1
-- Fixed unneeded errors on Epic about Il2CppFacepunch.Steamworks
+- Re-fixed the ApplyOutlineShader method to work even if no other displays caused the Shader to already be loaded
+- The space bar can now be used to skip the Title Screen animation and press the Start button
diff --git a/BloonsTD6 Mod Helper/MelonMain.cs b/BloonsTD6 Mod Helper/MelonMain.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using BTD_Mod_Helper;
 using BTD_Mod_Helper.Api;

diff --git a/BloonsTD6 Mod Helper/btd6.targets b/BloonsTD6 Mod Helper/btd6.targets
@@ -1,7 +1,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <!--BloonsTD6 property gets automatically set correctly when this file is generated by the Mod Helper on startup-->
-        <BloonsTD6>C:\Program Files (x86)\Steam\steamapps\common\BloonsTD6</BloonsTD6>
+        <BloonsTD6 Condition="'$(BloonsTD6)' == ''">C:\Program Files (x86)\Steam\steamapps\common\BloonsTD6</BloonsTD6>
         <Il2CppAssemblies>$(BloonsTD6)\MelonLoader\Il2CppAssemblies</Il2CppAssemblies>
         <ManagedFolder>$(BloonsTD6)\MelonLoader\Managed</ManagedFolder>
         <OutputFolder Condition="'$(OutputFolder)' == ''">Mods</OutputFolder>