From f9a0fb8df5fd596e5f45f1094166b06479fc399f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Sat, 15 Jan 2022 22:21:07 +0100 Subject: [PATCH] fix: use correct namespaces inside of game project --- Core/NosSmooth.Game/Apis/NostaleChatPacketApi.cs | 4 ++-- Core/NosSmooth.Game/Apis/NostaleSkillsPacketApi.cs | 2 +- Core/NosSmooth.Game/Data/Dialogs/Dialog.cs | 2 -- Core/NosSmooth.Game/Data/Entities/Player.cs | 1 - Core/NosSmooth.Game/NosSmooth.Game.csproj | 2 +- .../PacketHandlers/Characters/CharacterInitResponder.cs | 3 +-- .../PacketHandlers/Characters/SkillResponder.cs | 2 +- .../PacketHandlers/Characters/WalkResponder.cs | 2 +- .../PacketHandlers/Entities/SkillUsedResponder.cs | 5 ++--- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Core/NosSmooth.Game/Apis/NostaleChatPacketApi.cs b/Core/NosSmooth.Game/Apis/NostaleChatPacketApi.cs index a2bcb33a7afac8d9f439efda1e5e0d0485785775..2bc5763b4dc69b6ec1e0a6b4fb5a759c83507153 100644 --- a/Core/NosSmooth.Game/Apis/NostaleChatPacketApi.cs +++ b/Core/NosSmooth.Game/Apis/NostaleChatPacketApi.cs @@ -7,7 +7,7 @@ using NosSmooth.Core.Client; using NosSmooth.Packets.Enums; using NosSmooth.Packets.Enums.Chat; -using NosSmooth.Packets.Packets.Server.Chat; +using NosSmooth.Packets.Server.Chat; using Remora.Results; namespace NosSmooth.Game.Apis; @@ -49,7 +49,7 @@ public class NostaleChatPacketApi /// The cancellation token for cancelling the operation. /// A result that may or may not have succeeded. public Task SendMessageAsync(string content, CancellationToken ct = default) - => _client.SendPacketAsync(new Packets.Packets.Client.Chat.SayPacket(content), ct); + => _client.SendPacketAsync(new Packets.Client.Chat.SayPacket(content), ct); /// /// Sends the given message to the family chat. diff --git a/Core/NosSmooth.Game/Apis/NostaleSkillsPacketApi.cs b/Core/NosSmooth.Game/Apis/NostaleSkillsPacketApi.cs index 3e76a03a49d4af608efb03a56515907c42f1e89b..67c1e67a515eeac96c1cd8fb5b382bce311e09cf 100644 --- a/Core/NosSmooth.Game/Apis/NostaleSkillsPacketApi.cs +++ b/Core/NosSmooth.Game/Apis/NostaleSkillsPacketApi.cs @@ -8,8 +8,8 @@ using NosSmooth.Core.Client; using NosSmooth.Game.Data.Characters; using NosSmooth.Game.Data.Entities; using NosSmooth.Game.Errors; +using NosSmooth.Packets.Client.Battle; using NosSmooth.Packets.Enums; -using NosSmooth.Packets.Packets.Client.Battle; using Remora.Results; namespace NosSmooth.Game.Apis; diff --git a/Core/NosSmooth.Game/Data/Dialogs/Dialog.cs b/Core/NosSmooth.Game/Data/Dialogs/Dialog.cs index 7a03833225537a79cb715681727eb13b3b8afe74..7fafc2b8cc9e4160bb232f70d331c7af56d853ca 100644 --- a/Core/NosSmooth.Game/Data/Dialogs/Dialog.cs +++ b/Core/NosSmooth.Game/Data/Dialogs/Dialog.cs @@ -4,8 +4,6 @@ // Copyright (c) František Boháček. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using OneOf; - namespace NosSmooth.Game.Data.Dialogs; /// diff --git a/Core/NosSmooth.Game/Data/Entities/Player.cs b/Core/NosSmooth.Game/Data/Entities/Player.cs index 48ad1f22f3d49884ff4ed5fe74e897379042cf45..d8ffc808e67834ca70021dcf9cc7787ffeb35e68 100644 --- a/Core/NosSmooth.Game/Data/Entities/Player.cs +++ b/Core/NosSmooth.Game/Data/Entities/Player.cs @@ -4,7 +4,6 @@ // Copyright (c) František Boháček. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections.ObjectModel; using NosSmooth.Game.Data.Info; using NosSmooth.Packets.Enums; using NosSmooth.Packets.Enums.Players; diff --git a/Core/NosSmooth.Game/NosSmooth.Game.csproj b/Core/NosSmooth.Game/NosSmooth.Game.csproj index 4c8f4b49b5820d0fc04e0df9eb09aba0db3c10b3..81e0dc9332561b6923ac2f8fcfddf406a4b2dc37 100644 --- a/Core/NosSmooth.Game/NosSmooth.Game.csproj +++ b/Core/NosSmooth.Game/NosSmooth.Game.csproj @@ -4,7 +4,7 @@ enable enable 10 - net6.0;netstandard2.0 + net6.0;netstandard2.1 diff --git a/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs b/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs index 0ff28c02bc1a06a37f2538bc5989a7874fe8c0d1..ac9424912d8ca0eb004335fd35db7bbfcab3c890 100644 --- a/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs +++ b/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs @@ -4,14 +4,13 @@ // Copyright (c) František Boháček. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.Common; using NosSmooth.Core.Packets; using NosSmooth.Game.Data.Characters; using NosSmooth.Game.Data.Info; using NosSmooth.Game.Data.Social; using NosSmooth.Game.Events.Characters; using NosSmooth.Game.Events.Core; -using NosSmooth.Packets.Packets.Server.Players; +using NosSmooth.Packets.Server.Players; using Remora.Results; namespace NosSmooth.Game.PacketHandlers.Characters; diff --git a/Core/NosSmooth.Game/PacketHandlers/Characters/SkillResponder.cs b/Core/NosSmooth.Game/PacketHandlers/Characters/SkillResponder.cs index c128cb6e770915765d35e3cb5e6cf76fde3eafda..05d86585a7f6b70961f15b3bcd309808f062d528 100644 --- a/Core/NosSmooth.Game/PacketHandlers/Characters/SkillResponder.cs +++ b/Core/NosSmooth.Game/PacketHandlers/Characters/SkillResponder.cs @@ -8,7 +8,7 @@ using NosSmooth.Core.Packets; using NosSmooth.Game.Data.Characters; using NosSmooth.Game.Events.Characters; using NosSmooth.Game.Events.Core; -using NosSmooth.Packets.Packets.Server.Skills; +using NosSmooth.Packets.Server.Skills; using Remora.Results; namespace NosSmooth.Game.PacketHandlers.Characters; diff --git a/Core/NosSmooth.Game/PacketHandlers/Characters/WalkResponder.cs b/Core/NosSmooth.Game/PacketHandlers/Characters/WalkResponder.cs index 1e6ea675e7f3ddb50994b27df8de7c718d82834d..5047b052ce6d040fcd81d84bb4ed473aa3fe03cc 100644 --- a/Core/NosSmooth.Game/PacketHandlers/Characters/WalkResponder.cs +++ b/Core/NosSmooth.Game/PacketHandlers/Characters/WalkResponder.cs @@ -9,7 +9,7 @@ using NosSmooth.Game.Data.Characters; using NosSmooth.Game.Data.Info; using NosSmooth.Game.Events.Core; using NosSmooth.Game.Events.Entities; -using NosSmooth.Packets.Packets.Client.Movement; +using NosSmooth.Packets.Client.Movement; using Remora.Results; namespace NosSmooth.Game.PacketHandlers.Characters; diff --git a/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs b/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs index 1da0790e4c51f95497cbc5fb6f6ebd939ca61a9f..748097afc449353514b330b3a89d45f3259dc7f7 100644 --- a/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs +++ b/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs @@ -10,9 +10,8 @@ using NosSmooth.Game.Events.Characters; using NosSmooth.Game.Events.Core; using NosSmooth.Game.Events.Players; using NosSmooth.Game.Extensions; -using NosSmooth.Packets.Enums; -using NosSmooth.Packets.Packets.Server.Battle; -using NosSmooth.Packets.Packets.Server.Skills; +using NosSmooth.Packets.Server.Battle; +using NosSmooth.Packets.Server.Skills; using Remora.Results; namespace NosSmooth.Game.PacketHandlers.Entities;