Group domain game projects and tests into a single one

benchmarks/NeoServer.Benchmarks/DIFramework/AutoFacVsMicrosoft.cs

@@ -0,0 +1,61 @@
+using Autofac;
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Engines;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace NeoServer.Benchmarks.DIFramework;
+
+[SimpleJob(RunStrategy.ColdStart, 5)]
+public class AutoFacVsMicrosoft
+{
+    private IContainer _autoFacContainer;
+    private ServiceProvider _serviceProviderContainer;
+
+    public AutoFacVsMicrosoft()
+    {
+        SetupAutoFacContainer();
+        SetupServiceProviderContainer();
+    }
+
+    private void SetupAutoFacContainer()
+    {
+        var containerBuilder = new ContainerBuilder();
+
+        containerBuilder.RegisterType<SingletonService>().SingleInstance();
+        containerBuilder.RegisterType<Singleton2Service>().SingleInstance();
+
+        _autoFacContainer = containerBuilder.Build();
+    }
+
+    private void SetupServiceProviderContainer()
+    {
+        var serviceCollection = new ServiceCollection();
+
+        serviceCollection.AddSingleton<SingletonService>();
+        serviceCollection.AddSingleton<Singleton2Service>();
+        _serviceProviderContainer = serviceCollection.BuildServiceProvider();
+    }
+
+    [Benchmark]
+    public void GetInstanceUsingAutofac()
+    {
+        for (var i = 0; i < 1_000_000; i++) _ = _autoFacContainer.Resolve<SingletonService>();
+    }
+
+    [Benchmark]
+    public void GetInstanceUsingServiceProvider()
+    {
+        for (var i = 0; i < 1_000_000; i++) _ = _serviceProviderContainer.GetService<SingletonService>();
+    }
+}
+
+public class SingletonService
+{
+    public SingletonService(Singleton2Service singleton2Service)
+    {
+    }
+}
+
+public class Singleton2Service
+{
+}

benchmarks/NeoServer.Benchmarks/NeoServer.Benchmarks.csproj

@@ -21,16 +21,18 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.5"/>
-        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.5"/>
+        <PackageReference Include="Autofac" Version="7.1.0"/>
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.9"/>
+        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.9"/>
+        <PackageReference Include="CS-Script" Version="4.8.10"/>
         <PackageReference Include="MoonSharp" Version="2.0.0"/>
         <PackageReference Include="NLua" Version="1.6.3"/>
+        <PackageReference Include="System.IO.Pipelines" Version="7.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game.Creatures\NeoServer.Game.Creatures.csproj"/>
+        <ProjectReference Include="..\..\src\NeoServer.Data\NeoServer.Data.csproj"/>
         <ProjectReference Include="..\..\src\NetworkingServer\NeoServer.Networking.Packets\NeoServer.Networking.Packets.csproj"/>
-        <ProjectReference Include="..\..\src\ApplicationServer\NeoServer.Server\NeoServer.Server.csproj"/>
     </ItemGroup>
 
 </Project>

benchmarks/NeoServer.Benchmarks/Program.cs

@@ -1,6 +1,6 @@
 using System;
 using BenchmarkDotNet.Running;
-using NeoServer.Benchmarks.Collections;
+using NeoServer.Benchmarks.Script;
 
 namespace NeoServer.Benchmarks;
 
@@ -9,7 +9,7 @@ internal class Program
     private static void Main(string[] args)
     {
         //  BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugBuildConfig());
-        BenchmarkRunner.Run<StackVsListInsertZeroIndex>();
+        BenchmarkRunner.Run<LuaVsCsScriptBenchmark>();
 
         Console.ReadKey();
     }

benchmarks/NeoServer.Benchmarks/Script/LuaVsCsScriptBenchmark.cs

