Update info about startup script -noci

Line numbers and startup script
Bump version
2025-06-22 16:42:38 +08:00 · 2021-06-20 19:10:44 +10:00 · 2021-06-20 19:06:52 +10:00 · 2021-06-20 19:06:33 +10:00 · 2021-06-14 18:56:56 +10:00 · 2021-06-14 18:56:51 +10:00
71 changed files with 657 additions and 523 deletions
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@ -7,21 +7,18 @@ on:
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:

-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
  build:
-    # The type of runner that the job will run on
    runs-on: windows-latest
    if: "!contains(github.event.head_commit.message, '-noci')"

-    # Steps represent a sequence of tasks that will be executed as part of the job
    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      # Checkout latest with submodules
      - uses: actions/checkout@v2
        with:
          submodules: recursive
          
+      # Setup tools
      - name: Setup msbuild
        uses: microsoft/setup-msbuild@v1       
        
@ -32,113 +29,84 @@ jobs:
          nuget-version: '5.x'
          
      # Build Il2CppAssemblyUnhollower
-      - name: Build Il2CppAssemblyUnhollower
-        shell: cmd
-        run: msbuild lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\UnhollowerBaseLib.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
-      
-      # Restore mcs nuget
-      - name: Restore mcs nuget
-        run: nuget restore lib\mcs-unity\mcs.sln
+      - run: msbuild lib\Il2CppAssemblyUnhollower\UnhollowerBaseLib\UnhollowerBaseLib.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
      
      # Build mcs
-      - name: Build mcs
-        shell: cmd
-        run: msbuild lib\mcs-unity\mcs\mcs.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
+      - run: nuget restore lib\mcs-unity\mcs.sln
+      - run: msbuild lib\mcs-unity\mcs\mcs.csproj -t:Restore -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release
        
-      # Restore NuGet packages
-      - name: Restore UnityExplorer nuget
-        run: nuget restore src\UnityExplorer.sln
+      # Build UnityExplorer releases, and upload artifacts
      
-      # Build UnityExplorer Releases
+      - run: nuget restore src\UnityExplorer.sln      
      
-      - name: Build UnityExplorer BepInEx Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE_Cpp
-      
-      - name: Build UnityExplorer BepInEx 5 Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE5_Mono
-      
-      - name: Build UnityExplorer BepInEx 6 Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE6_Mono
-      
-      - name: Build UnityExplorer MelonLoader Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Cpp
-      
-      - name: Build UnityExplorer MelonLoader Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Mono
-      
-      - name: Build UnityExplorer MelonLoader Legacy Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Cpp
-      
-      - name: Build UnityExplorer MelonLoader Legacy Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Mono
-      
-      - name: Build UnityExplorer Standalone Il2Cpp
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Cpp
-      
-      - name: Build UnityExplorer Standalone Mono
-        shell: cmd
-        run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Mono
-        
-      # Upload artifacts
+      # BepInEx Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE_Cpp
      
      - uses: actions/upload-artifact@v2
