Revert "rework plugin type patch"

This reverts commit d4bf30a2

CringeLauncher/CringeLauncher.csproj

@@ -18,7 +18,7 @@
         <Publicize Include="Sandbox.Game:Sandbox.Engine.Platform.Game.set_DrawThread" />
         <Publicize Include="Sandbox.Game:Sandbox.MySandboxGame.form" />
         <Publicize Include="Sandbox.Game:Sandbox.MySandboxGame.RenderThread_SizeChanged" />
-        <Publicize Include="VRage.Render;VRage.Render11;VRage.Platform.Windows;VRage.Scripting;Sandbox.Game" IncludeCompilerGeneratedMembers="false" />
+        <Publicize Include="VRage.Render;VRage.Render11;VRage.Platform.Windows;VRage.Scripting" IncludeCompilerGeneratedMembers="false" />
     </ItemGroup>
 
     <ItemGroup>

CringeLauncher/Patches/PluginTypePatch.cs

@@ -3,7 +3,7 @@ using HarmonyLib;
 using Sandbox.Game.World;
 using System.Reflection;
 using System.Reflection.Emit;
-using VRage.Game;
+using System.Runtime.Loader;
 using VRage.Game.ObjectBuilder;
 using VRage.Plugins;
 
@@ -12,67 +12,40 @@ namespace CringeLauncher.Patches;
 [HarmonyPatch]
 internal static class PluginTypePatch
 {
-    [HarmonyPatch(typeof(MyGlobalTypeMetadata), nameof(MyGlobalTypeMetadata.Init))]
+    [HarmonyTargetMethods]
-    [HarmonyTranspiler]
+    public static IEnumerable<MethodInfo> TargetMethods()
-    private static IEnumerable<CodeInstruction> MetadataTranspiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
     {
-        return new CodeMatcher(instructions, generator)
+        yield return AccessTools.Method(typeof(MySession), "RegisterComponentsFromAssemblies");
-            .SearchForward(b => b.opcode == OpCodes.Ldloc_2)
+        yield return AccessTools.Method(typeof(MyGlobalTypeMetadata), nameof(MyGlobalTypeMetadata.Init));
-            .Advance(-1)
+    }
-            .CreateLabel(out var regularPluginLabel)
+
-            .DeclareLocal(typeof(PluginWrapper), out var wrapper)
+    [HarmonyTranspiler]
-            .DefineLabel(out var continueLabel)
+    public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, MethodBase original)
-            .Insert(new(OpCodes.Ldloc_2), 
+    {
-                new(OpCodes.Isinst, typeof(PluginWrapper)), new(OpCodes.Stloc, wrapper),
+        //replaces plugin.GetType() with GetPluginType(plugin)
-                new(OpCodes.Ldloc_S, wrapper), 
+        var pve = AccessTools.Method(typeof(Assembly), nameof(Assembly.Load), [typeof(AssemblyName)]);
-                new(OpCodes.Brfalse_S, regularPluginLabel), 
+        var method = AccessTools.Method(typeof(object), nameof(GetType));
-                new(OpCodes.Ldloc_0),
+        var getter = AccessTools.PropertyGetter(typeof(MyPlugins), nameof(MyPlugins.Plugins));
-                new(OpCodes.Ldloc_S, wrapper),
+
-                new(OpCodes.Call,
+
-                    AccessTools.PropertyGetter(typeof(PluginWrapper), nameof(PluginWrapper.InstanceType))),
+        var matcher = new CodeMatcher(instructions);
-                new(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(Type), nameof(Type.Assembly))),
+
-                CodeInstruction.Call(typeof(MyGlobalTypeMetadata), nameof(MyGlobalTypeMetadata.RegisterAssembly),
+        if (original.DeclaringType == typeof(MySession))
-                    [typeof(Assembly)]), 
+        {
-                new(OpCodes.Br_S, continueLabel))
+            matcher = matcher
-            .SearchForward(b => b.opcode == OpCodes.Ldloca_S)
+                .SearchForward(b => b.Calls(pve))
-            .AddLabels([continueLabel])
+                .Set(OpCodes.Call, AccessTools.Method(typeof(PluginTypePatch), nameof(LoadAssembly)));
+        }
+
+        return matcher
+            .SearchForward(b => b.Calls(getter))
+            .SearchForward(b => b.Calls(method))
+            .Set(OpCodes.Call, AccessTools.Method(typeof(PluginTypePatch), nameof(GetPluginType)))
             .InstructionEnumeration();
     }
 
-    [HarmonyPatch(typeof(MySession), "RegisterComponentsFromAssemblies")]
+    //Assembly.Load is called in MySession.RegisterComponentsFromAssemblies. When patching, it uses the wrong context
-    [HarmonyPrefix]
+    //todo: maybe there's a better way to do this?
-    private static bool RegisterComponentsPrefix(MySession __instance)
+    private static Assembly LoadAssembly(AssemblyName name) => AssemblyLoadContext.GetLoadContext(typeof(Launcher).Assembly)!.LoadFromAssemblyName(name);
-    {
+    private static Type GetPluginType(IPlugin plugin) => plugin is PluginWrapper wrapper ? wrapper.InstanceType : plugin.GetType();
-        __instance.m_componentsToLoad = [..__instance.GameDefinition.SessionComponents.Keys];
-        __instance.m_componentsToLoad.ExceptWith(__instance.SessionComponentDisabled);
-        __instance.m_componentsToLoad.UnionWith(__instance.SessionComponentEnabled);
-        
-        __instance.RegisterComponentsFromAssembly(MyPlugins.SandboxAssembly);
-        __instance.RegisterComponentsFromAssembly(MyPlugins.SandboxGameAssembly);
-        __instance.RegisterComponentsFromAssembly(MyPlugins.GameAssembly);
-        
-        foreach (var (context, ids) in __instance.ScriptManager.ScriptsPerMod)
-        {
-            foreach (var id in ids)
-            {
-                __instance.RegisterComponentsFromAssembly(__instance.ScriptManager.Scripts[id], true, context);
-            }
-        }
-        
-        foreach (var plugin in MyPlugins.Plugins)
-        {
-            var type = plugin is PluginWrapper wrapper ? wrapper.InstanceType : plugin.GetType();
-            
-            __instance.RegisterComponentsFromAssembly(type.Assembly, true);
-        }
-        
-        foreach (var component in __instance.m_sessionComponents.Values)
-        {
-            if (component.ModContext is null or { IsBaseGame: true })
-                __instance.m_sessionComponentForDrawAsync.Add(component);
-            else
-                __instance.m_sessionComponentForDraw.Add(component);
-        }
-        return false;
-    }
 }