@@ -0,0 +1,43 @@
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Engines;
+using CSScriptLib;
+using NLua;
+
+namespace NeoServer.Benchmarks.Script;
+
+[SimpleJob(RunStrategy.ColdStart, 1)]
+public class LuaVsCsScriptBenchmark
+{
+    private readonly Lua _lua = new();
+
+    private readonly dynamic _script = CSScript.Evaluator
+        .LoadMethod("""
+                    void Product()
+                        {
+                            for(int i = 0;  i < 100; i++)
+                                for(int j = 0; j < 100; j++)
+                                    _ = i+j;
+                        }
+                    """);
+
+    [Benchmark]
+    public void Lua()
+    {
+        for (var i = 0; i < 10_000; i++)
+            _ = _lua.DoString("""
+                               for i = 1, 100 do
+                                  for j = 1, 100 do
+                                     y = i+j
+                                  end
+                               end
+
+                              """);
+    }
+
+
+    [Benchmark]
+    public void CsScript()
+    {
+        for (var i = 0; i < 10_000; i++) _script.Product();
+    }
+}

benchmarks/NeoServer.Benchmarks/Tasks/SchedulerBenchmark.cs

@@ -3,8 +3,8 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Engines;
-using NeoServer.Server.Common.Contracts.Tasks;
-using NeoServer.Server.Tasks;
+using NeoServer.Application.Common.Contracts.Tasks;
+using NeoServer.Application.Infrastructure.Thread;
 
 namespace NeoServer.Benchmarks.Tasks;
 

benchmarks/NeoServer.Benchmarks/Tasks/SchedulerQueueBenchmark.cs

@@ -3,8 +3,8 @@
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
-using NeoServer.Server.Common.Contracts.Tasks;
-using NeoServer.Server.Tasks;
+using NeoServer.Application.Common.Contracts.Tasks;
+using NeoServer.Application.Infrastructure.Thread;
 
 namespace NeoServer.Benchmarks.Tasks;
 

data/extensions/AttachEventLoaders.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using NeoServer.Application.Common.Contracts;
 using NeoServer.Game.Common.Contracts.Creatures;
-using NeoServer.Server.Common.Contracts;
 
 namespace NeoServer.Extensions;
 

data/extensions/Chat/DeathChannel.cs

@@ -1,5 +1,5 @@
-using NeoServer.Game.Chats;
-using NeoServer.Game.Chats.Rules;
+using NeoServer.Game.Chat.Channels;
+using NeoServer.Game.Chat.Rules;
 using NeoServer.Game.Common.Chats;
 
 namespace NeoServer.Extensions.Chat;

data/extensions/Chat/LootChannel.cs

@@ -1,5 +1,5 @@
-using NeoServer.Game.Chats;
-using NeoServer.Game.Chats.Rules;
+using NeoServer.Game.Chat.Channels;
+using NeoServer.Game.Chat.Rules;
 using NeoServer.Game.Common.Chats;
 
 namespace NeoServer.Extensions.Chat;

data/extensions/Events/Creatures/CreatureDroppedLootEventHandler.cs

@@ -3,7 +3,7 @@
 using NeoServer.Game.Common.Contracts.Creatures;
 using NeoServer.Game.Common.Contracts.Items;
 using NeoServer.Game.Common.Services;
-using NeoServer.Game.Creatures.Monster.Summon;
+using NeoServer.Game.Creature.Monster.Summon;
 
 namespace NeoServer.Extensions.Events.Creatures;
 

data/extensions/Events/Startup/VocationConverter.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NeoServer.Application.Common.Contracts;
 using NeoServer.Game.Common.Contracts.DataStores;
 using NeoServer.Game.Common.Item;
-using NeoServer.Server.Common.Contracts;
 using Serilog;
 
 namespace NeoServer.Extensions.Events.Startup;

data/extensions/Items/Doors/Door.cs

@@ -7,8 +7,8 @@
 using NeoServer.Game.Common.Location.Structs;
 using NeoServer.Game.Common.Services;
 using NeoServer.Game.Common.Texts;
-using NeoServer.Game.Items.Bases;
-using NeoServer.Game.Items.Factories;
+using NeoServer.Game.Item.Bases;
+using NeoServer.Game.Item.Factories;
 using NeoServer.Game.World.Map;
 using NeoServer.Game.World.Models.Tiles;
 

data/extensions/Items/Lever.cs

@@ -4,8 +4,8 @@
 using NeoServer.Game.Common.Contracts.Items;
 using NeoServer.Game.Common.Item;
 using NeoServer.Game.Common.Location.Structs;
-using NeoServer.Game.Items.Bases;
-using NeoServer.Game.Items.Factories;
+using NeoServer.Game.Item.Bases;
+using NeoServer.Game.Item.Factories;
 using NeoServer.Game.World.Map;
 using NeoServer.Game.World.Models.Tiles;
 

