Merge pull request #794 from Wartori54/text-menu-cecil-missuse

Replace FieldReference to correct the TokenType
EverestAPI · Jul 16, 2024 · 5c387ef · 5c387ef
2 parents d825d6f + 637f9f3
commit 5c387ef
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Celeste.Mod.mm/Patches/TextMenu.cs b/Celeste.Mod.mm/Patches/TextMenu.cs
@@ -572,18 +572,19 @@ class PatchTextMenuSettingUpdateAttribute : Attribute { }
     static partial class MonoModRules {
 
         public static void PatchTextMenuOptionColor(ILContext context, CustomAttribute attrib) {
-            FieldReference f_UnselectedColor = context.Method.DeclaringType.FindField("UnselectedColor");
+            FieldReference f_UnselectedColor = context.Method.DeclaringType.FindField("UnselectedColor")!;
 
             //Explicitly instantiate the generic Option<T> type
-            GenericInstanceType genericInst = new GenericInstanceType(f_UnselectedColor.DeclaringType);
+            GenericInstanceType genericInst = new(f_UnselectedColor.DeclaringType);
             genericInst.GenericArguments.AddRange(f_UnselectedColor.DeclaringType.GenericParameters);
-            f_UnselectedColor.DeclaringType = genericInst;
+            // Replace the FieldReference in order to generate a `TokenType.MemberRef` (fields read from binary data use `TokenType.Field`)
+            f_UnselectedColor = new FieldReference(f_UnselectedColor.Name, f_UnselectedColor.FieldType, genericInst);
 
             ILCursor cursor = new ILCursor(context);
             cursor.GotoNext(instr => instr.MatchCall("Microsoft.Xna.Framework.Color", "get_White"));
             cursor.Emit(OpCodes.Ldarg_0);
-            cursor.Next.OpCode = OpCodes.Ldfld;
-            cursor.Next.Operand = f_UnselectedColor;
+            cursor.Next!.OpCode = OpCodes.Ldfld;
+            cursor.Next!.Operand = f_UnselectedColor;
         }
 
         public static void PatchTextMenuSettingUpdate(ILContext il, CustomAttribute _) {