add a way for ser methods to be ran using a prefix

Author: Elektryk-Andrzej

Plugin/CommandEvents.cs

@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Linq;
+using CommandSystem;
+using LabApi.Events.Arguments.ServerEvents;
+using LabApi.Events.Handlers;
+using LabApi.Features.Enums;
+using LabApi.Features.Permissions;
+using LabApi.Features.Wrappers;
+using SER.Helpers.Extensions;
+using SER.Plugin.Commands;
+using SER.ScriptSystem;
+using SER.ScriptSystem.Structures;
+using SER.TokenSystem;
+using SER.TokenSystem.Tokens;
+
+namespace SER.Plugin;
+
+public static class CommandEvents
+{
+    public static readonly Dictionary<ICommandSender, CommandType> UsedCommandTypes = [];
+    
+    public static void Initialize()
+    {
+        UsedCommandTypes.Clear();
+        ServerEvents.CommandExecuting += CaptureComamnd;
+    }
+
+    public static void CaptureComamnd(CommandExecutingEventArgs ev)
+    {
+        UsedCommandTypes[ev.Sender] = ev.CommandType;
+        
+        if (MainPlugin.Instance.Config?.SerMethodsAsCommands != true)
+        {
+            return;
+        }
+        
+        if (Player.Get(ev.Sender) is { } player && player.HasPermissions(MethodCommand.RunPermission))
+        {
+            return ;
+        }
+
+        if (!ev.CommandName.StartsWith(">"))
+        {
+            return;
+        }
+        
+        var methodName = ev.CommandName.Substring(1);
+        
+        if (!methodName.Any())
+        {
+            return;
+        }
+        
+        var script = new Script
+        {
+            Name = methodName,
+            Content = $"{methodName} {ev.Arguments.JoinStrings(" ")}",
+            Executor = ScriptExecutor.Get(ev.Sender, ev.CommandType)
+        };
+
+        if (Tokenizer.SliceLine(methodName).HasErrored(out _, out var slices))
+        {
+            return;
+        }
+        
+        // check if the a method like this exists
+        var instance = new MethodToken();
+        var res = (BaseToken.IParseResult) typeof(MethodToken)
+            .GetMethod(nameof(MethodToken.TryInit))!
+            .Invoke(instance, [slices.First(), script, null]);
+
+        if (res is not BaseToken.Success)
+        {
+            return;
+        }
+
+        ev.IsAllowed = false;
+        script.Run();
+    }
+}

Plugin/Commands/MethodCommand.cs

@@ -13,10 +13,12 @@ namespace SER.Plugin.Commands;
 [CommandHandler(typeof(RemoteAdminCommandHandler))]
 public class MethodCommand : ICommand, IUsePermissions
 {
+    public static string RunPermission => "ser.run";
+    
     public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
     {
         var player = Player.Get(sender);
-        if (player is not null && player.HasPermissions(Permission))
+        if (player is not null && player.HasPermissions(RunPermission))
         {
             response = "You do not have permission to run scripts.";
             return false;
@@ -37,5 +39,5 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
     public string Command => "sermethod";
     public string[] Aliases => [];
     public string Description => "Runs the provied arguments at it was a line in a script.";
-    public string Permission => "ser.run";
+    public string Permission => RunPermission;
 }

Plugin/Config.cs

@@ -0,0 +1,6 @@
+namespace SER.Plugin;
+
+public class Config
+{
+    public bool SerMethodsAsCommands { get; set; } = false;
+}

Plugin/MainPlugin.cs

@@ -9,15 +9,14 @@
 using SER.MethodSystem;
 using SER.MethodSystem.Methods.LiteralVariableMethods;
 using SER.ScriptSystem;
-using SER.ScriptSystem.Structures;
 using SER.VariableSystem;
 using EventHandler = SER.EventSystem.EventHandler;
 using Events = LabApi.Events.Handlers;
 
 namespace SER.Plugin;
 
 [UsedImplicitly]
-public class MainPlugin : LabApi.Loader.Features.Plugins.Plugin
+public class MainPlugin : LabApi.Loader.Features.Plugins.Plugin<Config>
 {
     public override string Name => "SER";
     public override string Description => "The scripting language for SCP:SL.";
@@ -62,7 +61,7 @@ public override void Enable()
         MethodIndex.Initialize();
         VariableIndex.Initialize();
         Flag.RegisterFlags();
-        ScriptExecutor.Initialize();
+        CommandEvents.Initialize();
         SendLogo();
 
         Events.ServerEvents.WaitingForPlayers += OnServerFullyInit;

SER.csproj

@@ -305,9 +305,11 @@
         <Compile Include="Plugin\Commands\RunCommand.cs" />
         <Compile Include="Plugin\Commands\StopAllCommand.cs" />
         <Compile Include="Plugin\Commands\StopCommand.cs" />
+        <Compile Include="Plugin\Config.cs" />
         <Compile Include="Plugin\FileSystem.cs" />
         <Compile Include="Plugin\MainPlugin.cs" />
         <Compile Include="Helpers\Log.cs" />
+        <Compile Include="Plugin\CommandEvents.cs" />
         <Compile Include="ScriptSystem\Script.cs" />
         <Compile Include="ScriptSystem\Structures\PlayerConsoleExecutor.cs" />
         <Compile Include="ScriptSystem\Structures\RemoteAdminExecutor.cs" />

ScriptSystem/Structures/ScriptExecutor.cs

@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-using CommandSystem;
-using LabApi.Events.Arguments.ServerEvents;
-using LabApi.Events.Handlers;
+using CommandSystem;
 using LabApi.Features.Enums;
 using RemoteAdmin;
 using SER.Helpers.Exceptions;
+using SER.Plugin;
 using Logger = LabApi.Features.Console.Logger;
 
 namespace SER.ScriptSystem.Structures;
@@ -14,19 +12,22 @@ public abstract class ScriptExecutor
     public abstract void Reply(string content, Script scr);
     public abstract void Warn(string content, Script scr);
     public abstract void Error(string content, Script scr);
-
-    public static readonly Dictionary<ICommandSender, CommandType> UsedCommandTypes = [];
 
     public static ScriptExecutor Get() => ServerConsoleExecutor.Instance;
 
     public static ScriptExecutor Get(ICommandSender sender)
     {
-        if (!UsedCommandTypes.TryGetValue(sender, out var type))
+        if (!CommandEvents.UsedCommandTypes.TryGetValue(sender, out var type))
         {
             Logger.Warn("A command was sent, but cannot infer the command type used. Switching to server.");
             return ServerConsoleExecutor.Instance;
         }
 
+        return Get(sender, type);
+    }
+
+    public static ScriptExecutor Get(ICommandSender sender, CommandType type)
+    {
         if (type == CommandType.Console) return ServerConsoleExecutor.Instance;
 
         if (sender is not PlayerCommandSender playerSender)
@@ -43,21 +44,4 @@ public static ScriptExecutor Get(ICommandSender sender)
             _ => throw new AndrzejFuckedUpException()
         };
     }
-
-    public static void Initialize()
-    {
-        ServerEvents.CommandExecuting += OnCommandExecuting;
-        UsedCommandTypes.Clear();
-    }
-
-    public static void Disable()
-    {
-        ServerEvents.CommandExecuting -= OnCommandExecuting;
-        UsedCommandTypes.Clear();
-    }
-
-    public static void OnCommandExecuting(CommandExecutingEventArgs ev)
-    {
-        UsedCommandTypes[ev.Sender] = ev.CommandType;
-    }
 }