Cleanup

src/NosCore.Core/NosCore.Core.csproj

@@ -37,7 +37,7 @@
     <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.0" />
     <PackageReference Include="NosCore.Dao" Version="4.0.3" />
     <PackageReference Include="NosCore.Networking" Version="7.0.0" />
-    <PackageReference Include="NosCore.PathFinder" Version="2.0.1" />
+    <PackageReference Include="NosCore.PathFinder" Version="2.1.0" />
     <PackageReference Include="NosCore.Shared" Version="6.0.0" />
     <PackageReference Include="Serilog" Version="4.3.0" />
     <PackageReference Include="Polly" Version="8.6.5" />

src/NosCore.Data/CommandPackets/CommandPacketHeaderAttribute.cs

@@ -23,7 +23,7 @@
 
 namespace NosCore.Data.CommandPackets
 {
-    public class CommandPacketHeaderAttribute(string identification, AuthorityType authority) : PacketHeaderAttribute(identification, Scope.InGame | Scope.InGame)
+    public class CommandPacketHeaderAttribute(string identification, AuthorityType authority) : PacketHeaderAttribute(identification, Scope.InGame)
     {
         public AuthorityType Authority { get; } = authority;
     }

src/NosCore.Data/SkillPacket.cs

@@ -1,10 +1,6 @@
 using NosCore.Packets.Attributes;
 using NosCore.Packets;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NosCore.Packets.Enumerations;
 
 //todo move to NosCore.Packets

src/NosCore.Data/WebApi/WarehouseLink.cs

@@ -25,6 +25,8 @@ public class WarehouseLink
     {
         public WarehouseDto? Warehouse { get; set; }
 
+        public short Slot { get; set; }
+
         //todo move this to a generic ItemInstance with a converter
         public ItemInstanceDto? ItemInstance { get; set; }
     }

src/NosCore.GameObject/Services/MapInstanceGenerationService/MapDesignObject.cs → src/NosCore.GameObject/ComponentEntities/Entities/MapDesignObject.cs

@@ -22,7 +22,7 @@
 using NosCore.Packets.ServerPackets.Map;
 using NosCore.Packets.ServerPackets.Miniland;
 
-namespace NosCore.GameObject.Services.MapInstanceGenerationService
+namespace NosCore.GameObject.ComponentEntities.Entities
 {
     public class MapDesignObject : MinilandObjectDto
     {

src/NosCore.GameObject/Services/MapItemGenerationService/MapItem.cs → src/NosCore.GameObject/ComponentEntities/Entities/MapItem.cs

@@ -29,8 +29,9 @@
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
 using NodaTime;
+using NosCore.GameObject.Services.MapItemGenerationService;
 
-namespace NosCore.GameObject.Services.MapItemGenerationService
+namespace NosCore.GameObject.ComponentEntities.Entities
 {
     public class MapItem(long visualId) : ICountableEntity, IRequestableEntity<Tuple<MapItem, GetPacket>>
     {

src/NosCore.GameObject/MapMonster.cs → src/NosCore.GameObject/ComponentEntities/Entities/MapMonster.cs

@@ -1,4 +1,4 @@
-//  __  _  __    __   ___ __  ___ ___
+//  __  _  __    __   ___ __  ___ ___
 // |  \| |/__\ /' _/ / _//__\| _ \ __|
 // | | ' | \/ |`._`.| \_| \/ | v / _|
 // |_|\__|\__/ |___/ \__/\__/|_|_\___|
@@ -22,6 +22,7 @@
 using NosCore.GameObject.ComponentEntities.Extensions;
 using NosCore.GameObject.ComponentEntities.Interfaces;
 using NosCore.GameObject.Services.MapInstanceGenerationService;
+using NosCore.GameObject.Services.ShopService;
 using NosCore.PathFinder.Interfaces;
 using NosCore.Shared.Enumerations;
 using Serilog;
@@ -33,7 +34,7 @@
 using System.Threading;
 using System.Collections.Concurrent;
 
-namespace NosCore.GameObject
+namespace NosCore.GameObject.ComponentEntities.Entities
 {
     public class MapMonster(ILogger logger, IHeuristic distanceCalculator, IClock clock,
             ISpeedCalculationService speedCalculationService)
@@ -99,20 +100,21 @@ internal void StopLife()
 
         public Task StartLifeAsync()
         {
+            Life?.Dispose();
+
             async Task LifeAsync()
             {
                 try
                 {
                     if (!MapInstance.IsSleeping)
                     {
-                        await MonsterLifeAsync().ConfigureAwait(false);
+                        await MonsterLifeAsync();
                     }
                 }
                 catch (Exception e)
                 {
                     logger.Error(e.Message, e);
                 }
-
             }
             Life = Observable.Interval(TimeSpan.FromMilliseconds(400)).Select(_ => LifeAsync()).Subscribe();
             return Task.CompletedTask;

src/NosCore.GameObject/MapNpc.cs → src/NosCore.GameObject/ComponentEntities/Entities/MapNpc.cs

@@ -1,4 +1,4 @@
-//  __  _  __    __   ___ __  ___ ___
+//  __  _  __    __   ___ __  ___ ___
 // |  \| |/__\ /' _/ / _//__\| _ \ __|
 // | | ' | \/ |`._`.| \_| \/ | v / _|
 // |_|\__|\__/ |___/ \__/\__/|_|_\___|
@@ -26,6 +26,7 @@
 using NosCore.GameObject.Services.ItemGenerationService;
 using NosCore.GameObject.Services.MapInstanceGenerationService;
 using NosCore.GameObject.Services.NRunService;
+using NosCore.GameObject.Services.ShopService;
 using NosCore.PathFinder.Interfaces;
 using NosCore.Shared.Enumerations;
 using Serilog;
@@ -38,7 +39,7 @@
 using NodaTime;
 using System.Threading;
 
-namespace NosCore.GameObject
+namespace NosCore.GameObject.ComponentEntities.Entities
 {
     public class MapNpc(IItemGenerationService? itemProvider, ILogger logger, IHeuristic distanceCalculator,
             IClock clock)
@@ -133,13 +134,15 @@ internal void StopLife()
 
         public Task StartLifeAsync()
         {
+            Life?.Dispose();
+
             async Task LifeAsync()
             {
                 try
                 {
                     if (!MapInstance.IsSleeping)
                     {
-                        await MonsterLifeAsync().ConfigureAwait(false);
+                        await MonsterLifeAsync();
                     }
                 }
                 catch (Exception e)

src/NosCore.GameObject/Pet.cs → src/NosCore.GameObject/ComponentEntities/Entities/Pet.cs

@@ -20,14 +20,16 @@
 using NosCore.Data.Dto;
 using NosCore.Data.StaticEntities;
 using NosCore.GameObject.ComponentEntities.Interfaces;
+using NosCore.GameObject.Services.GroupService;
 using NosCore.GameObject.Services.MapInstanceGenerationService;
+using NosCore.GameObject.Services.ShopService;
 using NosCore.Shared.Enumerations;
 using System;
 using System.Collections.Concurrent;
 using NodaTime;
 using System.Threading;
 
-namespace NosCore.GameObject
+namespace NosCore.GameObject.ComponentEntities.Entities
 {
     public class Pet : MapMonsterDto, INamedEntity //TODO replace MapMonsterDTO by the correct PetDTO
     {

src/NosCore.GameObject/Portal.cs → src/NosCore.GameObject/ComponentEntities/Entities/Portal.cs

@@ -21,7 +21,7 @@
 using NosCore.Packets.ServerPackets.Portals;
 using System;
 
-namespace NosCore.GameObject
+namespace NosCore.GameObject.ComponentEntities.Entities
 {
     public class Portal : PortalDto
     {

src/NosCore.GameObject/ComponentEntities/Extensions/AliveEntityExtension.cs

@@ -41,15 +41,6 @@
 using System.Threading.Tasks;
 using NodaTime;
 using NosCore.Networking;
-using NosCore.GameObject.Networking.ClientSession;
-using NosCore.Packets.ClientPackets.Battle;
-using NosCore.Packets.ServerPackets.Battle;
-using Microsoft.AspNetCore.Http;
-using NosCore.Data.Enumerations.Battle;
-using NosCore.Data.Enumerations.Map;
-using static NosCore.Data.Enumerations.Buff.AdditionalTypes;
-using System.Collections.Concurrent;
-using System.Threading;
 
 
 namespace NosCore.GameObject.ComponentEntities.Extensions

src/NosCore.GameObject/ComponentEntities/Extensions/CharacterEntityExtension.cs

@@ -1,4 +1,4 @@
-//  __  _  __    __   ___ __  ___ ___
+//  __  _  __    __   ___ __  ___ ___
 // |  \| |/__\ /' _/ / _//__\| _ \ __|
 // | | ' | \/ |`._`.| \_| \/ | v / _|
 // |_|\__|\__/ |___/ \__/\__/|_|_\___|
@@ -363,7 +363,7 @@
             IBlacklistHub blacklistHttpClient)
         {
             var subpackets = new List<BlinitSubPacket?>();
-            var blackList = await blacklistHttpClient.GetBlacklistedAsync(visualEntity.VisualId).ConfigureAwait(false);
+            var blackList = await blacklistHttpClient.GetBlacklistedAsync(visualEntity.VisualId);
             foreach (var relation in blackList)
             {
                 if (relation.CharacterId == visualEntity.VisualId)
@@ -385,12 +385,12 @@
             IChannelHub channelHttpClient, IPubSubHub pubSubHub)
         {
             //same canal
-            var servers = (await channelHttpClient.GetCommunicationChannels().ConfigureAwait(false))
+            var servers = (await channelHttpClient.GetCommunicationChannels())
                 ?.Where(c => c.Type == ServerType.WorldServer).ToList();
             var accounts = await pubSubHub.GetSubscribersAsync();
 
             var subpackets = new List<FinitSubPacket?>();
-            var friendlist = await friendHttpClient.GetFriendsAsync(visualEntity.VisualId).ConfigureAwait(false);
+            var friendlist = await friendHttpClient.GetFriendsAsync(visualEntity.VisualId);
             //TODO add spouselist
             //var spouseList = _webApiAccess.Get<List<CharacterRelationDto>>(WebApiRoute.Spouse, friendServer.WebApi, visualEntity.VisualId) ?? new List<CharacterRelationDto>();
             foreach (var relation in friendlist)
@@ -412,7 +412,7 @@
         public static async Task SendFinfoAsync(this ICharacterEntity visualEntity, IFriendHub friendHttpClient,
             IPubSubHub pubSubHub, ISerializer packetSerializer, bool isConnected)
         {
-            var friendlist = await friendHttpClient.GetFriendsAsync(visualEntity.VisualId).ConfigureAwait(false);
+            var friendlist = await friendHttpClient.GetFriendsAsync(visualEntity.VisualId);
             await Task.WhenAll(friendlist.Select(friend =>
                 pubSubHub.SendMessageAsync(new PostedPacket
                 {
@@ -437,7 +437,7 @@
                         Id = friend.CharacterId,
                         Name = friend.CharacterName!
                     }
-                }))).ConfigureAwait(false);
+                })));
         }
 
         public static ServerGetPacket GenerateGet(this ICharacterEntity visualEntity, long itemId)

src/NosCore.GameObject/ComponentEntities/Extensions/GroupExtension.cs

@@ -18,6 +18,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using NosCore.GameObject.ComponentEntities.Interfaces;
+using NosCore.GameObject.Services.GroupService;
 using NosCore.Packets.ServerPackets.Shop;
 using System.Collections.Generic;
 using System.Linq;

src/NosCore.GameObject/ComponentEntities/Extensions/VisualEntityExtension.cs

@@ -17,6 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using NosCore.GameObject.ComponentEntities.Entities;
 using NosCore.GameObject.ComponentEntities.Interfaces;
 using NosCore.Packets.Enumerations;
 using NosCore.Packets.ServerPackets.Chats;

src/NosCore.GameObject/ComponentEntities/Interfaces/IAliveEntity.cs

@@ -19,8 +19,7 @@
 
 using System.Collections.Concurrent;
 using System.Threading;
-using System.Threading.Tasks;
-using NosCore.GameObject.Services.BattleService;
+using NosCore.GameObject.Services.ShopService;
 
 namespace NosCore.GameObject.ComponentEntities.Interfaces
 {

src/NosCore.GameObject/ComponentEntities/Interfaces/ICharacterEntity.cs

@@ -30,6 +30,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NosCore.GameObject.Services.BattleService;
+using NosCore.GameObject.Services.GroupService;
 using NosCore.GameObject.Services.MapChangeService;
 using NosCore.Networking;
 using MailData = NosCore.GameObject.InterChannelCommunication.Messages.MailData;

src/NosCore.GameObject/ComponentEntities/Interfaces/INamedEntity.cs

@@ -17,6 +17,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using NosCore.GameObject.Services.GroupService;
+
 namespace NosCore.GameObject.ComponentEntities.Interfaces
 {
     public interface INamedEntity : IAliveEntity

src/NosCore.GameObject/IEventHandler.cs → src/NosCore.GameObject/Infastructure/IEventHandler.cs

@@ -20,7 +20,7 @@
 using NosCore.GameObject.Networking.ClientSession;
 using System.Threading.Tasks;
 
-namespace NosCore.GameObject
+namespace NosCore.GameObject.Infastructure
 {
     public interface IEventHandler<in T, T2> : IEventHandler
     {

src/NosCore.GameObject/IPacketHandler.cs → src/NosCore.GameObject/Infastructure/IPacketHandler.cs

@@ -21,7 +21,7 @@
 using NosCore.Packets.Interfaces;
 using System.Threading.Tasks;
 
-namespace NosCore.GameObject
+namespace NosCore.GameObject.Infastructure
 {
     public interface IPacketHandler
     {