fix cpp2il related issues

Author: K0lb3

TypeTreeGeneratorAPI/TypeTreeGenerator/AssetsTools/AssetsToolsGenerator.cs

@@ -90,6 +90,12 @@ public override void LoadDll(Stream dllStream)
             monoCecilGenerator.loadedAssemblies.Add(assembly.MainModule.Name, assembly);
         }
 
+        public override void LoadIl2Cpp(byte[] assemblyData, byte[] metadataData)
+        {
+            base.LoadIl2Cpp(assemblyData, metadataData);
+            cpp2IlGenerator.SetInitialized(true);
+        }
+
         public override List<(string, string)> GetMonoBehaviourDefinitions()
         {
             if (monoLoaded)

TypeTreeGeneratorAPI/TypeTreeGenerator/AssetsTools/MonoBehaviourTemplateGeneratorPatch.cs

@@ -17,11 +17,20 @@ public class Cpp2IlTempGeneratorPatch : Cpp2IlTempGenerator, IMonoBehaviourTempl
     {
         public Cpp2IlTempGeneratorPatch() : base("", "")
         {
-            // As we initialized LibCpp2Il, we can set the _initialized field to true
-            // otherwise Cpp2IlTempGenerator will try to initialize again from the dummy paths
-            typeof(Cpp2IlTempGenerator)
-                .GetField("_initialized", BindingFlags.Instance | BindingFlags.NonPublic)
-                ?.SetValue(this, true);
+        }
+        public void SetInitialized(bool initialized)
+        {
+            // This is a workaround to set the _initialized field to true
+            // as we already initialized LibCpp2Il in the constructor
+            var field = typeof(Cpp2IlTempGenerator).GetField("_initialized", BindingFlags.Instance | BindingFlags.NonPublic);
+            if (field != null)
+            {
+                field.SetValue(this, initialized);
+            }
+            else
+            {
+                throw new InvalidOperationException("Could not find the _initialized field in Cpp2IlTempGenerator.");
+            }
         }
     }
 

TypeTreeGeneratorAPI/TypeTreeGenerator/Il2CppHandler.cs

@@ -14,28 +14,13 @@ public class Il2CppHandler
 
         static Il2CppHandler()
         {
-            InstructionSetRegistry.RegisterInstructionSet<X86InstructionSet>(DefaultInstructionSets.X86_32);
-            InstructionSetRegistry.RegisterInstructionSet<X86InstructionSet>(DefaultInstructionSets.X86_64);
-            InstructionSetRegistry.RegisterInstructionSet<WasmInstructionSet>(DefaultInstructionSets.WASM);
-            InstructionSetRegistry.RegisterInstructionSet<ArmV7InstructionSet>(DefaultInstructionSets.ARM_V7);
-            bool useNewArm64 = false;
-            if (useNewArm64)
-            {
-                InstructionSetRegistry.RegisterInstructionSet<NewArmV8InstructionSet>(DefaultInstructionSets.ARM_V8);
-            }
-            else
-            {
-                InstructionSetRegistry.RegisterInstructionSet<Arm64InstructionSet>(DefaultInstructionSets.ARM_V8);
-            }
-
-            LibCpp2IlBinaryRegistry.RegisterBuiltInBinarySupport();
+            Cpp2IlApi.Init();
+            Cpp2IlApi.ConfigureLib(false);
         }
 
         public static void Initialize(byte[] assemblyData, byte[] metadataData, string unityVersionString)
         {
             unityVersion = UnityVersion.Parse(unityVersionString);
-            Cpp2IlApi.Init();
-            Cpp2IlApi.ConfigureLib(false);
             Cpp2IlApi.InitializeLibCpp2Il(assemblyData, metadataData, unityVersion, false);
         }
 
@@ -60,6 +45,7 @@ public static void Initialize(byte[] assemblyData, byte[] metadataData, string u
             var assemblyResolver = new AssemblyResolver();
             foreach (var assembly in outputFormat.BuildAssemblies(Cpp2IlApi.CurrentAppContext!))
             {
+                assemblyResolver.AddToCache(assembly.ManifestModule.Name, assembly);
                 foreach (var module in assembly.Modules)
                 {
                     module.MetadataResolver = new AsmResolver.DotNet.DefaultMetadataResolver(assemblyResolver);
@@ -72,6 +58,11 @@ public class AssemblyResolver : AsmResolver.DotNet.IAssemblyResolver
         {
             public Dictionary<string, AsmResolver.DotNet.AssemblyDefinition> assemblyDefinitions = new();
 
+            public void AddToCache(string name, AsmResolver.DotNet.AssemblyDefinition definition)
+            {
+                assemblyDefinitions[name] = definition;
+            }
+
             public void AddToCache(AsmResolver.DotNet.AssemblyDescriptor descriptor, AsmResolver.DotNet.AssemblyDefinition definition)
             {
                 assemblyDefinitions[descriptor.Name] = definition;