Fix issues from previous commits

Cpp2IL.Core/Model/Contexts/ApplicationAnalysisContext.cs

@@ -6,6 +6,7 @@
 using Cpp2IL.Core.Exceptions;
 using Cpp2IL.Core.Il2CppApiFunctions;
 using Cpp2IL.Core.Logging;
+using Cpp2IL.Core.Utils;
 using LibCpp2IL;
 using LibCpp2IL.Metadata;
 
@@ -101,6 +102,8 @@ public ApplicationAnalysisContext(Il2CppBinary binary, Il2CppMetadata metadata)
         }
 
         SystemTypes = new(this);
+
+        MiscUtils.InitFunctionStarts(this);
 
         PopulateMethodsByAddressTable();
 

Cpp2IL.Core/Utils/MiscUtils.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Cpp2IL.Core.Model.Contexts;
 using LibCpp2IL;
 
 namespace Cpp2IL.Core.Utils;
@@ -168,21 +169,23 @@ internal static byte[] RawBytes(IConvertible original) =>
             _ => throw new($"ReinterpretBytes: Cannot get byte array from {original} (type {original.GetType()}")
         };
 
-    private static void InitFunctionStarts()
+    //TODO: Refactor this out to a property of ApplicationAnalysisContext
+    internal static void InitFunctionStarts(ApplicationAnalysisContext appContext)
     {
-        _allKnownFunctionStarts = Cpp2IlApi.CurrentAppContext!.Metadata.methodDefs.Select(m => m.MethodPointer)
-            .Concat(Cpp2IlApi.CurrentAppContext.Binary.ConcreteGenericImplementationsByAddress.Keys)
+        _allKnownFunctionStarts = appContext.Metadata.methodDefs.Select(m => m.MethodPointer)
+            .Concat(appContext.Binary.ConcreteGenericImplementationsByAddress.Keys)
             .Concat(SharedState.AttributeGeneratorStarts)
             .ToList();
 
         //Sort in ascending order
         _allKnownFunctionStarts.Sort();
     }
+    //TODO: End
 
     public static ulong GetAddressOfNextFunctionStart(ulong current)
     {
         if (_allKnownFunctionStarts == null)
-            InitFunctionStarts();
+            throw new("Function starts not initialized!");
 
         //Binary-search-like approach
         var lower = 0;

LibCpp2IL/ClassReadingBinaryReader.cs

@@ -9,7 +9,7 @@
 
 namespace LibCpp2IL;
 
-public class ClassReadingBinaryReader : EndianAwareBinaryReader
+public abstract class ClassReadingBinaryReader : EndianAwareBinaryReader
 {
     /// <summary>
     /// Set this to true to enable storing of amount of bytes read of each readable structure.
@@ -26,6 +26,8 @@ public class ClassReadingBinaryReader : EndianAwareBinaryReader
     protected bool _hasFinishedInitialRead;
     private bool _inReadableRead;
     public ConcurrentDictionary<Type, int> BytesReadPerClass = new();
+
+    public abstract float MetadataVersion { get; }
 
 
     public ClassReadingBinaryReader(MemoryStream input) : base(input)
@@ -173,7 +175,7 @@ protected internal int ReadUnityCompressedIntAtRawAddr(long position, bool doLoc
 
     private T InternalReadReadableClass<T>() where T : ReadableClass, new()
     {
-        var t = new T();
+        var t = new T { MetadataVersion = MetadataVersion };
 
         if (!_inReadableRead)
         {

LibCpp2IL/Il2CppBinary.cs

@@ -60,10 +60,15 @@ public abstract class Il2CppBinary(MemoryStream input) : ClassReadingBinaryReade
     /// </summary>
     public virtual ClassReadingBinaryReader Reader => this;
 
+    private float _metadataVersion;
+    public sealed override float MetadataVersion => _metadataVersion; 
+
     public int InBinaryMetadataSize { get; private set; }
 
     public void Init(ulong pCodeRegistration, ulong pMetadataRegistration, Il2CppMetadata metadata)
     {
+        _metadataVersion = metadata.MetadataVersion;
+
         var cr = pCodeRegistration > 0 ? ReadReadableAtVirtualAddress<Il2CppCodeRegistration>(pCodeRegistration) : null;
         var mr = pMetadataRegistration > 0 ? ReadReadableAtVirtualAddress<Il2CppMetadataRegistration>(pMetadataRegistration) : null;
 

LibCpp2IL/LibCpp2IlMain.cs

@@ -29,7 +29,7 @@ public class LibCpp2IlSettings
     public static readonly LibCpp2IlSettings Settings = new();
 
     public static bool Il2CppTypeHasNumMods5Bits;
-    public static float MetadataVersion => TheMetadata?.MetadataVersion ?? 0;
+    public static float MetadataVersion => TheMetadata!.MetadataVersion;
 
     public static Il2CppBinary? Binary;
     public static Il2CppMetadata? TheMetadata;

LibCpp2IL/Metadata/Il2CppMetadata.cs

@@ -14,7 +14,7 @@ namespace LibCpp2IL.Metadata;
 public class Il2CppMetadata : ClassReadingBinaryReader
 {
     public const uint MetadataMagic = 0xFAB11BAF;
-    public float MetadataVersion { get; }
+    public override float MetadataVersion { get; }
     public UnityVersion UnityVersion { get; }
 
     //Disable null check as this stuff is reflected.

LibCpp2IL/ReadableClass.cs

@@ -4,11 +4,13 @@ namespace LibCpp2IL;
 
 public abstract class ReadableClass
 {
-    protected static bool IsAtLeast(float vers) => LibCpp2IlMain.MetadataVersion >= vers;
-    protected static bool IsLessThan(float vers) => LibCpp2IlMain.MetadataVersion < vers;
-    protected static bool IsAtMost(float vers) => LibCpp2IlMain.MetadataVersion <= vers;
-    protected static bool IsNot(float vers) => Math.Abs(LibCpp2IlMain.MetadataVersion - vers) > 0.001f;
-    protected static bool Is(float vers) => Math.Abs(LibCpp2IlMain.MetadataVersion - vers) < 0.001f;
+    internal float MetadataVersion { get; set; }
+
+    protected bool IsAtLeast(float vers) => MetadataVersion >= vers;
+    protected bool IsLessThan(float vers) => MetadataVersion < vers;
+    protected bool IsAtMost(float vers) => MetadataVersion <= vers;
+    protected bool IsNot(float vers) => Math.Abs(MetadataVersion - vers) > 0.001f;
+    protected bool Is(float vers) => Math.Abs(MetadataVersion - vers) < 0.001f;
 
     public abstract void Read(ClassReadingBinaryReader reader);
 }

LibCpp2IL/Wasm/WasmMemoryBlock.cs

@@ -7,6 +7,8 @@ public class WasmMemoryBlock : ClassReadingBinaryReader
 {
     internal byte[] Bytes;
 
+    public override float MetadataVersion { get; }
+
     private static MemoryStream BuildStream(WasmFile file)
     {
         //Find the maximum byte in the data section that has a value
@@ -32,6 +34,7 @@ private static MemoryStream BuildStream(WasmFile file)
 
     public WasmMemoryBlock(WasmFile file) : base(BuildStream(file))
     {
+        MetadataVersion = file.MetadataVersion;
         is32Bit = true;
         Bytes = ((MemoryStream)BaseStream).ToArray();
     }