Change Bin2Object URL to point to forked repo instead

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "Bin2Object"]
 	path = Bin2Object
-	url = https://github.com/djkaty/Bin2Object
+	url = https://github.com/LukeFZ/Bin2Object

Il2CppInspector.Common/IL2CPP/Metadata.cs

@@ -95,7 +95,7 @@ namespace Il2CppInspector
             // Set object versioning for Bin2Object from metadata version
             Version = new StructVersion(Header.Version);
 
-            if (Version < MetadataVersions.V160 || Version > MetadataVersions.V380) {
+            if (Version < MetadataVersions.V160 || Version > MetadataVersions.V390) {
                 throw new InvalidOperationException($"The supplied metadata file is not of a supported version ({Header.Version}).");
             }
 
@@ -142,6 +142,13 @@ namespace Il2CppInspector
                     throw new InvalidOperationException("Could not determine TypeIndex size based on the metadata header");
 
                 var fullTag = $"{tag}_{TypeIndex.TagPrefix}{typeIndexSize}";
+
+                if (Version >= MetadataVersions.V390)
+                {
+                    var parameterIndexSize = GetIndexSize(Header.Parameters.Count);
+                    fullTag += $"_{ParameterIndex.TagPrefix}{parameterIndexSize}";
+                }
+
                 Version = new StructVersion(Version.Major, Version.Minor, fullTag);
             }
 
@@ -154,8 +161,11 @@ namespace Il2CppInspector
             // in the header after the sanity and version fields, and since it will always point directly to the first byte after the end of the header,
             // we can use this value to determine the actual header length and therefore narrow down the metadata version to 24.0/24.1 or 24.2.
 
