Merge pull request #45 from Alexejhero/tri-inspector-AND-csc-settings

.github/workflows/build.yml

@@ -24,6 +24,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - uses: actions/setup-dotnet@v3
       with:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Unity/Packages/Tri-Inspector"]
+	path = Unity/Packages/Tri-Inspector
+	url = https://github.com/Alexejhero/Tri-Inspector/

SCHIZO/Helpers/StaticHelpers.cs

@@ -1,9 +1,10 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using HarmonyLib;
-using NaughtyAttributes;
+using TriInspector;
 
 namespace SCHIZO.Helpers;
 
@@ -13,11 +14,13 @@ partial class CacheAttribute
     {
         public static void CacheAll()
         {
-            PLUGIN_ASSEMBLY.GetTypes().SelectMany(t => t.GetFields(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
-                .Where(f => f.GetCustomAttribute<CacheAttribute>() != null)
-                .Select(f => (IDropdownList) f.GetValue(null))
-                .Select(d => d.Select(kvp => (string) kvp.Value))
-                .ForEach(CacheValues);
+            IEnumerable<string> names = PLUGIN_ASSEMBLY.GetTypes()
+                .SelectMany(t => t.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
+                .Where(m => m.GetCustomAttribute<CacheAttribute>() != null)
+                .SelectMany(m => (IEnumerable<ITriDropdownItem>) m.Invoke(null, Array.Empty<object>()))
+                .Select(i => i.Value.ToString());
+
+            CacheValues(names);
         }
     }
 

SCHIZO/Resources/AssetBundles/Assets.cs

@@ -12,7 +12,7 @@ namespace SCHIZO.Resources;
 
 public static class Assets
 {
-    private const int _rnd = 228879590;
+    private const int _rnd = -684662253;
 
     private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets");
 

SCHIZO/SCHIZO.csproj

@@ -29,6 +29,8 @@
             <DependentUpon>%(FileName).cs</DependentUpon>
         </Compile>
         <Compile Remove="$(SolutionDir)/Unity/Assets/Scripts/SCHIZO/**/*.Unity.cs" />
+
+        <Compile Include="$(SolutionDir)/Unity/Packages/Tri-Inspector/Runtime/**/*.cs" LinkBase="TriInspector/Linked" />
 
         <Folder Include="Attributes" />
         <Folder Include="Attributes/Typing" />

Unity/Assets/Editor/Scripts/Inspectors/ModRegistryItemInspector.cs

@@ -1,12 +1,12 @@
-using NaughtyAttributes.Editor;
-using SCHIZO.Registering;
+using SCHIZO.Registering;
+using TriInspector.Editors;
 using UnityEditor;
 using UnityEngine;
 
 namespace Editor.Scripts.Inspectors
 {
     [CustomEditor(typeof(ModRegistryItem), true)]
-    public class ModRegistryItemInspector : NaughtyInspector
+    public class ModRegistryItemInspector : TriEditor
     {
         private GUIStyle _toggle;
 

Unity/Assets/Editor/Scripts/Inspectors/RecipeInspector.cs

@@ -1,12 +1,12 @@
 using Editor.Scripts.PropertyDrawers;
-using NaughtyAttributes.Editor;
 using SCHIZO.Items.Data.Crafting;
+using TriInspector.Editors;
 using UnityEditor;
 
 namespace Editor.Scripts.Inspectors
 {
     [CustomEditor(typeof(Recipe))]
-    public sealed class RecipeInspector : NaughtyInspector
+    public sealed class RecipeInspector : TriEditor
     {
         public override void OnInspectorGUI()
         {
@@ -16,16 +16,14 @@ public override void OnInspectorGUI()
             TechType_AllDrawer.TargetGame = recipe.game;
         }
 
-        private new void OnEnable()
+        private void OnEnable()
         {
-            base.OnEnable();
             Recipe recipe = (Recipe) target;
             TechType_AllDrawer.TargetGame = recipe.game;
         }
 
-        private new void OnDisable()
+        private void OnDisable()
         {
-            base.OnDisable();
             TechType_AllDrawer.TargetGame = 0;
         }
     }