Core Systems Refactor

Obsidian/Commands/Parsers/LocationTypeParser.cs → Obsidian.API/Commands/ArgumentParsers/LocationArgumentParser.cs

@@ -1,19 +1,18 @@
-using Obsidian.Entities;
+namespace Obsidian.API.Commands.ArgumentParsers;
 
-namespace Obsidian.Commands.Parsers;
-
-public class LocationTypeParser : BaseArgumentParser<VectorF>
+public sealed class LocationArgumentParser : BaseArgumentParser<VectorF>
 {
-    public LocationTypeParser() : base(10, "minecraft:vec3")
+    public LocationArgumentParser() : base(10, "minecraft:vec3")
     {
     }
 
     public override bool TryParseArgument(string input, CommandContext context, out VectorF result)
     {
         var splitted = input.Split(' ');
         var location = new VectorF();
+        var player = context.Player;
 
-        for (int i = 0; i < splitted.Length; i++)
+        for (var i = 0; i < splitted.Length; i++)
         {
             var text = splitted[i];
             if (float.TryParse(text, out var floatResult))
@@ -31,25 +30,24 @@ public override bool TryParseArgument(string input, CommandContext context, out
                     default:
                         throw new IndexOutOfRangeException("Count went out of range");
                 }
-            else if (text.StartsWith("~"))
+            else if (text.StartsWith('~'))
             {
-                if (context.Player is not Player player)
+                if (player is null)
                 {
                     result = default;
                     return false;
                 }
 
-                float.TryParse(text.Replace("~", ""), out float relative);
                 switch (i)
                 {
                     case 0:
-                        location.X = player.Position.X + relative;
+                        location.X = player.Position.X;
                         break;
                     case 1:
-                        location.Y = player.Position.Y + relative;
+                        location.Y = player.Position.Y;
                         break;
                     case 2:
-                        location.Z = player.Position.Z + relative;
+                        location.Z = player.Position.Z;
                         break;
                     default:
                         throw new IndexOutOfRangeException("Count went out of range");

Obsidian/Commands/Framework/ArgumentParsers/NumericArgumentParsers.cs → Obsidian.API/Commands/ArgumentParsers/NumericArgumentParsers.cs

@@ -1,81 +1,81 @@
-namespace Obsidian.API;
+namespace Obsidian.API.Commands.ArgumentParsers;
 
-public class SignedIntArgumentParser : BaseArgumentParser<int>
+public sealed class SignedIntArgumentParser : BaseArgumentParser<int>
 {
     public SignedIntArgumentParser() : base(3, "brigadier:integer") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out int result)
         => int.TryParse(input, out result);
 }
 
-public class BoolArgumentParser : BaseArgumentParser<bool>
+public sealed class BoolArgumentParser : BaseArgumentParser<bool>
 {
     public BoolArgumentParser() : base(0, "brigadier:bool") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out bool result)
         => bool.TryParse(input, out result);
 }
 
-public class UnsignedByteArgumentParser : BaseArgumentParser<byte>
+public sealed class UnsignedByteArgumentParser : BaseArgumentParser<byte>
 {
     public UnsignedByteArgumentParser() : base(3, "brigadier:integer") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out byte result)
         => byte.TryParse(input, out result);
 }
 
-public class SignedByteArgumentParser : BaseArgumentParser<sbyte>
+public sealed class SignedByteArgumentParser : BaseArgumentParser<sbyte>
 {
     public SignedByteArgumentParser() : base(3, "brigadier:integer") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out sbyte result)
         => sbyte.TryParse(input, out result);
 }
 
-public class SignedShortArgumentParser : BaseArgumentParser<short>
+public sealed class SignedShortArgumentParser : BaseArgumentParser<short>
 {
     public SignedShortArgumentParser() : base(3, "brigadier:integer") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out short result)
         => short.TryParse(input, out result);
 }
 
-public class UnsignedShortArgumentParser : BaseArgumentParser<ushort>
+public sealed class UnsignedShortArgumentParser : BaseArgumentParser<ushort>
 {
     public UnsignedShortArgumentParser() : base(3, "brigadier:integer") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out ushort result)
         => ushort.TryParse(input, out result);
 }
 
-public class UnsignedIntArgumentParser : BaseArgumentParser<uint>
+public sealed class UnsignedIntArgumentParser : BaseArgumentParser<uint>
 {
     public UnsignedIntArgumentParser() : base(3, "brigadier:integer") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out uint result)
         => uint.TryParse(input, out result);
 }
 
-public class SignedLongArgumentParser : BaseArgumentParser<long>
+public sealed class SignedLongArgumentParser : BaseArgumentParser<long>
 {
     public SignedLongArgumentParser() : base(3, "brigadier:long") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out long result)
         => long.TryParse(input, out result);
 }
 
-public class UnsignedLongArgumentParser : BaseArgumentParser<ulong>
+public sealed class UnsignedLongArgumentParser : BaseArgumentParser<ulong>
 {
     public UnsignedLongArgumentParser() : base(4, "brigadier:long") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out ulong result)
         => ulong.TryParse(input, out result);
 }
 
-public class FloatArgumentParser : BaseArgumentParser<float>
+public sealed class FloatArgumentParser : BaseArgumentParser<float>
 {
     public FloatArgumentParser() : base(1, "brigadier:float") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out float result)
         => float.TryParse(input, out result);
 }
-public class DoubleArgumentParser : BaseArgumentParser<double>
+public sealed class DoubleArgumentParser : BaseArgumentParser<double>
 {
     public DoubleArgumentParser() : base(2, "brigadier:double") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out double result)
         => double.TryParse(input, out result);
 }
