Merge branch 'master' of https://github.com/sinai-dev/Explorer

README.md

@@ -133,4 +133,4 @@ Written by Sinai.
 This project uses code from:
 * (GPL) [ManlyMarco](https://github.com/ManlyMarco)'s [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor), which I used for some aspects of the C# Console and Auto-Complete features. The snippets I used are indicated with a comment.
 * (MIT) [denikson](https://github.com/denikson) (aka Horse)'s [mcs-unity](https://github.com/denikson/mcs-unity). I commented out the `SkipVisibilityExt` constructor since it was causing an exception with the Hook it attempted in IL2CPP.
-* (Apache) [InGameCodeEditor](https://assetstore.unity.com/packages/tools/gui/ingame-code-editor-144254) was used as the base for the syntax highlighting for UnityExplorer's C# console, although it has been heavily rewritten and optimized. Used classes are in the `UnityExplorer.CSConsole.Lexer` namespace.
+* (Apache) [InGameCodeEditor](https://assetstore.unity.com/packages/tools/gui/ingame-code-editor-144254) was used as the base for the syntax highlighting for UnityExplorer's C# console, although it has been heavily rewritten and optimized. Used classes are in the `UnityExplorer.UI.Main.CSConsole.Lexer` namespace.

src/Core/CSharp/ScriptInteraction.cs

@@ -3,6 +3,7 @@ using Mono.CSharp;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Main;
 using UnityExplorer.Core.Inspectors;
+using UnityExplorer.UI.Main.CSConsole;
 
 namespace UnityExplorer.Core.CSharp
 {

src/Core/CSharp/Suggestion.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using UnityEngine;
 using UnityExplorer.Core;
 using UnityExplorer.Core.Unity;
-using UnityExplorer.UI.CSConsole;
+using UnityExplorer.UI.Main.CSConsole;
 
 namespace UnityExplorer.Core.CSharp
 {

src/Core/Inspectors/Reflection/InteractiveValue/InteractiveValue.cs

@@ -255,6 +255,8 @@ namespace UnityExplorer.Core.Inspectors.Reflection
                 else
                     toString = (string)m_toStringMethod.Invoke(Value, new object[0]);
 
+                toString = toString ?? "";
+
                 string typeName = valueType.FullName;
                 if (typeName.StartsWith("Il2CppSystem."))
                     typeName = typeName.Substring(6, typeName.Length - 6);

src/Core/Runtime/TextureUtilProvider.cs

@@ -55,7 +55,7 @@ namespace UnityExplorer.Core.Runtime
         {
             Color[] pixels;
 
-            if (IsReadable(orig))
+            if (!IsReadable(orig))
                 orig = ForceReadTexture(orig);
 
             pixels = orig.GetPixels((int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);

src/ExplorerCore.cs

@@ -17,7 +17,7 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.2.4";
+        public const string VERSION = "3.2.5";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 

src/UI/Main/CSConsole/AutoCompleter.cs

@@ -7,7 +7,6 @@ using UnityEngine.UI;
 using UnityExplorer.Core.CSharp;
 using UnityExplorer.Core.Unity;
 using UnityExplorer.UI;
-using UnityExplorer.UI.CSConsole;
 using UnityExplorer.UI.Main;
 
 namespace UnityExplorer.UI.Main.CSConsole

src/UI/Main/CSConsole/CSLexerHighlighter.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.CSConsole.Lexer;
+using UnityExplorer.UI.Main.CSConsole.Lexer;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.UI.Main.CSConsole
 {
     public struct LexerMatchInfo
     {

src/UI/Main/CSConsole/CSharpConsole.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.Reflection;
 using System.Text;
 using UnityExplorer.Core.CSharp;
-using UnityExplorer.UI.CSConsole;
 using System.Linq;
 using UnityExplorer.Core.Input;
 using UnityEngine;
@@ -14,7 +13,7 @@ using UnityExplorer.UI.Reusable;
 using UnityExplorer.UI.Main.CSConsole;
 using UnityExplorer.Core;
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.UI.Main.CSConsole
 {
     public class CSharpConsole : BaseMenuPage
     {

src/UI/Main/CSConsole/Lexer/CommentMatch.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class CommentMatch : Matcher
     {

src/UI/Main/CSConsole/Lexer/KeywordMatch.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     // I use two different KeywordMatch instances (valid and invalid).
     // This class just contains common implementations.

src/UI/Main/CSConsole/Lexer/Matcher.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 using System.Linq;
 using UnityExplorer.Core.Unity;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public abstract class Matcher
     {

src/UI/Main/CSConsole/Lexer/NumberMatch.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class NumberMatch : Matcher
     {

src/UI/Main/CSConsole/Lexer/StringMatch.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class StringMatch : Matcher
     {

src/UI/Main/CSConsole/Lexer/SymbolMatch.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class SymbolMatch : Matcher
     {

src/UI/Main/MainMenu.cs

@@ -5,7 +5,6 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Unity;
-using UnityExplorer.UI.CSConsole;
 using UnityExplorer.UI.Main;
 using UnityExplorer.UI.Main.CSConsole;