IconCache

Author: war3i4i

Diff for: kg_LastEpoch_Improvements.sln.DotSettings.user

@@ -321,7 +321,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALootFilterUI_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003FKilling_0020God_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F960c6514eb514391852fc8fede18aa04228f000_003Fc5_003Fad013d5c_003FLootFilterUI_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMelonPreferences_005FCategory_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003FKilling_0020God_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa8f6c33fa12646d38264c39c3694d5f3c0e00_003F45_003F9e306759_003FMelonPreferences_005FCategory_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARuleUI_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003FKilling_0020God_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F960c6514eb514391852fc8fede18aa04228f000_003Fd4_003Fdd1eb0f5_003FRuleUI_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/ActualSeverity/@EntryValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/ActualSeverity/@EntryValue">INFO</s:String>
 	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/FiltersState/=CodeStyle/@EntryIndexedValue">Off</s:String>
 	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/FiltersState/=NamingFilter/@EntryIndexedValue">Off</s:String>
 	<s:String x:Key="/Default/CodeInspection/PencilsConfiguration/FiltersState/=SpellingFilter/@EntryIndexedValue">Off</s:String>

Diff for: kg_LastEpoch_Improvements/CustomDropSounds.cs

@@ -10,9 +10,9 @@ namespace kg_LastEpoch_Improvements;
 
 public static class CustomDropSounds
 {
-    public static string CustomSoundMapperPath = Path.Combine(MelonEnvironment.UserDataDirectory, "CustomDropSounds", "CustomSoundMapper.json");
-    public static Dictionary<string, string> RuleToSound = [];
-    public static Dictionary<string, AudioSource> Sounds  = [];
+    private static readonly string CustomSoundMapperPath = Path.Combine(MelonEnvironment.UserDataDirectory, "CustomDropSounds", "CustomSoundMapper.json");
+    private static Dictionary<string, string> RuleToSound = [];
+    private static readonly Dictionary<string, AudioSource> Sounds  = [];
     private static AudioSource CreateAudioSource(AudioClip clip)
     {
         GameObject audioSource = new GameObject("kg_AudioSource") { hideFlags = HideFlags.HideAndDontSave };
@@ -66,8 +66,8 @@ private static IEnumerator LoadCustomDropSounds(string path)
     }
     public static bool TryPlaySoundDelayed(string name, float delay, float volume)
     {
-        if (Sounds.Count == 0 || !Sounds.ContainsKey(name)) return false;
-        MelonCoroutines.Start(DelaySound(Sounds[name], delay, volume));
+        if (Sounds.Count == 0 || !Sounds.TryGetValue(name, out var sound)) return false;
+        MelonCoroutines.Start(DelaySound(sound, delay, volume));
         return true;
     }
     private static IEnumerator DelaySound(AudioSource source, float delay, float volume)
@@ -76,16 +76,23 @@ private static IEnumerator DelaySound(AudioSource source, float delay, float vol
         source.PlayOneShot(source.clip, volume);
     }
     public static void Load()
-    {
+    { 
+        fastJSON.JSON.Parameters = new fastJSON.JSONParameters
+        {
+            UseExtensions = false,
+            SerializeNullValues = false,
+            UseOptimizedDatasetSchema = true,
+            UseValuesOfEnums = true,
+        };
         LoadSoundsSync();
-        if (File.Exists(CustomDropSounds.CustomSoundMapperPath))
+        if (File.Exists(CustomSoundMapperPath))
         {
             try
             {
-                string json = File.ReadAllText(CustomDropSounds.CustomSoundMapperPath);
-                CustomDropSounds.RuleToSound = fastJSON.JSON.ToObject<Dictionary<string, string>>(json);
+                string json = File.ReadAllText(CustomSoundMapperPath);
+                RuleToSound = fastJSON.JSON.ToObject<Dictionary<string, string>>(json);
             }
-            catch (Exception) { CustomDropSounds.RuleToSound = []; }
+            catch (Exception) { RuleToSound = []; }
         }
     }
     [HarmonyPatch(typeof(RuleUI),nameof(RuleUI.Awake))]
@@ -98,19 +105,19 @@ private static void Postfix(RuleUI __instance)
             if (Utils.CopyFrom_Dropdown)
             {
                 Transform targetParent = __instance.transform.Find("Content/LeftRulePanel");
-                GameObject copyFromDropdown = UnityEngine.Object.Instantiate(Utils.CopyFrom_Dropdown, targetParent);
+                GameObject copyFromDropdown = Object.Instantiate(Utils.CopyFrom_Dropdown, targetParent);
                 copyFromDropdown.name = "CopyFromDropdown";
                 copyFromDropdown.transform.SetAsLastSibling();
-                UnityEngine.Object.DestroyImmediate(copyFromDropdown.transform.GetChild(2).gameObject);
-                UnityEngine.Object.DestroyImmediate(copyFromDropdown.transform.GetChild(0).gameObject);
+                Object.DestroyImmediate(copyFromDropdown.transform.GetChild(2).gameObject);
+                Object.DestroyImmediate(copyFromDropdown.transform.GetChild(0).gameObject);
                 ColoredIconDropdown dropdown = copyFromDropdown.transform.GetChild(1).GetComponent<ColoredIconDropdown>();
                 dropdown.onValueChanged.RemoveAllListeners();
                 dropdown.ClearOptions();
 
                 RectTransform rect = copyFromDropdown.GetComponent<RectTransform>(); 
                 rect.anchorMin = new Vector2(0, 0);
                 rect.anchorMax = new Vector2(0, 0);
-                rect.pivot = new Vector2(0, 0);
+                rect.pivot = new Vector2(0, 0); 
                 rect.anchoredPosition = new Vector2(10f, -80f);
                 rect.GetComponent<VerticalLayoutGroup>().spacing = -10f; 
                 copyFromDropdown.transform.GetChild(0).GetComponent<TMP_Text>().fontSize = 16;
@@ -134,16 +141,21 @@ private static void Postfix(RuleUI __instance)
     [HarmonyPatch(typeof(RuleUI),nameof(RuleUI.Init))]
     private static class RuleUI_Init_Patch
     {
-        private static void Postfix(LootFilterUI __instance, Rule rule, RuleUI.PanelMode mode)
+        private static void Postfix(Rule rule)
         {
             if (rule == null) return;
             if (!RuleUI_Awake_Patch.Dropdown.Value) return;
+            if (Sounds.Count == 0)
+            {
+                RuleUI_Awake_Patch.Dropdown.Key.SetActive(false);
+                return;
+            }
+            RuleUI_Awake_Patch.Dropdown.Key.SetActive(true);
             ColoredIconDropdown dropdown = RuleUI_Awake_Patch.Dropdown.Value;
             if (RuleHasCustomSound(rule, out string sName))
             {
                 int index = RuleUI_Awake_Patch.LastOrdered.IndexOf(sName);
-                if (index != -1) dropdown.value = index;
-                else dropdown.value = 0;
+                dropdown.value = index != -1 ? index : 0;
             }
             else dropdown.value = 0;
         }
@@ -156,15 +168,16 @@ private static void Prefix(RuleUI __instance)
             if (__instance.rule == null || !RuleUI_Awake_Patch.Dropdown.Value) return;
             string ruleName = __instance.rule.nameOverride.Trim();
             if (string.IsNullOrWhiteSpace(ruleName)) return;
+            int index = RuleUI_Awake_Patch.Dropdown.Value.value;
+            if (index < 0 || index >= RuleUI_Awake_Patch.LastOrdered.Count) return;
             if (RuleUI_Awake_Patch.Dropdown.Value.value == 0)
             {
                 if (RuleToSound.ContainsKey(ruleName)) RuleToSound.Remove(ruleName);
             }
             else
             {
-                string soundName = RuleUI_Awake_Patch.LastOrdered[RuleUI_Awake_Patch.Dropdown.Value.value];
-                if (RuleToSound.ContainsKey(ruleName)) RuleToSound[ruleName] = soundName;
-                else RuleToSound.Add(ruleName, soundName);
+                string soundName = RuleUI_Awake_Patch.LastOrdered[index];
+                RuleToSound[ruleName] = soundName;
             }
             string json = fastJSON.JSON.ToNiceJSON(RuleToSound);
             try

Diff for: kg_LastEpoch_Improvements/Utils.cs

@@ -95,4 +95,5 @@ public static void CreateNewOption_EnumDropdown<T>(this SettingsPanelTabNavigabl
         dropdown.value = (int)(object)option.Value;
         dropdown.onValueChanged.AddListener(new Action<int>(_ => a(dropdown.value)));
     }
+    public static int CharToIntFast(this char c) => c - '0';
 }

Diff for: kg_LastEpoch_Improvements/kg_LastEpoch_Improvements.cs

@@ -1,15 +1,8 @@
-#define FOGCAMERAVERSION 
+//#define FOGCAMERAVERSION 
 using Il2CppDMM;
-using Il2CppInterop.Common;
 using Il2CppInterop.Runtime.Injection;
 using Il2CppItemFiltering;
-using Il2CppLE.Telemetry;
-using Il2CppLE.UI;
-using Il2CppSystem.Net;
-using Il2CppTMPro;
 using MelonLoader;
-using MelonLoader.Utils;
-using UnityEngine.Networking;
 using Object = UnityEngine.Object;
 
 [assembly: MelonInfo(typeof(kg_LastEpoch_Improvements.kg_LastEpoch_Improvements), "kg.LastEpoch.Improvements", "1.3.7", "KG", "https://www.nexusmods.com/lastepoch/mods/8")]
@@ -18,7 +11,6 @@ namespace kg_LastEpoch_Improvements;
 
 public class kg_LastEpoch_Improvements : MelonMod
 {
-    private static kg_LastEpoch_Improvements _thistype; 
     private static MelonPreferences_Category ImprovementsModCategory; 
     private static MelonPreferences_Entry<bool> ShowAll;
     private static MelonPreferences_Entry<DisplayAffixType> AffixShowRoll;
@@ -64,11 +56,10 @@ private void CreateCustomMapIcon()
 
     public override void OnInitializeMelon()
     { 
-        _thistype = this;
         ImprovementsModCategory = MelonPreferences.CreateCategory("kg_Improvements");
         ShowAll = ImprovementsModCategory.CreateEntry("Show Override", false, "Show Override", "Show each filter rule on map");
-        AffixShowRoll = ImprovementsModCategory.CreateEntry("Show Affix Roll New", DisplayAffixType.None, "Show Affix Roll New", "Show each affix roll on item");
-        ShowAffixOnLabel = ImprovementsModCategory.CreateEntry("Show Affix On Label", DisplayAffixType_GroundLabel.None, "Show Affix On Label Type", "Show each affix roll on item label (ground)");
+        AffixShowRoll = ImprovementsModCategory.CreateEntry("Item Tooltip Style", DisplayAffixType.New_Style, "Show Affix Roll New", "Show each affix roll on item");
+        ShowAffixOnLabel = ImprovementsModCategory.CreateEntry("Item Ground Label Style", DisplayAffixType_GroundLabel.With_Tier_Filter_Only, "Show Affix On Label Type", "Show each affix roll on item label (ground)");
         AutoStoreCraftMaterials = ImprovementsModCategory.CreateEntry("AutoStoreCraftMaterials", false, "Auto storage craft materials", "Automatic storage of craft materials from the inventory");
 #if FOGCAMERAVERSION
         FogOfWar = ImprovementsModCategory.CreateEntry("Fog of war", false, "Clear fog on map on start", "Clear fog of war when you 1th enter on map");
@@ -105,7 +96,7 @@ private static void Postfix(ItemDataUnpacked item, ItemAffix affix, ref string _
                 _ => __result 
             };
         }
-    }  
+    }
 
     [HarmonyPatch(typeof(TooltipItemManager), nameof(TooltipItemManager.UniqueBasicModFormatter))]
     private static class TooltipItemManager_FormatUniqueModAffixString_Patch 
@@ -126,7 +117,7 @@ private static void Postfix(ItemDataUnpacked item, ref string __result, int uniq
     [HarmonyPatch(typeof(TooltipItemManager),nameof(TooltipItemManager.ImplicitFormatter))]
     private static class TooltipItemManager_FormatMod_Patch
     {
-        private static void Postfix(ItemDataUnpacked item, int implicitNumber, ref string __result, bool isComparsionItem)
+        private static void Postfix(ItemDataUnpacked item, int implicitNumber, ref string __result)
         {
             if (item == null || AffixShowRoll.Value is DisplayAffixType.None || item.isSet()) return;
             __result = AffixShowRoll.Value switch
@@ -150,19 +141,18 @@ private static void Postfix(Rule __instance, ItemDataUnpacked data, ref bool __r
             if (string.IsNullOrWhiteSpace(ruleNameToLower)) return;
             int indexOf = ruleNameToLower.IndexOf("lpmin:", StringComparison.Ordinal);
             if (indexOf == -1) return;
-            char number = ruleNameToLower[indexOf + 6];
-            if (int.TryParse(number.ToString(), out int lpmin)) __result &= data.legendaryPotential >= lpmin;
+            __result &= data.legendaryPotential >= ruleNameToLower[indexOf + 6].CharToIntFast();
         }
     }
 
     [HarmonyPatch(typeof(GroundItemVisuals), nameof(GroundItemVisuals.initialise), typeof(ItemDataUnpacked), typeof(uint), typeof(GroundItemLabel), typeof(GroundItemRarityVisuals), typeof(bool))]
     private static class GroundItemVisuals_initialise_Patch
     {
+        private static readonly Dictionary<string, Sprite> IconCache = [];
         private static bool ShouldShow(Rule rule)
         {
             if (!rule.isEnabled || rule.type is Rule.RuleOutcome.HIDE) return false;
-            if (ShowAll.Value) return true;
-            return rule.emphasized;
+            return rule.emphasized || ShowAll.Value;
         }
 
         private static void Prefix(GroundItemVisuals __instance, ItemDataUnpacked itemData, GroundItemLabel label, GroundItemRarityVisuals groundItemRarityVisuals)
@@ -196,8 +186,13 @@ private static void Prefix(GroundItemVisuals __instance, ItemDataUnpacked itemDa
                             itemName = entry.name.Replace(" ", "_");
                         }
                     }
-
-                    Sprite icon = Resources.Load<Sprite>($"gear/{path}/{itemName}");
+                    string fullPath = $"gear/{path}/{itemName}";
+                    if (!IconCache.TryGetValue(fullPath, out var icon))
+                    {
+                        MelonLogger.Msg($"Couldn't find icon for {itemName} ({path}), loading from resources");
+                        icon = Resources.Load<Sprite>(fullPath);
+                        IconCache[fullPath] = icon;
+                    }else MelonLogger.Msg($"Found icon for {itemName} ({path}) in cache");
                     customMapIcon.GetComponent<Image>().sprite = ItemList.instance.defaultItemBackgroundSprite;
                     customMapIcon.GetComponent<Image>().color = GetColorForItemRarity(itemData);
                     customMapIcon.transform.GetChild(0).GetComponent<Image>().sprite = icon;
@@ -214,11 +209,8 @@ private class CustomIconProcessor : MonoBehaviour
         private Text _text;
         private RectTransform thisTransform;
         private GroundItemLabel _label;
-
-        private void Awake()
-        {
-            _text = transform.GetChild(1).GetComponent<Text>();
-        }
+        
+        private void Awake() => _text = transform.GetChild(1).GetComponent<Text>();
 
         public void Init(GameObject toTrack, GroundItemLabel label)
         {
@@ -250,7 +242,7 @@ private void PointerEnter()
         } 
 
         private void PointerExit()
-        {
+        { 
             if (_label != null && _label && _label.tooltipItem) _label.tooltipItem.OnPointerExit(null);
         } 
 
@@ -388,7 +380,7 @@ private static void Postfix(CameraManager __instance)
     private static class InventoryPanelUI_Awake_Patch
     {
         public static int AwakeFrame;
-        private static void Postfix(InventoryPanelUI __instance) => AwakeFrame = Time.frameCount;
+        private static void Postfix() => AwakeFrame = Time.frameCount;
     }
     [HarmonyPatch(typeof(InventoryPanelUI), nameof(InventoryPanelUI.OpenInventoryPanel))]
     private static class InventoryPanelUI_OpenInventoryPanel_Patch