-public class DecimalArgumentParser : BaseArgumentParser<decimal>
+public sealed class DecimalArgumentParser : BaseArgumentParser<decimal>
 {
     public DecimalArgumentParser() : base(3, "brigadier:integer") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out decimal result)

Obsidian.API/Commands/ArgumentParsers/PlayerArgumentParser.cs

@@ -0,0 +1,25 @@
+namespace Obsidian.API.Commands.ArgumentParsers;
+
+public class PlayerArgumentParser : BaseArgumentParser<IPlayer>
+{
+    public PlayerArgumentParser() : base(7, "minecraft:game_profile")
+    {
+    }
+
+    //TODO support selectors
+    public override bool TryParseArgument(string input, CommandContext context, out IPlayer result)
+    {
+        var server = context.Server;
+        IPlayer? player = null;
+
+        if (Guid.TryParse(input, out var guid))
+            // is valid GUID, try find with guid
+            player = server.GetPlayer(guid);
+        else
+            // is not valid GUID, try find with name
+            player = server.GetPlayer(input);
+
+        result = player;
+        return true;
+    }
+}

Obsidian/Commands/Framework/ArgumentParsers/StringArgumentParser.cs → Obsidian.API/Commands/ArgumentParsers/StringArgumentParser.cs

@@ -1,6 +1,6 @@
-namespace Obsidian.API;
+namespace Obsidian.API.Commands.ArgumentParsers;
 
-public class StringArgumentParser : BaseArgumentParser<string>
+public sealed class StringArgumentParser : BaseArgumentParser<string>
 {
     public StringArgumentParser() : base(5, "brigadier:string") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out string result)
@@ -10,9 +10,9 @@ public override bool TryParseArgument(string input, CommandContext ctx, out stri
     }
 }
 
-public class GuidArgumentParser : BaseArgumentParser<Guid>
+public sealed class GuidArgumentParser : BaseArgumentParser<Guid>
 {
-    public GuidArgumentParser() : base(47, "minecraft:uuid") { }
+    public GuidArgumentParser() : base(49, "minecraft:uuid") { }
     public override bool TryParseArgument(string input, CommandContext ctx, out Guid result)
     {
         return Guid.TryParse(input, out result);

Obsidian.API/Commands/CommandModuleBase.cs

@@ -0,0 +1,34 @@
+using Obsidian.API.Plugins;
+using System.Diagnostics;
+
+namespace Obsidian.API.Commands;
+public abstract class CommandModuleBase
+{
+    private CommandContext? commandContext;
+
+    [CommandContext]
+    public CommandContext CommandContext
+    {
+        get
+        {
+            if (commandContext == null)
+                throw new UnreachableException();//TODO empty command context maybe??
+
+            return this.commandContext;
+        }
+        set
+        {
+            ArgumentNullException.ThrowIfNull(value);
+
+            this.commandContext = value;
+        }
+    }
+
+    public IPlayer? Player => this.CommandContext.Player;
+    public IServer Server => this.CommandContext.Server;
+    public ICommandSender Sender => this.CommandContext.Sender;
+
+    public bool IsPlayer => this.CommandContext.IsPlayer;
+
+    public PluginBase? Plugin => this.CommandContext.Plugin;
+}

Obsidian.API/Events/BaseMinecraftEventArgs.cs

@@ -3,7 +3,7 @@
 /// <summary>
 /// Represents the base class for classes that contain minecraft event data.
 /// </summary>
-public class BaseMinecraftEventArgs : AsyncEventArgs
+public abstract class BaseMinecraftEventArgs : AsyncEventArgs
 {
     /// <summary>
     /// Server this event took place in.

Obsidian.API/Logging/Logger.cs

@@ -18,7 +18,7 @@ internal Logger(string prefix, LogLevel minLevel = LogLevel.Debug)
         Prefix = prefix;
     }
 
-    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
     {
         if (!IsEnabled(logLevel))
             return;
@@ -64,7 +64,7 @@ void PrintLinePrefix()
         var lines = message.Split('\n');
 
         if (message.IsNullOrEmpty())
-        { 
+        {
             this.LogTrace($"Empty log message sent. Dumping stacktrace:\n{new StackTrace().ToString().Replace("\n", "            ")}");
             return;
         }

Obsidian.API/Obsidian.API.csproj

@@ -52,8 +52,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
 		<PackageReference Include="SharpNoise" Version="0.12.1.1" />
 	</ItemGroup>
 

Obsidian.API/Plugins/IPluginInfo.cs

@@ -5,6 +5,6 @@ public interface IPluginInfo
     public string Name { get; }
     public Version Version { get; }
     public string Description { get; }
-    public string Authors { get; }
+    public string[] Authors { get; }
     public Uri ProjectUrl { get; }
 }

Obsidian.API/Plugins/IPluginRegistry.cs

@@ -0,0 +1,19 @@
+using Obsidian.API.Events;
+
+namespace Obsidian.API.Plugins;
+public interface IPluginRegistry
+{
+    public IPluginRegistry RegisterCommandArgumentHandler<T>(T parser) where T : BaseArgumentParser;
+
+    public IPluginRegistry MapCommands();
+    public IPluginRegistry MapCommand(string name, Delegate contextDelegate);
+    public IPluginRegistry MapCommand(string name, ValueTaskContextDelegate<CommandContext> contextDelegate);
+
+    public IPluginRegistry MapEvent<TEventArgs>(ValueTaskContextDelegate<TEventArgs> contextDelegate, Priority priority = Priority.Low) where TEventArgs : BaseMinecraftEventArgs;
+    public IPluginRegistry MapEvent(Delegate contextDelegate, Priority priority = Priority.Low);
+    public IPluginRegistry MapEvents();
+}
+
+
+//TODO better name maybe??
+public delegate ValueTask ValueTaskContextDelegate<TContext>(TContext context);