-        name: Upload BepInEx Il2Cpp zip
        with:
          name: UnityExplorer.BepInEx.Il2Cpp
          path: ./Release/UnityExplorer.BepInEx.Il2Cpp/*
     
+      # BepInEx 5 Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE5_Mono
+      
      - uses: actions/upload-artifact@v2
-        name: Upload BepInEx 5 Mono zip
        with:
          name: UnityExplorer.BepInEx5.Mono
          path: ./Release/UnityExplorer.BepInEx5.Mono/*
      
+      # BepInEx 6 Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_BIE6_Mono
+      
      - uses: actions/upload-artifact@v2
-        name: Upload BepInEx 6 Mono zip
        with:
          name: UnityExplorer.BepInEx6.Mono
          path: ./Release/UnityExplorer.BepInEx6.Mono/*
      
+      # MelonLoader Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Cpp
+      
      - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Il2Cpp zip
        with:
          name: UnityExplorer.MelonLoader.Il2Cpp
          path: ./Release/UnityExplorer.MelonLoader.Il2Cpp/*
      
+      # MelonLoader Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_ML_Mono
+      
      - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Mono zip
        with:
          name: UnityExplorer.MelonLoader.Mono
          path: ./Release/UnityExplorer.MelonLoader.Mono/*
      
+      # MelonLoader 0.3.0 Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Cpp
+      
      - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Legacy Il2Cpp zip
        with:
          name: UnityExplorer.MelonLoader_Legacy.Il2Cpp
          path: ./Release/UnityExplorer.MelonLoader_Legacy.Il2Cpp/*
      
+      # MelonLoader 0.3.0 Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_MLLegacy_Mono
+      
      - uses: actions/upload-artifact@v2
-        name: Upload MelonLoader Legacy Mono zip
        with:
          name: UnityExplorer.MelonLoader_Legacy.Mono
          path: ./Release/UnityExplorer.MelonLoader_Legacy.Mono/*
      
+      # Standalone Il2Cpp
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Cpp
+      
      - uses: actions/upload-artifact@v2
-        name: Upload Standalone Il2Cpp zip
        with:
          name: UnityExplorer.Standalone.Il2Cpp
          path: ./Release/UnityExplorer.Standalone.Il2Cpp/*
      
+      # Standalone Mono
+      - run: msbuild src\UnityExplorer.csproj -t:Rebuild -p:Platform="AnyCPU" -p:Configuration=Release_STANDALONE_Mono
+      
      - uses: actions/upload-artifact@v2
-        name: Upload Standalone Mono zip
        with:
          name: UnityExplorer.Standalone.Mono
          path: ./Release/UnityExplorer.Standalone.Mono/*
--- a/README.md
+++ b/README.md
@ -3,47 +3,48 @@
 </p>

 <p align="center">
-  An in-game explorer and a suite of debugging tools for <a href="https://docs.unity3d.com/Manual/IL2CPP.html">IL2CPP</a> and <b>Mono</b> Unity games, to aid with modding development.
+  🔍 An in-game UI for exploring, debugging and modifying Unity games.
 </p>
-
 <p align="center">
-  Supports most Unity games from versions 5.2 to 2020+.
+  ✔️ Supports most Unity versions from 5.2 to 2020+ (IL2CPP and Mono).
+</p>
+<p align="center">
+  ☕ Enjoy this tool? Consider supporting me on <a href="https://ko-fi.com/sinaidev">ko-fi</a>!
+</p>
+<p align="center">
+  ⚡ UnityExplorer is on <a href="https://thunderstore.io/package/sinai-dev/UnityExplorer/">Thunderstore</a>! (and as <a href="https://gtfo.thunderstore.io/package/sinai-dev/UnityExplorer_IL2CPP/">IL2CPP</a>)
 </p>

-## Releases  [![](https://img.shields.io/github/downloads/sinai-dev/UnityExplorer/total.svg)](../../releases) 
+# Releases  [![](https://img.shields.io/github/downloads/sinai-dev/UnityExplorer/total.svg)](../../releases)

-[![](https://img.shields.io/github/release/sinai-dev/UnityExplorer.svg?label=version)](../../releases/latest) [![](https://img.shields.io/github/downloads/sinai-dev/UnityExplorer/latest/total.svg)](../../releases/latest)
-| Mod Loader  | IL2CPP | Mono |
-| ----------- | ------ | ---- |
-| [BepInEx](https://github.com/BepInEx/BepInEx) 6.X | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx6.Mono.zip) |
-| [BepInEx](https://github.com/BepInEx/BepInEx) 5.X | ✖️ n/a | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx5.Mono.zip) |
-| [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) 0.3.1 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Mono.zip) | 
-| [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) 0.3.0 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Mono.zip) | 
-| Standalone | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Mono.zip) | 
+[![](https://img.shields.io/github/release/sinai-dev/UnityExplorer.svg?label=version)](../../releases/latest) [![](https://img.shields.io/github/workflow/status/sinai-dev/UnityExplorer/Build%20UnityExplorer)](https://github.com/sinai-dev/UnityExplorer/actions) [![](https://img.shields.io/github/downloads/sinai-dev/UnityExplorer/latest/total.svg)](../../releases/latest)

-* [Click here for Bleeding Edge releases](https://github.com/sinai-dev/UnityExplorer/actions) (click on the latest workflow and scroll down to Artifacts)
+## BepInEx

-### Known issues
-* Any `MissingMethodException` or `NotSupportedException`: please report the issue and provide a copy of your mod loader log and/or Unity log.
-* In IL2CPP, some IEnumerable and IDictionary types may fail enumeration. Waiting for the Unhollower rewrite to address this any further.
-* The C# Console's completions have some minor issues such as not suggestion global classes which have no namespace, and erronously suggesting classes from using directives when they shouldn't be suggested. These are issues with mcs itself which I am looking into.
+| Release | IL2CPP | Mono |
+| ------- | ------ | ---- |
+| BIE 6.X | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx6.Mono.zip) |
+| BIE 5.X | ✖️ n/a | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx5.Mono.zip) |

-## How to install
+1. Take the `UnityExplorer.BIE.[version].dll` file and put it in `BepInEx\plugins\`
+2. In IL2CPP, you will need to download the [Unity libs](https://github.com/LavaGang/Unity-Runtime-Libraries) for the game's Unity version, create a folder `BepInEx\unity-libs\`, then extract the Unity libs into this folder.

-### BepInEx
+<i>Note: BepInEx 6 is obtainable via [BepisBuilds](https://builds.bepis.io/projects/bepinex_be)</i>

-1. Install [BepInEx](https://github.com/BepInEx/BepInEx) for your game. IL2CPP currently requires a [Bleeding Edge](https://builds.bepis.io/projects/bepinex_be) release.
-2. Download the UnityExplorer release for BepInEx IL2CPP or Mono above.
-3. Take the `UnityExplorer.BIE.___.dll` file and put it in `[GameFolder]\BepInEx\plugins\`
-4. In IL2CPP, you will need to download the [Unity libs](https://github.com/LavaGang/Unity-Runtime-Libraries) for the game's Unity version and put them in the `BepInEx\unity-libs\` folder. 
+## MelonLoader

-### MelonLoader
+| Release | IL2CPP | Mono |
+| ------- | ------ | ---- |
+| ML 0.4.0 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Mono.zip) | 
+| ML 0.3.0 | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader_Legacy.Mono.zip) | 

-1. Install [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) 0.3.1+ for your game (or use `MelonLoader_Legacy` for `0.3.0`). This version can currently be obtained from [here](https://github.com/LavaGang/MelonLoader/actions).
-2. Download the UnityExplorer release for MelonLoader IL2CPP or Mono above.
-3. Take the `UnityExplorer.ML.___.dll` file and put it in the `[GameFolder]\Mods\` folder.
+1. Take the `UnityExplorer.ML.[version].dll` file and put it in the `Mods\` folder created by MelonLoader.

-### Standalone
+## Standalone
+
+| IL2CPP | Mono |
+| ------ | ---- |
+| ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Il2Cpp.zip) | ✅ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Mono.zip) | 

 The standalone release can be used with any injector or loader of your choice, but it requires you to load the dependencies manually: HarmonyX, and the IL2CPP version also requires that you set up an [Il2CppAssemblyUnhollower runtime](https://github.com/knah/Il2CppAssemblyUnhollower#required-external-setup).

@ -52,7 +53,12 @@ The standalone release can be used with any injector or loader of your choice, b
 3. Create an instance of Unity Explorer with `UnityExplorer.ExplorerStandalone.CreateInstance();`
 4. Optionally subscribe to the `ExplorerStandalone.OnLog` event to handle logging if you wish

-## Features
+# Known issues
+* Any `MissingMethodException` or `NotSupportedException`: please report the issue and provide a copy of your mod loader log and/or Unity log.
+* In IL2CPP, some IEnumerable and IDictionary types may fail enumeration. Waiting for the Unhollower rewrite to address this any further.
+* The C# Console's completions have some minor issues such as not suggestion global classes which have no namespace, and erronously suggesting classes from using directives when they shouldn't be suggested. These are issues with mcs itself which I am looking into.
+
+# Features

 <p align="center">
  <a href="https://raw.githubusercontent.com/sinai-dev/UnityExplorer/master/img/preview.png">
@ -62,39 +68,46 @@ The standalone release can be used with any injector or loader of your choice, b

 ### Object Explorer

-* Use the <b>Scene Explorer</b> tab to traverse the active scenes, as well as the DontDestroyOnLoad scene and the HideAndDontSave "scene" (assets and hidden objects).
+* Use the <b>Scene Explorer</b> tab to traverse the active scenes, as well as the DontDestroyOnLoad and HideAndDontSave objects.
+  * The "HideAndDontSave" scene contains objects with that flag, as well as Assets and Resources which are not in any scene but behave the same way.
+  * You can use the Scene Loader to easily load any of the scenes in the build (may not work for Unity 5.X games)
 * Use the <b>Object Search</b> tab to search for Unity objects (including GameObjects, Components, etc), C# Singletons or Static Classes.
+  * Use the UnityObject search to look for any objects which derive from `UnityEngine.Object`, with optional filters
+  * The singleton search will look for any classes with a typical "Instance" field, and check it for a current value. This may cause unexpected behaviour in some IL2CPP games as we cannot distinguish between true properties and field-properties, so some property accessors will be invoked.

 ### Inspector

-The inspector is used to see detailed information on GameObjects (GameObject Inspector), C# objects (Reflection Inspector) and C# classes (Static Inspector).
+The inspector is used to see detailed information on objects of any type and manipulate their values, as well as to inspect C# Classes with static reflection.

-* In the GameObject Inspector, you can edit any of the input fields in the inspector (excluding readonly fields) and press <b>Enter</b> to apply your changes. You can also do this to the GameObject path as a way to change the GameObject's parent. Press the <b>Escape</b> key to cancel your edits.
-* In the Reflection Inspectors, automatic updating is not enabled by default, and you must press Apply for any changes you make to take effect. 
+* The <b>GameObject Inspector</b> (tab prefix `[G]`) is used to inspect a `GameObject`, and to see and manipulate its Transform and Components.
+  * You can edit any of the input fields in the inspector (excluding readonly fields) and press <b>Enter</b> to apply your changes. You can also do this to the GameObject path as a way to change the GameObject's parent. Press the <b>Escape</b> key to cancel your edits.
+  * <i>note: When inspecting a GameObject with a Canvas, the transform controls may be overridden by the RectTransform anchors.</i>
+* The <b>Reflection Inspectors</b> (tab prefix `[R]` and `[S]`) are used for everything else
+  * Automatic updating is not enabled by default, and you must press Apply for any changes you make to take effect.
+  * Press the `▼` button to expand certain values such as strings, enums, lists, dictionaries, some structs, etc
+  * Use the filters at the top to quickly find the members you are looking for
+  * For `Texture2D` objects, there is a `View Texture` button at the top of the inspector which lets you view it and save it as a PNG file. Currently there are no other similar helpers yet, but I may add more at some point for Mesh, Sprite, Material, etc

 ### C# Console

-The C# Console uses the `Mono.CSharp.Evaluator` to define temporary classes or run immediate REPL code.
-
-See the "Help" dropdown in the C# console menu for more detailed information.
+* The C# Console uses the `Mono.CSharp.Evaluator` to define temporary classes or run immediate REPL code.
+* You can execute a script automatically on startup by naming it `startup.cs` and placing it in the `UnityExplorer\Scripts\` folder (this folder will be created where you placed the DLL file).
+* See the "Help" dropdown in the C# console menu for more detailed information.

 ### Mouse-Inspect

-The "Mouse Inspect" dropdown on the main UnityExplorer navbar allows you to inspect objects under the mouse.
-
-* <b>World</b>: uses Physics.Raycast to look for Colliders
-* <b>UI</b>: uses GraphicRaycasters to find UI objects
+* The "Mouse Inspect" dropdown on the main UnityExplorer navbar allows you to inspect objects under the mouse.
+  * <b>World</b>: uses Physics.Raycast to look for Colliders
+  * <b>UI</b>: uses GraphicRaycasters to find UI objects

 ### Settings

-You can change the settings via the "Options" page of the main menu, or directly from the config file.
+* You can change the settings via the "Options" tab of the menu, or directly from the config file.
+  * BepInEx: `BepInEx\config\com.sinai.unityexplorer.cfg`
+  * MelonLoader: `UserData\MelonPreferences.cfg`
+  * Standalone `{DLL_location}\UnityExplorer\config.ini`

-Depending on the release you are using, the config file will be found at:
-* BepInEx: `BepInEx\config\com.sinai.unityexplorer.cfg`
-* MelonLoader: `UserData\MelonPreferences.cfg`
-* Standalone `{DLL_location}\UnityExplorer\config.ini`
-
-## Building
+# Building

 If you fork the repository on GitHub you can build using the [dotnet workflow](https://github.com/sinai-dev/UnityExplorer/blob/master/.github/workflows/dotnet.yml):

@ -106,10 +119,10 @@ For Visual Studio:

 0. Clone the repository and run `git submodule update --init --recursive` to get the submodules.
 1. Open the `src\UnityExplorer.sln` project.
-2. Build `mcs`, and if using IL2CPP then build `UnhollowerBaseLib` as well.
+2. Build `mcs` (Release/AnyCPU, you may need to run `nuget restore mcs.sln`), and if using IL2CPP then build `Il2CppAssemblyUnhollower` (Release/AnyCPU) as well.
 3. Build the UnityExplorer release(s) you want to use, either by selecting the config as the Active Config, or batch-building.

-## Acknowledgments
+# Acknowledgments

 * [ManlyMarco](https://github.com/ManlyMarco) for [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor) \[[license](THIRDPARTY_LICENSES.md#runtimeunityeditor-license)\], the ScriptEvaluator from RUE's REPL console was used as the base for UnityExplorer's C# console.
 * [denikson](https://github.com/denikson) (aka Horse) for [mcs-unity](https://github.com/denikson/mcs-unity) \[no license\], used as the `Mono.CSharp` reference for the C# Console.
--- a/src/Core/Config/InternalConfigHandler.cs
+++ b/src/Core/Config/InternalConfigHandler.cs
@ -87,9 +87,6 @@ namespace UnityExplorer.Core.Config
            foreach (var entry in ConfigManager.InternalConfigs)
                sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());

-            if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
-                Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
-
            File.WriteAllText(INI_PATH, data.ToString());
        }

--- a/src/Core/Input/CursorUnlocker.cs
+++ b/src/Core/Input/CursorUnlocker.cs
@ -1,12 +1,12 @@
 using System;
+using System.Collections;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityExplorer.Core.Input;
-using BF = System.Reflection.BindingFlags;
-using UnityExplorer.Core.Config;
 using UnityExplorer.Core;
+using UnityExplorer.Core.Config;
+using UnityExplorer.Core.Input;
 using UnityExplorer.UI;
-using System.Collections;
+using BF = System.Reflection.BindingFlags;


 namespace UnityExplorer.Core.Input
--- a/src/Core/Input/InputManager.cs
+++ b/src/Core/Input/InputManager.cs
@ -1,6 +1,6 @@
 using System;
-using UnityEngine;
 using System.Diagnostics.CodeAnalysis;
+using UnityEngine;
 using UnityEngine.EventSystems;

 namespace UnityExplorer.Core.Input
--- a/src/Core/Input/InputSystem.cs
+++ b/src/Core/Input/InputSystem.cs
@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityExplorer.UI;
-using System.Collections.Generic;
-using System.Linq;

 namespace UnityExplorer.Core.Input
 {
--- a/src/Core/Reflection/Extensions.cs
+++ b/src/Core/Reflection/Extensions.cs
@ -99,8 +99,10 @@ namespace UnityExplorer

        public static Exception GetInnerMostException(this Exception e)
        {
-            while (e.InnerException != null)
+            while (e != null)
            {
+                if (e.InnerException == null)
+                    break;
 #if CPP
                if (e.InnerException is System.Runtime.CompilerServices.RuntimeWrappedException)
                    break;
--- a/src/Core/Reflection/Il2CppReflection.cs
+++ b/src/Core/Reflection/Il2CppReflection.cs
@ -16,6 +16,7 @@ using CppType = Il2CppSystem.Type;
 using BF = System.Reflection.BindingFlags;
 using UnityExplorer.Core.Config;
 using UnhollowerBaseLib.Attributes;
+using UnityEngine;

 namespace UnityExplorer
 {
@ -25,13 +26,18 @@ namespace UnityExplorer
        {
            base.Initialize();

+            float start = Time.realtimeSinceStartup;
            TryLoadGameModules();
+            ExplorerCore.Log($"Loaded Unhollowed modules in {Time.realtimeSinceStartup - start} seconds");

+            start = Time.realtimeSinceStartup;
            BuildDeobfuscationCache();
            OnTypeLoaded += TryCacheDeobfuscatedType;
+            ExplorerCore.Log($"Setup IL2CPP reflection in {Time.realtimeSinceStartup - start} seconds, " +
+                $"deobfuscated types count: {DeobfuscatedTypes.Count}");
        }

-        #region IL2CPP Extern and pointers
+#region IL2CPP Extern and pointers

        // Extern C++ methods 
        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
@ -57,29 +63,21 @@ namespace UnityExplorer
            return il2cppPtr != IntPtr.Zero;
        }

-        #endregion
+#endregion


-        #region Deobfuscation cache
+#region Deobfuscation cache

        private static readonly Dictionary<string, Type> DeobfuscatedTypes = new Dictionary<string, Type>();
        private static readonly Dictionary<string, string> reverseDeobCache = new Dictionary<string, string>();

        private static void BuildDeobfuscationCache()
        {
-            float start = UnityEngine.Time.realtimeSinceStartup;
-
            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
            {
                foreach (var type in asm.TryGetTypes())
                    TryCacheDeobfuscatedType(type);
            }
-
-            if (DeobfuscatedTypes.Count > 0)
-            {
-                ExplorerCore.Log($"Built deobfuscation cache in {UnityEngine.Time.realtimeSinceStartup - start} seconds, " +
-                    $"initial count: {DeobfuscatedTypes.Count} ");
-            }
        }

        private static void TryCacheDeobfuscatedType(Type type)
@ -113,7 +111,7 @@ namespace UnityExplorer
            return theString;
        }

-        #endregion
+#endregion


        // Get type by name
@ -126,7 +124,7 @@ namespace UnityExplorer
            return base.Internal_GetTypeByName(fullName);
        }

-        #region Get actual type
+#region Get actual type

        internal override Type Internal_GetActualType(object obj)
        {
@ -185,10 +183,10 @@ namespace UnityExplorer
            return monoType;
        }

-        #endregion
+#endregion


-        #region Casting
+#region Casting

        private static readonly Dictionary<string, IntPtr> cppClassPointers = new Dictionary<string, IntPtr>();

@ -280,10 +278,10 @@ namespace UnityExplorer
        //    return il2cpp_class_is_assignable_from(thisTypePtr, fromTypePtr);
        //}

-        #endregion
+#endregion


-        #region Boxing and unboxing ValueTypes
+#region Boxing and unboxing ValueTypes

        // cached il2cpp unbox methods
        internal static readonly Dictionary<string, MethodInfo> unboxMethods = new Dictionary<string, MethodInfo>();
@ -386,10 +384,10 @@ namespace UnityExplorer
            return cppStruct;
        }

-        #endregion
+#endregion


-        #region String boxing/unboxing
+#region String boxing/unboxing

        private const string IL2CPP_STRING_FULLNAME = "Il2CppSystem.String";
        private const string STRING_FULLNAME = "System.String";
@ -430,10 +428,10 @@ namespace UnityExplorer
            return s;
        }

-        #endregion
+#endregion


-        #region Singleton finder
+#region Singleton finder

        internal override void Internal_FindSingleton(string[] possibleNames, Type type, BF flags, List<object> instances)
        {
@ -455,16 +453,16 @@ namespace UnityExplorer
            base.Internal_FindSingleton(possibleNames, type, flags, instances);
        }

-        #endregion
+#endregion


-        #region Force-loading game modules
+#region Force-loading game modules

        internal static string UnhollowedFolderPath => Path.GetFullPath(
 #if ML
                    Path.Combine("MelonLoader", "Managed")
 #elif BIE
-                    Path.Combine("BepInEx", "unhollowed")
+                    Path.Combine(BepInEx.Paths.BepInExRootPath, "unhollowed")
 #else
                    Path.Combine(ExplorerCore.Loader.ExplorerFolder, "Modules")
 #endif
@ -515,10 +513,10 @@ namespace UnityExplorer
            return false;
        }

-        #endregion
+#endregion


-        #region Il2cpp reflection blacklist
+#region Il2cpp reflection blacklist

        public override string[] DefaultReflectionBlacklist => defaultIl2CppBlacklist.ToArray();

@ -667,10 +665,10 @@ namespace UnityExplorer
            "UnityEngine.XR.InputDevice.SendHapticImpulse",
        };

-        #endregion
+#endregion


-        #region IL2CPP IEnumerable and IDictionary
+#region IL2CPP IEnumerable and IDictionary

        protected override bool Internal_TryGetEntryType(Type enumerableType, out Type type)
        {
--- a/src/Core/Reflection/ReflectionUtility.cs
+++ b/src/Core/Reflection/ReflectionUtility.cs
@ -4,11 +4,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using BF = System.Reflection.BindingFlags;
-using UnityExplorer.Core.Runtime;
 using System.Text;
 using UnityEngine;
 using UnityExplorer.Core.Config;
+using UnityExplorer.Core.Runtime;
+using BF = System.Reflection.BindingFlags;

 namespace UnityExplorer
 {
@ -42,7 +42,7 @@ namespace UnityExplorer
        public static Action<Type> OnTypeLoaded;

        /// <summary>Key: Type.FullName</summary>
-        public static readonly SortedDictionary<string, Type> AllTypes = new SortedDictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
+        protected static readonly SortedDictionary<string, Type> AllTypes = new SortedDictionary<string, Type>(StringComparer.OrdinalIgnoreCase);

        public static readonly List<string> AllNamespaces = new List<string>();
        private static readonly HashSet<string> uniqueNamespaces = new HashSet<string>();
@ -65,10 +65,14 @@ namespace UnityExplorer

        private static void SetupTypeCache()
        {
+            float start = Time.realtimeSinceStartup;
+
            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
                CacheTypes(asm);

            AppDomain.CurrentDomain.AssemblyLoad += AssemblyLoaded;
+
+            ExplorerCore.Log($"Cached AppDomain assemblies in {Time.realtimeSinceStartup - start} seconds");
        }

        private static void AssemblyLoaded(object sender, AssemblyLoadEventArgs args)
@ -83,6 +87,7 @@ namespace UnityExplorer
        {
            foreach (var type in asm.TryGetTypes())
            {
+                // Cache namespace if there is one
                if (!string.IsNullOrEmpty(type.Namespace) && !uniqueNamespaces.Contains(type.Namespace))
                {
                    uniqueNamespaces.Add(type.Namespace);
@ -96,16 +101,16 @@ namespace UnityExplorer
                    AllNamespaces.Insert(i, type.Namespace);
                }

+                // Cache the type. Overwrite type if one exists with the full name
                if (AllTypes.ContainsKey(type.FullName))
                    AllTypes[type.FullName] = type;
                else
-                {
                    AllTypes.Add(type.FullName, type);
-                    //allTypeNames.Add(type.FullName);
-                }

+                // Invoke listener
                OnTypeLoaded?.Invoke(type);

+                // Check type inheritance cache, add this to any lists it should be in
                foreach (var key in typeInheritance.Keys)
                {
                    try
@ -150,13 +155,6 @@ namespace UnityExplorer
        internal virtual string Internal_ProcessTypeInString(string theString, Type type)
            => theString;

-        //// Force loading modules
-        //public static bool LoadModule(string moduleName)
-        //    => Instance.Internal_LoadModule(moduleName);
-        //
-        //internal virtual bool Internal_LoadModule(string moduleName) 
-        //    => false;
-
        // Singleton finder

        public static void FindSingleton(string[] possibleNames, Type type, BindingFlags flags, List<object> instances)
@ -221,7 +219,7 @@ namespace UnityExplorer
            return ret;
        }

-#endregion
+        #endregion


        #region Type and Generic Parameter implementation cache
@ -356,7 +354,7 @@ namespace UnityExplorer
            return genericParameterInheritance[key];
        }

-#endregion
+        #endregion


        #region Internal MemberInfo Cache
--- a/src/Core/Tests/TestClass.cs
+++ b/src/Core/Tests/TestClass.cs
@ -2,11 +2,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.CacheObject.IValues;
-using System.Reflection;
 using UnityExplorer.UI;
+using UnityExplorer.UI.CacheObject.IValues;
 #if CPP
 using UnhollowerRuntimeLib;
 using UnhollowerBaseLib;
@ -16,7 +16,7 @@ namespace UnityExplorer.Tests
 {
    public class TestIndexer : IList<int>
    {
-        private readonly List<int> list = new List<int>() { 1,2,3,4,5 };
+        private readonly List<int> list = new List<int>() { 1, 2, 3, 4, 5 };

        public int Count => list.Count;
        public bool IsReadOnly => false;
--- a/src/ExplorerCore.cs
+++ b/src/ExplorerCore.cs
@ -20,7 +20,7 @@ namespace UnityExplorer
    public static class ExplorerCore
    {
        public const string NAME = "UnityExplorer";
-        public const string VERSION = "4.1.0";
+        public const string VERSION = "4.1.6";
        public const string AUTHOR = "Sinai";
        public const string GUID = "com.sinai.unityexplorer";

@ -103,7 +103,7 @@ namespace UnityExplorer
            RuntimeProvider.Instance.ProcessOnPostRender();
        }

-#region LOGGING
+        #region LOGGING

        public static void Log(object message)
            => Log(message, LogType.Log);
@ -146,6 +146,6 @@ namespace UnityExplorer
            }
        }

-#endregion
+        #endregion
    }
 }
--- a/src/Loader/BIE/BepInExConfigHandler.cs
+++ b/src/Loader/BIE/BepInExConfigHandler.cs
@ -21,11 +21,7 @@ namespace UnityExplorer.Loader.BIE

        public override void RegisterConfigElement<T>(ConfigElement<T> config)
        {
-            object[] tags = null;
-            if (config.IsInternal)
-                tags = new[] { "Advanced" };
-
-            var entry = Config.Bind(CTG_NAME, config.Name, config.Value, new ConfigDescription(config.Description, null, tags));
+            var entry = Config.Bind(CTG_NAME, config.Name, config.Value, config.Description);

            entry.SettingChanged += (object o, EventArgs e) =>
            {
--- a/src/Loader/BIE/ExplorerBepInPlugin.cs
+++ b/src/Loader/BIE/ExplorerBepInPlugin.cs
@ -7,12 +7,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
-using UnityExplorer.Loader.BIE;
 using UnityEngine;
-using UnityExplorer.Core;
 using UnityEngine.EventSystems;
+using UnityExplorer.Core;
+using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Input;
+using UnityExplorer.Loader.BIE;
 #if CPP
 using BepInEx.IL2CPP;
 using UnhollowerRuntimeLib;
@ -46,7 +46,6 @@ namespace UnityExplorer
        private static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);

        public string ExplorerFolder => Path.Combine(Paths.PluginPath, ExplorerCore.NAME);
-        public string ConfigFolder => Path.Combine(Paths.ConfigPath, ExplorerCore.NAME);

        public Action<object> OnLogMessage => LogSource.LogMessage;
        public Action<object> OnLogWarning => LogSource.LogWarning;
--- a/src/Loader/IExplorerLoader.cs
+++ b/src/Loader/IExplorerLoader.cs
@ -10,7 +10,6 @@ namespace UnityExplorer
    {
        string ExplorerFolder { get; }

-        string ConfigFolder { get; }
        ConfigHandler ConfigHandler { get; }

        Action<object> OnLogMessage { get; }
--- a/src/Loader/ML/ExplorerMelonMod.cs
+++ b/src/Loader/ML/ExplorerMelonMod.cs
@ -27,7 +27,6 @@ namespace UnityExplorer
        public static ExplorerMelonMod Instance;

        public string ExplorerFolder => Path.Combine("Mods", ExplorerCore.NAME);
-        public string ConfigFolder => ExplorerFolder;

        public ConfigHandler ConfigHandler => _configHandler;
        public MelonLoaderConfigHandler _configHandler;
--- a/src/Loader/STANDALONE/ExplorerStandalone.cs
+++ b/src/Loader/STANDALONE/ExplorerStandalone.cs
@ -76,8 +76,6 @@ namespace UnityExplorer
        }
        private static string s_explorerFolder;
        
-        public string ConfigFolder => ExplorerFolder;
-
        Action<object> IExplorerLoader.OnLogMessage => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Log); };
        Action<object> IExplorerLoader.OnLogWarning => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Warning); };
        Action<object> IExplorerLoader.OnLogError   => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Error); };
--- a/src/Loader/STANDALONE/StandaloneConfigHandler.cs
+++ b/src/Loader/STANDALONE/StandaloneConfigHandler.cs
@ -13,11 +13,11 @@ namespace UnityExplorer.Loader.STANDALONE
    public class StandaloneConfigHandler : ConfigHandler
    {
        internal static IniDataParser _parser;
-        internal static string INI_PATH;
+        internal static string CONFIG_PATH;

        public override void Init()
        {
-            INI_PATH = Path.Combine(ExplorerCore.Loader.ConfigFolder, "config.ini");
+            CONFIG_PATH = Path.Combine(ExplorerCore.Loader.ExplorerFolder, "config.ini");
            _parser = new IniDataParser();
            _parser.Configuration.CommentString = "#";
        }
@ -49,10 +49,10 @@ namespace UnityExplorer.Loader.STANDALONE
        {
            try
            {
-                if (!File.Exists(INI_PATH))
+                if (!File.Exists(CONFIG_PATH))
                    return false;

-                string ini = File.ReadAllText(INI_PATH);
+                string ini = File.ReadAllText(CONFIG_PATH);

                var data = _parser.Parse(ini);

@ -97,10 +97,10 @@ namespace UnityExplorer.Loader.STANDALONE
            foreach (var entry in ConfigManager.ConfigElements)
                sec.AddKey(entry.Key, entry.Value.BoxedValue.ToString());

-            if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
-                Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
+            if (!Directory.Exists(ExplorerCore.Loader.ExplorerFolder))
+                Directory.CreateDirectory(ExplorerCore.Loader.ExplorerFolder);

-            File.WriteAllText(INI_PATH, data.ToString());
+            File.WriteAllText(CONFIG_PATH, data.ToString());
        }
    }
 }
--- a/src/UI/CSConsole/CSAutoCompleter.cs
+++ b/src/UI/CSConsole/CSAutoCompleter.cs
@ -22,7 +22,6 @@ namespace UnityExplorer.UI.CSConsole
            AutoCompleteModal.Instance.ReleaseOwnership(this);
        }

-        // Delimiters for completions, notably does not include '.'
        private readonly HashSet<char> delimiters = new HashSet<char>
        {
            '{', '}', ',', ';', '<', '>', '(', ')', '[', ']', '=', '|', '&', '?'
@ -41,7 +40,7 @@ namespace UnityExplorer.UI.CSConsole
            suggestions.Clear();

            int caret = Math.Max(0, Math.Min(InputField.Text.Length - 1, InputField.Component.caretPosition - 1));
-            int start = caret;
+            int startIdx = caret;

            // If the character at the caret index is whitespace or delimiter,
            // or if the next character (if it exists) is not whitespace,
@ -55,17 +54,17 @@ namespace UnityExplorer.UI.CSConsole
            }

            // get the current composition string (from caret back to last delimiter)
-            while (start > 0)
+            while (startIdx > 0)
            {
-                start--;
-                char c = InputField.Text[start];
-                if (delimiters.Contains(c))
+                startIdx--;
+                char c = InputField.Text[startIdx];
+                if (delimiters.Contains(c) || char.IsWhiteSpace(c))
                {
-                    start++;
+                    startIdx++;
                    break;
                }
            }
-            string input = InputField.Text.Substring(start, caret - start + 1);
+            string input = InputField.Text.Substring(startIdx, caret - startIdx + 1);

            // Get MCS completions

--- a/src/UI/CSConsole/ConsoleController.cs
+++ b/src/UI/CSConsole/ConsoleController.cs
@ -1,17 +1,18 @@
-using System;
+using Mono.CSharp;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using UnityExplorer.UI.CSConsole;
 using UnityExplorer.Core.Input;
+using UnityExplorer.UI.CSConsole;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
-using System.Reflection;

 namespace UnityExplorer.UI.CSConsole
 {
@ -35,6 +36,8 @@ namespace UnityExplorer.UI.CSConsole
        public static bool EnableAutoIndent { get; private set; } = true;
        public static bool EnableSuggestions { get; private set; } = true;

+        internal static string ScriptsFolder => Path.Combine(ExplorerCore.Loader.ExplorerFolder, "Scripts");
+
        internal static readonly string[] DefaultUsing = new string[]
        {
            "System",
@ -55,6 +58,18 @@ namespace UnityExplorer.UI.CSConsole
                ResetConsole(false);
                // ensure the compiler is supported (if this fails then SRE is probably stubbed)
                Evaluator.Compile("0 == 0");
+
+                if (!Directory.Exists(ScriptsFolder))
+                    Directory.CreateDirectory(ScriptsFolder);
+
+                var startupPath = Path.Combine(ScriptsFolder, "startup.cs");
+                if (File.Exists(startupPath))
+                {
+                    ExplorerCore.Log($"Executing startup script from '{startupPath}'...");
+                    var text = File.ReadAllText(startupPath);
+                    Input.Text = text;
+                    Evaluate();
+                }
            }
            catch (Exception ex)
            {
@ -68,7 +83,7 @@ namespace UnityExplorer.UI.CSConsole
            SetupHelpInteraction();

            Panel.OnInputChanged += OnInputChanged;
-            Panel.InputScroll.OnScroll += OnInputScrolled;
+            Panel.InputScroller.OnScroll += OnInputScrolled;
            Panel.OnCompileClicked += Evaluate;
            Panel.OnResetClicked += ResetConsole;
            Panel.OnHelpDropdownChanged += HelpSelected;
@ -150,15 +165,16 @@ namespace UnityExplorer.UI.CSConsole

            try
            {
-                // Try to "Compile" the code (tries to interpret it as REPL)
-                var evaluation = Evaluator.Compile(input);
-                if (evaluation != null)
+                // Compile the code. If it returned a CompiledMethod, it is REPL.
+                CompiledMethod repl = Evaluator.Compile(input);
+
+                if (repl != null)
                {
                    // Valid REPL, we have a delegate to the evaluation.
                    try
                    {
                        object ret = null;
-                        evaluation.Invoke(ref ret);
+                        repl.Invoke(ref ret);
                        var result = ret?.ToString();
                        if (!string.IsNullOrEmpty(result))
                            ExplorerCore.Log($"Invoked REPL, result: {ret}");
@ -172,9 +188,7 @@ namespace UnityExplorer.UI.CSConsole
                }
                else
                {
-                    // The input was not recognized as an evaluation. Compile the code.
-
-                    Evaluator.Run(input);
+                    // The compiled code was not REPL, so it was a using directive or it defined classes.

                    string output = ScriptEvaluator._textWriter.ToString();
                    var outputSplit = output.Split('\n');
@ -231,19 +245,26 @@ namespace UnityExplorer.UI.CSConsole
            previousInput = value;

            if (EnableSuggestions && AutoCompleteModal.CheckEnter(Completer))
-            {
                OnAutocompleteEnter();
-            }
-            else if (!settingCaretCoroutine)
-            {
-                if (EnableSuggestions)
-                    Completer.CheckAutocompletes();

+            if (!settingCaretCoroutine)
+            {
                if (EnableAutoIndent)
                    DoAutoIndent();
            }

-            HighlightVisibleInput();
+            var inStringOrComment = HighlightVisibleInput();
+
+            if (!settingCaretCoroutine)
+            {
+                if (EnableSuggestions)
+                {
+                    if (inStringOrComment)
+                        AutoCompleteModal.Instance.ReleaseOwnership(Completer);
+                    else
+                        Completer.CheckAutocompletes();
+                }
+            }

            UpdateCaret(out _);
        }
@ -257,16 +278,16 @@ namespace UnityExplorer.UI.CSConsole

            UpdateCaret(out bool caretMoved);

-            if (!settingCaretCoroutine && EnableSuggestions && AutoCompleteModal.CheckEscape(Completer))
+            if (!settingCaretCoroutine && EnableSuggestions)
+            {
+                if (AutoCompleteModal.CheckEscape(Completer))
                {
                    OnAutocompleteEscaped();
                    return;
                }

-            if (!settingCaretCoroutine && EnableSuggestions && caretMoved)
-            {
+                if (caretMoved)
                    AutoCompleteModal.Instance.ReleaseOwnership(Completer);
-                //Completer.CheckAutocompletes();
            }

            if (EnableCtrlRShortcut
@ -310,7 +331,7 @@ namespace UnityExplorer.UI.CSConsole
                var charBot = charTop - CSCONSOLE_LINEHEIGHT;

                var viewportMin = Input.Rect.rect.height - Input.Rect.anchoredPosition.y - (Input.Rect.rect.height * 0.5f);
-                var viewportMax = viewportMin - Panel.InputScroll.ViewportRect.rect.height;
+                var viewportMax = viewportMin - Panel.InputScroller.ViewportRect.rect.height;

                float diff = 0f;
                if (charTop > viewportMin)
@ -330,7 +351,7 @@ namespace UnityExplorer.UI.CSConsole
        {
            settingCaretCoroutine = true;
            Input.Component.readOnly = true;
-            RuntimeProvider.Instance.StartCoroutine(SetAutocompleteCaretCoro(caretPosition));
+            RuntimeProvider.Instance.StartCoroutine(SetCaretCoroutine(caretPosition));
        }

        internal static PropertyInfo SelectionGuardProperty => selectionGuardPropInfo ?? GetSelectionGuardPropInfo();
@ -345,7 +366,7 @@ namespace UnityExplorer.UI.CSConsole

        private static PropertyInfo selectionGuardPropInfo;

-        private static IEnumerator SetAutocompleteCaretCoro(int caretPosition)
+        private static IEnumerator SetCaretCoroutine(int caretPosition)
        {
            var color = Input.Component.selectionColor;
            color.a = 0f;
@ -369,25 +390,29 @@ namespace UnityExplorer.UI.CSConsole
            settingCaretCoroutine = false;
        }

-
        #region Lexer Highlighting

-        private static void HighlightVisibleInput()
+        /// <summary>
+        /// Returns true if caret is inside string or comment, false otherwise
+        /// </summary>
+        private static bool HighlightVisibleInput()
        {
-            int startIdx = 0;
-            int endIdx = Input.Text.Length - 1;
-            int topLine = 0;
+            if (string.IsNullOrEmpty(Input.Text))
+            {
+                Panel.HighlightText.text = "";
+                Panel.LineNumberText.text = "1";
+                return false;
+            }

-            // Calculate visible text if necessary
-            if (Input.Rect.rect.height > Panel.InputScroll.ViewportRect.rect.height)
-            {
-                topLine = -1;
+            // Calculate the visible lines
+
+            int topLine = -1;
            int bottomLine = -1;

            // the top and bottom position of the viewport in relation to the text height
            // they need the half-height adjustment to normalize against the 'line.topY' value.
            var viewportMin = Input.Rect.rect.height - Input.Rect.anchoredPosition.y - (Input.Rect.rect.height * 0.5f);
-                var viewportMax = viewportMin - Panel.InputScroll.ViewportRect.rect.height;
+            var viewportMax = viewportMin - Panel.InputScroller.ViewportRect.rect.height;

            for (int i = 0; i < Input.TextGenerator.lineCount; i++)
            {
@ -403,14 +428,53 @@ namespace UnityExplorer.UI.CSConsole
            topLine = Math.Max(0, topLine - 1);
            bottomLine = Math.Min(Input.TextGenerator.lineCount - 1, bottomLine + 1);

-                startIdx = Input.TextGenerator.lines[topLine].startCharIdx;
-                endIdx = (bottomLine >= Input.TextGenerator.lineCount - 1)
+            int startIdx = Input.TextGenerator.lines[topLine].startCharIdx;
+            int endIdx = (bottomLine >= Input.TextGenerator.lineCount - 1)
                ? Input.Text.Length - 1
                : (Input.TextGenerator.lines[bottomLine + 1].startCharIdx - 1);
-            }
+

            // Highlight the visible text with the LexerBuilder
-            Panel.HighlightText.text = Lexer.BuildHighlightedString(Input.Text, startIdx, endIdx, topLine);
+
+            Panel.HighlightText.text = Lexer.BuildHighlightedString(Input.Text, startIdx, endIdx, topLine, LastCaretPosition, out bool ret);
+
+            // Set the line numbers
+
+            // determine true starting line number (not the same as the cached TextGenerator line numbers)
+            int realStartLine = 0;
+            for (int i = 0; i < startIdx; i++)
+            {
+                if (LexerBuilder.IsNewLine(Input.Text[i]))
+                    realStartLine++;
+            }
+            realStartLine++;
+            char lastPrev = '\n';
+
+            var sb = new StringBuilder();
+
+            // append leading new lines for spacing (no point rendering line numbers we cant see)
+            for (int i = 0; i < topLine; i++)
+                sb.Append('\n');
+
+            // append the displayed line numbers
+            for (int i = topLine; i <= bottomLine; i++)
+            {
+                if (i > 0)
+                    lastPrev = Input.Text[Input.TextGenerator.lines[i].startCharIdx - 1];
+
+                // previous line ended with a newline character, this is an actual new line.
+                if (LexerBuilder.IsNewLine(lastPrev))
+                {
+                    sb.Append(realStartLine.ToString());
+                    realStartLine++;
+                }
+
+                sb.Append('\n');
+            }
+
+            Panel.LineNumberText.text = sb.ToString();
+
+            return ret;
        }

        #endregion
@ -544,7 +608,9 @@ If the game was built with Unity's stubbed netstandard 2.0 runtime, you can fix
        internal const string STARTUP_TEXT = @"<color=#5d8556>// Welcome to the UnityExplorer C# Console!

 // It is recommended to use the Log panel (or a console log window) while using this tool.
-// Use the Help dropdown to see detailed examples of how to use the console.</color>";
+// Use the Help dropdown to see detailed examples of how to use the console.
+
+// To execute a script automatically on startup, put the script at 'UnityExplorer\Scripts\startup.cs'</color>";

        internal const string HELP_USINGS = @"// You can add a using directive to any namespace, but you must compile for it to take effect.
 // It will remain in effect until you Reset the console.
--- a/src/UI/CSConsole/LexerBuilder.cs
+++ b/src/UI/CSConsole/LexerBuilder.cs
@ -13,6 +13,8 @@ namespace UnityExplorer.UI.CSConsole
    {
        public int startIndex;
        public int endIndex;
+        public bool isStringOrComment;
+        public bool matchToEndOfLine;
        public string htmlColorTag;
    }

@ -82,8 +84,10 @@ namespace UnityExplorer.UI.CSConsole
        /// <param name="endIdx">The last character you want to highlight</param>
        /// <param name="leadingLines">The amount of leading empty lines you want before the first character in the return string.</param>
        /// <returns>A string which contains the amount of leading lines specified, as well as the rich-text highlighted section.</returns>
-        public string BuildHighlightedString(string input, int startIdx, int endIdx, int leadingLines)
+        public string BuildHighlightedString(string input, int startIdx, int endIdx, int leadingLines, int caretIdx, out bool caretInStringOrComment)
        {
+            caretInStringOrComment = false;
+
            if (string.IsNullOrEmpty(input) || endIdx <= startIdx)
                return input;

@ -105,14 +109,28 @@ namespace UnityExplorer.UI.CSConsole

                // append the highlighted match
                sb.Append(match.htmlColorTag);
-
                for (int i = match.startIndex; i <= match.endIndex && i <= currentEndIdx; i++)
                    sb.Append(input[i]);
-
                sb.Append(SignatureHighlighter.CLOSE_COLOR);

                // update the last unhighlighted start index
                lastUnhighlighted = match.endIndex + 1;
+
+                int matchEndIdx = match.endIndex;
+                if (match.matchToEndOfLine)
+                {
+                    while (input.Length - 1 >= matchEndIdx)
+                    {
+                        if (IsNewLine(input[matchEndIdx]))
+                            break;
+                        matchEndIdx++;
+                    }
+                }
+
+                // check caretIdx to determine inStringOrComment state
+                if (caretIdx >= match.startIndex && (caretIdx <= matchEndIdx || (caretIdx >= input.Length && matchEndIdx >= input.Length - 1)))
+                    caretInStringOrComment = match.isStringOrComment;
+
            }

            // Append trailing unhighlighted input
@ -150,6 +168,7 @@ namespace UnityExplorer.UI.CSConsole
                            startIndex = startIndex,
                            endIndex = CommittedIndex,
                            htmlColorTag = lexer.ColorTag,
+                            isStringOrComment = lexer is StringLexer || lexer is CommentLexer,
                        };
                        break;
                    }
--- a/src/UI/CSConsole/Lexers/KeywordLexer.cs
+++ b/src/UI/CSConsole/Lexers/KeywordLexer.cs
@ -41,6 +41,10 @@ namespace UnityExplorer.UI.CSConsole.Lexers
                while (!lexer.EndOfInput && char.IsLetter(lexer.PeekNext()))
                    sb.Append(lexer.Current);

+                // next must be whitespace or delimiter
+                if (!lexer.EndOfInput && !(char.IsWhiteSpace(lexer.Current) || lexer.IsDelimiter(lexer.Current)))
+                    return false;
+
                if (keywords.Contains(sb.ToString()))
                {
                    if (!lexer.EndOfInput)
--- a/src/UI/CSConsole/Lexers/Lexer.cs
+++ b/src/UI/CSConsole/Lexers/Lexer.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using UnityEngine;
 using System.Linq;
+using UnityEngine;

 namespace UnityExplorer.UI.CSConsole.Lexers
 {
--- a/src/UI/CSConsole/Lexers/SymbolLexer.cs
+++ b/src/UI/CSConsole/Lexers/SymbolLexer.cs
@ -11,7 +11,7 @@ namespace UnityExplorer.UI.CSConsole.Lexers
        protected override Color HighlightColor => new Color(0.6f, 0.6f, 0.6f);

        // all symbols are delimiters
-        public override IEnumerable<char> Delimiters => symbols;
+        public override IEnumerable<char> Delimiters => symbols.Where(it => it != '.'); // '.' is not a delimiter, only a separator.

        public static bool IsSymbol(char c) => symbols.Contains(c);

--- a/src/UI/CSConsole/ScriptEvaluator.cs
+++ b/src/UI/CSConsole/ScriptEvaluator.cs
@ -1,9 +1,9 @@
-using System;
+using Mono.CSharp;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using Mono.CSharp;

 // Thanks to ManlyMarco for this

--- a/src/UI/CSConsole/ScriptInteraction.cs
+++ b/src/UI/CSConsole/ScriptInteraction.cs
@ -1,11 +1,11 @@
-using System;
-using Mono.CSharp;
+using Mono.CSharp;
+using System;
 using System.Collections;
-using UnityEngine;
 using System.Collections.Generic;
 using System.Linq;
-using UnityExplorer.Core.Runtime;
 using System.Text;
+using UnityEngine;
+using UnityExplorer.Core.Runtime;

 /*
    Welcome to the UnityExplorer C# Console!
--- a/src/UI/CacheObject/CacheKeyValuePair.cs
+++ b/src/UI/CacheObject/CacheKeyValuePair.cs
@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject.Views;
 using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.UI.CacheObject.Views;

 namespace UnityExplorer.UI.CacheObject
 {
--- a/src/UI/CacheObject/CacheListEntry.cs
+++ b/src/UI/CacheObject/CacheListEntry.cs
@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject.Views;
 using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.UI.CacheObject.Views;

 namespace UnityExplorer.UI.CacheObject
 {
--- a/src/UI/CacheObject/CacheObjectBase.cs
+++ b/src/UI/CacheObject/CacheObjectBase.cs
@ -7,8 +7,8 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Runtime;
-using UnityExplorer.UI.CacheObject.Views;
 using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.UI.CacheObject.Views;
 using UnityExplorer.UI.Models;

 namespace UnityExplorer.UI.CacheObject
--- a/src/UI/CacheObject/Views/CacheKeyValuePairCell.cs
+++ b/src/UI/CacheObject/Views/CacheKeyValuePairCell.cs
@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.CacheObject.Views
--- a/src/UI/CacheObject/Views/CacheObjectCell.cs
+++ b/src/UI/CacheObject/Views/CacheObjectCell.cs
@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.CacheObject.Views
--- a/src/UI/Inspectors/GameObjectInspector.cs
+++ b/src/UI/Inspectors/GameObjectInspector.cs
@ -147,32 +147,39 @@ namespace UnityExplorer.UI.Inspectors
            var behaviours = GOTarget.GetComponents<Behaviour>();

            bool needRefresh = false;
-            if (comps.Length != componentEntries.Count || behaviours.Length != behaviourEntries.Count)
-            {
-                needRefresh = true;
-            }
-            else
-            {
+
+            int count = 0;
            foreach (var comp in comps)
            {
+                if (!comp)
+                    continue;
+                count++;
                if (!compInstanceIDs.Contains(comp.GetInstanceID()))
                {
                    needRefresh = true;
                    break;
                }
            }
-
            if (!needRefresh)
            {
-                    for (int i = 0; i < behaviours.Length; i++)
+                if (count != componentEntries.Count)
+                    needRefresh = true;
+                else
                {
-                        var behaviour = behaviours[i];
-                        if (behaviour.enabled != behaviourEnabledStates[i])
+                    count = 0;
+                    foreach (var behaviour in behaviours)
+                    {
+                        if (!behaviour)
+                            continue;
+                        if (count >= behaviourEnabledStates.Count || behaviour.enabled != behaviourEnabledStates[count])
                        {
                            needRefresh = true;
                            break;
                        }
+                        count++;
                    }
+                    if (!needRefresh && count != behaviourEntries.Count)
+                        needRefresh = true;
                }
            }

@ -181,9 +188,9 @@ namespace UnityExplorer.UI.Inspectors

            componentEntries.Clear();
            compInstanceIDs.Clear();
-
            foreach (var comp in comps)
            {
+                if (!comp) continue;
                componentEntries.Add(comp);
                compInstanceIDs.Add(comp.GetInstanceID());
            }
@ -192,6 +199,7 @@ namespace UnityExplorer.UI.Inspectors
            behaviourEnabledStates.Clear();
            foreach (var behaviour in behaviours)
            {
+                if (!behaviour) continue;
                behaviourEntries.Add(behaviour);
                behaviourEnabledStates.Add(behaviour.enabled);
            }
@ -211,7 +219,7 @@ namespace UnityExplorer.UI.Inspectors

        private void OnAddComponentClicked(string input)
        {
-            if (ReflectionUtility.AllTypes.TryGetValue(input, out Type type))
+            if (ReflectionUtility.GetTypeByName(input) is Type type)
            {
                try
                {
--- a/src/UI/Inspectors/InspectUnderMouse.cs
+++ b/src/UI/Inspectors/InspectUnderMouse.cs
@ -67,8 +67,12 @@ namespace UnityExplorer.UI.Inspectors
        public void StartInspect(MouseInspectMode mode)
        {
            MainCamera = Camera.main;
-            if (!MainCamera)
+            
+            if (!MainCamera && mode == MouseInspectMode.World)
+            {
+                ExplorerCore.LogWarning("No MainCamera found! Cannot inspect world!");
                return;
+            }

            PanelDragger.ForceEnd();

--- a/src/UI/Inspectors/ReflectionInspector.cs
+++ b/src/UI/Inspectors/ReflectionInspector.cs
@ -54,6 +54,7 @@ namespace UnityExplorer.UI.Inspectors

        private readonly Color disabledButtonColor = new Color(0.24f, 0.24f, 0.24f);
        private readonly Color enabledButtonColor = new Color(0.2f, 0.27f, 0.2f);
+
        private readonly Dictionary<BindingFlags, ButtonRef> scopeFilterButtons = new Dictionary<BindingFlags, ButtonRef>();
        private readonly List<Toggle> memberTypeToggles = new List<Toggle>();
        private InputFieldRef filterInputField;
@ -73,7 +74,6 @@ namespace UnityExplorer.UI.Inspectors
        private IEnumerator InitCoroutine()
        {
            yield return null;
-
            LayoutRebuilder.ForceRebuildLayoutImmediate(InspectorPanel.Instance.ContentRect);
        }

@ -307,11 +307,8 @@ namespace UnityExplorer.UI.Inspectors

        private void CalculateLayouts()
        {
-            // Calculate sizes
-            LeftGroupWidth = (int)Math.Max(200, (0.4f * InspectorManager.PanelWidth) - 5);// Math.Min(450f, 0.4f * InspectorManager.PanelWidth - 5));
+            LeftGroupWidth = (int)Math.Max(200, (0.4f * InspectorManager.PanelWidth) - 5);
            RightGroupWidth = (int)Math.Max(200, InspectorManager.PanelWidth - LeftGroupWidth - 65);
-
-            //memberTitleLayout.minWidth = LeftGroupWidth;
        }

        private void SetCellLayout(CacheObjectCell cell)
@ -342,7 +339,7 @@ namespace UnityExplorer.UI.Inspectors

            ConstructUnityObjectRow();

-            mainContentHolder = UIFactory.CreateVerticalGroup(UIRoot, "MemberHolder", false, false, true, true, 5, new Vector4(2,2,2,2),
+            mainContentHolder = UIFactory.CreateVerticalGroup(UIRoot, "MemberHolder", false, false, true, true, 5, new Vector4(2, 2, 2, 2),
                new Color(0.12f, 0.12f, 0.12f));
            UIFactory.SetLayoutElement(mainContentHolder, flexibleWidth: 9999, flexibleHeight: 9999);

@ -352,7 +349,7 @@ namespace UnityExplorer.UI.Inspectors

            // Member scroll pool

-            var memberBorder = UIFactory.CreateVerticalGroup(mainContentHolder, "ScrollPoolHolder", false, false, true, true, padding: new Vector4(2,2,2,2),
+            var memberBorder = UIFactory.CreateVerticalGroup(mainContentHolder, "ScrollPoolHolder", false, false, true, true, padding: new Vector4(2, 2, 2, 2),
                bgColor: new Color(0.05f, 0.05f, 0.05f));
            UIFactory.SetLayoutElement(memberBorder, flexibleWidth: 9999, flexibleHeight: 9999);

@ -617,12 +614,15 @@ namespace UnityExplorer.UI.Inspectors

            // Actual texture viewer

-            var imageObj = UIFactory.CreateUIObject("TextureViewerImage", textureViewer);
-            textureImage = imageObj.AddComponent<Image>();
-            textureImageLayout = textureImage.gameObject.AddComponent<LayoutElement>();
+            var imageViewport = UIFactory.CreateVerticalGroup(textureViewer, "Viewport", false, false, true, true);
+            imageViewport.GetComponent<Image>().color = Color.white;
+            imageViewport.AddComponent<Mask>().showMaskGraphic = false;

+            var imageObj = UIFactory.CreateUIObject("Image", imageViewport);
            var fitter = imageObj.AddComponent<ContentSizeFitter>();
            fitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+            textureImage = imageObj.AddComponent<Image>();
+            textureImageLayout = UIFactory.SetLayoutElement(imageObj, flexibleWidth: 9999, flexibleHeight: 9999);

            textureViewer.SetActive(false);
        }
--- a/src/UI/ObjectExplorer/ObjectSearch.cs
+++ b/src/UI/ObjectExplorer/ObjectSearch.cs
@ -76,7 +76,7 @@ namespace UnityExplorer.UI.ObjectExplorer
                lastCheckedTypeInput = desiredTypeInput;

                //var type = ReflectionUtility.GetTypeByName(desiredTypeInput);
-                if (ReflectionUtility.AllTypes.TryGetValue(desiredTypeInput, out var cachedType))
+                if (ReflectionUtility.GetTypeByName(desiredTypeInput) is Type cachedType)
                {
                    var type = cachedType;
                    lastTypeCanHaveGO = typeof(Component).IsAssignableFrom(type) || type == typeof(GameObject);
--- a/src/UI/Panels/CSConsolePanel.cs
+++ b/src/UI/Panels/CSConsolePanel.cs
@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@ -18,10 +19,11 @@ namespace UnityExplorer.UI.Panels
        public override int MinWidth => 750;
        public override int MinHeight => 300;

-        public InputFieldScroller InputScroll { get; private set; }
-        public InputFieldRef Input => InputScroll.InputField;
+        public InputFieldScroller InputScroller { get; private set; }
+        public InputFieldRef Input => InputScroller.InputField;
        public Text InputText { get; private set; }
        public Text HighlightText { get; private set; }
+        public Text LineNumberText { get; private set; }

        public Dropdown HelpDropdown { get; private set; }

@ -121,19 +123,53 @@ namespace UnityExplorer.UI.Panels

            // Console Input

+            var inputArea = UIFactory.CreateUIObject("InputGroup", content);
+            UIFactory.SetLayoutElement(inputArea, flexibleWidth: 9999, flexibleHeight: 9999);
+            UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(inputArea, false, true, true, true);
+            inputArea.AddComponent<Image>().color = Color.white;
+            inputArea.AddComponent<Mask>().showMaskGraphic = false;
+
+            // line numbers
+
+            var linesHolder = UIFactory.CreateUIObject("LinesHolder", inputArea);
+            var linesRect = linesHolder.GetComponent<RectTransform>();
+            linesRect.pivot = new Vector2(0, 1);
+            linesRect.anchorMin = new Vector2(0, 0);
+            linesRect.anchorMax = new Vector2(0, 1);
+            linesRect.sizeDelta = new Vector2(0, 305000);
+            linesRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, 0, 50);
+            linesHolder.AddComponent<Image>().color = new Color(0.05f, 0.05f, 0.05f);
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(linesHolder, true, true, true, true);
+
+            LineNumberText = UIFactory.CreateLabel(linesHolder, "LineNumbers", "1", TextAnchor.UpperCenter, Color.grey, fontSize: 16);
+            LineNumberText.font = UIManager.ConsoleFont;
+
+            // input field
+
            int fontSize = 16;

-            var inputObj = UIFactory.CreateScrollInputField(this.content, "ConsoleInput", ConsoleController.STARTUP_TEXT, out var inputScroller, fontSize);
-            InputScroll = inputScroller;
+            var inputObj = UIFactory.CreateScrollInputField(inputArea, "ConsoleInput", ConsoleController.STARTUP_TEXT, 
+                out var inputScroller, fontSize);
+            InputScroller = inputScroller;
            ConsoleController.defaultInputFieldAlpha = Input.Component.selectionColor.a;
            Input.OnValueChanged += InvokeOnValueChanged;

+            // move line number text with input field
+            linesRect.transform.SetParent(inputObj.transform.Find("Viewport"), false);
+            inputScroller.Slider.Scrollbar.onValueChanged.AddListener((float val) => { SetLinesPosition(); });
+            inputScroller.Slider.Slider.onValueChanged.AddListener((float val) => { SetLinesPosition(); });
+            void SetLinesPosition()
+            {
+                linesRect.anchoredPosition = new Vector2(linesRect.anchoredPosition.x, inputScroller.ContentRect.anchoredPosition.y);
+                //SetInputLayout();
+            }
+
            InputText = Input.Component.textComponent;
            InputText.supportRichText = false;
-            Input.PlaceholderText.fontSize = fontSize;
            InputText.color = Color.clear;
            Input.Component.customCaretColor = true;
            Input.Component.caretColor = Color.white;
+            Input.PlaceholderText.fontSize = fontSize;

            // Lexer highlight text overlay
            var highlightTextObj = UIFactory.CreateUIObject("HighlightText", InputText.gameObject);
@ -154,7 +190,19 @@ namespace UnityExplorer.UI.Panels
            Input.PlaceholderText.font = UIManager.ConsoleFont;
            HighlightText.font = UIManager.ConsoleFont;

+            RuntimeProvider.Instance.StartCoroutine(DelayedLayoutSetup());
+        }

+        private IEnumerator DelayedLayoutSetup()
+        {
+            yield return null;
+            SetInputLayout();
+        }
+
+        public void SetInputLayout()
+        {
+            Input.Rect.offsetMin = new Vector2(52, Input.Rect.offsetMin.y);
+            Input.Rect.offsetMax = new Vector2(2, Input.Rect.offsetMax.y);
        }
    }
 }
--- a/src/UI/Panels/PanelDragger.cs
+++ b/src/UI/Panels/PanelDragger.cs
@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
-using System.IO;
-using System.Diagnostics;
 using UnityExplorer.UI.Models;
-using System.Linq;
 using UnityExplorer.UI.Widgets.AutoComplete;

 namespace UnityExplorer.UI.Panels
--- a/src/UI/Panels/UIPanel.cs
+++ b/src/UI/Panels/UIPanel.cs
@ -154,14 +154,13 @@ namespace UnityExplorer.UI.Panels
            // Prevent panel going oustide screen bounds
            var halfW = Screen.width * 0.5f;
            var halfH = Screen.height * 0.5f;
-            pos.x = Math.Max(-halfW, Math.Min(pos.x, halfW - panel.rect.width));
-            pos.y = Math.Max(-halfH + panel.rect.height, Math.Min(pos.y, halfH));
+
+            pos.x = Math.Max(-halfW - panel.rect.width + 50, Math.Min(pos.x, halfW - 50));
+            pos.y = Math.Max(-halfH + 50, Math.Min(pos.y, halfH));

            panel.localPosition = pos;
        }

-
-
        #region Save Data

        public abstract void DoSaveToConfigElement();
--- a/src/UI/UIFactory.cs
+++ b/src/UI/UIFactory.cs
@ -409,56 +409,49 @@ namespace UnityExplorer.UI
        /// <summary>
        /// Create a Toggle control.
        /// </summary>
-        public static GameObject CreateToggle(GameObject parent, string name, out Toggle toggle, out Text text, Color bgColor = default)
+        public static GameObject CreateToggle(GameObject parent, string name, out Toggle toggle, out Text text, Color bgColor = default, 
+            int checkWidth = 20, int checkHeight = 20)
        {
+            // Main obj
            GameObject toggleObj = CreateUIObject(name, parent, _smallElementSize);
-
-            GameObject bgObj = CreateUIObject("Background", toggleObj);
-            GameObject checkObj = CreateUIObject("Checkmark", bgObj);
-            GameObject labelObj = CreateUIObject("Label", toggleObj);
-
+            SetLayoutGroup<HorizontalLayoutGroup>(toggleObj, false, false, true, true, 5, 0,0,0,0, childAlignment: TextAnchor.MiddleLeft);
            toggle = toggleObj.AddComponent<Toggle>();
            toggle.isOn = true;
+            SetDefaultSelectableColors(toggle);
+            // need a second reference so we can use it inside the lambda, since 'toggle' is an out var.
+            Toggle t2 = toggle;
+            toggle.onValueChanged.AddListener((bool _) => { t2.OnDeselect(null); });

-            // second reference so we can use it inside the lambda, 'toggle' is an out var.
-            Toggle toggleComp = toggle;
-            toggle.onValueChanged.AddListener(Deselect);
-            void Deselect(bool _)
-            {
-                toggleComp.OnDeselect(null);
-            }
+            // Check mark background

-            Image bgImage = bgObj.AddComponent<Image>();
+            GameObject checkBgObj = CreateUIObject("Background", toggleObj);
+            Image bgImage = checkBgObj.AddComponent<Image>();
            bgImage.color = bgColor == default ? new Color(0.04f, 0.04f, 0.04f, 0.75f) : bgColor;

-            Image checkImage = checkObj.AddComponent<Image>();
+            SetLayoutGroup<HorizontalLayoutGroup>(checkBgObj, true, true, true, true, 0, 2, 2, 2, 2);
+            SetLayoutElement(checkBgObj, minWidth: checkWidth, flexibleWidth: 0, minHeight: checkHeight, flexibleHeight: 0);
+
+            // Check mark image
+
+            GameObject checkMarkObj = CreateUIObject("Checkmark", checkBgObj);
+            Image checkImage = checkMarkObj.AddComponent<Image>();
            checkImage.color = new Color(0.8f, 1, 0.8f, 0.3f);

+            // Label 
+
+            GameObject labelObj = CreateUIObject("Label", toggleObj);
            text = labelObj.AddComponent<Text>();
-            text.text = "Toggle";
+            text.text = "";
+            text.alignment = TextAnchor.MiddleLeft;
            SetDefaultTextValues(text);

+            SetLayoutElement(labelObj, minWidth: 0, flexibleWidth: 0, minHeight: checkHeight, flexibleHeight: 0);
+
+            // References
+
            toggle.graphic = checkImage;
            toggle.targetGraphic = bgImage;
-            SetDefaultSelectableColors(toggle);

-            RectTransform bgRect = bgObj.GetComponent<RectTransform>();
-            bgRect.anchorMin = new Vector2(0f, 1f);
-            bgRect.anchorMax = new Vector2(0f, 1f);
-            bgRect.anchoredPosition = new Vector2(13f, -13f);
-            bgRect.sizeDelta = new Vector2(20f, 20f);
-
-            RectTransform checkRect = checkObj.GetComponent<RectTransform>();
-            checkRect.anchorMin = new Vector2(0.5f, 0.5f);
-            checkRect.anchorMax = new Vector2(0.5f, 0.5f);
-            checkRect.anchoredPosition = Vector2.zero;
-            checkRect.sizeDelta = new Vector2(14f, 14f);
-
-            RectTransform labelRect = labelObj.GetComponent<RectTransform>();
-            labelRect.anchorMin = new Vector2(0f, 0f);
-            labelRect.anchorMax = new Vector2(1f, 1f);
-            labelRect.offsetMin = new Vector2(28f, 2f);
-            labelRect.offsetMax = new Vector2(-5f, -5f);
            return toggleObj;
        }

@ -729,7 +722,7 @@ namespace UnityExplorer.UI

            var sliderContainer = CreateVerticalGroup(mainObj, "SliderContainer",
                false, false, true, true, 0, default, new Color(0.05f, 0.05f, 0.05f));
-            SetLayoutElement(sliderContainer, minWidth: 25, flexibleWidth:0, flexibleHeight: 9999);
+            SetLayoutElement(sliderContainer, minWidth: 25, flexibleWidth: 0, flexibleHeight: 9999);
            sliderContainer.AddComponent<Mask>();

            CreateSliderScrollbar(sliderContainer, out Slider slider);
--- a/src/UI/Widgets/AutoComplete/AutoCompleteModal.cs
+++ b/src/UI/Widgets/AutoComplete/AutoCompleteModal.cs
@ -169,7 +169,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete

        // Setting autocomplete cell buttons

-        private readonly Color selectedSuggestionColor = new Color(45/255f, 75/255f, 80/255f);
+        private readonly Color selectedSuggestionColor = new Color(45 / 255f, 75 / 255f, 80 / 255f);
        private readonly Color inactiveSuggestionColor = new Color(0.11f, 0.11f, 0.11f);

        private List<Suggestion> GetEntries() => Suggestions;
--- a/src/UI/Widgets/AutoComplete/TypeCompleter.cs
+++ b/src/UI/Widgets/AutoComplete/TypeCompleter.cs
@ -87,7 +87,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
            }

            // Check for exact match first
-            if (ReflectionUtility.AllTypes.TryGetValue(value, out Type t) && allowedTypes.Contains(t))
+            if (ReflectionUtility.GetTypeByName(value) is Type t && allowedTypes.Contains(t))
                AddSuggestion(t);

            foreach (var entry in allowedTypes)
--- a/src/UI/Widgets/InputFieldScroller.cs
+++ b/src/UI/Widgets/InputFieldScroller.cs
@ -4,9 +4,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
 using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
 using UnityExplorer.UI.Models;

 namespace UnityExplorer.UI.Widgets
@ -80,12 +80,12 @@ namespace UnityExplorer.UI.Widgets

                if (ContentRect.rect.height < desiredHeight)
                {
-                    ContentRect.sizeDelta = new Vector2(0, desiredHeight);
+                    ContentRect.sizeDelta = new Vector2(ContentRect.sizeDelta.x, desiredHeight);
                    this.Slider.UpdateSliderHandle();
                }
                else if (ContentRect.rect.height > desiredHeight)
                {
-                    ContentRect.sizeDelta = new Vector2(0, desiredHeight);
+                    ContentRect.sizeDelta = new Vector2(ContentRect.sizeDelta.x, desiredHeight);
                    this.Slider.UpdateSliderHandle();
                }
            }
--- a/src/UI/Widgets/TransformTree/TransformCell.cs
+++ b/src/UI/Widgets/TransformTree/TransformCell.cs
@ -17,6 +17,7 @@ namespace UnityExplorer.UI.Widgets
        private bool m_enabled;

        public Action<CachedTransform> OnExpandToggled;
+        public Action<CachedTransform> OnEnableToggled;
        public Action<GameObject> OnGameObjectClicked;

        public CachedTransform cachedTransform;
@ -27,15 +28,20 @@ namespace UnityExplorer.UI.Widgets

        public ButtonRef ExpandButton;
        public ButtonRef NameButton;
+        public Toggle EnabledToggle;

        public LayoutElement spacer;

-        public void OnMainButtonClicked()
+        public void Enable()
        {
-            if (cachedTransform.Value)
-                OnGameObjectClicked?.Invoke(cachedTransform.Value.gameObject);
-            else
-                ExplorerCore.LogWarning("The object was destroyed!");
+            m_enabled = true;
+            UIRoot.SetActive(true);
+        }
+
+        public void Disable()
+        {
+            m_enabled = false;
+            UIRoot.SetActive(false);
        }

        public void ConfigureCell(CachedTransform cached, int cellIndex)
@ -59,6 +65,8 @@ namespace UnityExplorer.UI.Widgets
                NameButton.ButtonText.text = cached.Value.name;
                NameButton.ButtonText.color = cached.Value.gameObject.activeSelf ? Color.white : Color.grey;

+                EnabledToggle.Set(cached.Value.gameObject.activeSelf, false);
+
                int childCount = cached.Value.childCount;
                if (childCount > 0)
                {
@ -82,16 +90,12 @@ namespace UnityExplorer.UI.Widgets
            }
        }

-        public void Disable()
+        public void OnMainButtonClicked()
        {
-            m_enabled = false;
-            UIRoot.SetActive(false);
-        }
-
-        public void Enable()
-        {
-            m_enabled = true;
-            UIRoot.SetActive(true);
+            if (cachedTransform.Value)
+                OnGameObjectClicked?.Invoke(cachedTransform.Value.gameObject);
+            else
+                ExplorerCore.LogWarning("The object was destroyed!");
        }

        public void OnExpandClicked()
@ -99,10 +103,15 @@ namespace UnityExplorer.UI.Widgets
            OnExpandToggled?.Invoke(cachedTransform);
        }

+        private void OnEnableClicked(bool value)
+        {
+            OnEnableToggled?.Invoke(cachedTransform);
+        }
+
        public GameObject CreateContent(GameObject parent)
        {
            UIRoot = UIFactory.CreateUIObject("TransformCell", parent);
-            UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(UIRoot, true, true, true, true, 2, childAlignment: TextAnchor.MiddleCenter);
+            UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(UIRoot, false, false, true, true, 2, childAlignment: TextAnchor.MiddleCenter);
            Rect = UIRoot.GetComponent<RectTransform>();
            Rect.anchorMin = new Vector2(0, 1);
            Rect.anchorMax = new Vector2(0, 1);
@ -114,9 +123,19 @@ namespace UnityExplorer.UI.Widgets
            UIFactory.SetLayoutElement(spacerObj, minWidth: 0, flexibleWidth: 0, minHeight: 0, flexibleHeight: 0);
            this.spacer = spacerObj.GetComponent<LayoutElement>();

+            // Expand arrow
+
            ExpandButton = UIFactory.CreateButton(this.UIRoot, "ExpandButton", "►");
            UIFactory.SetLayoutElement(ExpandButton.Component.gameObject, minWidth: 15, flexibleWidth: 0, minHeight: 25, flexibleHeight: 0);

+            // Enabled toggle
+
+            var toggleObj = UIFactory.CreateToggle(UIRoot, "BehaviourToggle", out EnabledToggle, out var behavText, default, 17, 17);
+            UIFactory.SetLayoutElement(toggleObj, minHeight: 17, flexibleHeight: 0, minWidth: 17);
+            EnabledToggle.onValueChanged.AddListener(OnEnableClicked);
+
+            // Name button
+
            NameButton = UIFactory.CreateButton(this.UIRoot, "NameButton", "Name", null);
            UIFactory.SetLayoutElement(NameButton.Component.gameObject, flexibleWidth: 9999, minHeight: 25, flexibleHeight: 0);
            var nameLabel = NameButton.Component.GetComponentInChildren<Text>();
--- a/src/UI/Widgets/TransformTree/TransformTree.cs
+++ b/src/UI/Widgets/TransformTree/TransformTree.cs
@ -60,8 +60,9 @@ namespace UnityExplorer.UI.Widgets

        public void OnCellBorrowed(TransformCell cell)
        {
-            cell.OnExpandToggled += ToggleExpandCell;
+            cell.OnExpandToggled += OnCellExpandToggled;
            cell.OnGameObjectClicked += OnGameObjectClicked;
+            cell.OnEnableToggled += OnCellEnableToggled;
        }

        private void OnGameObjectClicked(GameObject obj)
@ -72,6 +73,24 @@ namespace UnityExplorer.UI.Widgets
                InspectorManager.Inspect(obj);
        }

+        public void OnCellExpandToggled(CachedTransform cache)
+        {
+            var instanceID = cache.InstanceID;
+            if (expandedInstanceIDs.Contains(instanceID))
+                expandedInstanceIDs.Remove(instanceID);
+            else
+                expandedInstanceIDs.Add(instanceID);
+
+            RefreshData(true);
+        }
+
+        public void OnCellEnableToggled(CachedTransform cache)
+        {
+            cache.Value.gameObject.SetActive(!cache.Value.gameObject.activeSelf);
+
+            RefreshData(true);
+        }
+
        public void Init()
        {
            ScrollPool.Initialize(this);
@ -261,16 +280,5 @@ namespace UnityExplorer.UI.Widgets
            else
                cell.Disable();
        }
-
-        public void ToggleExpandCell(CachedTransform cache)
-        {
-            var instanceID = cache.InstanceID;
-            if (expandedInstanceIDs.Contains(instanceID))
-                expandedInstanceIDs.Remove(instanceID);
-            else
-                expandedInstanceIDs.Add(instanceID);
-
-            RefreshData(true);
-        }
    }
 }
Author	SHA1	Message	Date
Sinai	7a59f9a2a1	Update info about startup script -noci	2021-06-20 19:10:44 +10:00
Sinai	9b42eef1b9	Line numbers and startup script	2021-06-20 19:06:52 +10:00
Sinai	830000b019	Bump version	2021-06-20 19:06:33 +10:00
Sinai	34910ab273	Bump version	2021-06-14 18:56:56 +10:00
Sinai	86b036095e	Allow panels to be dragged further outside the game window	2021-06-14 18:56:51 +10:00
Sinai	b57e5be2e6	Add GameObject.activeSelf toggle to TransformTree, adjust UI Toggle design	2021-06-14 18:43:26 +10:00
Sinai	2d8ae45814	Cleanup	2021-06-14 18:43:08 +10:00
Sinai	66dc262a68	Move inner exception null check outside IL2CPP ppd	2021-06-11 18:12:14 +10:00
Sinai	4342901206	Prevent null exceptions being used in ReflectionExToString	2021-06-11 17:36:35 +10:00
Sinai	58b7c72a5c	Allow UI inspect without main camera	2021-06-11 17:36:17 +10:00
Sinai	623dc7b7be	Clarify VS build instructions	2021-06-10 18:14:33 +10:00
Sinai	e6f4939cc9	Update README.md	2021-06-07 19:50:36 +10:00
Sinai	7a539ba78b	Bump version	2021-06-07 19:28:25 +10:00
Sinai	0d10f94eb5	Use Paths.BepInExRootPath, and cleanup dirs	2021-06-07 19:27:39 +10:00
Sinai	91671bf243	Failsafe in case Component is null from GetComponents?	2021-06-07 19:27:09 +10:00
Sinai	a72877befb	Make AllTypes protected, force using GetTypeByName	2021-06-07 19:26:46 +10:00
Sinai	16335c1bc4	Auto-cleanup	2021-06-05 19:36:09 +10:00
Sinai	8fab9e6268	Update readme -noci	2021-06-03 17:50:48 +10:00
Sinai	fdd9039cca	Update README.md	2021-06-03 17:47:57 +10:00
Sinai	dcca980635	Merge branch 'master' of https://github.com/sinai-dev/Explorer	2021-06-03 17:19:01 +10:00
Sinai	bfcab8248e	Bump version	2021-06-03 17:18:52 +10:00
Sinai	97c20144f1	Fix string/comment state being incorrect if match ended at last character	2021-06-03 17:18:46 +10:00
Sinai	aaab10a0a0	Do auto-indent before highlighting so the characters are in the correct position	2021-06-03 17:18:11 +10:00
Sinai	b42a8dbe6a	Update readme -noci	2021-06-03 02:48:14 +10:00
Sinai	d7008db22e	Update README.md	2021-06-02 16:25:12 +10:00
Sinai	8c1913fe80	Update README.md	2021-06-02 15:33:19 +10:00
Sinai	8d8c9ac7c9	Use whitespace as delimiter in completion composition, handle string/comment state with Lexer	2021-06-01 16:40:51 +10:00
Sinai	f35beeaf58	Bump version	2021-06-01 16:00:56 +10:00
Sinai	d150ff3455	Fix minor issues with CSConsole delimiter logic	2021-06-01 16:00:52 +10:00
Sinai	c4fa0d6bcd	Add better time logging to reflection init	2021-06-01 16:00:18 +10:00
Sinai	a5f56cf5a3	Prevent very large Texture images from overflowing outside the Texture Viewer	2021-05-31 19:10:05 +10:00
Sinai	8c822b2ee9	Simplify ci workflow	2021-05-30 04:50:37 +10:00