Fix: Incorrect Il2CppTypeEnum for primitive type contexts

SamboyCoding · SamboyCoding · commit e4ffa0b69e69 · 2025-03-17T20:51:28.000Z
Closes #424 Closes #423
diff --git a/Cpp2IL.Core/Model/Contexts/TypeAnalysisContext.cs b/Cpp2IL.Core/Model/Contexts/TypeAnalysisContext.cs
@@ -96,11 +96,11 @@ public virtual Il2CppTypeEnum Type
     {
         get
         {
-            if (Definition is { RawBaseType: not null })
-                return Definition.RawBaseType.Type;
-
             if (AppContext.SystemTypes.TryGetIl2CppTypeEnum(this, out var value))
                 return value;
+            
+            if (Definition is { RawType: {} rawType })
+                return rawType.Type;
 
             if (IsEnumType)
                 return Il2CppTypeEnum.IL2CPP_TYPE_ENUM;
diff --git a/LibCpp2IL/Metadata/Il2CppTypeDefinition.cs b/LibCpp2IL/Metadata/Il2CppTypeDefinition.cs
@@ -73,6 +73,8 @@ public class Il2CppTypeDefinition : ReadableClass
 
     public TypeAttributes Attributes => (TypeAttributes)Flags;
 
+    public Il2CppType RawType => LibCpp2IlMain.Binary!.AllTypes[ByvalTypeIndex];
+
     public Il2CppTypeDefinitionSizes RawSizes
     {
         get
diff --git a/LibCpp2IL/Reflection/LibCpp2IlReflection.cs b/LibCpp2IL/Reflection/LibCpp2IlReflection.cs
@@ -61,7 +61,7 @@ internal static void InitCaches()
 
             TypeIndices[typeDefinition] = i;
 
-            var type = LibCpp2IlMain.Binary!.AllTypes[typeDefinition.ByvalTypeIndex];
+            var type = typeDefinition.RawType;
 
             if (type.Type.IsIl2CppPrimitive())
                 PrimitiveTypeDefinitions[type.Type] = typeDefinition;

Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,11 @@ public virtual Il2CppTypeEnum Type`
`96`	`96`	`{`
`97`	`97`	`get`
`98`	`98`	`{`
`99`		`- if (Definition is { RawBaseType: not null })`
`100`		`- return Definition.RawBaseType.Type;`
`101`		`-`
`102`	`99`	`if (AppContext.SystemTypes.TryGetIl2CppTypeEnum(this, out var value))`
`103`	`100`	`return value;`
	`101`	`+`
	`102`	`+ if (Definition is { RawType: {} rawType })`
	`103`	`+ return rawType.Type;`
`104`	`104`
`105`	`105`	`if (IsEnumType)`
`106`	`106`	`return Il2CppTypeEnum.IL2CPP_TYPE_ENUM;`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ public class Il2CppTypeDefinition : ReadableClass`
`73`	`73`
`74`	`74`	`public TypeAttributes Attributes => (TypeAttributes)Flags;`
`75`	`75`
	`76`	`+ public Il2CppType RawType => LibCpp2IlMain.Binary!.AllTypes[ByvalTypeIndex];`
	`77`	`+`
`76`	`78`	`public Il2CppTypeDefinitionSizes RawSizes`
`77`	`79`	`{`
`78`	`80`	`get`