PvE/se-launcher
11
0
Fork 0
Code Actions Wiki Activity

Fix DarkTardMissingNamespacePatch, add some compiler stuff from normal plugin loader, and some code cleanup

Browse Source
This commit is contained in:
pas2704
2023-07-03 16:23:42 -04:00
parent 856e7dce59
commit 40fa225b1c
11 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CringeLauncher/Patches/DarkTardMissingNamespacePatch.cs
View File

@@ -7,7 +7,7 @@ namespace CringeLauncher.Patches;
[HarmonyPatch(typeof(MyScriptManager), nameof(MyScriptManager.Init))]
public static class DarkTardMissingNamespacePatch
{
private static void Postfix(Dictionary<string, string> ___m_compatibilityChanges)
private static void Prefix(Dictionary<string, string> ___m_compatibilityChanges)
{
___m_compatibilityChanges["using System.Runtime.Remoting.Metadata.W3cXsd2001;"] = "";
___m_compatibilityChanges["using System.IO.Ports;"] = "";

2
PluginLoader/Compiler/RoslynCompiler.cs
View File

@@ -35,7 +35,7 @@ public class RoslynCompiler
RoslynReferences.EnumerateAllReferences(),
new(
OutputKind.DynamicallyLinkedLibrary,
optimizationLevel: debugBuild ? OptimizationLevel.Debug : OptimizationLevel.Release));
optimizationLevel: debugBuild ? OptimizationLevel.Debug : OptimizationLevel.Release, allowUnsafe: true));
using (var pdb = new MemoryStream())
using (var ms = new MemoryStream())

14
PluginLoader/Compiler/RoslynReferences.cs
View File