data/extensions/Items/Tools/Rope.cs

@@ -9,8 +9,8 @@
 using NeoServer.Game.Common.Location.Structs;
 using NeoServer.Game.Common.Services;
 using NeoServer.Game.Common.Texts;
-using NeoServer.Game.Creatures;
-using NeoServer.Game.Items.Items.UsableItems;
+using NeoServer.Game.Creature;
+using NeoServer.Game.Item.Items.UsableItems;
 using NeoServer.Game.World.Map;
 using NeoServer.Game.World.Services;
 

data/extensions/Items/Tools/Shovel.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NeoServer.Application.Common;
+using NeoServer.Application.Features.Item.Decay;
 using NeoServer.Game.Common.Contracts.Creatures;
 using NeoServer.Game.Common.Contracts.Items;
 using NeoServer.Game.Common.Contracts.Items.Types.Usable;
@@ -10,9 +12,8 @@
 using NeoServer.Game.Common.Location.Structs;
 using NeoServer.Game.Common.Services;
 using NeoServer.Game.Common.Texts;
-using NeoServer.Game.Items.Items.UsableItems;
+using NeoServer.Game.Item.Items.UsableItems;
 using NeoServer.Game.World.Map;
-using NeoServer.Server.Helpers;
 
 namespace NeoServer.Extensions.Items.Tools;
 
@@ -59,6 +60,7 @@ private bool OpenCaveHole(ICreature usedBy, IItem item)
         transformService.Transform(player, tile.Ground, tile.Ground.Metadata.TransformTo);
 
         tile.Ground.Decay?.StartDecay();
+        IoC.GetInstance<IItemDecayTracker>().Track(tile.Ground);
 
         Map.Instance.TryMoveCreature(usedBy, tile.Location);
 

data/extensions/NeoServer.Extensions.csproj

@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
+        <LangVersion>default</LangVersion>
 
     </PropertyGroup>
 
@@ -10,22 +11,11 @@
         <PackageReference Include="System.Collections.Immutable" Version="7.0.0"/>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\src\ApplicationServer\NeoServer.Server.Contracts\NeoServer.Server.Common.csproj"/>
-        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game.Chats\NeoServer.Game.Chats.csproj"/>
-        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game.Combat\NeoServer.Game.Combat.csproj"/>
-        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game.Common\NeoServer.Game.Common.csproj"/>
-        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game.Creatures\NeoServer.Game.Creatures.csproj"/>
-        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game.Items\NeoServer.Game.Items.csproj"/>
-        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game.World\NeoServer.Game.World.csproj"/>
+        <ProjectReference Include="..\..\src\GameWorldSimulator\NeoServer.Game\NeoServer.Game.csproj"/>
         <ProjectReference Include="..\..\src\Loaders\NeoServer.Loaders\NeoServer.Loaders.csproj"/>
         <ProjectReference Include="..\..\src\Standalone\NeoServer.Server.Standalone.csproj"/>
-        <ProjectReference Include="..\..\src\NetworkingServer\NeoServer.Networking.Handlers\NeoServer.Networking.Handlers.csproj"/>
         <ProjectReference Include="..\..\src\NetworkingServer\NeoServer.Networking\NeoServer.Networking.csproj"/>
-        <ProjectReference Include="..\..\src\ApplicationServer\NeoServer.Server.Commands\NeoServer.Server.Commands.csproj"/>
         <ProjectReference Include="..\..\src\ApplicationServer\NeoServer.Server.Contracts\NeoServer.Server.Common.csproj"/>
-        <ProjectReference Include="..\..\src\ApplicationServer\NeoServer.Server.Events\NeoServer.Server.Events.csproj"/>
-        <ProjectReference Include="..\..\src\ApplicationServer\NeoServer.Server.Jobs\NeoServer.Server.Jobs.csproj"/>
-        <ProjectReference Include="..\..\src\ApplicationServer\NeoServer.Server\NeoServer.Server.csproj"/>
     </ItemGroup>
     <ItemGroup>
         <Compile Remove="Items\Sign.cs"/>

data/extensions/Npcs/Rookgaard/Cipfried.cs

