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 a2bcb33..2bc5763 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 3e76a03..67c1e67 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 7a03833..7fafc2b 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 48ad1f2..d8ffc80 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 4c8f4b4..81e0dc9 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 0ff28c0..ac94249 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 c128cb6..05d8658 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 1e6ea67..5047b05 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 1da0790..748097a 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; -- 2.48.1