backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-07-24 04:37:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added enablePlugin() and disablePlugin() (#13)

Browse source 
* Exposed loaded plugins in FourKitHost with public getLoadedPlugins()

* Fixed bad reference to ServerPlugins

* Forgot that the PluginLoader was nullable, handled it

* Implemented getPlugin(name) and getPlugins() in FourKit.cs

* Implemented enablePlugin(plugin) and disablePlugin(plugin) in FourKit.cs

---------

Co-authored-by: UniPM <zoc6x8voc@mozmail.com>
This commit is contained in:
UniPM 2026-04-06 02:06:10 -05:00 committed by GitHub
parent 18a673bd46
commit 94bed94d00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 54 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Minecraft.Server.FourKit/FourKit.cs
View file

@ -365,7 +365,7 @@ public static class FourKit
/// <param name="name">Name of the plugin to check.</param> /// <param name="name">Name of the plugin to check.</param>
/// <returns>Plugin if it exists, otherwise null</returns> /// <returns>Plugin if it exists, otherwise null</returns>
public static ServerPlugin? getPlugin(string name) { public static ServerPlugin? getPlugin(string name) {
var loadedPlugins = Minecraft.Server.FourKit.FourKitHost.getLoadedPlugins().Where(x => x.name == name); var loadedPlugins = FourKitHost.getLoadedPlugins().Where(x => x.name == name);
if (loadedPlugins.Count() > 1) ServerLog.Warn("fourkit", $"More than one instance of a(n) '{name}' plugin."); if (loadedPlugins.Count() > 1) ServerLog.Warn("fourkit", $"More than one instance of a(n) '{name}' plugin.");
return loadedPlugins.FirstOrDefault(); return loadedPlugins.FirstOrDefault();
@ -375,5 +375,17 @@ public static class FourKit
/// Gets a list of all currently loaded plugins. /// Gets a list of all currently loaded plugins.
/// </summary> /// </summary>
/// <returns>The array of plugins.</returns> /// <returns>The array of plugins.</returns>
public static ServerPlugin[] getPlugins() => Minecraft.Server.FourKit.FourKitHost.getLoadedPlugins().ToArray(); // returns an array for better compatibility for bukkit->fourkit public static ServerPlugin[] getPlugins() => FourKitHost.getLoadedPlugins().ToArray(); // returns an array for better compatibility for bukkit->fourkit
/// <summary>
/// Enables the specified plugin.
/// </summary>
/// <param name="plugin">Plugin to enable.</param>
public static void enablePlugin(ServerPlugin plugin) => FourKitHost.s_loader?.EnablePlugin(plugin);
/// <summary>
/// Disables the specified plugin.
/// </summary>
/// <param name="plugin">Plugin to disable.</param>
public static void disablePlugin(ServerPlugin plugin) => FourKitHost.s_loader?.DisablePlugin(plugin);
} }

4
Minecraft.Server.FourKit/FourKitHost.cs
View file

@ -7,9 +7,9 @@ namespace Minecraft.Server.FourKit;
public static partial class FourKitHost public static partial class FourKitHost
{ {
private static PluginLoader? s_loader; internal static PluginLoader? s_loader;
public static IReadOnlyList<Minecraft.Server.FourKit.Plugin.ServerPlugin> getLoadedPlugins() => s_loader?.Plugins ?? []; public static IReadOnlyList<Plugin.ServerPlugin> getLoadedPlugins() => s_loader?.Plugins ?? [];
[UnmanagedCallersOnly] [UnmanagedCallersOnly]
public static void Initialize() public static void Initialize()

29
Minecraft.Server.FourKit/PluginLoader.cs
View file

@ -118,6 +118,20 @@ internal sealed class PluginLoader
public void EnableAll() public void EnableAll()
{ {
foreach (var plugin in _plugins) foreach (var plugin in _plugins)
{
EnablePlugin(plugin);
}
}
public void DisableAll()
{
foreach (var plugin in _plugins)
{
DisablePlugin(plugin);
}
}
public void EnablePlugin(ServerPlugin plugin)
{ {
try try
{ {
@ -133,27 +147,24 @@ internal sealed class PluginLoader
ServerLog.Error("fourkit", $"Error enabling {pName}: {ex.Message}"); ServerLog.Error("fourkit", $"Error enabling {pName}: {ex.Message}");
} }
} }
}
public void DisableAll() public void DisablePlugin(ServerPlugin plugin)
{
for (int i = _plugins.Count - 1; i >= 0; i--)
{ {
try try
{ {
InvokePluginMethod(_plugins[i], "onDisable", "OnDisable"); InvokePluginMethod(plugin, "onDisable", "OnDisable");
string pName = GetPluginString(_plugins[i], "name", "getName", "GetName", _plugins[i].GetType().Name); string pName = GetPluginString(plugin, "name", "getName", "GetName", plugin.GetType().Name);
ServerLog.Info("fourkit", $"Disabled: {pName}"); ServerLog.Info("fourkit", $"Disabled: {pName}");
FourKit.FireEvent(new PluginDisableEvent(_plugins[i])); FourKit.FireEvent(new PluginDisableEvent(plugin));
} }
catch (Exception ex) catch (Exception ex)
{ {
string pName = GetPluginString(_plugins[i], "name", "getName", "GetName", _plugins[i].GetType().Name); string pName = GetPluginString(plugin, "name", "getName", "GetName", plugin.GetType().Name);
ServerLog.Error("fourkit", $"Error disabling {pName}: {ex.Message}"); ServerLog.Error("fourkit", $"Error disabling {pName}: {ex.Message}");
} }
} }
}
private static void InvokePluginMethod(ServerPlugin plugin, string camelName, string pascalName) private static void InvokePluginMethod(ServerPlugin plugin, string camelName, string pascalName)
{ {
Type type = plugin.GetType(); Type type = plugin.GetType();