Bump UniverseLib to 1.0.4, use HighlightMethod, add Clipboard (unfinished)

Author: sinai-dev

src/CacheObject/CacheMember.cs

@@ -32,7 +32,9 @@ public abstract class CacheMember : CacheObjectBase
         public virtual void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
         {
             this.Owner = inspector;
-            this.NameLabelText = SignatureHighlighter.Parse(member.DeclaringType, false, member);
+            this.NameLabelText = this is CacheMethod 
+                ? SignatureHighlighter.HighlightMethod(member as MethodInfo) 
+                : SignatureHighlighter.Parse(member.DeclaringType, false, member);
             this.NameForFiltering = $"{member.DeclaringType.Name}.{member.Name}";
             this.NameLabelTextRaw = NameForFiltering;
         }

src/Hooks/HookManager.cs

@@ -84,7 +84,7 @@ public void SetCell(HookCell cell, int index)
             cell.CurrentDisplayedIndex = index;
             var hook = (HookInstance)this.currentHooks[index];
 
-            cell.MethodNameLabel.text = HighlightMethod(hook.TargetMethod);
+            cell.MethodNameLabel.text = SignatureHighlighter.HighlightMethod(hook.TargetMethod);
 
             cell.ToggleActiveButton.ButtonText.text = hook.Enabled ? "Enabled" : "Disabled";
             RuntimeProvider.Instance.SetColorBlockAuto(cell.ToggleActiveButton.Component,
@@ -183,7 +183,7 @@ public void SetCell(AddHookCell cell, int index)
             cell.CurrentDisplayedIndex = index;
             var method = this.filteredEligableMethods[index];
 
-            cell.MethodNameLabel.text = HighlightMethod(method);
+            cell.MethodNameLabel.text = SignatureHighlighter.HighlightMethod(method);
 
             var sig = method.FullDescription();
             if (hookedSignatures.Contains(sig))
@@ -225,50 +225,5 @@ public void EditorInputSave()
                 Panel.SetPage(HookManagerPanel.Pages.CurrentHooks);
             }
         }
-
-        // ~~~~~~~~~~ Method syntax highlighting
-
-        private static readonly Dictionary<string, string> highlightedMethods = new Dictionary<string, string>();
-
-        private string HighlightMethod(MethodInfo method)
-        {
-            var sig = method.FullDescription();
-            if (highlightedMethods.ContainsKey(sig))
-                return highlightedMethods[sig];
-
-            var sb = new StringBuilder();
-
-            // declaring type
-            sb.Append(SignatureHighlighter.Parse(method.DeclaringType, false));
-            sb.Append('.');
-
-            // method name
-            var color = !method.IsStatic
-                    ? SignatureHighlighter.METHOD_INSTANCE
-                    : SignatureHighlighter.METHOD_STATIC;
-            sb.Append($"<color={color}>{method.Name}</color>");
-
-            // arguments
-            sb.Append('(');
-            var args = method.GetParameters();
-            if (args != null && args.Any())
-            {
-                int i = 0;
-                foreach (var param in args)
-                {
-                    sb.Append(SignatureHighlighter.Parse(param.ParameterType, false));
-                    sb.Append(' ');
-                    sb.Append($"<color={SignatureHighlighter.LOCAL_ARG}>{param.Name}</color>");
-                    i++;
-                    if (i < args.Length)
-                        sb.Append(", ");
-                }
-            }
-            sb.Append(')');
-
-            var ret = sb.ToString();
-            highlightedMethods.Add(sig, ret);
-            return ret;
-        }
     }
 }

src/UI/Clipboard/Clipboard.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace UnityExplorer.UI
+{
+    public static class Clipboard
+    {
+        public static object Current { get; private set; }
+
+        public static void Init()
+        {
+
+        }
+
+        public static void Copy(object obj)
+        {
+            Current = obj;
+        }
+    }
+}

src/UI/UIManager.cs

@@ -102,6 +102,7 @@ internal static void InitUI()
 
             // Call some initialize methods
             ConsoleController.Init();
+            Clipboard.Init();
 
             // Add this listener to prevent ScrollPool doing anything while we are resizing panels
             ScrollPool<ICell>.writingLockedListeners.Add(() => !PanelDragger.Resizing);

src/UnityExplorer.csproj

@@ -172,13 +172,13 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="UniverseLib.Mono">
-      <HintPath>packages\UniverseLib.1.0.3\lib\net35\UniverseLib.Mono.dll</HintPath>
+      <HintPath>packages\UniverseLib.1.0.4\lib\net35\UniverseLib.Mono.dll</HintPath>
     </Reference>
   </ItemGroup>
   <!-- Il2Cpp refs -->
   <ItemGroup Condition="'$(IsCpp)'=='true'">
     <Reference Include="UniverseLib.IL2CPP">
-      <HintPath>packages\UniverseLib.1.0.3\lib\net472\UniverseLib.IL2CPP.dll</HintPath>
+      <HintPath>packages\UniverseLib.1.0.4\lib\net472\UniverseLib.IL2CPP.dll</HintPath>
     </Reference>
     <Reference Include="UnhollowerBaseLib">
       <HintPath>..\lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\bin\Release\net4.7.2\UnhollowerBaseLib.dll</HintPath>
@@ -222,6 +222,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="UI\Clipboard\Clipboard.cs" />
     <Compile Include="Hooks\HookCell.cs" />
     <Compile Include="Hooks\HookInstance.cs" />
     <Compile Include="Hooks\HookManager.cs" />

src/packages.config

@@ -4,5 +4,5 @@
   <package id="ILRepack.Lib.MSBuild.Task" version="2.0.18.2" targetFramework="net35" />
   <package id="ini-parser" version="2.5.2" targetFramework="net35" />
   <package id="Mono.Cecil" version="0.10.4" targetFramework="net35" />
-  <package id="UniverseLib" version="1.0.3" targetFramework="net35" />
+  <package id="UniverseLib" version="1.0.4" targetFramework="net35" />
 </packages>