Server refactor (#484)

Author: Tides

.github/workflows/dotnet.yml

@@ -1,6 +1,7 @@
 name: .NET Build
 
 on:
+  workflow_dispatch:
   push:
     branches: [ 1.* ]
     paths:

Obsidian.API/ChunkData/DataContainer.cs

@@ -0,0 +1,30 @@
+using Obsidian.API.Utilities;
+
+namespace Obsidian.API.ChunkData;
+public abstract class DataContainer<T>
+{
+    public bool IsEmpty { get; }
+    public byte BitsPerEntry => (byte)DataArray.BitsPerEntry;
+
+    public abstract IPalette<T> Palette { get; internal set; }
+
+    internal abstract DataArray DataArray { get; private protected set; }
+
+    public virtual int GetIndex(int x, int y, int z) => (y << this.BitsPerEntry | z) << this.BitsPerEntry | x;
+
+    public void GrowDataArray()
+    {
+        if (Palette.BitCount <= DataArray.BitsPerEntry)
+            return;
+
+        DataArray = DataArray.Grow(Palette.BitCount);
+    }
+
+    public abstract void Set(int x, int y, int z, T blockState);
+
+    public abstract T Get(int x, int y, int z);
+
+    public abstract void WriteTo(INetStreamWriter writer);
+
+    public abstract DataContainer<T> Clone();
+}

Obsidian.API/ChunkData/IBlockUpdate.cs

@@ -0,0 +1,12 @@
+namespace Obsidian.API.ChunkData;
+
+public interface IBlockUpdate
+{
+    public IBlock? Block { get; set; }
+
+    public IWorld World { get; }
+    public Vector Position { get; set; }
+
+    public int Delay { get; set; }
+    public int DelayCounter { get; set; }
+}

Obsidian.API/ChunkData/IChunkSection.cs

@@ -0,0 +1,38 @@
+namespace Obsidian.API.ChunkData;
+public interface IChunkSection
+{
+    public int? YBase { get; }
+
+    public DataContainer<IBlock> BlockStateContainer { get; }
+    public DataContainer<Biome> BiomeContainer { get; }
+
+    public bool HasSkyLight { get;  }
+    public ReadOnlyMemory<byte> SkyLightArray { get; }
+
+    public bool HasBlockLight { get; } 
+    public ReadOnlyMemory<byte> BlockLightArray { get; }
+
+    public bool IsEmpty { get; }
+
+    public IBlock GetBlock(Vector position);
+    public IBlock GetBlock(int x, int y, int z);
+
+    public Biome GetBiome(Vector position);
+    public Biome GetBiome(int x, int y, int z);
+
+    public void SetBlock(Vector position, IBlock block);
+    public void SetBlock(int x, int y, int z, IBlock block);
+
+    public void SetBiome(Vector position, Biome biome);
+    public void SetBiome(int x, int y, int z, Biome biome);
+
+    public void SetLightLevel(Vector position, LightType lt, int level);
+    public void SetLightLevel(int x, int y, int z, LightType lt, int level);
+
+    public int GetLightLevel(Vector position, LightType lt);
+    public int GetLightLevel(int x, int y, int z, LightType lt);
+
+
+    public void SetLight(byte[] data, LightType lt);
+    public IChunkSection Clone();
+}

Obsidian/ChunkData/IPalette.cs renamed to Obsidian.API/ChunkData/IPalette.cs

@@ -1,7 +1,4 @@
-using Obsidian.Net;
-
-namespace Obsidian.ChunkData;
-
+namespace Obsidian.API.ChunkData;
 public interface IPalette<T>
 {
     public int[] Values { get; }

Obsidian/Commands/Framework/Entities/Command.cs renamed to Obsidian.API/Commands/Command.cs

@@ -1,22 +1,18 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using Obsidian.API.Commands.Exceptions;
+using Obsidian.API.Plugins;
 using Obsidian.API.Utilities;
-using Obsidian.Commands.Framework.Exceptions;
-using Obsidian.Plugins;
-using Obsidian.Utilities.Interfaces;
+using Obsidian.API.Utilities.Interfaces;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
-namespace Obsidian.Commands.Framework.Entities;
-
+namespace Obsidian.API.Commands;
 public sealed class Command
 {
-    internal CommandIssuers AllowedIssuers { get; init; }
-
-    private ILogger? Logger => this.CommandHandler.logger;
+    public CommandIssuers AllowedIssuers { get; init; }
 
-    public required CommandHandler CommandHandler { get; init; }
-    public required PluginContainer? PluginContainer { get; init; }
+    public required ICommandHandler CommandHandler { get; init; }
+    public required IPluginContainer? PluginContainer { get; init; }
     public required string Name { get; init; }
 
     public string[] Aliases { get; init; } = [];
@@ -85,7 +81,7 @@ public async Task ExecuteAsync(CommandContext context, string[] args)
         {
             await context.Sender.SendMessageAsync(ChatMessage.Simple($"Correct usage: {Usage}", ChatColor.Red));
             return;
-        }   
+        }
 
         await this.ExecuteAsync(executor, context, args);
     }

Obsidian/Commands/Framework/Entities/CommandSender.cs renamed to Obsidian.API/Commands/CommandSender.cs

@@ -1,11 +1,6 @@
-using Microsoft.Extensions.Logging;
-
-namespace Obsidian.Commands.Framework.Entities;
-
-public class CommandSender(CommandIssuers issuer, IPlayer? player, ILogger logger) : ICommandSender
+namespace Obsidian.API.Commands;
+public class CommandSender(CommandIssuers issuer, IPlayer? player) : ICommandSender
 {
-    private readonly ILogger logger = logger;
-
     public IPlayer? Player { get; } = player;
     public CommandIssuers Issuer { get; } = issuer;
 
@@ -22,8 +17,6 @@ public async Task SendMessageAsync(ChatMessage message)
         var messageString = message.Text;
         foreach (var extra in message.GetExtras())
             messageString += extra.Text;
-
-        this.logger.LogInformation("{message}", messageString);
     }
 
     public Task SendMessageAsync(ChatMessage message, Guid sender) => throw new NotImplementedException();

Obsidian.API/Commands/Exceptions/CommandArgumentParsingException.cs

@@ -0,0 +1,9 @@
+namespace Obsidian.API.Commands.Exceptions;
+
+public class CommandArgumentParsingException : Exception
+{
+    public CommandArgumentParsingException(string message) : base(message)
+    {
+
+    }
+}

Obsidian.API/Commands/Exceptions/CommandExecutionCheckException.cs

@@ -0,0 +1,9 @@
+namespace Obsidian.API.Commands.Exceptions;
+
+public class CommandExecutionCheckException : Exception
+{
+    public CommandExecutionCheckException(string message) : base(message)
+    {
+
+    }
+}

Obsidian.API/Commands/Exceptions/CommandNotFoundException.cs

@@ -0,0 +1,9 @@
+namespace Obsidian.API.Commands.Exceptions;
+
+public class CommandNotFoundException : Exception
+{
+    public CommandNotFoundException(string message) : base(message)
+    {
+
+    }
+}