@@ -3,7 +3,7 @@
 using NeoServer.Game.Common.Chats;
 using NeoServer.Game.Common.Contracts.Creatures;
 using NeoServer.Game.Common.Contracts.World;
-using NeoServer.Game.Creatures.Npcs;
+using NeoServer.Game.Creature.Npcs;
 
 namespace NeoServer.Extensions.Npcs.Rookgaard;
 

data/extensions/Players/Loaders/GodLoader.cs

@@ -1,13 +1,13 @@
 using NeoServer.Data.Entities;
-using NeoServer.Game.Chats;
+using NeoServer.Game.Chat.Channels;
 using NeoServer.Game.Common;
 using NeoServer.Game.Common.Contracts.Creatures;
 using NeoServer.Game.Common.Contracts.DataStores;
 using NeoServer.Game.Common.Contracts.Items;
 using NeoServer.Game.Common.Contracts.World;
 using NeoServer.Game.Common.Helpers;
 using NeoServer.Game.Common.Location.Structs;
-using NeoServer.Game.Creatures.Player;
+using NeoServer.Game.Creature.Player;
 using NeoServer.Game.World;
 using NeoServer.Loaders.Players;
 using Serilog;

data/extensions/Players/Loaders/TutorLoader.cs

@@ -1,13 +1,13 @@
 using NeoServer.Data.Entities;
-using NeoServer.Game.Chats;
+using NeoServer.Game.Chat.Channels;
 using NeoServer.Game.Common;
 using NeoServer.Game.Common.Contracts.Creatures;
 using NeoServer.Game.Common.Contracts.DataStores;
 using NeoServer.Game.Common.Contracts.Items;
 using NeoServer.Game.Common.Contracts.World;
 using NeoServer.Game.Common.Helpers;
 using NeoServer.Game.Common.Location.Structs;
-using NeoServer.Game.Creatures.Player;
+using NeoServer.Game.Creature.Player;
 using NeoServer.Game.World;
 using NeoServer.Loaders.Players;
 using Serilog;

data/extensions/Players/Tutor.cs

@@ -7,7 +7,7 @@
 using NeoServer.Game.Common.Creatures;
 using NeoServer.Game.Common.Creatures.Players;
 using NeoServer.Game.Common.Location.Structs;
-using NeoServer.Game.Creatures.Player;
+using NeoServer.Game.Creature.Player;
 
 namespace NeoServer.Extensions.Players;
 

data/extensions/Runes/HealingRune.cs

@@ -7,11 +7,11 @@
 using NeoServer.Game.Common.Helpers;
 using NeoServer.Game.Common.Item;
 using NeoServer.Game.Common.Location.Structs;
-using NeoServer.Game.Items.Items.UsableItems.Runes;
+using NeoServer.Game.Item.Items.UsableItems.Runes;
 
 namespace NeoServer.Extensions.Runes;
 
-public class HealingRune : Rune, IConsumable, IUsableOnCreature, IUsableOn
+public class HealingRune : Rune, IConsumable
 {
     public HealingRune(IItemType type, Location location, IDictionary<ItemAttribute, IConvertible> attributes) :
         base(type, location, attributes)

data/extensions/Services/EffectService.cs

@@ -1,9 +1,9 @@
-using NeoServer.Game.Common.Contracts.World;
+using NeoServer.Application.Common;
+using NeoServer.Application.Common.Contracts;
+using NeoServer.Game.Common.Contracts.World;
 using NeoServer.Game.Common.Creatures;
 using NeoServer.Game.Common.Location.Structs;
 using NeoServer.Networking.Packets.Outgoing.Effect;
-using NeoServer.Server.Common.Contracts;
-using NeoServer.Server.Helpers;
 
 namespace NeoServer.Extensions.Services;
 

data/extensions/Spells/Attack/WaveSpell.cs

@@ -1,9 +1,9 @@
-using NeoServer.Game.Combat.Attacks;
+using NeoServer.Application.Common;
+using NeoServer.Game.Combat.Attacks;
 using NeoServer.Game.Combat.Spells;
 using NeoServer.Game.Common;
 using NeoServer.Game.Common.Contracts.Creatures;
 using NeoServer.Game.Common.Contracts.DataStores;
-using NeoServer.Server.Helpers;
 
 namespace NeoServer.Extensions.Spells.Attack;