AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-15 18:28:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move plugin dll assembly resolving and directory creation to IScripting.cs

Browse Source
This commit is contained in:
UnknownShadow200 2022-09-08 20:03:51 +10:00
parent 028425ed5f
commit 72fdb1c835
4 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
MCGalaxy/Scripting/Scripting.cs
View File

@ -35,6 +35,31 @@ namespace MCGalaxy.Scripting
/// <summary> Returns the default .dll path for the plugin with the given name </summary>
public static string PluginPath(string name) { return PLUGINS_DLL_DIR + name + ".dll"; }
public static void Init() {
Directory.CreateDirectory(COMMANDS_DLL_DIR);
Directory.CreateDirectory(PLUGINS_DLL_DIR);
AppDomain.CurrentDomain.AssemblyResolve += ResolvePluginAssembly;
}
// only used for resolving plugin DLLs depending on other plugin DLLs
static Assembly ResolvePluginAssembly(object sender, ResolveEventArgs args) {
if (args.RequestingAssembly == null) return null;
if (!IsPluginDLL(args.RequestingAssembly)) return null;
Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
foreach (Assembly assem in assemblies)
{
if (!IsPluginDLL(assem)) continue;
if (args.Name == assem.FullName) return assem;
}
return null;
}
static bool IsPluginDLL(Assembly a) { return String.IsNullOrEmpty(a.Location); }
/// <summary> Constructs instances of all types which derive from T in the given assembly. </summary>
/// <returns> The list of constructed instances. </returns>
public static List<T> LoadTypes<T>(Assembly lib) {
@ -54,6 +79,13 @@ namespace MCGalaxy.Scripting
return instances;
}
/// <summary> Loads the given assembly from disc (and associated .pdb debug data) </summary>
public static Assembly LoadAssembly(string path) {
byte[] data = File.ReadAllBytes(path);
byte[] debug = GetDebugData(path);
return Assembly.Load(data, debug);
}
static byte[] GetDebugData(string path) {
if (Server.RunningOnMono()) {
// Cmdtest.dll -> Cmdtest.dll.mdb
@ -72,33 +104,23 @@ namespace MCGalaxy.Scripting
}
}
/// <summary> Loads the given assembly from disc (and associated .pdb debug data) </summary>
public static Assembly LoadAssembly(string path) {
byte[] data = File.ReadAllBytes(path);
byte[] debug = GetDebugData(path);
return Assembly.Load(data, debug);
}
public static void AutoloadCommands() {
string[] files = AtomicIO.TryGetFiles(COMMANDS_DLL_DIR, "*.dll");
if (files == null) return;
if (files != null) {
foreach (string path in files) { AutoloadCommands(path); }
} else {
Directory.CreateDirectory(COMMANDS_DLL_DIR);
}
foreach (string path in files) { AutoloadCommands(path); }
}
static void AutoloadCommands(string path) {
string error;
string error;
List<Command> cmds = LoadCommands(path, out error);
if (error != null) {
Logger.Log(LogType.Warning, error);
} else {
Logger.Log(LogType.SystemActivity, "AUTOLOAD: Loaded {0} from {1}",
cmds.Join(c => "/" + c.name), Path.GetFileName(path));
cmds.Join(c => "/" + c.name), Path.GetFileName(path));
}
}
@ -146,11 +168,8 @@ namespace MCGalaxy.Scripting
public static void AutoloadPlugins() {
string[] files = AtomicIO.TryGetFiles(PLUGINS_DLL_DIR, "*.dll");
if (files == null) {
Directory.CreateDirectory(PLUGINS_DLL_DIR); return;
}
if (files == null) return;
// Ensure that plugin files are loaded in a consistent order,
// in case plugins have a dependency on other plugins
Array.Sort<string>(files);

1
MCGalaxy/Server/Maintenance/Updater.cs
View File

@ -90,6 +90,7 @@ namespace MCGalaxy {
Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) pl.SaveStats();
string serverDLL = Server.GetServerDLLPath();
// Move current files to previous files (by moving instead of copying,

2
MCGalaxy/Server/Server.cs
View File

@ -102,6 +102,7 @@ namespace MCGalaxy
EnsureFilesExist();
MoveOutdatedFiles();
IScripting.Init();
LoadAllSettings();
InitDatabase();
@ -145,7 +146,6 @@ namespace MCGalaxy
EnsureDirectoryExists("extra/bots");
EnsureDirectoryExists(Paths.ImportsDir);
EnsureDirectoryExists("blockdefs");
EnsureDirectoryExists(IScripting.COMMANDS_DLL_DIR);
#if !MCG_STANDALONE
EnsureDirectoryExists(MCGalaxy.Modules.Compiling.ICompiler.COMMANDS_SOURCE_DIR); // TODO move to compiling module
#endif

25
MCGalaxy/util/OperatingSystem.cs
View File

@ -38,31 +38,10 @@ namespace MCGalaxy
public abstract void RestartProcess();
public abstract bool IsWindows { get; }
public virtual void Init() {
AppDomain.CurrentDomain.AssemblyResolve += ResolvePluginAssembly;
}
// only used for resolving plugin DLLs depending on other plugin DLLs
static Assembly ResolvePluginAssembly(object sender, ResolveEventArgs args) {
if (args.RequestingAssembly == null) return null;
if (!IsPluginDLL(args.RequestingAssembly)) return null;
Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
foreach (Assembly assem in assemblies)
{
if (!IsPluginDLL(assem)) continue;
if (args.Name == assem.FullName) return assem;
}
return null;
}
static bool IsPluginDLL(Assembly a) { return String.IsNullOrEmpty(a.Location); }
public virtual void Init() { }
static IOperatingSystem detectedOS;
public unsafe static IOperatingSystem DetectOS() {
public static IOperatingSystem DetectOS() {
detectedOS = detectedOS ?? DoDetectOS();
return detectedOS;
}