-            if (!pluginResult.SkipValidation) {
-                var realHeaderLength = Header.StringLiteralOffset;
+            if (!pluginResult.SkipValidation)
+            {
+                var realHeaderLength = Version >= MetadataVersions.V380
+                    ? Header.StringLiterals.Offset
+                    : Header.StringLiteralOffset;
 
                 if (realHeaderLength != Sizeof<Il2CppGlobalMetadataHeader>()) {
                     if (Version == MetadataVersions.V240) {
@@ -255,10 +265,17 @@ namespace Il2CppInspector
                 Strings = pluginGetStringsResult.Strings;
 
             else {
-                Position = Header.StringOffset;
+                var stringOffset = Version >= MetadataVersions.V380
+                    ? Header.Strings.Offset
+                    : Header.StringOffset;
+                var stringLength = Version >= MetadataVersions.V380
+                    ? Header.Strings.SectionSize
+                    : Header.StringSize;
 
-                while (Position < Header.StringOffset + Header.StringSize)
-                    Strings.Add((int) Position - Header.StringOffset, ReadNullTerminatedString());
+                Position = stringOffset;
+
+                while (Position < stringOffset + stringLength)
+                    Strings.Add((int)Position - stringOffset, ReadNullTerminatedString());
             }
 
             // Get all string literals
@@ -277,15 +294,17 @@ namespace Il2CppInspector
 
                 if (Version >= MetadataVersions.V350)
                 {
-                    StringLiterals = new string[stringLiteralList.Length - 1];
-                    for (var i = 0; i < stringLiteralList.Length; i++)
+                    var literals = new string[stringLiteralList.Length - 1];
+                    for (var i = 0; i < literals.Length; i++)
                     {
                         var currentStringDataIndex = stringLiteralList[i].DataIndex;
                         var nextStringDataIndex = stringLiteralList[i + 1].DataIndex;
                         var stringLength = nextStringDataIndex - currentStringDataIndex;
 
-                        StringLiterals[i] = ReadFixedLengthString(dataOffset + currentStringDataIndex, stringLength);
+                        literals[i] = ReadFixedLengthString(dataOffset + currentStringDataIndex, stringLength);
                     }
+
+                    StringLiterals = literals;
                 }
                 else
                 {

Il2CppInspector.Common/Next/Metadata/GenericContainerIndex.cs

@@ -2,58 +2,27 @@
 
 namespace Il2CppInspector.Next.Metadata;
 
-public struct GenericContainerIndex(int value) : IReadable, IEquatable<GenericContainerIndex>
+public struct GenericContainerIndex(int value) : IIndexType<GenericContainerIndex>, IReadable, IEquatable<GenericContainerIndex>
 {
     public const string TagPrefix = nameof(GenericContainerIndex);
 
+    static string IIndexType<GenericContainerIndex>.TagPrefix => TagPrefix;
+    static StructVersion IIndexType<GenericContainerIndex>.AddedVersion => MetadataVersions.V390;
+
     private int _value = value;
 
-    public static implicit operator int(GenericContainerIndex idx) => idx._value;
-    public static implicit operator GenericContainerIndex(int idx) => new(idx);
-
     public static int Size(in StructVersion version = default, bool is32Bit = false)
-    {
-        if (version >= MetadataVersions.V380
-            && version.Tag != null
-            && version.Tag.Contains(TagPrefix)
-            && !version.Tag.Contains($"{TagPrefix}4"))
-        {
-            if (version.Tag.Contains($"{TagPrefix}2"))
-                return sizeof(ushort);
-
-            if (version.Tag.Contains($"{TagPrefix}1"))
-                return sizeof(byte);
-        }
-
-        return sizeof(int);
-    }
+        => IIndexType<GenericContainerIndex>.IndexSize(version, is32Bit);
 
     public void Read<TReader>(ref TReader reader, in StructVersion version = default) where TReader : IReader, allows ref struct
     {
-        if (version >= MetadataVersions.V380
-            && version.Tag != null
-            && version.Tag.Contains(TagPrefix)
-            && !version.Tag.Contains($"{TagPrefix}4"))
-        {
-            if (version.Tag.Contains($"{TagPrefix}2"))
-            {
-                _value = reader.ReadPrimitive<short>();
-                _value = _value == ushort.MaxValue ? -1 : _value;
-                return;
+        _value = IIndexType<GenericContainerIndex>.ReadIndex(ref reader, in version);
     }
 
-            if (version.Tag.Contains($"{TagPrefix}1"))
-            {
-                _value = reader.ReadPrimitive<byte>();
-                _value = _value == byte.MaxValue ? -1 : _value;
-                return;
-            }
-        }
+    #region Operators + ToString
 
-        _value = reader.ReadPrimitive<int>();
-    }
-
-    #region Equality operators + ToString
+    public static implicit operator int(GenericContainerIndex idx) => idx._value;
+    public static implicit operator GenericContainerIndex(int idx) => new(idx);
 
     public static bool operator ==(GenericContainerIndex left, GenericContainerIndex right)
         => left._value == right._value;
@@ -61,7 +30,7 @@ public struct GenericContainerIndex(int value) : IReadable, IEquatable<GenericCo
     public static bool operator !=(GenericContainerIndex left, GenericContainerIndex right)
         => !(left == right);
 
-    public readonly override bool Equals(object? obj)
+    public readonly override bool Equals(object obj)
         => obj is GenericContainerIndex other && Equals(other);
 
     public readonly bool Equals(GenericContainerIndex other)

Il2CppInspector.Common/Next/Metadata/IIndexType.cs

@@ -0,0 +1,55 @@
+using VersionedSerialization;
+
+namespace Il2CppInspector.Next.Metadata;
+
+public interface IIndexType<T> where T 
+    : IIndexType<T>, allows ref struct
+{
+    public static abstract string TagPrefix { get; }
+    public static abstract StructVersion AddedVersion { get; }
+
+    private static string TagSize4 => $"{T.TagPrefix}4";
+    private static string TagSize2 => $"{T.TagPrefix}2";
+    private static string TagSize1 => $"{T.TagPrefix}1";
+
+    private static bool HasCustomSize(in StructVersion version)
+        => version >= T.AddedVersion
+           && version.Tag != null
+           && version.Tag.Contains(T.TagPrefix)
+           && !version.Tag.Contains(TagSize4);
+
+    public static int IndexSize(in StructVersion version = default, bool is32Bit = false)
+    {
+        if (version.Tag != null && HasCustomSize(version))
+        {
+            if (version.Tag.Contains(TagSize2))
+                return sizeof(ushort);
+
+            if (version.Tag.Contains(TagSize1))
+                return sizeof(byte);
+        }
+
+        return sizeof(int);
+
+    }
+
+    public static int ReadIndex<TReader>(ref TReader reader, in StructVersion version = default) where TReader : IReader, allows ref struct
+    {
+        if (version.Tag != null && HasCustomSize(version))
+        {
+            if (version.Tag.Contains(TagSize2))
+            {
+                var value = reader.ReadPrimitive<ushort>(); 
+                return value == ushort.MaxValue ? -1 : value;
+            }
+
+            if (version.Tag.Contains(TagSize1))
+            {
+                var value = reader.ReadPrimitive<byte>();
+                return value == byte.MaxValue ? -1 : value;
+            }
+        }
+
+        return reader.ReadPrimitive<int>();
+    }
+}

Il2CppInspector.Common/Next/Metadata/Il2CppGlobalMetadataHeader.cs

@@ -66,7 +66,7 @@ public partial record struct Il2CppGlobalMetadataHeader
     [VersionCondition(LessThan = "35.0")]
     public int MethodsSize { get; private set; }
 
-    [VersionCondition(GreaterThan = "16.0")]
+    [VersionCondition(GreaterThan = "16.0", LessThan = "35.0")]
     [VersionCondition(EqualTo = "16.0")]
     public int ParameterDefaultValuesOffset { get; private set; }
 

Il2CppInspector.Common/Next/Metadata/Il2CppMethodDefinition.cs

@@ -4,7 +4,6 @@ using VersionedSerialization.Attributes;
 namespace Il2CppInspector.Next.Metadata;
 
 using StringIndex = int;
-using ParameterIndex = int;
 
 [VersionedStruct]
 public partial record struct Il2CppMethodDefinition

Il2CppInspector.Common/Next/Metadata/Il2CppParameterDefaultValue.cs

@@ -1,6 +1,5 @@
 namespace Il2CppInspector.Next.Metadata;
 
-using ParameterIndex = int;
 using DefaultValueDataIndex = int;
 using VersionedSerialization.Attributes;
 

Il2CppInspector.Common/Next/Metadata/ParameterIndex.cs

@@ -0,0 +1,46 @@
+using NoisyCowStudios.Bin2Object;
+using VersionedSerialization;
+
+namespace Il2CppInspector.Next.Metadata;
+
+public struct ParameterIndex(int value) : IIndexType<ParameterIndex>, IReadable, IEquatable<ParameterIndex>
+{
+    public const string TagPrefix = nameof(ParameterIndex);
+
+    static string IIndexType<ParameterIndex>.TagPrefix => TagPrefix; 
+    static StructVersion IIndexType<ParameterIndex>.AddedVersion => MetadataVersions.V390;
+
+    private int _value = value;
+
+    public static int Size(in StructVersion version = default, bool is32Bit = false)
+        => IIndexType<ParameterIndex>.IndexSize(version, is32Bit);
+
+    public void Read<TReader>(ref TReader reader, in StructVersion version = default) where TReader : IReader, allows ref struct
+    {
+        _value = IIndexType<ParameterIndex>.ReadIndex(ref reader, in version);
+    }
+
+    #region Operators + ToString
+
+    public static implicit operator int(ParameterIndex idx) => idx._value;
+    public static implicit operator ParameterIndex(int idx) => new(idx);
+
+    public static bool operator ==(ParameterIndex left, ParameterIndex right)
+        => left._value == right._value;
+
+    public static bool operator !=(ParameterIndex left, ParameterIndex right)
+        => !(left == right);
+
+    public readonly override bool Equals(object obj)
+        => obj is ParameterIndex other && Equals(other);
+
+    public readonly bool Equals(ParameterIndex other)
+        => this == other;
+
+    public readonly override int GetHashCode()
+        => HashCode.Combine(_value);
+
+    public readonly override string ToString() => _value.ToString();
+
+    #endregion
+}

Il2CppInspector.Common/Next/Metadata/TypeDefinitionIndex.cs

@@ -2,57 +2,27 @@
 
 namespace Il2CppInspector.Next.Metadata;
 
-public struct TypeDefinitionIndex(int value) : IReadable, IEquatable<TypeDefinitionIndex>
+public struct TypeDefinitionIndex(int value) : IIndexType<TypeDefinitionIndex>, IReadable, IEquatable<TypeDefinitionIndex>
 {
     public const string TagPrefix = nameof(TypeDefinitionIndex);
 
+    static string IIndexType<TypeDefinitionIndex>.TagPrefix => TagPrefix;
+    static StructVersion IIndexType<TypeDefinitionIndex>.AddedVersion => MetadataVersions.V390;
+
     private int _value = value;
 
-    public static implicit operator int(TypeDefinitionIndex idx) => idx._value;
-    public static implicit operator TypeDefinitionIndex(int idx) => new(idx);
-
     public static int Size(in StructVersion version = default, bool is32Bit = false)
-    {
-        if (version >= MetadataVersions.V380
-            && version.Tag != null
-            && version.Tag.Contains(TagPrefix)
-            && !version.Tag.Contains($"{TagPrefix}4"))
-        {
-            if (version.Tag.Contains($"{TagPrefix}2"))
-                return sizeof(ushort);
-
-            if (version.Tag.Contains($"{TagPrefix}1"))
-                return sizeof(byte);
-        }
-
-        return sizeof(int);
-    }
+        => IIndexType<TypeDefinitionIndex>.IndexSize(version, is32Bit);
 
     public void Read<TReader>(ref TReader reader, in StructVersion version = default) where TReader : IReader, allows ref struct
     {
-        if (version >= MetadataVersions.V380
-            && version.Tag != null
-            && version.Tag.Contains(TagPrefix)
-            && !version.Tag.Contains($"{TagPrefix}4"))
-        {
-            if (version.Tag.Contains($"{TagPrefix}2"))
-            {
-                _value = reader.ReadPrimitive<ushort>();
-                return;
+        _value = IIndexType<TypeDefinitionIndex>.ReadIndex(ref reader, in version);
     }
 
-            if (version.Tag.Contains($"{TagPrefix}1"))
-            {
-                _value = reader.ReadPrimitive<byte>();
-                _value = _value == byte.MaxValue ? -1 : _value;
-                return;
-            }
-        }
+    #region Operators + ToString
 
-        _value = reader.ReadPrimitive<int>();
-    }
-
-    #region Equality operators + ToString
+    public static implicit operator int(TypeDefinitionIndex idx) => idx._value;
+    public static implicit operator TypeDefinitionIndex(int idx) => new(idx);
 
     public static bool operator ==(TypeDefinitionIndex left, TypeDefinitionIndex right)
         => left._value == right._value;
@@ -60,7 +30,7 @@ public struct TypeDefinitionIndex(int value) : IReadable, IEquatable<TypeDefinit
     public static bool operator !=(TypeDefinitionIndex left, TypeDefinitionIndex right)
         => !(left == right);
 
-    public readonly override bool Equals(object? obj)
+    public readonly override bool Equals(object obj)
         => obj is TypeDefinitionIndex other && Equals(other);
 
     public readonly bool Equals(TypeDefinitionIndex other)

Il2CppInspector.Common/Next/Metadata/TypeIndex.cs

@@ -2,58 +2,27 @@
 
 namespace Il2CppInspector.Next.Metadata;
 
-public struct TypeIndex(int value) : IReadable, IEquatable<TypeIndex>
+public struct TypeIndex(int value) : IIndexType<TypeIndex>, IReadable, IEquatable<TypeIndex>
 {
     public const string TagPrefix = nameof(TypeIndex);
 
+    static string IIndexType<TypeIndex>.TagPrefix => TagPrefix;
+    static StructVersion IIndexType<TypeIndex>.AddedVersion => MetadataVersions.V390;
+
     private int _value = value;
 
-    public static implicit operator int(TypeIndex idx) => idx._value;
-    public static implicit operator TypeIndex(int idx) => new(idx);
-
     public static int Size(in StructVersion version = default, bool is32Bit = false)
-    {
-        if (version >= MetadataVersions.V380
-            && version.Tag != null
-            && version.Tag.Contains(TagPrefix)
-            && !version.Tag.Contains($"{TagPrefix}4"))
-        {
-            if (version.Tag.Contains($"{TagPrefix}2"))
-                return sizeof(ushort);
-
-            if (version.Tag.Contains($"{TagPrefix}1"))
-                return sizeof(byte);
-        }
-
-        return sizeof(int);
-    }
+        => IIndexType<TypeIndex>.IndexSize(version, is32Bit);
 
     public void Read<TReader>(ref TReader reader, in StructVersion version = default) where TReader : IReader, allows ref struct
     {
-        if (version >= MetadataVersions.V380 
-            && version.Tag != null
-            && version.Tag.Contains(TagPrefix)
-            && !version.Tag.Contains($"{TagPrefix}4"))
-        {
-            if (version.Tag.Contains($"{TagPrefix}2"))
-            {
-                _value = reader.ReadPrimitive<ushort>();
-                _value = _value == ushort.MaxValue ? -1 : _value;
-                return;
+        _value = IIndexType<TypeIndex>.ReadIndex(ref reader, in version);
     }
 
-            if (version.Tag.Contains($"{TagPrefix}1"))
-            {
-                _value = reader.ReadPrimitive<byte>();
-                _value = _value == byte.MaxValue ? -1 : _value;
-                return;
-            }
-        }
+    #region Operators + ToString
 
-        _value = reader.ReadPrimitive<int>();
-    }
-
-    #region Equality operators + ToString
+    public static implicit operator int(TypeIndex idx) => idx._value;
+    public static implicit operator TypeIndex(int idx) => new(idx);
 
     public static bool operator ==(TypeIndex left, TypeIndex right)
         => left._value == right._value;
@@ -61,7 +30,7 @@ public struct TypeIndex(int value) : IReadable, IEquatable<TypeIndex>
     public static bool operator !=(TypeIndex left, TypeIndex right)
         => !(left == right);
 
-    public readonly override bool Equals(object? obj)
+    public readonly override bool Equals(object obj)
         => obj is TypeIndex other && Equals(other);
 
     public readonly bool Equals(TypeIndex other)

Il2CppInspector.Common/Next/MetadataVersions.cs

@@ -35,4 +35,8 @@ public static class MetadataVersions
     // Unity 6000.3.0a5
     public static readonly StructVersion V380 = new(38);
     // NOTE: This version uses tags to specify the size of TypeIndex, TypeDefinitionIndex, and GenericContainerIndex.
+
+    // Unity 6000.3.0b1
+    public static readonly StructVersion V390 = new(39);
+    // NOTE This version additionally uses a tag to specify the size of ParameterIndex.
 }

Il2CppInspector.Common/Outputs/AssemblyShims.cs

@@ -298,6 +298,10 @@ namespace Il2CppInspector.Outputs
         private PropertyDef AddProperty(ModuleDef module, TypeDef mType, PropertyInfo prop) {
             PropertySig s;
 
+            // Example: ZstdSharp MEM_32Bit which gets inlined using weaving and all accessors removed
+            if (prop.GetMethod == null && prop.SetMethod == null)
+                return null;
+
             // Static or instance
             if (prop.GetMethod?.IsStatic ?? prop.SetMethod.IsStatic)
                 s = PropertySig.CreateStatic(GetTypeSig(module, prop.PropertyType));

Il2CppInspector.Common/Outputs/ScriptResources/Targets/BinaryNinja.py

@@ -71,7 +71,7 @@ class BinaryNinjaDisassemblerInterface(BaseDisassemblerInterface):
         self._type_cache[type] = parsed
         return parsed
 
-    def _parse_type_source(self, types: str, filename: str | None = None):
+    def _parse_type_source(self, types: str, filename: Union[str, None] = None):
         parsed_types, errors = TypeParser.default.parse_types_from_source(
             types,
             filename if filename else "types.hpp",
@@ -127,7 +127,7 @@ class BinaryNinjaDisassemblerInterface(BaseDisassemblerInterface):
         self._view.set_analysis_hold(False)
         self._view.update_analysis()
 
-    def define_function(self, address: int, end: int | None = None):
+    def define_function(self, address: int, end: Union[int, None] = None):
         if self._view.get_function_at(address) is not None:
             return
 

Il2CppInspector.Common/Outputs/ScriptResources/Targets/Ghidra.py

@@ -51,7 +51,7 @@ class GhidraDisassemblerInterface(BaseDisassemblerInterface):
 	def on_finish(self):
 		pass
 
-	def define_function(self, address: int, end: int | None = None):
+	def define_function(self, address: int, end: Union[int, None] = None):
 		address = self._to_address(address)
 		# Don't override existing functions
 		fn = getFunctionAt(address)

Il2CppInspector.Common/Outputs/ScriptResources/Targets/IDA.py

@@ -118,7 +118,7 @@ class IDADisassemblerInterface(BaseDisassemblerInterface):
 	def on_finish(self):
 		ida_ida.inf_set_genflags(self._cached_genflags)
 
-	def define_function(self, address: int, end: int | None = None):
+	def define_function(self, address: int, end: Union[int, None] = None):
 		if self._skip_function_creation:
 			return
 

Il2CppInspector.Common/Outputs/ScriptResources/shared_base.py

@@ -1,9 +1,13 @@
+#@runtime PyGhidra
+# ^-- required for ghidra, ignored by all others
+
 # Generated script file by Il2CppInspectorRedux - https://github.com/LukeFZ (Original Il2CppInspector by http://www.djkaty.com - https://github.com/djkaty)
 # Target Unity version: %TARGET_UNITY_VERSION%
 
 import json
 import os
 from datetime import datetime
+from typing import Union
 import abc
 
 class BaseStatusHandler(abc.ABC):
@@ -28,7 +32,7 @@ class BaseDisassemblerInterface(abc.ABC):
 	def on_finish(self): pass
 
 	@abc.abstractmethod
-	def define_function(self, address: int, end: int | None = None): pass
+	def define_function(self, address: int, end: Union[int, None] = None): pass
 
 	@abc.abstractmethod
 	def define_data_array(self, address: int, type: str, count: int): pass
@@ -108,7 +112,7 @@ class ScriptContext:
 		self._backend.set_data_name(addr, definition['name'])
 		self._backend.set_data_comment(addr, definition['string'])
 
-	def define_field(self, addr: str, name: str, type: str, il_type: str | None = None):
+	def define_field(self, addr: str, name: str, type: str, il_type: Union[str, None] = None):
 		address = self.from_hex(addr)
 		self._backend.set_data_type(address, type)
 		self._backend.set_data_name(address, name)

README.md

@@ -332,9 +332,9 @@ The `--seperate-attributes` switch directs Il2CppInspector to put assembly-level
 
 ### Adding metadata to your IDA workflow
 
-**NOTE:** IDA 7.6+ is required, but 7.7 is recommended.
+**NOTE:** IDA 7.6+ is required, but 7.7 is recommended. You also need to use Python 3.8+ to be able to run the script.
 
-**NOTE:** Run script as-soon-as-possible after IDA loads binary into database
+**NOTE:** Run script as-soon-as-possible after IDA loads binary into database!
 
 Simply run Il2CppInspector with the `-p` switch to choose the IDA script output file. Load your binary file into IDA, press Alt+F7 and select the generated script. Observe the Output Window while IDA analyzes the file - this may take a long time.