@@ -44,6 +44,12 @@ public static class RoslynReferences
sb.AppendLine(a.FullName);
}
foreach(var a in GetOtherReferences())
{
AddAssemblyReference(a);
sb.AppendLine(a.FullName);
}
sb.AppendLine(line);
while (loadedAssemblies.Count > 0)
{
@@ -78,6 +84,14 @@ public static class RoslynReferences
LogFile.WriteLine(sb.ToString(), false);
}
/// <summary>
/// This method is used to load references that otherwise would not exist or be optimized out
/// </summary>
private static IEnumerable<Assembly> GetOtherReferences()
{
yield return typeof(Microsoft.CSharp.RuntimeBinder.Binder).Assembly;
}
private static bool ContainsReference(AssemblyName name)
{
return allReferences.ContainsKey(name.Name);

4
PluginLoader/Data/GitHubPlugin.cs
View File

@@ -68,12 +68,12 @@ public class GitHubPlugin : PluginData
return sb.ToString();
}
public override Assembly GetAssembly()
public override Assembly? GetAssembly()
{
if (!Directory.Exists(cacheDir))
Directory.CreateDirectory(cacheDir);
Assembly a;
Assembly? a;
var dllFile = Path.Combine(cacheDir, pluginFile);
var commitFile = Path.Combine(cacheDir, commitHashFile);

2
PluginLoader/Data/LocalFolderPlugin.cs
View File

@@ -38,7 +38,7 @@ public class LocalFolderPlugin : PluginData
public Config FolderSettings { get; }
public override Assembly GetAssembly()
public override Assembly? GetAssembly()
{
if (Directory.Exists(Id))
{

37
PluginLoader/Data/LocalPlugin.cs
View File

@@ -30,14 +30,26 @@ public class LocalPlugin : PluginData
}
}
public override Assembly GetAssembly()
public override Assembly? GetAssembly()
{
if (File.Exists(Id))
if (!File.Exists(Id)) return null;
//prevent random unloading if being used by another process
int maxRetries = 10;
while (maxRetries > 0)
{
AppDomain.CurrentDomain.AssemblyResolve += LoadFromSameFolder;
var a = Assembly.LoadFile(Id);
Version = a.GetName().Version;
return a;
try
{
AppDomain.CurrentDomain.AssemblyResolve += LoadFromSameFolder;
var a = Assembly.LoadFile(Id);
Version = a?.GetName()?.Version ?? Version;
return a;
}
catch (IOException)
{
LogFile.WriteLine($"Waiting to load {Id} because it's being used by another process");
Thread.Sleep(250);
maxRetries--;
}
}
return null;
@@ -55,27 +67,28 @@ public class LocalPlugin : PluginData
Process.Start("explorer.exe", $"/select, \"{file}\"");
}
private Assembly LoadFromSameFolder(object sender, ResolveEventArgs args)
private Assembly? LoadFromSameFolder(object sender, ResolveEventArgs args)
{
if (args.RequestingAssembly.IsDynamic)
if (args.RequestingAssembly?.IsDynamic ?? false)
return null;
if (args.Name.Contains("0Harmony") || args.Name.Contains("SEPluginManager"))
return null;
var location = args.RequestingAssembly.Location;
var location = args.RequestingAssembly?.Location;
if (string.IsNullOrWhiteSpace(location) || !Path.GetFullPath(location)
.StartsWith(Path.GetDirectoryName(Id),
.StartsWith(Path.GetDirectoryName(Id)!,
StringComparison.OrdinalIgnoreCase))
return null;
var folderPath = Path.GetDirectoryName(location);
var folderPath = Path.GetDirectoryName(Id);
if (string.IsNullOrEmpty(folderPath)) return null;
var assemblyPath = Path.Combine(folderPath, new AssemblyName(args.Name).Name + ".dll");
if (!File.Exists(assemblyPath))
return null;
var assembly = Assembly.LoadFile(assemblyPath);
LogFile.WriteLine("Resolving " + assembly.GetName().Name + " for " + args.RequestingAssembly.FullName);
LogFile.WriteLine("Resolving " + assembly.GetName().Name + " for " + args.RequestingAssembly?.FullName);
var main = Main.Instance;
if (!main.Config.IsEnabled(assemblyPath))

4
PluginLoader/Data/ModPlugin.cs
View File

@@ -58,12 +58,12 @@ public class ModPlugin : PluginData, ISteamItem
}
}
public override Assembly GetAssembly()
public override Assembly? GetAssembly()
{
return null;
}
public override bool TryLoadAssembly(out Assembly a)
public override bool TryLoadAssembly(out Assembly? a)
{
a = null;
return false;

4
PluginLoader/Data/PluginData.cs
View File

@@ -72,9 +72,9 @@ public abstract class PluginData : IEquatable<PluginData>
Id == other.Id;
}
public abstract Assembly GetAssembly();
public abstract Assembly? GetAssembly();
public virtual bool TryLoadAssembly(out Assembly a)
public virtual bool TryLoadAssembly(out Assembly? a)
{
if (Status == PluginStatus.Error)
{

2
PluginLoader/Data/SteamPlugin.cs
View File

@@ -53,7 +53,7 @@ public abstract class SteamPlugin : PluginData, ISteamItem
}
}
public override Assembly GetAssembly()
public override Assembly? GetAssembly()
{
if (Status == PluginStatus.PendingUpdate)
{

7
PluginLoader/Main.cs
View File

@@ -82,7 +82,7 @@ public class Main : IHandleInputPlugin
sw.Stop();
// FIXME: It can potentially run in the background speeding up the game's startup
ReportEnabledPlugins();
//ReportEnabledPlugins();
LogFile.WriteLine($"Finished startup. Took {sw.ElapsedMilliseconds}ms");
@@ -220,6 +220,11 @@ public class Main : IHandleInputPlugin
return typeof(Harmony).Assembly;
}
if (args.Name.Contains("MonoMod.RuntimeDetour"))
{
return typeof(MonoMod.RuntimeDetour.NativeHook).Assembly;
}
if (args.Name.Contains("SEPluginManager"))
{
if (assembly != null)

4
PluginLoader/PluginInstance.cs
View File

@@ -11,13 +11,13 @@ namespace PluginLoader;
public class PluginInstance
{
private readonly PluginData data;
private readonly Assembly mainAssembly;
private readonly Assembly? mainAssembly;
private readonly Type mainType;
private IHandleInputPlugin inputPlugin;
private MethodInfo openConfigDialog;
private IPlugin plugin;
private PluginInstance(PluginData data, Assembly mainAssembly, Type mainType)
private PluginInstance(PluginData data, Assembly? mainAssembly, Type mainType)
{
this.data = data;
this.mainAssembly = mainAssembly;