diff --git a/src/NosCore.Core/AuthorizeRoleAttribute.cs b/src/NosCore.Core/AuthorizeRoleAttribute.cs index 431cacbec..dec27f6d7 100644 --- a/src/NosCore.Core/AuthorizeRoleAttribute.cs +++ b/src/NosCore.Core/AuthorizeRoleAttribute.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.AspNetCore.Authorization; using NosCore.Shared.Enumerations; @@ -33,4 +20,4 @@ public AuthorizeRoleAttribute(AuthorityType allowedRole) Roles = string.Join(",", enums.ToArray()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Channel.cs b/src/NosCore.Core/Channel.cs index 6d389860b..c2e3f46bd 100644 --- a/src/NosCore.Core/Channel.cs +++ b/src/NosCore.Core/Channel.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Configuration; using NosCore.Shared.Enumerations; @@ -46,4 +33,4 @@ public class Channel public int ConnectedAccountLimit { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/ChannelInfo.cs b/src/NosCore.Core/ChannelInfo.cs index 982798630..78e146136 100644 --- a/src/NosCore.Core/ChannelInfo.cs +++ b/src/NosCore.Core/ChannelInfo.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NodaTime; using NosCore.Shared.Enumerations; @@ -38,4 +25,4 @@ public class ChannelInfo public bool IsMaintenance { get; set; } public byte ServerId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Configuration/LoginConfiguration.cs b/src/NosCore.Core/Configuration/LoginConfiguration.cs index 30c0bb369..a32a81fdb 100644 --- a/src/NosCore.Core/Configuration/LoginConfiguration.cs +++ b/src/NosCore.Core/Configuration/LoginConfiguration.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.ClientPackets.Login; using NosCore.Shared.Configuration; @@ -35,4 +22,4 @@ public class LoginConfiguration : ServerConfiguration public string? Md5String { get; set; } public bool EnforceNewAuth { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Configuration/WorldConfiguration.cs b/src/NosCore.Core/Configuration/WorldConfiguration.cs index 688e343f6..8e99ec571 100644 --- a/src/NosCore.Core/Configuration/WorldConfiguration.cs +++ b/src/NosCore.Core/Configuration/WorldConfiguration.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.Shared.Configuration; @@ -70,7 +57,7 @@ public class WorldConfiguration : ServerConfiguration public Dictionary> BasicEquipments { get; set; } = new(); public Dictionary> BasicSkills { get; set; } = new(); - + #pragma warning restore CA2227 // Collection properties should be read only } @@ -82,4 +69,4 @@ public class BasicEquipment public NoscorePocketType NoscorePocketType { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/ConfigureJwtBearerOptions.cs b/src/NosCore.Core/ConfigureJwtBearerOptions.cs index 80fbb845f..48f0f4493 100644 --- a/src/NosCore.Core/ConfigureJwtBearerOptions.cs +++ b/src/NosCore.Core/ConfigureJwtBearerOptions.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; diff --git a/src/NosCore.Core/ConnectionInfo.cs b/src/NosCore.Core/ConnectionInfo.cs index b3e4e6ede..45ae75f58 100644 --- a/src/NosCore.Core/ConnectionInfo.cs +++ b/src/NosCore.Core/ConnectionInfo.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Core { @@ -24,4 +11,4 @@ public class ConnectionInfo public string? Token { get; set; } public Channel? ChannelInfo { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Encryption/BcryptEncryption.cs b/src/NosCore.Core/Encryption/BcryptEncryption.cs index 217a5634b..f1233fa25 100644 --- a/src/NosCore.Core/Encryption/BcryptEncryption.cs +++ b/src/NosCore.Core/Encryption/BcryptEncryption.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Authentication; using System; @@ -31,4 +18,4 @@ public string Hash(string password, string? salt) public string Hash(string password) => throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Encryption/Pbkdf2Hasher.cs b/src/NosCore.Core/Encryption/Pbkdf2Hasher.cs index ed9ed22f3..503868404 100644 --- a/src/NosCore.Core/Encryption/Pbkdf2Hasher.cs +++ b/src/NosCore.Core/Encryption/Pbkdf2Hasher.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Authentication; using System; @@ -43,4 +30,4 @@ public string Hash(string inputString, string? salt) public string Hash(string password) => throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Encryption/Sha512Hasher.cs b/src/NosCore.Core/Encryption/Sha512Hasher.cs index 88330caa1..f7f7cfde0 100644 --- a/src/NosCore.Core/Encryption/Sha512Hasher.cs +++ b/src/NosCore.Core/Encryption/Sha512Hasher.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Authentication; using System.Globalization; @@ -36,4 +23,4 @@ public string Hash(string password, string? salt) public string Hash(string password) => Hash(password, null); } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Extensions/TypeExtension.cs b/src/NosCore.Core/Extensions/TypeExtension.cs index c98d4b264..a6cd63f99 100644 --- a/src/NosCore.Core/Extensions/TypeExtension.cs +++ b/src/NosCore.Core/Extensions/TypeExtension.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; using System.Collections.Concurrent; @@ -91,4 +78,4 @@ public static T CreateInstance(this Type type) return (T)constructor(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/I18N/GameLanguageLocalizer.cs b/src/NosCore.Core/I18N/GameLanguageLocalizer.cs index b69b7b9ae..c0c65fe28 100644 --- a/src/NosCore.Core/I18N/GameLanguageLocalizer.cs +++ b/src/NosCore.Core/I18N/GameLanguageLocalizer.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Collections.Generic; +using Microsoft.Extensions.Localization; using NosCore.Data.Enumerations.I18N; using NosCore.Shared.Enumerations; -using System.Globalization; -using Microsoft.Extensions.Localization; using NosCore.Shared.I18N; +using System.Collections.Generic; +using System.Globalization; namespace NosCore.Core.I18N { @@ -64,4 +51,4 @@ public class GameLanguageLocalizer(ILogLanguageLocalizer stringLoca public IEnumerable GetAllStrings() => stringLocalizer.GetAllStrings(); } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/I18N/IGameLanguageLocalizer.cs b/src/NosCore.Core/I18N/IGameLanguageLocalizer.cs index 07b238add..691de8b9f 100644 --- a/src/NosCore.Core/I18N/IGameLanguageLocalizer.cs +++ b/src/NosCore.Core/I18N/IGameLanguageLocalizer.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Localization; using NosCore.Data.Enumerations.I18N; @@ -28,4 +15,4 @@ public interface IGameLanguageLocalizer : ILogLanguageLocalizer { LocalizedString this[LanguageKey key, RegionType region, params object[] arguments] { get; } LocalizedString this[LanguageKey key, RegionType region] { get; } -} \ No newline at end of file +} diff --git a/src/NosCore.Core/Services/IdService/IIdService.cs b/src/NosCore.Core/Services/IdService/IIdService.cs index bad2f7f84..622046a10 100644 --- a/src/NosCore.Core/Services/IdService/IIdService.cs +++ b/src/NosCore.Core/Services/IdService/IIdService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Collections.Concurrent; diff --git a/src/NosCore.Core/Services/IdService/IdService.cs b/src/NosCore.Core/Services/IdService/IdService.cs index b05551617..53c0cca6b 100644 --- a/src/NosCore.Core/Services/IdService/IdService.cs +++ b/src/NosCore.Core/Services/IdService/IdService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Collections.Concurrent; diff --git a/src/NosCore.Core/SessionFactory.cs b/src/NosCore.Core/SessionFactory.cs index 60cf23ad6..6b1cfab7a 100644 --- a/src/NosCore.Core/SessionFactory.cs +++ b/src/NosCore.Core/SessionFactory.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; using System.Collections.Concurrent; @@ -37,4 +24,4 @@ private SessionFactory() public ConcurrentDictionary AuthCodes { get; } public ConcurrentDictionary ReadyForAuth { get; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/ChangeChannelPacket.cs b/src/NosCore.Data/CommandPackets/ChangeChannelPacket.cs index 45d5a042c..2413c3058 100644 --- a/src/NosCore.Data/CommandPackets/ChangeChannelPacket.cs +++ b/src/NosCore.Data/CommandPackets/ChangeChannelPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -33,4 +20,4 @@ public override string Help() return "$ChangeChannel ChannelId"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/ChangeClassPacket.cs b/src/NosCore.Data/CommandPackets/ChangeClassPacket.cs index 7d7521158..e43fd2e60 100644 --- a/src/NosCore.Data/CommandPackets/ChangeClassPacket.cs +++ b/src/NosCore.Data/CommandPackets/ChangeClassPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -36,4 +23,4 @@ public override string Help() return "$ChangeClass ClassType [Name]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/ClearInventoryPacket.cs b/src/NosCore.Data/CommandPackets/ClearInventoryPacket.cs index 1de25d2a1..9f69230ea 100644 --- a/src/NosCore.Data/CommandPackets/ClearInventoryPacket.cs +++ b/src/NosCore.Data/CommandPackets/ClearInventoryPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Enumerations; @@ -29,4 +16,4 @@ public override string Help() return "$ClearInventory"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/CommandPacketHeaderAttribute.cs b/src/NosCore.Data/CommandPackets/CommandPacketHeaderAttribute.cs index 04a6257e5..bf27f934f 100644 --- a/src/NosCore.Data/CommandPackets/CommandPacketHeaderAttribute.cs +++ b/src/NosCore.Data/CommandPackets/CommandPacketHeaderAttribute.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Packets.Enumerations; @@ -27,4 +14,4 @@ public class CommandPacketHeaderAttribute(string identification, AuthorityType a { public AuthorityType Authority { get; } = authority; } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/CreateItemPacket.cs b/src/NosCore.Data/CommandPackets/CreateItemPacket.cs index f91e1f3de..e6e5d48e6 100644 --- a/src/NosCore.Data/CommandPackets/CreateItemPacket.cs +++ b/src/NosCore.Data/CommandPackets/CreateItemPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$CreateItem VNum [DesignOrAmount] [Upgrade]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/EffectCommandPacket.cs b/src/NosCore.Data/CommandPackets/EffectCommandPacket.cs index 0905d832f..27cad8677 100644 --- a/src/NosCore.Data/CommandPackets/EffectCommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/EffectCommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -33,4 +20,4 @@ public override string Help() return "$Effect EffectId"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/EntryPointPacket.cs b/src/NosCore.Data/CommandPackets/EntryPointPacket.cs index 0b3525e05..a5d9595e1 100644 --- a/src/NosCore.Data/CommandPackets/EntryPointPacket.cs +++ b/src/NosCore.Data/CommandPackets/EntryPointPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets; using NosCore.Packets.Attributes; @@ -27,10 +14,10 @@ namespace NosCore.Data.CommandPackets public class EntryPointPacket : PacketBase { [PacketIndex(1)] - public required string Name { get; set; } + public required string Name { get; set; } [PacketIndex(2)] - public string? Password { get; set; } + public string? Password { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/FlCommandPacket.cs b/src/NosCore.Data/CommandPackets/FlCommandPacket.cs index df486f5ff..5dda9726a 100644 --- a/src/NosCore.Data/CommandPackets/FlCommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/FlCommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Packets.Enumerations; @@ -33,4 +20,4 @@ public override string Help() return "$fl [CharacterName]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/GiftPacket.cs b/src/NosCore.Data/CommandPackets/GiftPacket.cs index 83c929345..5386019fb 100644 --- a/src/NosCore.Data/CommandPackets/GiftPacket.cs +++ b/src/NosCore.Data/CommandPackets/GiftPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -45,4 +32,4 @@ public override string Help() return "$Gift VNum Amount Rare Upgrade [CharacterName]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/HelpPacket.cs b/src/NosCore.Data/CommandPackets/HelpPacket.cs index 8493f6c50..2822770c6 100644 --- a/src/NosCore.Data/CommandPackets/HelpPacket.cs +++ b/src/NosCore.Data/CommandPackets/HelpPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Enumerations; @@ -29,4 +16,4 @@ public override string Help() return "$Help"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/ICommandPacket.cs b/src/NosCore.Data/CommandPackets/ICommandPacket.cs index f9f294feb..dfb50d6e8 100644 --- a/src/NosCore.Data/CommandPackets/ICommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/ICommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using JetBrains.Annotations; using NosCore.Packets; @@ -33,4 +20,4 @@ public abstract class CommandPacket : PacketBase, ICommandPacket { public abstract string Help(); } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/InvisibleCommandPacket.cs b/src/NosCore.Data/CommandPackets/InvisibleCommandPacket.cs index ab88bba7d..40213df55 100644 --- a/src/NosCore.Data/CommandPackets/InvisibleCommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/InvisibleCommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Enumerations; @@ -29,4 +16,4 @@ public override string Help() return "$Invisible"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/KickPacket.cs b/src/NosCore.Data/CommandPackets/KickPacket.cs index a13c7fa44..8cb510244 100644 --- a/src/NosCore.Data/CommandPackets/KickPacket.cs +++ b/src/NosCore.Data/CommandPackets/KickPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -33,4 +20,4 @@ public override string Help() return "$Kick [Name]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/PositionPacket.cs b/src/NosCore.Data/CommandPackets/PositionPacket.cs index 4f025a861..98d6f8b76 100644 --- a/src/NosCore.Data/CommandPackets/PositionPacket.cs +++ b/src/NosCore.Data/CommandPackets/PositionPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Enumerations; @@ -29,4 +16,4 @@ public override string Help() return "$Position"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SetGoldCommandPacket.cs b/src/NosCore.Data/CommandPackets/SetGoldCommandPacket.cs index 6b468f870..701a4e79e 100644 --- a/src/NosCore.Data/CommandPackets/SetGoldCommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/SetGoldCommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$Gold Gold [Name]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SetHeroLevelCommandPacket.cs b/src/NosCore.Data/CommandPackets/SetHeroLevelCommandPacket.cs index ecdb6a080..d11fc08c1 100644 --- a/src/NosCore.Data/CommandPackets/SetHeroLevelCommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/SetHeroLevelCommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$SetHeroLevel Level [Name]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SetJobLevelCommandPacket.cs b/src/NosCore.Data/CommandPackets/SetJobLevelCommandPacket.cs index 366f166c8..b35c1f27e 100644 --- a/src/NosCore.Data/CommandPackets/SetJobLevelCommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/SetJobLevelCommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$SetJobLevel Level [Name]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SetLevelCommandPacket.cs b/src/NosCore.Data/CommandPackets/SetLevelCommandPacket.cs index ef2e9c4cb..c0a024ae8 100644 --- a/src/NosCore.Data/CommandPackets/SetLevelCommandPacket.cs +++ b/src/NosCore.Data/CommandPackets/SetLevelCommandPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$SetLevel Level [Name]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SetMaintenancePacket.cs b/src/NosCore.Data/CommandPackets/SetMaintenancePacket.cs index c4b9d772b..d22cfdd1f 100644 --- a/src/NosCore.Data/CommandPackets/SetMaintenancePacket.cs +++ b/src/NosCore.Data/CommandPackets/SetMaintenancePacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -36,4 +23,4 @@ public override string Help() return "$SetMaintenance IsGlobal MaintenanceMode"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SetReputationPacket.cs b/src/NosCore.Data/CommandPackets/SetReputationPacket.cs index cf9142e19..101166968 100644 --- a/src/NosCore.Data/CommandPackets/SetReputationPacket.cs +++ b/src/NosCore.Data/CommandPackets/SetReputationPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$SetReputation Reputation [Name]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/ShoutPacket.cs b/src/NosCore.Data/CommandPackets/ShoutPacket.cs index a9fd506ae..08494e796 100644 --- a/src/NosCore.Data/CommandPackets/ShoutPacket.cs +++ b/src/NosCore.Data/CommandPackets/ShoutPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -33,4 +20,4 @@ public override string Help() return "$Shout Message"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SizePacket.cs b/src/NosCore.Data/CommandPackets/SizePacket.cs index 182ed39b1..473dfa558 100644 --- a/src/NosCore.Data/CommandPackets/SizePacket.cs +++ b/src/NosCore.Data/CommandPackets/SizePacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$Size VisualType VisualId Size"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/SpeedPacket.cs b/src/NosCore.Data/CommandPackets/SpeedPacket.cs index fc007ece5..8b1e787d6 100644 --- a/src/NosCore.Data/CommandPackets/SpeedPacket.cs +++ b/src/NosCore.Data/CommandPackets/SpeedPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -33,4 +20,4 @@ public override string Help() return "$Speed Speed"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/CommandPackets/TeleportPacket.cs b/src/NosCore.Data/CommandPackets/TeleportPacket.cs index fe28231cc..503e3d20d 100644 --- a/src/NosCore.Data/CommandPackets/TeleportPacket.cs +++ b/src/NosCore.Data/CommandPackets/TeleportPacket.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Attributes; using NosCore.Shared.Enumerations; @@ -39,4 +26,4 @@ public override string Help() return "$Teleport TeleportArgument [X] [Y]"; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/DataAttributes/StaticMetaDataAttribute.cs b/src/NosCore.Data/DataAttributes/StaticMetaDataAttribute.cs index 167d86abe..d08f61a60 100644 --- a/src/NosCore.Data/DataAttributes/StaticMetaDataAttribute.cs +++ b/src/NosCore.Data/DataAttributes/StaticMetaDataAttribute.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using System; @@ -28,4 +15,4 @@ public class StaticMetaDataAttribute : Attribute public LogLanguageKey EmptyMessage { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Dto/I18NFromAttribute.cs b/src/NosCore.Data/Dto/I18NFromAttribute.cs index 69ef15606..4ac086727 100644 --- a/src/NosCore.Data/Dto/I18NFromAttribute.cs +++ b/src/NosCore.Data/Dto/I18NFromAttribute.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; @@ -25,4 +12,4 @@ public class I18NFromAttribute(Type type) : Attribute { public Type Type { get; set; } = type; } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Dto/I18NString.cs b/src/NosCore.Data/Dto/I18NString.cs index cc847612a..1babde2b6 100644 --- a/src/NosCore.Data/Dto/I18NString.cs +++ b/src/NosCore.Data/Dto/I18NString.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Enumerations; using System.Collections.Generic; @@ -37,4 +24,4 @@ public I18NString() Add(RegionType.RU, "NONAME"); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Dto/IDTO.cs b/src/NosCore.Data/Dto/IDTO.cs index ba9014047..74564a8b0 100644 --- a/src/NosCore.Data/Dto/IDTO.cs +++ b/src/NosCore.Data/Dto/IDTO.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Dto { public interface IDto { } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Dto/II18NDto.cs b/src/NosCore.Data/Dto/II18NDto.cs index 2df869c19..d5e47f193 100644 --- a/src/NosCore.Data/Dto/II18NDto.cs +++ b/src/NosCore.Data/Dto/II18NDto.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Enumerations; @@ -27,4 +14,4 @@ public interface II18NDto : IDto RegionType RegionType { get; set; } string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Dto/IItemInstanceDto.cs b/src/NosCore.Data/Dto/IItemInstanceDto.cs index dd23aad25..a7452b3b1 100644 --- a/src/NosCore.Data/Dto/IItemInstanceDto.cs +++ b/src/NosCore.Data/Dto/IItemInstanceDto.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using System; using System.ComponentModel.DataAnnotations; -using NodaTime; namespace NosCore.Data.Dto { @@ -44,4 +31,4 @@ public interface IItemInstanceDto : IDto byte Upgrade { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Dto/IStaticDto.cs b/src/NosCore.Data/Dto/IStaticDto.cs index 7ccd0a6c4..9c7592a49 100644 --- a/src/NosCore.Data/Dto/IStaticDto.cs +++ b/src/NosCore.Data/Dto/IStaticDto.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Dto { public interface IStaticDto : IDto { } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Dto/StaticDtoExtension.cs b/src/NosCore.Data/Dto/StaticDtoExtension.cs index da0150340..c12bba6ad 100644 --- a/src/NosCore.Data/Dto/StaticDtoExtension.cs +++ b/src/NosCore.Data/Dto/StaticDtoExtension.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using FastMember; using NosCore.Shared.Enumerations; @@ -73,4 +60,4 @@ public static void InjectI18N(this IStaticDto staticDto, } } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Audit/AuditLogType.cs b/src/NosCore.Data/Enumerations/Audit/AuditLogType.cs index 880525efe..c6a250d98 100644 --- a/src/NosCore.Data/Enumerations/Audit/AuditLogType.cs +++ b/src/NosCore.Data/Enumerations/Audit/AuditLogType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Audit { diff --git a/src/NosCore.Data/Enumerations/Battle/TargetHitType.cs b/src/NosCore.Data/Enumerations/Battle/TargetHitType.cs index 9abd64af5..84595caac 100644 --- a/src/NosCore.Data/Enumerations/Battle/TargetHitType.cs +++ b/src/NosCore.Data/Enumerations/Battle/TargetHitType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Battle { @@ -28,4 +15,4 @@ public enum TargetHitType : byte ZoneHit = 4, SpecialZoneHit = 5 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Bazaar/BazaarEquipmentType.cs b/src/NosCore.Data/Enumerations/Bazaar/BazaarEquipmentType.cs index aa27aa8e8..0d0191a14 100644 --- a/src/NosCore.Data/Enumerations/Bazaar/BazaarEquipmentType.cs +++ b/src/NosCore.Data/Enumerations/Bazaar/BazaarEquipmentType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Bazaar { @@ -28,4 +15,4 @@ public enum BazaarEquipmentType Gloves = 3, Boots = 4 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Bazaar/BazaarJeweleryType.cs b/src/NosCore.Data/Enumerations/Bazaar/BazaarJeweleryType.cs index b114fa285..37dbfaa2e 100644 --- a/src/NosCore.Data/Enumerations/Bazaar/BazaarJeweleryType.cs +++ b/src/NosCore.Data/Enumerations/Bazaar/BazaarJeweleryType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Bazaar { @@ -28,4 +15,4 @@ public enum BazaarJeweleryType Fairy = 4, Box = 5 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Bazaar/BazaarMainType.cs b/src/NosCore.Data/Enumerations/Bazaar/BazaarMainType.cs index 204b2b1ec..4370db32c 100644 --- a/src/NosCore.Data/Enumerations/Bazaar/BazaarMainType.cs +++ b/src/NosCore.Data/Enumerations/Bazaar/BazaarMainType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Bazaar { @@ -28,4 +15,4 @@ public enum BazaarMainType Potion = 5, Event = 6 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Bazaar/BazaarUsableType.cs b/src/NosCore.Data/Enumerations/Bazaar/BazaarUsableType.cs index 9f5d6ebe7..0c08e0062 100644 --- a/src/NosCore.Data/Enumerations/Bazaar/BazaarUsableType.cs +++ b/src/NosCore.Data/Enumerations/Bazaar/BazaarUsableType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Bazaar { @@ -28,4 +15,4 @@ public enum BazaarUsableType Teacher = 5, Sell = 6 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Buff/AdditionalTypes.cs b/src/NosCore.Data/Enumerations/Buff/AdditionalTypes.cs index 1d11fff51..b4d00509d 100644 --- a/src/NosCore.Data/Enumerations/Buff/AdditionalTypes.cs +++ b/src/NosCore.Data/Enumerations/Buff/AdditionalTypes.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -1278,4 +1265,4 @@ public enum Type110 : byte // end! } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Buff/BCardType.cs b/src/NosCore.Data/Enumerations/Buff/BCardType.cs index 2acfbc704..b4883b8bb 100644 --- a/src/NosCore.Data/Enumerations/Buff/BCardType.cs +++ b/src/NosCore.Data/Enumerations/Buff/BCardType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Buff { @@ -145,4 +132,4 @@ public enum CardType : byte Spsl = 200 } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Buff/BuffType.cs b/src/NosCore.Data/Enumerations/Buff/BuffType.cs index 963a3346d..e31aca97b 100644 --- a/src/NosCore.Data/Enumerations/Buff/BuffType.cs +++ b/src/NosCore.Data/Enumerations/Buff/BuffType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Buff { @@ -25,4 +12,4 @@ public enum BuffType : byte Neutral = 1, Bad = 2 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Buff/MedalType.cs b/src/NosCore.Data/Enumerations/Buff/MedalType.cs index 6ac807294..ab07c388f 100644 --- a/src/NosCore.Data/Enumerations/Buff/MedalType.cs +++ b/src/NosCore.Data/Enumerations/Buff/MedalType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Buff { @@ -25,4 +12,4 @@ public enum MedalType : byte Silver = 1, Gold = 2 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Buff/ShellOptionType.cs b/src/NosCore.Data/Enumerations/Buff/ShellOptionType.cs index 8184e5b69..58de33760 100644 --- a/src/NosCore.Data/Enumerations/Buff/ShellOptionType.cs +++ b/src/NosCore.Data/Enumerations/Buff/ShellOptionType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Buff { @@ -150,4 +137,4 @@ public enum ShellOptionType AbsorbDamagePercentageC = 95, IncreaseEvasiveness = 96 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Buff/StaticBonusType.cs b/src/NosCore.Data/Enumerations/Buff/StaticBonusType.cs index 644c1723d..33d6bf93a 100644 --- a/src/NosCore.Data/Enumerations/Buff/StaticBonusType.cs +++ b/src/NosCore.Data/Enumerations/Buff/StaticBonusType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Buff { @@ -28,4 +15,4 @@ public enum StaticBonusType : byte PetBackPack = 4, InventoryTicketUpgrade = 5 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Character/CharacterOption.cs b/src/NosCore.Data/Enumerations/Character/CharacterOption.cs index ca4d5a995..2330b13c1 100644 --- a/src/NosCore.Data/Enumerations/Character/CharacterOption.cs +++ b/src/NosCore.Data/Enumerations/Character/CharacterOption.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Character { diff --git a/src/NosCore.Data/Enumerations/Character/CharacterState.cs b/src/NosCore.Data/Enumerations/Character/CharacterState.cs index 1c7d0af38..8d88e2043 100644 --- a/src/NosCore.Data/Enumerations/Character/CharacterState.cs +++ b/src/NosCore.Data/Enumerations/Character/CharacterState.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Character { @@ -24,4 +11,4 @@ public enum CharacterState : byte Active = 1, Inactive = 2 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Character/FactionType.cs b/src/NosCore.Data/Enumerations/Character/FactionType.cs index c8a139e62..f9d2a1828 100644 --- a/src/NosCore.Data/Enumerations/Character/FactionType.cs +++ b/src/NosCore.Data/Enumerations/Character/FactionType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -28,4 +15,4 @@ public enum FactionType : byte Angel = 1, Demon = 2 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Character/MateType.cs b/src/NosCore.Data/Enumerations/Character/MateType.cs index 9615c5a3e..e91fc6aff 100644 --- a/src/NosCore.Data/Enumerations/Character/MateType.cs +++ b/src/NosCore.Data/Enumerations/Character/MateType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -27,4 +14,4 @@ public enum MateType : byte Partner = 0, Pet = 1 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Event/EventActionType.cs b/src/NosCore.Data/Enumerations/Event/EventActionType.cs index fb32e3203..56f963619 100644 --- a/src/NosCore.Data/Enumerations/Event/EventActionType.cs +++ b/src/NosCore.Data/Enumerations/Event/EventActionType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Event { @@ -58,4 +45,4 @@ public enum EventActionType Ontarget, Controlemonsterinrange } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Event/EventType.cs b/src/NosCore.Data/Enumerations/Event/EventType.cs index 4b2be0c64..592705798 100644 --- a/src/NosCore.Data/Enumerations/Event/EventType.cs +++ b/src/NosCore.Data/Enumerations/Event/EventType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -34,4 +21,4 @@ public enum EventType IceBreaker, Act4Ship } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Family/FamilyAuthority.cs b/src/NosCore.Data/Enumerations/Family/FamilyAuthority.cs index df3004f3e..182512ab0 100644 --- a/src/NosCore.Data/Enumerations/Family/FamilyAuthority.cs +++ b/src/NosCore.Data/Enumerations/Family/FamilyAuthority.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -29,4 +16,4 @@ public enum FamilyAuthority : byte Manager = 2, Member = 3 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Family/FamilyLogType.cs b/src/NosCore.Data/Enumerations/Family/FamilyLogType.cs index 2b76a3fbf..cb7fe70e3 100644 --- a/src/NosCore.Data/Enumerations/Family/FamilyLogType.cs +++ b/src/NosCore.Data/Enumerations/Family/FamilyLogType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -38,4 +25,4 @@ public enum FamilyLogType : byte WareHouseAdded = 12, WareHouseRemoved = 13 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Family/FamilyMemberRank.cs b/src/NosCore.Data/Enumerations/Family/FamilyMemberRank.cs index 809c9babf..cc1026fb3 100644 --- a/src/NosCore.Data/Enumerations/Family/FamilyMemberRank.cs +++ b/src/NosCore.Data/Enumerations/Family/FamilyMemberRank.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -49,4 +36,4 @@ public enum FamilyMemberRank : byte MiddleLittleSon = 22, MiddleLittleDaugter = 23 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Group/GroupSharingType.cs b/src/NosCore.Data/Enumerations/Group/GroupSharingType.cs index e01b46c22..a521784d7 100644 --- a/src/NosCore.Data/Enumerations/Group/GroupSharingType.cs +++ b/src/NosCore.Data/Enumerations/Group/GroupSharingType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Group { @@ -24,4 +11,4 @@ public enum GroupSharingType : byte ByOrder = 0, Everyone = 1 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Group/GroupType.cs b/src/NosCore.Data/Enumerations/Group/GroupType.cs index 954251716..e310a3b2e 100644 --- a/src/NosCore.Data/Enumerations/Group/GroupType.cs +++ b/src/NosCore.Data/Enumerations/Group/GroupType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Group { @@ -26,4 +13,4 @@ public enum GroupType : byte BigTeam = 20, GiantTeam = 40 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/HashingType.cs b/src/NosCore.Data/Enumerations/HashingType.cs index 662422608..6c936db43 100644 --- a/src/NosCore.Data/Enumerations/HashingType.cs +++ b/src/NosCore.Data/Enumerations/HashingType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations { @@ -28,4 +15,4 @@ public enum HashingType Pbkdf2, BCrypt } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/I18N/LanguageKey.cs b/src/NosCore.Data/Enumerations/I18N/LanguageKey.cs index 5cb71b053..16d32b109 100644 --- a/src/NosCore.Data/Enumerations/I18N/LanguageKey.cs +++ b/src/NosCore.Data/Enumerations/I18N/LanguageKey.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -203,4 +190,4 @@ public enum LanguageKey NOT_IN_FRIENDLIST, SPEAKER } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/Act4RaidType.cs b/src/NosCore.Data/Enumerations/Interaction/Act4RaidType.cs index c8e9760d6..6f6d6f5e7 100644 --- a/src/NosCore.Data/Enumerations/Interaction/Act4RaidType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/Act4RaidType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -26,4 +13,4 @@ public enum Act4RaidType : byte Calvina, Berios } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/ArenaTeamType.cs b/src/NosCore.Data/Enumerations/Interaction/ArenaTeamType.cs index d368442b3..6b7532987 100644 --- a/src/NosCore.Data/Enumerations/Interaction/ArenaTeamType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/ArenaTeamType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -24,4 +11,4 @@ public enum ArenaTeamType : byte Zenas = 1, Erenia = 2 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/ChatType.cs b/src/NosCore.Data/Enumerations/Interaction/ChatType.cs index afcf9bb46..090f6571e 100644 --- a/src/NosCore.Data/Enumerations/Interaction/ChatType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/ChatType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -28,4 +15,4 @@ public enum ChatType : byte Friend = 4, Speaker = 5 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/GeneralLogType.cs b/src/NosCore.Data/Enumerations/Interaction/GeneralLogType.cs index 934eb9db6..bc8b988ce 100644 --- a/src/NosCore.Data/Enumerations/Interaction/GeneralLogType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/GeneralLogType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -25,4 +12,4 @@ public enum GeneralLogType Promotion, Demotion } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/InRespawnType.cs b/src/NosCore.Data/Enumerations/Interaction/InRespawnType.cs index 91cea12eb..af55fe159 100644 --- a/src/NosCore.Data/Enumerations/Interaction/InRespawnType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/InRespawnType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -25,4 +12,4 @@ public enum InRespawnType : byte NoEffect = 1, FallingDown = 2 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/PenaltyType.cs b/src/NosCore.Data/Enumerations/Interaction/PenaltyType.cs index 3b63ed440..5b88be6fb 100644 --- a/src/NosCore.Data/Enumerations/Interaction/PenaltyType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/PenaltyType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -28,4 +15,4 @@ public enum PenaltyType : byte BlockRep = 4, Warning = 5 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/ReceiverType.cs b/src/NosCore.Data/Enumerations/Interaction/ReceiverType.cs index e5f7a3654..641aa6e86 100644 --- a/src/NosCore.Data/Enumerations/Interaction/ReceiverType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/ReceiverType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -31,4 +18,4 @@ public enum ReceiverType : byte AllExceptGroup = 8, AllExceptMeAndBlacklisted = 9 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/RespawnType.cs b/src/NosCore.Data/Enumerations/Interaction/RespawnType.cs index 1b80693e9..a5e29e0d8 100644 --- a/src/NosCore.Data/Enumerations/Interaction/RespawnType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/RespawnType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -33,4 +20,4 @@ public enum RespawnType : byte DefaultAct62 = 6, DefaultOasis = 7 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/ScriptedInstanceType.cs b/src/NosCore.Data/Enumerations/Interaction/ScriptedInstanceType.cs index 984e98b98..31874e72e 100644 --- a/src/NosCore.Data/Enumerations/Interaction/ScriptedInstanceType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/ScriptedInstanceType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -28,4 +15,4 @@ public enum ScriptedInstanceType : byte Raid = 1, RaidAct4 = 2 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/TalentArenaOptionType.cs b/src/NosCore.Data/Enumerations/Interaction/TalentArenaOptionType.cs index bf54c708e..9acaa017e 100644 --- a/src/NosCore.Data/Enumerations/Interaction/TalentArenaOptionType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/TalentArenaOptionType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -29,4 +16,4 @@ public enum TalentArenaOptionType : byte Call = 2, WatchAndCall = 3 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Interaction/TeleporterType.cs b/src/NosCore.Data/Enumerations/Interaction/TeleporterType.cs index 3b4f8a779..d64b9d282 100644 --- a/src/NosCore.Data/Enumerations/Interaction/TeleporterType.cs +++ b/src/NosCore.Data/Enumerations/Interaction/TeleporterType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Interaction { @@ -24,4 +11,4 @@ public enum TeleporterType : byte Teleporter = 0, TeleporterOnMap = 1 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/CellonType.cs b/src/NosCore.Data/Enumerations/Items/CellonType.cs index db911c0cb..550859aba 100644 --- a/src/NosCore.Data/Enumerations/Items/CellonType.cs +++ b/src/NosCore.Data/Enumerations/Items/CellonType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Items { @@ -28,4 +15,4 @@ public enum CellonType : byte MpConsumption, CriticalDamageDecrease } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/ItemEffectType.cs b/src/NosCore.Data/Enumerations/Items/ItemEffectType.cs index 37d51d297..eba63708d 100644 --- a/src/NosCore.Data/Enumerations/Items/ItemEffectType.cs +++ b/src/NosCore.Data/Enumerations/Items/ItemEffectType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Items { @@ -57,4 +44,4 @@ public enum ItemEffectType : ushort BuffPotions = 6600, MarriageSeparation = 6969 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/ItemType.cs b/src/NosCore.Data/Enumerations/Items/ItemType.cs index 13a9c61ad..4396c07e9 100644 --- a/src/NosCore.Data/Enumerations/Items/ItemType.cs +++ b/src/NosCore.Data/Enumerations/Items/ItemType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Items { @@ -51,4 +38,4 @@ public enum ItemType : byte Terrace = 33, MinilandTheme = 34 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/JewelOptionType.cs b/src/NosCore.Data/Enumerations/Items/JewelOptionType.cs index 964c4f58a..ed09962d9 100644 --- a/src/NosCore.Data/Enumerations/Items/JewelOptionType.cs +++ b/src/NosCore.Data/Enumerations/Items/JewelOptionType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Items { @@ -28,4 +15,4 @@ public enum JewelOptionType : byte MinimiseUsedMp = 4, MinimiseCriticalHit = 5 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/RarifyMode.cs b/src/NosCore.Data/Enumerations/Items/RarifyMode.cs index fcfbc7e11..1e177f589 100644 --- a/src/NosCore.Data/Enumerations/Items/RarifyMode.cs +++ b/src/NosCore.Data/Enumerations/Items/RarifyMode.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -30,4 +17,4 @@ public enum RarifyMode Drop, Success } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/RarifyProtection.cs b/src/NosCore.Data/Enumerations/Items/RarifyProtection.cs index acd5e2763..1cd522433 100644 --- a/src/NosCore.Data/Enumerations/Items/RarifyProtection.cs +++ b/src/NosCore.Data/Enumerations/Items/RarifyProtection.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Items { @@ -26,4 +13,4 @@ public enum RarifyProtection RedAmulet, Scroll } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/UpgradeMode.cs b/src/NosCore.Data/Enumerations/Items/UpgradeMode.cs index 033e3f12d..9bcdaa52e 100644 --- a/src/NosCore.Data/Enumerations/Items/UpgradeMode.cs +++ b/src/NosCore.Data/Enumerations/Items/UpgradeMode.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Items { @@ -25,4 +12,4 @@ public enum UpgradeMode Reduced, Free } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Items/UpgradeProtection.cs b/src/NosCore.Data/Enumerations/Items/UpgradeProtection.cs index eaa42a3af..fe5c26d2d 100644 --- a/src/NosCore.Data/Enumerations/Items/UpgradeProtection.cs +++ b/src/NosCore.Data/Enumerations/Items/UpgradeProtection.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -27,4 +14,4 @@ public enum UpgradeProtection None, Protected } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Map/MapInstanceEventType.cs b/src/NosCore.Data/Enumerations/Map/MapInstanceEventType.cs index 7c34196a5..ccfbe99f2 100644 --- a/src/NosCore.Data/Enumerations/Map/MapInstanceEventType.cs +++ b/src/NosCore.Data/Enumerations/Map/MapInstanceEventType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Map { @@ -23,4 +10,4 @@ public enum MapInstanceEventType { Entrance } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Map/MapInstanceType.cs b/src/NosCore.Data/Enumerations/Map/MapInstanceType.cs index 50faf12af..5b80e0f01 100644 --- a/src/NosCore.Data/Enumerations/Map/MapInstanceType.cs +++ b/src/NosCore.Data/Enumerations/Map/MapInstanceType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -36,4 +23,4 @@ public enum MapInstanceType RainbowBattleInstance, ArenaInstance } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Map/MapTypeType.cs b/src/NosCore.Data/Enumerations/Map/MapTypeType.cs index afe83fb4f..a291ebab2 100644 --- a/src/NosCore.Data/Enumerations/Map/MapTypeType.cs +++ b/src/NosCore.Data/Enumerations/Map/MapTypeType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Map { @@ -48,4 +35,4 @@ public enum MapTypeType : short CitadelDemon = 24, Oasis = 25 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Map/MonsterType.cs b/src/NosCore.Data/Enumerations/Map/MonsterType.cs index e56e55b53..ef629ef39 100644 --- a/src/NosCore.Data/Enumerations/Map/MonsterType.cs +++ b/src/NosCore.Data/Enumerations/Map/MonsterType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Map { @@ -32,4 +19,4 @@ public enum MonsterType : byte Special = 8, GemSpaceTime = 9 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Miniland/WarehouseType.cs b/src/NosCore.Data/Enumerations/Miniland/WarehouseType.cs index c553b32cf..3429ad83b 100644 --- a/src/NosCore.Data/Enumerations/Miniland/WarehouseType.cs +++ b/src/NosCore.Data/Enumerations/Miniland/WarehouseType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations.Miniland { @@ -25,4 +12,4 @@ public enum WarehouseType : byte FamilyWareHouse = 2, PetWarehouse = 3 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/NoscorePocketType.cs b/src/NosCore.Data/Enumerations/NoscorePocketType.cs index f5ec542bd..ddfcf059d 100644 --- a/src/NosCore.Data/Enumerations/NoscorePocketType.cs +++ b/src/NosCore.Data/Enumerations/NoscorePocketType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Enumerations; @@ -31,4 +18,4 @@ public enum NoscorePocketType : byte Costume = PocketType.Costume, Wear = 8 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/Quest/QuestRewardType.cs b/src/NosCore.Data/Enumerations/Quest/QuestRewardType.cs index e17f3d8db..9356d432b 100644 --- a/src/NosCore.Data/Enumerations/Quest/QuestRewardType.cs +++ b/src/NosCore.Data/Enumerations/Quest/QuestRewardType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Diagnostics.CodeAnalysis; @@ -37,4 +24,4 @@ public enum QuestRewardType : byte PercentJobExp = 12, Unknow = 13 //never used but it is in the dat file } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/SaveResult.cs b/src/NosCore.Data/Enumerations/SaveResult.cs index 9edc1ccea..ca11b2a1d 100644 --- a/src/NosCore.Data/Enumerations/SaveResult.cs +++ b/src/NosCore.Data/Enumerations/SaveResult.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations { @@ -25,4 +12,4 @@ public enum SaveResult : byte Saved = 1, Error = 3 } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/Enumerations/UpdateStatActionType.cs b/src/NosCore.Data/Enumerations/UpdateStatActionType.cs index 770f1913a..56bfeca75 100644 --- a/src/NosCore.Data/Enumerations/UpdateStatActionType.cs +++ b/src/NosCore.Data/Enumerations/UpdateStatActionType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.Enumerations { @@ -28,4 +15,4 @@ public enum UpdateStatActionType : byte UpdateGold, UpdateClass } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/GameObjectMapper.cs b/src/NosCore.Data/GameObjectMapper.cs index 8c3286608..129f1c796 100644 --- a/src/NosCore.Data/GameObjectMapper.cs +++ b/src/NosCore.Data/GameObjectMapper.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; using Mapster; +using System; namespace NosCore.Data { diff --git a/src/NosCore.Data/SkillPacket.cs b/src/NosCore.Data/SkillPacket.cs index 577b2684a..83c4802b5 100644 --- a/src/NosCore.Data/SkillPacket.cs +++ b/src/NosCore.Data/SkillPacket.cs @@ -1,7 +1,7 @@ -using NosCore.Packets.Attributes; -using NosCore.Packets; -using System.Collections.Generic; +using NosCore.Packets; +using NosCore.Packets.Attributes; using NosCore.Packets.Enumerations; +using System.Collections.Generic; //todo move to NosCore.Packets namespace NosCore.Data diff --git a/src/NosCore.Data/WebApi/AuthIntent.cs b/src/NosCore.Data/WebApi/AuthIntent.cs index 1f422d61f..f7461bc68 100644 --- a/src/NosCore.Data/WebApi/AuthIntent.cs +++ b/src/NosCore.Data/WebApi/AuthIntent.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.WebApi { @@ -24,4 +11,4 @@ public class AuthIntent public long SessionId { get; set; } public string AccountName { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/BazaarLink.cs b/src/NosCore.Data/WebApi/BazaarLink.cs index 0dc2801b6..f218e89b8 100644 --- a/src/NosCore.Data/WebApi/BazaarLink.cs +++ b/src/NosCore.Data/WebApi/BazaarLink.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; @@ -29,4 +16,4 @@ public class BazaarLink public ItemInstanceDto? ItemInstance { get; set; } public string? SellerName { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/BazaarRequest.cs b/src/NosCore.Data/WebApi/BazaarRequest.cs index 0b95f4111..486c3ff27 100644 --- a/src/NosCore.Data/WebApi/BazaarRequest.cs +++ b/src/NosCore.Data/WebApi/BazaarRequest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; @@ -32,4 +19,4 @@ public class BazaarRequest public short Duration { get; set; } public short Amount { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/BlacklistRequest.cs b/src/NosCore.Data/WebApi/BlacklistRequest.cs index 12dd7a64d..4f5484837 100644 --- a/src/NosCore.Data/WebApi/BlacklistRequest.cs +++ b/src/NosCore.Data/WebApi/BlacklistRequest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.ClientPackets.Relations; @@ -26,4 +13,4 @@ public class BlacklistRequest public long CharacterId { get; set; } public BlInsPacket? BlInsPacket { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/Character.cs b/src/NosCore.Data/WebApi/Character.cs index 8ba5ed046..0779c7ca5 100644 --- a/src/NosCore.Data/WebApi/Character.cs +++ b/src/NosCore.Data/WebApi/Character.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Data.WebApi { @@ -26,4 +13,4 @@ public class Character public long Id { get; set; } public bool FriendRequestBlocked { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/CharacterRelationStatus.cs b/src/NosCore.Data/WebApi/CharacterRelationStatus.cs index ed90968a7..7ff507eb8 100644 --- a/src/NosCore.Data/WebApi/CharacterRelationStatus.cs +++ b/src/NosCore.Data/WebApi/CharacterRelationStatus.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Enumerations; using System; @@ -30,4 +17,4 @@ public class CharacterRelationStatus public string? CharacterName { get; set; } public bool IsConnected { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/FriendShipRequest.cs b/src/NosCore.Data/WebApi/FriendShipRequest.cs index 73962170a..86c365c6e 100644 --- a/src/NosCore.Data/WebApi/FriendShipRequest.cs +++ b/src/NosCore.Data/WebApi/FriendShipRequest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.ClientPackets.Relations; @@ -26,4 +13,4 @@ public class FriendShipRequest public long CharacterId { get; set; } public FinsPacket? FinsPacket { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/MailRequest.cs b/src/NosCore.Data/WebApi/MailRequest.cs index 215e7ca71..0e5a663cd 100644 --- a/src/NosCore.Data/WebApi/MailRequest.cs +++ b/src/NosCore.Data/WebApi/MailRequest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using System.ComponentModel.DataAnnotations; @@ -31,4 +18,4 @@ public class MailRequest public sbyte? Rare { get; set; } public byte? Upgrade { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/Subscriber.cs b/src/NosCore.Data/WebApi/Subscriber.cs index 45263881c..77fa741bb 100644 --- a/src/NosCore.Data/WebApi/Subscriber.cs +++ b/src/NosCore.Data/WebApi/Subscriber.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Enumerations; @@ -29,4 +16,4 @@ public class Subscriber public Character? ConnectedCharacter { get; set; } public long Id { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/WareHouseDepositRequest.cs b/src/NosCore.Data/WebApi/WareHouseDepositRequest.cs index 2e0a4f24b..9516f13b4 100644 --- a/src/NosCore.Data/WebApi/WareHouseDepositRequest.cs +++ b/src/NosCore.Data/WebApi/WareHouseDepositRequest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.Data.Enumerations.Miniland; @@ -29,4 +16,4 @@ public class WareHouseDepositRequest public ItemInstanceDto? ItemInstance { get; set; } public short Slot { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Data/WebApi/WarehouseLink.cs b/src/NosCore.Data/WebApi/WarehouseLink.cs index 3d423c0e1..3ff210d28 100644 --- a/src/NosCore.Data/WebApi/WarehouseLink.cs +++ b/src/NosCore.Data/WebApi/WarehouseLink.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; @@ -30,4 +17,4 @@ public class WarehouseLink //todo move this to a generic ItemInstance with a converter public ItemInstanceDto? ItemInstance { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/DesignTimeDbContextFactory.cs b/src/NosCore.Database/DesignTimeDbContextFactory.cs index a290cdf1d..6c897c6a8 100644 --- a/src/NosCore.Database/DesignTimeDbContextFactory.cs +++ b/src/NosCore.Database/DesignTimeDbContextFactory.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; @@ -35,4 +22,4 @@ public NosCoreContext CreateDbContext(string[] args) return new NosCoreContext(optionsBuilder.Options); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Account.cs b/src/NosCore.Database/Entities/Account.cs index 016c80ec6..54147853b 100644 --- a/src/NosCore.Database/Entities/Account.cs +++ b/src/NosCore.Database/Entities/Account.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -46,7 +33,7 @@ public Account() [Required] [MaxLength(255)] - public required string Name { get; set; } + public required string Name { get; set; } [MaxLength(255)] public string? Password { get; set; } @@ -74,4 +61,4 @@ public Account() [MaxLength(255)] public string? MfaSecret { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Act.cs b/src/NosCore.Database/Entities/Act.cs index f5ee31d5f..828cfd143 100644 --- a/src/NosCore.Database/Entities/Act.cs +++ b/src/NosCore.Database/Entities/Act.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.Collections.Generic; @@ -38,10 +25,10 @@ public Act() [Required] [MaxLength(255)] [I18NString(typeof(I18NQuest))] - public required string Title { get; set; } + public required string Title { get; set; } public virtual HashSet ActParts { get; set; } public byte Scene { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/ActPart.cs b/src/NosCore.Database/Entities/ActPart.cs index b4ebbff59..de2d619c3 100644 --- a/src/NosCore.Database/Entities/ActPart.cs +++ b/src/NosCore.Database/Entities/ActPart.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.Collections.Generic; @@ -44,4 +31,4 @@ public ActPart() public virtual HashSet CharacterActParts { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/AuditLog.cs b/src/NosCore.Database/Entities/AuditLog.cs index 8d38d855a..f014277da 100644 --- a/src/NosCore.Database/Entities/AuditLog.cs +++ b/src/NosCore.Database/Entities/AuditLog.cs @@ -2,25 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Audit; using System; using System.ComponentModel.DataAnnotations; -using NodaTime; namespace NosCore.Database.Entities { @@ -31,11 +18,11 @@ public class AuditLog [Required] [MaxLength(80)] - public required string TargetId { get; set; } + public required string TargetId { get; set; } [Required] [MaxLength(32)] - public required string TargetType { get; set; } + public required string TargetType { get; set; } public Instant Time { get; set; } @@ -43,6 +30,6 @@ public class AuditLog [Required] [MaxLength(255)] - public required string Value { get; set; } + public required string Value { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/BCard.cs b/src/NosCore.Database/Entities/BCard.cs index 016edb019..8267c81e8 100644 --- a/src/NosCore.Database/Entities/BCard.cs +++ b/src/NosCore.Database/Entities/BCard.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -59,4 +46,4 @@ public class BCard : IStaticEntity public bool IsLevelDivided { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Base/I18NStringAttribute.cs b/src/NosCore.Database/Entities/Base/I18NStringAttribute.cs index 47ec01875..bfd957a96 100644 --- a/src/NosCore.Database/Entities/Base/I18NStringAttribute.cs +++ b/src/NosCore.Database/Entities/Base/I18NStringAttribute.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; @@ -25,4 +12,4 @@ public class I18NStringAttribute(Type type) : Attribute { public Type Type { get; set; } = type; } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Base/IEntity.cs b/src/NosCore.Database/Entities/Base/IEntity.cs index a96b31bd2..19b5179b3 100644 --- a/src/NosCore.Database/Entities/Base/IEntity.cs +++ b/src/NosCore.Database/Entities/Base/IEntity.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Database.Entities.Base { public interface IEntity { } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Base/IStaticEntity.cs b/src/NosCore.Database/Entities/Base/IStaticEntity.cs index 9f0f27c7d..ccd10ec71 100644 --- a/src/NosCore.Database/Entities/Base/IStaticEntity.cs +++ b/src/NosCore.Database/Entities/Base/IStaticEntity.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Database.Entities.Base { public interface IStaticEntity : IEntity { } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Base/SynchronizableBaseEntity.cs b/src/NosCore.Database/Entities/Base/SynchronizableBaseEntity.cs index cb07239e3..96e653a12 100644 --- a/src/NosCore.Database/Entities/Base/SynchronizableBaseEntity.cs +++ b/src/NosCore.Database/Entities/Base/SynchronizableBaseEntity.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; using System.ComponentModel.DataAnnotations; @@ -29,4 +16,4 @@ public abstract class SynchronizableBaseEntity : IEntity [DatabaseGenerated(DatabaseGeneratedOption.None)] public Guid Id { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/BazaarItem.cs b/src/NosCore.Database/Entities/BazaarItem.cs index a8c65e82c..b58af2ce0 100644 --- a/src/NosCore.Database/Entities/BazaarItem.cs +++ b/src/NosCore.Database/Entities/BazaarItem.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Database.Entities.Base; using System; using System.ComponentModel.DataAnnotations; -using NodaTime; namespace NosCore.Database.Entities { @@ -49,4 +36,4 @@ public class BazaarItem : IEntity public long SellerId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/BoxInstance.cs b/src/NosCore.Database/Entities/BoxInstance.cs index a505c8ada..8e2d31b76 100644 --- a/src/NosCore.Database/Entities/BoxInstance.cs +++ b/src/NosCore.Database/Entities/BoxInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Database.Entities { @@ -23,4 +10,4 @@ public class BoxInstance : SpecialistInstance { public short? HoldingVNum { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Card.cs b/src/NosCore.Database/Entities/Card.cs index 74703f4aa..581162b37 100644 --- a/src/NosCore.Database/Entities/Card.cs +++ b/src/NosCore.Database/Entities/Card.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.Collections.Generic; @@ -46,7 +33,7 @@ public Card() [Required] [MaxLength(255)] [I18NString(typeof(I18NBCard))] - public required string Name { get; set; } + public required string Name { get; set; } public int Delay { get; set; } @@ -62,4 +49,4 @@ public Card() public virtual ICollection StaticBuff { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Character.cs b/src/NosCore.Database/Entities/Character.cs index 70c27cb42..4bd0795ad 100644 --- a/src/NosCore.Database/Entities/Character.cs +++ b/src/NosCore.Database/Entities/Character.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Character; using NosCore.Database.Entities.Base; @@ -173,7 +160,7 @@ public Character() [Required] [MaxLength(255)] - public required string Name { get; set; } + public required string Name { get; set; } public bool QuickGetUp { get; set; } @@ -206,4 +193,4 @@ public Character() public bool WhisperBlocked { get; set; } public virtual ICollection Warehouses { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/CharacterActPart.cs b/src/NosCore.Database/Entities/CharacterActPart.cs index b5ffd78da..d4118f32b 100644 --- a/src/NosCore.Database/Entities/CharacterActPart.cs +++ b/src/NosCore.Database/Entities/CharacterActPart.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; @@ -31,4 +18,4 @@ public class CharacterActPart : SynchronizableBaseEntity public byte CurrentTs; } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/CharacterQuest.cs b/src/NosCore.Database/Entities/CharacterQuest.cs index 837533810..5ccfcb7db 100644 --- a/src/NosCore.Database/Entities/CharacterQuest.cs +++ b/src/NosCore.Database/Entities/CharacterQuest.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using NosCore.Database.Entities.Base; using NodaTime; +using NosCore.Database.Entities.Base; namespace NosCore.Database.Entities { @@ -34,4 +21,4 @@ public class CharacterQuest : SynchronizableBaseEntity public Instant? CompletedOn { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/CharacterRelation.cs b/src/NosCore.Database/Entities/CharacterRelation.cs index 11c9b4b58..b2901b371 100644 --- a/src/NosCore.Database/Entities/CharacterRelation.cs +++ b/src/NosCore.Database/Entities/CharacterRelation.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Packets.Enumerations; @@ -39,4 +26,4 @@ public class CharacterRelation : IEntity public CharacterRelationType RelationType { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Characterskill.cs b/src/NosCore.Database/Entities/Characterskill.cs index fa4b90337..6fffc70b4 100644 --- a/src/NosCore.Database/Entities/Characterskill.cs +++ b/src/NosCore.Database/Entities/Characterskill.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; @@ -31,4 +18,4 @@ public class CharacterSkill : SynchronizableBaseEntity public short SkillVNum { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Combo.cs b/src/NosCore.Database/Entities/Combo.cs index ef3390504..707d2513e 100644 --- a/src/NosCore.Database/Entities/Combo.cs +++ b/src/NosCore.Database/Entities/Combo.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -37,4 +24,4 @@ public class Combo : IStaticEntity public short SkillVNum { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Drop.cs b/src/NosCore.Database/Entities/Drop.cs index b87baed4a..a26b575ad 100644 --- a/src/NosCore.Database/Entities/Drop.cs +++ b/src/NosCore.Database/Entities/Drop.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -43,4 +30,4 @@ public class Drop : IStaticEntity public virtual NpcMonster? NpcMonster { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/EquipmentOption.cs b/src/NosCore.Database/Entities/EquipmentOption.cs index f9accf898..d846a5ee1 100644 --- a/src/NosCore.Database/Entities/EquipmentOption.cs +++ b/src/NosCore.Database/Entities/EquipmentOption.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System; @@ -36,4 +23,4 @@ public class EquipmentOption : SynchronizableBaseEntity public Guid WearableInstanceId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Family.cs b/src/NosCore.Database/Entities/Family.cs index 8ab71f57a..f433905d2 100644 --- a/src/NosCore.Database/Entities/Family.cs +++ b/src/NosCore.Database/Entities/Family.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Packets.Enumerations; @@ -69,10 +56,10 @@ public Family() [Required] [MaxLength(255)] - public required string Name { get; set; } + public required string Name { get; set; } public byte WarehouseSize { get; set; } public virtual ICollection Warehouses { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/FamilyCharacter.cs b/src/NosCore.Database/Entities/FamilyCharacter.cs index 41a46149f..c3c829245 100644 --- a/src/NosCore.Database/Entities/FamilyCharacter.cs +++ b/src/NosCore.Database/Entities/FamilyCharacter.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Family; using NosCore.Database.Entities.Base; @@ -45,4 +32,4 @@ public class FamilyCharacter : IEntity public FamilyMemberRank Rank { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/FamilyLog.cs b/src/NosCore.Database/Entities/FamilyLog.cs index 18a6dd2a6..2f3e74936 100644 --- a/src/NosCore.Database/Entities/FamilyLog.cs +++ b/src/NosCore.Database/Entities/FamilyLog.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Family; using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; -using NodaTime; namespace NosCore.Database.Entities { @@ -40,4 +27,4 @@ public class FamilyLog : IEntity public Instant Timestamp { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NActDesc.cs b/src/NosCore.Database/Entities/I18NActDesc.cs index f1864dabf..89e096f4a 100644 --- a/src/NosCore.Database/Entities/I18NActDesc.cs +++ b/src/NosCore.Database/Entities/I18NActDesc.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NActDesc : IEntity public int I18NActDescId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NBCard.cs b/src/NosCore.Database/Entities/I18NBCard.cs index 23c9353c2..99a40fb20 100644 --- a/src/NosCore.Database/Entities/I18NBCard.cs +++ b/src/NosCore.Database/Entities/I18NBCard.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NBCard : IEntity public int I18NbCardId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NCard.cs b/src/NosCore.Database/Entities/I18NCard.cs index 26b7651e5..b10a9e2e9 100644 --- a/src/NosCore.Database/Entities/I18NCard.cs +++ b/src/NosCore.Database/Entities/I18NCard.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NCard : IEntity public int I18NCardId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NItem.cs b/src/NosCore.Database/Entities/I18NItem.cs index d273fb2e5..4bee692f7 100644 --- a/src/NosCore.Database/Entities/I18NItem.cs +++ b/src/NosCore.Database/Entities/I18NItem.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NItem : IEntity public int I18NItemId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NMapIdData.cs b/src/NosCore.Database/Entities/I18NMapIdData.cs index 301ef70c5..78d54b367 100644 --- a/src/NosCore.Database/Entities/I18NMapIdData.cs +++ b/src/NosCore.Database/Entities/I18NMapIdData.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NMapIdData : IEntity public int I18NMapIdDataId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NMapPointData.cs b/src/NosCore.Database/Entities/I18NMapPointData.cs index 0b861d446..8efa8dbfb 100644 --- a/src/NosCore.Database/Entities/I18NMapPointData.cs +++ b/src/NosCore.Database/Entities/I18NMapPointData.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NMapPointData : IEntity public int I18NMapPointDataId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NNpcMonster.cs b/src/NosCore.Database/Entities/I18NNpcMonster.cs index 34de865df..9d8122fed 100644 --- a/src/NosCore.Database/Entities/I18NNpcMonster.cs +++ b/src/NosCore.Database/Entities/I18NNpcMonster.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NNpcMonster : IEntity public int I18NNpcMonsterId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NNpcMonsterTalk.cs b/src/NosCore.Database/Entities/I18NNpcMonsterTalk.cs index 85a07eb74..ce0e12e6e 100644 --- a/src/NosCore.Database/Entities/I18NNpcMonsterTalk.cs +++ b/src/NosCore.Database/Entities/I18NNpcMonsterTalk.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NNpcMonsterTalk : IEntity public int I18NNpcMonsterTalkId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NQuest.cs b/src/NosCore.Database/Entities/I18NQuest.cs index a5d19718e..e95b7b504 100644 --- a/src/NosCore.Database/Entities/I18NQuest.cs +++ b/src/NosCore.Database/Entities/I18NQuest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NQuest : IEntity public int I18NQuestId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/I18NSkill.cs b/src/NosCore.Database/Entities/I18NSkill.cs index 4d598fc21..170d84476 100644 --- a/src/NosCore.Database/Entities/I18NSkill.cs +++ b/src/NosCore.Database/Entities/I18NSkill.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Shared.Enumerations; @@ -29,11 +16,11 @@ public class I18NSkill : IEntity public int I18NSkillId { get; set; } [Required] - public required string Key { get; set; } + public required string Key { get; set; } public RegionType RegionType { get; set; } [Required] - public required string Text { get; set; } + public required string Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/InventoryItemInstance.cs b/src/NosCore.Database/Entities/InventoryItemInstance.cs index 6641a0eab..fa152098f 100644 --- a/src/NosCore.Database/Entities/InventoryItemInstance.cs +++ b/src/NosCore.Database/Entities/InventoryItemInstance.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.Database.Entities.Base; @@ -46,4 +33,4 @@ public InventoryItemInstance() public NoscorePocketType Type { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Item.cs b/src/NosCore.Database/Entities/Item.cs index ef6c43d54..708f2d3e7 100644 --- a/src/NosCore.Database/Entities/Item.cs +++ b/src/NosCore.Database/Entities/Item.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations; @@ -173,7 +160,7 @@ public Item() [Required] [MaxLength(255)] [I18NString(typeof(I18NItem))] - public required string Name { get; set; } + public required string Name { get; set; } public long Price { get; set; } @@ -215,4 +202,4 @@ public Item() public byte Width { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/ItemInstance.cs b/src/NosCore.Database/Entities/ItemInstance.cs index bab4602cd..85bf9844c 100644 --- a/src/NosCore.Database/Entities/ItemInstance.cs +++ b/src/NosCore.Database/Entities/ItemInstance.cs @@ -2,25 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Database.Entities.Base; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -using NodaTime; namespace NosCore.Database.Entities { @@ -65,4 +52,4 @@ public ItemInstance() public short Rare { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Mail.cs b/src/NosCore.Database/Entities/Mail.cs index 0cf3e5c7a..f170a794c 100644 --- a/src/NosCore.Database/Entities/Mail.cs +++ b/src/NosCore.Database/Entities/Mail.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Database.Entities.Base; using NosCore.Packets.Enumerations; using NosCore.Shared.Enumerations; using System; using System.ComponentModel.DataAnnotations; -using NodaTime; namespace NosCore.Database.Entities { @@ -63,7 +50,7 @@ public class Mail : IEntity [Required] [MaxLength(255)] - public required string Message { get; set; } + public required string Message { get; set; } public virtual Character Receiver { get; set; } = null!; @@ -85,6 +72,6 @@ public class Mail : IEntity [Required] [MaxLength(255)] - public required string Title { get; set; } + public required string Title { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Map.cs b/src/NosCore.Database/Entities/Map.cs index 6559b3ac2..053809f85 100644 --- a/src/NosCore.Database/Entities/Map.cs +++ b/src/NosCore.Database/Entities/Map.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -62,7 +49,7 @@ public Map() [Required] [MaxLength(255)] [I18NString(typeof(I18NMapIdData))] - public required string Name { get; set; } + public required string Name { get; set; } public virtual ICollection Portal { get; set; } @@ -78,4 +65,4 @@ public Map() public virtual ICollection Teleporter { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/MapMonster.cs b/src/NosCore.Database/Entities/MapMonster.cs index 6b3861958..ee9f5d553 100644 --- a/src/NosCore.Database/Entities/MapMonster.cs +++ b/src/NosCore.Database/Entities/MapMonster.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -50,4 +37,4 @@ public class MapMonster : IEntity public byte Direction { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/MapNpc.cs b/src/NosCore.Database/Entities/MapNpc.cs index 0d79cfb68..61974f1af 100644 --- a/src/NosCore.Database/Entities/MapNpc.cs +++ b/src/NosCore.Database/Entities/MapNpc.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -74,4 +61,4 @@ public MapNpc() public virtual NpcTalk? NpcTalk { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/MapType.cs b/src/NosCore.Database/Entities/MapType.cs index 257d635e2..2d883cfb0 100644 --- a/src/NosCore.Database/Entities/MapType.cs +++ b/src/NosCore.Database/Entities/MapType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.Collections.Generic; @@ -41,7 +28,7 @@ public MapType() public virtual ICollection MapTypeMap { get; set; } [Required] - public required string MapTypeName { get; set; } + public required string MapTypeName { get; set; } public short PotionDelay { get; set; } @@ -53,4 +40,4 @@ public MapType() public long? ReturnMapTypeId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/MapTypeMap.cs b/src/NosCore.Database/Entities/MapTypeMap.cs index 978f8ab22..927a4c063 100644 --- a/src/NosCore.Database/Entities/MapTypeMap.cs +++ b/src/NosCore.Database/Entities/MapTypeMap.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -35,4 +22,4 @@ public class MapTypeMap : IStaticEntity public short MapTypeId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Mate.cs b/src/NosCore.Database/Entities/Mate.cs index ac4fab978..6990f8e04 100644 --- a/src/NosCore.Database/Entities/Mate.cs +++ b/src/NosCore.Database/Entities/Mate.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Character; using NosCore.Database.Entities.Base; @@ -69,4 +56,4 @@ public class Mate : IEntity public short Skin { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Miniland.cs b/src/NosCore.Database/Entities/Miniland.cs index 0e7a49640..bb097bc2e 100644 --- a/src/NosCore.Database/Entities/Miniland.cs +++ b/src/NosCore.Database/Entities/Miniland.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Packets.Enumerations; @@ -46,4 +33,4 @@ public class Miniland : IEntity public short WelcomeMusicInfo { get; set; } = 3800; } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/MinilandObject.cs b/src/NosCore.Database/Entities/MinilandObject.cs index e66343f27..5d045cdb1 100644 --- a/src/NosCore.Database/Entities/MinilandObject.cs +++ b/src/NosCore.Database/Entities/MinilandObject.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System; @@ -46,4 +33,4 @@ public class MinilandObject : IEntity [Key] public Guid MinilandObjectId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/NpcMonster.cs b/src/NosCore.Database/Entities/NpcMonster.cs index d27aff8fc..64d711bfd 100644 --- a/src/NosCore.Database/Entities/NpcMonster.cs +++ b/src/NosCore.Database/Entities/NpcMonster.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -114,7 +101,7 @@ public NpcMonster() [Required] [MaxLength(255)] [I18NString(typeof(I18NNpcMonster))] - public required string Name { get; set; } + public required string Name { get; set; } public bool NoAggresiveIcon { get; set; } @@ -148,4 +135,4 @@ public NpcMonster() public virtual ICollection BCards { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/NpcMonsterskill.cs b/src/NosCore.Database/Entities/NpcMonsterskill.cs index e397ff925..c15d243cd 100644 --- a/src/NosCore.Database/Entities/NpcMonsterskill.cs +++ b/src/NosCore.Database/Entities/NpcMonsterskill.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -37,4 +24,4 @@ public class NpcMonsterSkill : IStaticEntity public short SkillVNum { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/NpcTalk.cs b/src/NosCore.Database/Entities/NpcTalk.cs index 271e18c2a..08355a920 100644 --- a/src/NosCore.Database/Entities/NpcTalk.cs +++ b/src/NosCore.Database/Entities/NpcTalk.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -39,8 +26,8 @@ public NpcTalk() [Required] [MaxLength(255)] [I18NString(typeof(I18NNpcMonsterTalk))] - public required string Name { get; set; } + public required string Name { get; set; } public virtual ICollection MapNpc { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/PenaltyLog.cs b/src/NosCore.Database/Entities/PenaltyLog.cs index eaa5f430d..b3fa4836b 100644 --- a/src/NosCore.Database/Entities/PenaltyLog.cs +++ b/src/NosCore.Database/Entities/PenaltyLog.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Interaction; using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; -using NodaTime; namespace NosCore.Database.Entities { @@ -31,7 +18,7 @@ public class PenaltyLog : IEntity public long AccountId { get; set; } [Required] - public required string AdminName { get; set; } + public required string AdminName { get; set; } public Instant DateEnd { get; set; } @@ -44,6 +31,6 @@ public class PenaltyLog : IEntity [Required] [MaxLength(255)] - public required string Reason { get; set; } + public required string Reason { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Portal.cs b/src/NosCore.Database/Entities/Portal.cs index 45280b109..4b4c98412 100644 --- a/src/NosCore.Database/Entities/Portal.cs +++ b/src/NosCore.Database/Entities/Portal.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using NosCore.Packets.Enumerations; @@ -48,4 +35,4 @@ public class Portal : IStaticEntity public PortalType Type { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Quest.cs b/src/NosCore.Database/Entities/Quest.cs index 60b605007..227e3e8e0 100644 --- a/src/NosCore.Database/Entities/Quest.cs +++ b/src/NosCore.Database/Entities/Quest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -80,11 +67,11 @@ public Quest() [Required] [MaxLength(255)] [I18NString(typeof(I18NQuest))] - public required string Title { get; set; } + public required string Title { get; set; } [Required] [MaxLength(255)] [I18NString(typeof(I18NQuest))] - public required string Desc { get; set; } + public required string Desc { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/QuestObjective.cs b/src/NosCore.Database/Entities/QuestObjective.cs index ee5bf7510..d00da6308 100644 --- a/src/NosCore.Database/Entities/QuestObjective.cs +++ b/src/NosCore.Database/Entities/QuestObjective.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -43,4 +30,4 @@ public class QuestObjective : IStaticEntity public virtual Quest Quest { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/QuestQuestReward.cs b/src/NosCore.Database/Entities/QuestQuestReward.cs index c779ed32e..9955fe98d 100644 --- a/src/NosCore.Database/Entities/QuestQuestReward.cs +++ b/src/NosCore.Database/Entities/QuestQuestReward.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System; @@ -42,4 +29,4 @@ public class QuestQuestReward : IStaticEntity [Required] public virtual Quest Quest { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/QuestReward.cs b/src/NosCore.Database/Entities/QuestReward.cs index c3f87c3dc..aa6e6ad34 100644 --- a/src/NosCore.Database/Entities/QuestReward.cs +++ b/src/NosCore.Database/Entities/QuestReward.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -49,4 +36,4 @@ public QuestReward() public virtual ICollection QuestQuestReward { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/QuicklistEntry.cs b/src/NosCore.Database/Entities/QuicklistEntry.cs index fe4c05426..bc84079fa 100644 --- a/src/NosCore.Database/Entities/QuicklistEntry.cs +++ b/src/NosCore.Database/Entities/QuicklistEntry.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; @@ -39,4 +26,4 @@ public class QuicklistEntry : SynchronizableBaseEntity public short Type { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Recipe.cs b/src/NosCore.Database/Entities/Recipe.cs index d857cfd35..adaea671f 100644 --- a/src/NosCore.Database/Entities/Recipe.cs +++ b/src/NosCore.Database/Entities/Recipe.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.Collections.Generic; @@ -45,4 +32,4 @@ public Recipe() public virtual ICollection RecipeItem { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/RecipeItem.cs b/src/NosCore.Database/Entities/RecipeItem.cs index a91741f2f..36e59b8c6 100644 --- a/src/NosCore.Database/Entities/RecipeItem.cs +++ b/src/NosCore.Database/Entities/RecipeItem.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -37,4 +24,4 @@ public class RecipeItem : IEntity [Key] public short RecipeItemId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Respawn.cs b/src/NosCore.Database/Entities/Respawn.cs index 1ab88a799..c0f96e558 100644 --- a/src/NosCore.Database/Entities/Respawn.cs +++ b/src/NosCore.Database/Entities/Respawn.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -43,4 +30,4 @@ public class Respawn : IEntity public short Y { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/RespawnMapType.cs b/src/NosCore.Database/Entities/RespawnMapType.cs index 8782d0d7f..ee6c2a4d6 100644 --- a/src/NosCore.Database/Entities/RespawnMapType.cs +++ b/src/NosCore.Database/Entities/RespawnMapType.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.Collections.Generic; @@ -54,4 +41,4 @@ public RespawnMapType() [DatabaseGenerated(DatabaseGeneratedOption.None)] public long RespawnMapTypeId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/RollGeneratedItem.cs b/src/NosCore.Database/Entities/RollGeneratedItem.cs index 947138654..0d4c75b2a 100644 --- a/src/NosCore.Database/Entities/RollGeneratedItem.cs +++ b/src/NosCore.Database/Entities/RollGeneratedItem.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -51,4 +38,4 @@ public class RollGeneratedItem : IEntity public bool IsSuperReward { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Script.cs b/src/NosCore.Database/Entities/Script.cs index 69684990a..f7aa96ccf 100644 --- a/src/NosCore.Database/Entities/Script.cs +++ b/src/NosCore.Database/Entities/Script.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -50,4 +37,4 @@ public Script() public short? Argument3 { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/ScriptedInstance.cs b/src/NosCore.Database/Entities/ScriptedInstance.cs index aee536a74..191ec566e 100644 --- a/src/NosCore.Database/Entities/ScriptedInstance.cs +++ b/src/NosCore.Database/Entities/ScriptedInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Interaction; using NosCore.Database.Entities.Base; @@ -43,4 +30,4 @@ public class ScriptedInstance : IEntity public ScriptedInstanceType Type { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Shop.cs b/src/NosCore.Database/Entities/Shop.cs index a47ad5f19..06479ec6d 100644 --- a/src/NosCore.Database/Entities/Shop.cs +++ b/src/NosCore.Database/Entities/Shop.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -49,4 +36,4 @@ public Shop() public byte ShopType { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/ShopItem.cs b/src/NosCore.Database/Entities/ShopItem.cs index e0ec1c0b1..29b80d92f 100644 --- a/src/NosCore.Database/Entities/ShopItem.cs +++ b/src/NosCore.Database/Entities/ShopItem.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -48,4 +35,4 @@ public class ShopItem : IStaticEntity public byte Upgrade { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Shopskill.cs b/src/NosCore.Database/Entities/Shopskill.cs index d4de79755..15cb213aa 100644 --- a/src/NosCore.Database/Entities/Shopskill.cs +++ b/src/NosCore.Database/Entities/Shopskill.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.DataAttributes; using NosCore.Data.Enumerations.I18N; @@ -42,4 +29,4 @@ public class ShopSkill : IStaticEntity public byte Type { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Skill.cs b/src/NosCore.Database/Entities/Skill.cs index 243a3e501..6e7c9837d 100644 --- a/src/NosCore.Database/Entities/Skill.cs +++ b/src/NosCore.Database/Entities/Skill.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.Collections.Generic; @@ -82,7 +69,7 @@ public Skill() [Required] [MaxLength(255)] [I18NString(typeof(I18NSkill))] - public required string Name { get; set; } + public required string Name { get; set; } public virtual ICollection NpcMonsterSkill { get; set; } @@ -110,4 +97,4 @@ public Skill() public virtual ICollection BCards { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/SpecialistInstance.cs b/src/NosCore.Database/Entities/SpecialistInstance.cs index 2932f2104..50f46f46c 100644 --- a/src/NosCore.Database/Entities/SpecialistInstance.cs +++ b/src/NosCore.Database/Entities/SpecialistInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Database.Entities { @@ -49,4 +36,4 @@ public class SpecialistInstance : WearableInstance public byte SpWater { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/StaticBonus.cs b/src/NosCore.Database/Entities/StaticBonus.cs index 0124e92d5..1ea9e8685 100644 --- a/src/NosCore.Database/Entities/StaticBonus.cs +++ b/src/NosCore.Database/Entities/StaticBonus.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Buff; using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; -using NodaTime; namespace NosCore.Database.Entities { @@ -37,4 +24,4 @@ public class StaticBonus : IEntity public StaticBonusType StaticBonusType { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/StaticBuff.cs b/src/NosCore.Database/Entities/StaticBuff.cs index 25cbb4391..49a50c707 100644 --- a/src/NosCore.Database/Entities/StaticBuff.cs +++ b/src/NosCore.Database/Entities/StaticBuff.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System.ComponentModel.DataAnnotations; @@ -37,4 +24,4 @@ public class StaticBuff : IEntity [Key] public long StaticBuffId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Teleporter.cs b/src/NosCore.Database/Entities/Teleporter.cs index a62b6cd3d..af9995769 100644 --- a/src/NosCore.Database/Entities/Teleporter.cs +++ b/src/NosCore.Database/Entities/Teleporter.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Interaction; using NosCore.Database.Entities.Base; @@ -44,4 +31,4 @@ public class Teleporter : IStaticEntity [Key] public short TeleporterId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Title.cs b/src/NosCore.Database/Entities/Title.cs index f4977ae39..341bd5ad9 100644 --- a/src/NosCore.Database/Entities/Title.cs +++ b/src/NosCore.Database/Entities/Title.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; @@ -33,4 +20,4 @@ public class Title : SynchronizableBaseEntity public short TitleType { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/UsableInstance.cs b/src/NosCore.Database/Entities/UsableInstance.cs index 39ce3c799..1c4b9ebcf 100644 --- a/src/NosCore.Database/Entities/UsableInstance.cs +++ b/src/NosCore.Database/Entities/UsableInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Database.Entities { @@ -25,4 +12,4 @@ public class UsableInstance : ItemInstance public short? Mp { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/Warehouse.cs b/src/NosCore.Database/Entities/Warehouse.cs index d5d8079d8..38b7f2c68 100644 --- a/src/NosCore.Database/Entities/Warehouse.cs +++ b/src/NosCore.Database/Entities/Warehouse.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Miniland; using NosCore.Database.Entities.Base; @@ -42,4 +29,4 @@ public Warehouse() public WarehouseType Type { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/WarehouseItem.cs b/src/NosCore.Database/Entities/WarehouseItem.cs index b86cdba1a..918796ba7 100644 --- a/src/NosCore.Database/Entities/WarehouseItem.cs +++ b/src/NosCore.Database/Entities/WarehouseItem.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Database.Entities.Base; using System; @@ -40,4 +27,4 @@ public class WarehouseItem : SynchronizableBaseEntity [Required] public short Slot { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Entities/WearableInstance.cs b/src/NosCore.Database/Entities/WearableInstance.cs index 27ed7ac2d..253aedfca 100644 --- a/src/NosCore.Database/Entities/WearableInstance.cs +++ b/src/NosCore.Database/Entities/WearableInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.Database.Entities { @@ -81,4 +68,4 @@ public class WearableInstance : ItemInstance public long? Xp { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Database/Migrations/20220103074410_FirstMigration.cs b/src/NosCore.Database/Migrations/20220103074410_FirstMigration.cs index 658141426..cbd16d538 100644 --- a/src/NosCore.Database/Migrations/20220103074410_FirstMigration.cs +++ b/src/NosCore.Database/Migrations/20220103074410_FirstMigration.cs @@ -1,7 +1,7 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; using NodaTime; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using System; #nullable disable diff --git a/src/NosCore.Database/NosCoreContext.cs b/src/NosCore.Database/NosCoreContext.cs index 874e6df08..1351bc87e 100644 --- a/src/NosCore.Database/NosCoreContext.cs +++ b/src/NosCore.Database/NosCoreContext.cs @@ -2,27 +2,14 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Linq; using Microsoft.EntityFrameworkCore; using NosCore.Dao.Extensions; using NosCore.Database.Entities; using Npgsql; +using System; +using System.Linq; namespace NosCore.Database { @@ -182,7 +169,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .GetTypes() .SelectMany(t => t.GetProperties()) .Where(t => t.PropertyType.IsEnum && t.PropertyType.IsPublic) - .Select(t=>t.PropertyType) + .Select(t => t.PropertyType) .Distinct() .ToList().ForEach(t => HasPostgresEnum(modelBuilder, t)); @@ -747,4 +734,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .OnDelete(DeleteBehavior.Restrict); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Entities/Character.cs b/src/NosCore.GameObject/ComponentEntities/Entities/Character.cs index 83cc89bc6..5baaf6880 100644 --- a/src/NosCore.GameObject/ComponentEntities/Entities/Character.cs +++ b/src/NosCore.GameObject/ComponentEntities/Entities/Character.cs @@ -2,22 +2,10 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; +using NodaTime; using NosCore.Algorithm.DignityService; using NosCore.Algorithm.ExperienceService; using NosCore.Algorithm.HeroExperienceService; @@ -26,6 +14,7 @@ using NosCore.Algorithm.MpService; using NosCore.Algorithm.ReputationService; using NosCore.Core.Configuration; +using NosCore.Core.I18N; using NosCore.Data.Dto; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Group; @@ -34,14 +23,21 @@ using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BattleService; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.ExchangeService; using NosCore.GameObject.Services.GroupService; using NosCore.GameObject.Services.InventoryService; -using NosCore.GameObject.Services.ShopService; using NosCore.GameObject.Services.ItemGenerationService; +using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.MapInstanceGenerationService; using NosCore.GameObject.Services.NRunService; using NosCore.GameObject.Services.QuestService; +using NosCore.GameObject.Services.ShopService; +using NosCore.GameObject.Services.SpeedCalculationService; +using NosCore.Networking; +using NosCore.Networking.SessionGroup; +using NosCore.Networking.SessionGroup.ChannelMatcher; using NosCore.Packets.ClientPackets.Shops; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; @@ -58,15 +54,6 @@ using System.Reactive.Subjects; using System.Threading; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Services.BattleService; -using NosCore.GameObject.Services.BroadcastService; -using NosCore.GameObject.Services.MapChangeService; -using NosCore.GameObject.Services.SpeedCalculationService; -using NosCore.Core.I18N; -using NosCore.Networking; -using NosCore.Networking.SessionGroup; -using NosCore.Networking.SessionGroup.ChannelMatcher; using MailData = NosCore.GameObject.InterChannelCommunication.Messages.MailData; namespace NosCore.GameObject.ComponentEntities.Entities @@ -750,4 +737,4 @@ public Task AddAdditionalSpPointsAsync(int spPointToAdd) return SendPacketAsync(GenerateSpPoint()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Entities/MapDesignObject.cs b/src/NosCore.GameObject/ComponentEntities/Entities/MapDesignObject.cs index 22055a6b6..98eb5a740 100644 --- a/src/NosCore.GameObject/ComponentEntities/Entities/MapDesignObject.cs +++ b/src/NosCore.GameObject/ComponentEntities/Entities/MapDesignObject.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.GameObject.Services.InventoryService; @@ -82,4 +69,4 @@ public MlobjPacket GenerateMapDesignObject(bool isRemoval) }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Entities/MapItem.cs b/src/NosCore.GameObject/ComponentEntities/Entities/MapItem.cs index d7756d3e4..984d486da 100644 --- a/src/NosCore.GameObject/ComponentEntities/Entities/MapItem.cs +++ b/src/NosCore.GameObject/ComponentEntities/Entities/MapItem.cs @@ -1,26 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.GameObject.Services.MapInstanceGenerationService; +using NosCore.GameObject.Services.MapItemGenerationService; using NosCore.Packets.ClientPackets.Drops; using NosCore.Packets.ServerPackets.Entities; using NosCore.Shared.Enumerations; @@ -28,8 +17,6 @@ using System.Collections.Generic; using System.Reactive.Subjects; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Services.MapItemGenerationService; namespace NosCore.GameObject.ComponentEntities.Entities { @@ -78,4 +65,4 @@ public DropPacket GenerateDrop() }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Entities/MapMonster.cs b/src/NosCore.GameObject/ComponentEntities/Entities/MapMonster.cs index 81dc4eb5d..83be3c12f 100644 --- a/src/NosCore.GameObject/ComponentEntities/Entities/MapMonster.cs +++ b/src/NosCore.GameObject/ComponentEntities/Entities/MapMonster.cs @@ -2,37 +2,24 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Dto; using NosCore.Data.StaticEntities; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Services.MapInstanceGenerationService; using NosCore.GameObject.Services.ShopService; +using NosCore.GameObject.Services.SpeedCalculationService; using NosCore.PathFinder.Interfaces; using NosCore.Shared.Enumerations; using Serilog; using System; +using System.Collections.Concurrent; using System.Reactive.Linq; -using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Services.SpeedCalculationService; using System.Threading; -using System.Collections.Concurrent; +using System.Threading.Tasks; namespace NosCore.GameObject.ComponentEntities.Entities { @@ -125,4 +112,4 @@ private Task MonsterLifeAsync() return this.MoveAsync(distanceCalculator, clock); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Entities/MapNpc.cs b/src/NosCore.GameObject/ComponentEntities/Entities/MapNpc.cs index fe294fc6f..f873ed7ff 100644 --- a/src/NosCore.GameObject/ComponentEntities/Entities/MapNpc.cs +++ b/src/NosCore.GameObject/ComponentEntities/Entities/MapNpc.cs @@ -2,22 +2,10 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; +using NodaTime; using NosCore.Data.Dto; using NosCore.Data.StaticEntities; using NosCore.GameObject.ComponentEntities.Extensions; @@ -35,9 +23,8 @@ using System.Collections.Generic; using System.Reactive.Linq; using System.Reactive.Subjects; -using System.Threading.Tasks; -using NodaTime; using System.Threading; +using System.Threading.Tasks; namespace NosCore.GameObject.ComponentEntities.Entities { @@ -159,4 +146,4 @@ private Task MonsterLifeAsync() return this.MoveAsync(distanceCalculator, clock); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Entities/Pet.cs b/src/NosCore.GameObject/ComponentEntities/Entities/Pet.cs index a683671fe..b82007694 100644 --- a/src/NosCore.GameObject/ComponentEntities/Entities/Pet.cs +++ b/src/NosCore.GameObject/ComponentEntities/Entities/Pet.cs @@ -1,22 +1,10 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Dto; using NosCore.Data.StaticEntities; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -26,7 +14,6 @@ using NosCore.Shared.Enumerations; using System; using System.Collections.Concurrent; -using NodaTime; using System.Threading; namespace NosCore.GameObject.ComponentEntities.Entities @@ -87,4 +74,4 @@ internal void Initialize(NpcMonsterDto npcMonster) IsAlive = true; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Entities/Portal.cs b/src/NosCore.GameObject/ComponentEntities/Entities/Portal.cs index 2961c253d..9c6ab0909 100644 --- a/src/NosCore.GameObject/ComponentEntities/Entities/Portal.cs +++ b/src/NosCore.GameObject/ComponentEntities/Entities/Portal.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.StaticEntities; using NosCore.Packets.ServerPackets.Portals; @@ -41,4 +28,4 @@ public GpPacket GenerateGp() }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Extensions/AliveEntityExtension.cs b/src/NosCore.GameObject/ComponentEntities/Extensions/AliveEntityExtension.cs index acf1f8927..e7c1ae5dd 100644 --- a/src/NosCore.GameObject/ComponentEntities/Extensions/AliveEntityExtension.cs +++ b/src/NosCore.GameObject/ComponentEntities/Extensions/AliveEntityExtension.cs @@ -1,26 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService.Item; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.ClientPackets.Npcs; using NosCore.Packets.Enumerations; @@ -39,8 +28,6 @@ using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.Networking; namespace NosCore.GameObject.ComponentEntities.Extensions @@ -382,4 +369,4 @@ public static NInvPacket GenerateNInv(this IAliveEntity aliveEntity, double perc }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Extensions/CharacterEntityExtension.cs b/src/NosCore.GameObject/ComponentEntities/Extensions/CharacterEntityExtension.cs index 8528aa072..5824480e4 100644 --- a/src/NosCore.GameObject/ComponentEntities/Extensions/CharacterEntityExtension.cs +++ b/src/NosCore.GameObject/ComponentEntities/Extensions/CharacterEntityExtension.cs @@ -2,27 +2,25 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; +using NosCore.Algorithm.ExperienceService; +using NosCore.Algorithm.HeroExperienceService; +using NosCore.Algorithm.JobExperienceService; using NosCore.Core.Configuration; +using NosCore.Data; using NosCore.Data.Enumerations; +using NosCore.Data.Enumerations.Buff; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Interaction; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.Services.BattleService; +using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.Packets.ClientPackets.Player; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; @@ -34,28 +32,17 @@ using NosCore.Packets.ServerPackets.MiniMap; using NosCore.Packets.ServerPackets.Player; using NosCore.Packets.ServerPackets.Quest; +using NosCore.Packets.ServerPackets.Quicklist; using NosCore.Packets.ServerPackets.Relations; using NosCore.Packets.ServerPackets.UI; using NosCore.Packets.ServerPackets.Visibility; using NosCore.Shared.Enumerations; +using NosCore.Shared.I18N; +using Serilog; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.Algorithm.ExperienceService; -using NosCore.Algorithm.HeroExperienceService; -using NosCore.Algorithm.JobExperienceService; -using NosCore.Data; -using NosCore.Data.Enumerations.Buff; -using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; -using NosCore.GameObject.Services.ItemGenerationService.Item; -using NosCore.Packets.ServerPackets.Quicklist; -using NosCore.Shared.I18N; -using Serilog; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.Services.BattleService; using PostedPacket = NosCore.GameObject.InterChannelCommunication.Messages.PostedPacket; namespace NosCore.GameObject.ComponentEntities.Extensions @@ -709,4 +696,4 @@ public static CInfoPacket GenerateCInfo(this ICharacterEntity visualEntity) }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Extensions/GroupExtension.cs b/src/NosCore.GameObject/ComponentEntities/Extensions/GroupExtension.cs index 1ede33863..42bf2d326 100644 --- a/src/NosCore.GameObject/ComponentEntities/Extensions/GroupExtension.cs +++ b/src/NosCore.GameObject/ComponentEntities/Extensions/GroupExtension.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Services.GroupService; @@ -37,4 +24,4 @@ public static PidxPacket GeneratePidx(this Group group, INamedEntity entity) }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Extensions/ItemInstanceExtension.cs b/src/NosCore.GameObject/ComponentEntities/Extensions/ItemInstanceExtension.cs index 26d9f1c58..f59e4f2fb 100644 --- a/src/NosCore.GameObject/ComponentEntities/Extensions/ItemInstanceExtension.cs +++ b/src/NosCore.GameObject/ComponentEntities/Extensions/ItemInstanceExtension.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.GameObject.Services.InventoryService; @@ -105,4 +92,4 @@ public static IvnPacket GeneratePocketChange(this InventoryItemInstance? itemIns } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Extensions/VisualEntityExtension.cs b/src/NosCore.GameObject/ComponentEntities/Extensions/VisualEntityExtension.cs index 53af3ef53..a8ec4bcbb 100644 --- a/src/NosCore.GameObject/ComponentEntities/Extensions/VisualEntityExtension.cs +++ b/src/NosCore.GameObject/ComponentEntities/Extensions/VisualEntityExtension.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -86,4 +73,4 @@ public static SpeakPacket GenerateSpk(this INamedEntity visualEntity, SpeakPacke }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Interfaces/IAliveEntity.cs b/src/NosCore.GameObject/ComponentEntities/Interfaces/IAliveEntity.cs index 14bc84374..c4837f262 100644 --- a/src/NosCore.GameObject/ComponentEntities/Interfaces/IAliveEntity.cs +++ b/src/NosCore.GameObject/ComponentEntities/Interfaces/IAliveEntity.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Services.ShopService; using System.Collections.Concurrent; using System.Threading; -using NosCore.GameObject.Services.ShopService; namespace NosCore.GameObject.ComponentEntities.Interfaces { @@ -67,6 +54,6 @@ public interface IAliveEntity : IVisualEntity SemaphoreSlim HitSemaphore { get; } - ConcurrentDictionary HitList {get;} + ConcurrentDictionary HitList { get; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Interfaces/ICharacterEntity.cs b/src/NosCore.GameObject/ComponentEntities/Interfaces/ICharacterEntity.cs index deaaec475..4c193ca70 100644 --- a/src/NosCore.GameObject/ComponentEntities/Interfaces/ICharacterEntity.cs +++ b/src/NosCore.GameObject/ComponentEntities/Interfaces/ICharacterEntity.cs @@ -1,27 +1,18 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Services.BattleService; +using NosCore.GameObject.Services.GroupService; using NosCore.GameObject.Services.InventoryService; +using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.QuestService; +using NosCore.Networking; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; using NosCore.Shared.Enumerations; @@ -29,10 +20,6 @@ using System.Collections.Concurrent; 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; namespace NosCore.GameObject.ComponentEntities.Interfaces @@ -88,7 +75,7 @@ public interface ICharacterEntity : INamedEntity, IRequestableEntity RegionType AccountLanguage { get; } - List StaticBonusList { get; } + List StaticBonusList { get; } List Titles { get; } @@ -97,8 +84,8 @@ public interface ICharacterEntity : INamedEntity, IRequestableEntity Guid? CurrentScriptId { get; } ConcurrentDictionary Quests { get; } short Compliment { get; } - long Reput { get; } - short Dignity { get; } + long Reput { get; } + short Dignity { get; } Task GenerateMailAsync(IEnumerable data); @@ -131,4 +118,4 @@ public interface ICharacterEntity : INamedEntity, IRequestableEntity Task ChangeMapAsync(IMapChangeService mapChangeService, short mapId, short mapX, short mapY); string GetMessageFromKey(LanguageKey support); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Interfaces/ICountableEntity.cs b/src/NosCore.GameObject/ComponentEntities/Interfaces/ICountableEntity.cs index 4cee016ce..be1778cd1 100644 --- a/src/NosCore.GameObject/ComponentEntities/Interfaces/ICountableEntity.cs +++ b/src/NosCore.GameObject/ComponentEntities/Interfaces/ICountableEntity.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.GameObject.ComponentEntities.Interfaces { @@ -23,4 +10,4 @@ public interface ICountableEntity : IVisualEntity { short Amount { get; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Interfaces/INamedEntity.cs b/src/NosCore.GameObject/ComponentEntities/Interfaces/INamedEntity.cs index 251b4f24e..0e3b49242 100644 --- a/src/NosCore.GameObject/ComponentEntities/Interfaces/INamedEntity.cs +++ b/src/NosCore.GameObject/ComponentEntities/Interfaces/INamedEntity.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Services.GroupService; @@ -29,4 +16,4 @@ public interface INamedEntity : IAliveEntity long LevelXp { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Interfaces/INonPlayableEntity.cs b/src/NosCore.GameObject/ComponentEntities/Interfaces/INonPlayableEntity.cs index 7f7570f91..53897cf1f 100644 --- a/src/NosCore.GameObject/ComponentEntities/Interfaces/INonPlayableEntity.cs +++ b/src/NosCore.GameObject/ComponentEntities/Interfaces/INonPlayableEntity.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using NosCore.Data.StaticEntities; using NodaTime; +using NosCore.Data.StaticEntities; namespace NosCore.GameObject.ComponentEntities.Interfaces { @@ -36,4 +23,4 @@ public interface INonPlayableEntity : IAliveEntity Instant LastMove { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Interfaces/IRequestableEntity.cs b/src/NosCore.GameObject/ComponentEntities/Interfaces/IRequestableEntity.cs index a9b41d47f..851b9792f 100644 --- a/src/NosCore.GameObject/ComponentEntities/Interfaces/IRequestableEntity.cs +++ b/src/NosCore.GameObject/ComponentEntities/Interfaces/IRequestableEntity.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Networking.ClientSession; using System; @@ -36,4 +23,4 @@ public interface IRequestableEntity { Dictionary> Requests { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/ComponentEntities/Interfaces/IVisualEntity.cs b/src/NosCore.GameObject/ComponentEntities/Interfaces/IVisualEntity.cs index d14ea2b8f..b1e2b6ddd 100644 --- a/src/NosCore.GameObject/ComponentEntities/Interfaces/IVisualEntity.cs +++ b/src/NosCore.GameObject/ComponentEntities/Interfaces/IVisualEntity.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Services.MapInstanceGenerationService; using NosCore.Shared.Enumerations; @@ -41,4 +28,4 @@ public interface IVisualEntity short PositionY { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Infastructure/IEventHandler.cs b/src/NosCore.GameObject/Infastructure/IEventHandler.cs index 5f5245ad0..14db42a68 100644 --- a/src/NosCore.GameObject/Infastructure/IEventHandler.cs +++ b/src/NosCore.GameObject/Infastructure/IEventHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Networking.ClientSession; using System.Threading.Tasks; @@ -32,4 +19,4 @@ public interface IEventHandler : IEventHandler public interface IEventHandler { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Infastructure/IPacketHandler.cs b/src/NosCore.GameObject/Infastructure/IPacketHandler.cs index c356eb908..5b58c3a58 100644 --- a/src/NosCore.GameObject/Infastructure/IPacketHandler.cs +++ b/src/NosCore.GameObject/Infastructure/IPacketHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Interfaces; @@ -50,4 +37,4 @@ public Task ExecuteAsync(IPacket packet, ClientSession clientSession) return ExecuteAsync((TPacket)packet, clientSession); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/HubConnectionFactory.cs b/src/NosCore.GameObject/InterChannelCommunication/HubConnectionFactory.cs index 872dc96e0..04f77a0e1 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/HubConnectionFactory.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/HubConnectionFactory.cs @@ -1,26 +1,9 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using System.Text; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR.Client; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; @@ -29,6 +12,10 @@ using NosCore.Shared.Authentication; using NosCore.Shared.Configuration; using NosCore.Shared.Enumerations; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication; @@ -65,4 +52,4 @@ public HubConnection Create(string name) }) .Build(); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHub.cs index ca19d10cd..2079347e5 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHub.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using Microsoft.AspNetCore.SignalR; +using NosCore.GameObject.Services.AuthService; using System; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; -using NosCore.GameObject.Services.AuthService; namespace NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub { @@ -79,4 +66,4 @@ public Task SetAwaitingConnectionAsync(long sessionId, string accountName) } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHubClient.cs index f3623b36d..43ae21412 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/AuthHubClient.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR.Client; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub { @@ -41,4 +28,4 @@ public async Task SetAwaitingConnectionAsync(long sessionId, string accountName) await _hubConnection.StopAsync(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/IAuthHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/IAuthHub.cs index cef019125..d65d07b83 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/IAuthHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/AuthHub/IAuthHub.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Threading.Tasks; @@ -26,4 +13,4 @@ public interface IAuthHub Task GetAwaitingConnectionAsync(string? name, string? packetPassword, int clientSessionSessionId); Task SetAwaitingConnectionAsync(long sessionId, string accountName); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BaseHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BaseHubClient.cs index bfdd2a70e..b646ac404 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BaseHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BaseHubClient.cs @@ -3,27 +3,14 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Threading; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR.Client; using Polly; using Polly.Retry; using Serilog; +using System; +using System.Threading; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs; diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHub.cs index 433a432d6..10984d0b0 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHub.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.Services.BazaarService; using NosCore.Packets.Enumerations; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub { @@ -35,9 +22,9 @@ public Task> GetBazaar(long id, byte? index, byte? pageSize, Ba public Task DeleteBazaarAsync(long id, short count, string requestCharacterName, long? requestCharacterId = null) => bazaarService.DeleteBazaarAsync(id, count, requestCharacterName, requestCharacterId); - public Task AddBazaarAsync( BazaarRequest bazaarRequest) => bazaarService.AddBazaarAsync(bazaarRequest.ItemInstanceId, + public Task AddBazaarAsync(BazaarRequest bazaarRequest) => bazaarService.AddBazaarAsync(bazaarRequest.ItemInstanceId, bazaarRequest.CharacterId, bazaarRequest.CharacterName, bazaarRequest.HasMedal, bazaarRequest.Price, bazaarRequest.IsPackage, bazaarRequest.Duration, bazaarRequest.Amount); public Task ModifyBazaarAsync(long id, Json.Patch.JsonPatch bzMod) => bazaarService.ModifyBazaarAsync(id, bzMod); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHubClient.cs index 1f77693e7..b4ad8777e 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/BazaarHubClient.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.Packets.Enumerations; using Serilog; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub { diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/IBazaarHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/IBazaarHub.cs index d7ba5987d..88ef1db82 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/IBazaarHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BazaarHub/IBazaarHub.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Collections.Generic; -using System.Threading.Tasks; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.Packets.Enumerations; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; @@ -32,4 +19,4 @@ Task> GetBazaar(long id, byte? index, byte? pageSize, BazaarLis Task DeleteBazaarAsync(long id, short count, string requestCharacterName, long? requestCharacterId = null); Task AddBazaarAsync(BazaarRequest bazaarRequest); Task ModifyBazaarAsync(long id, Json.Patch.JsonPatch bzMod); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHub.cs index deb5c6d95..9a56e1199 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHub.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.Services.BlackListService; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub { @@ -35,4 +22,4 @@ public class BlacklistHub(IBlacklistService blacklistService) : Hub, IBlacklistH public async Task DeleteAsync(Guid id) => await blacklistService.UnblacklistAsync(id); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHubClient.cs index d30c78134..4ccb6dbd7 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/BlacklistHubClient.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using Serilog; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub { diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/IBlacklistHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/IBlacklistHub.cs index 718096fe0..beccb763f 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/IBlacklistHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/BlacklistHub/IBlacklistHub.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.Data.Enumerations.I18N; +using NosCore.Data.WebApi; using System; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Data.Enumerations.I18N; -using NosCore.Data.WebApi; namespace NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; @@ -30,4 +17,4 @@ public interface IBlacklistHub Task AddBlacklistAsync(BlacklistRequest blacklistRequest); Task> GetBlacklistedAsync(long id); Task DeleteAsync(Guid id); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHub.cs index 9686b308f..484cd89c7 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHub.cs @@ -1,28 +1,9 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; using NosCore.Core; @@ -30,6 +11,12 @@ using NosCore.Data.WebApi; using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.Shared.I18N; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub { @@ -98,4 +85,4 @@ public Task SetMaintenance(bool isGlobal, bool value) return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHubClient.cs index 077bdfbd6..418ccf0a6 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/ChannelHubClient.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR.Client; using NosCore.Core; using NosCore.Data.Enumerations.I18N; using NosCore.Shared.I18N; using Polly; using Serilog; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub { diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/IChannelHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/IChannelHub.cs index 24ff17cfc..6ddd7c37d 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/IChannelHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/ChannelHub/IChannelHub.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.Core; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Core; namespace NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; @@ -31,4 +18,4 @@ public interface IChannelHub Task SetMaintenance(bool isGlobal, bool value); Task Ping(); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHub.cs index 2963e3228..b8b236619 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHub.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.Services.FriendService; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub { @@ -35,4 +22,4 @@ public class FriendHub(IFriendService friendService) : Hub, IFriendHub public async Task DeleteAsync(Guid id) => await friendService.DeleteAsync(id); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHubClient.cs index bb45e2f15..fd2a1ca74 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/FriendHubClient.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using Serilog; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub { diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/IFriendHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/IFriendHub.cs index dd05a8095..7b5bbbd72 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/IFriendHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/FriendHub/IFriendHub.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.Data.Enumerations.I18N; +using NosCore.Data.WebApi; using System; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Data.Enumerations.I18N; -using NosCore.Data.WebApi; namespace NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; @@ -30,4 +17,4 @@ public interface IFriendHub Task AddFriendAsync(FriendShipRequest friendPacket); Task> GetFriendsAsync(long id); Task DeleteAsync(Guid id); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/IMailHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/IMailHub.cs index 562e2d4f4..674a7e041 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/IMailHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/IMailHub.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Collections.Generic; -using System.Threading.Tasks; using Json.Patch; using NosCore.Data.WebApi; using NosCore.GameObject.InterChannelCommunication.Messages; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; @@ -31,4 +18,4 @@ public interface IMailHub Task DeleteMailAsync(long id, long characterId, bool senderCopy); Task ViewMailAsync(long id, JsonPatch mailData); Task SendMailAsync(MailRequest mail); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHub.cs index 0d12a82be..f376f1a7a 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHub.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Collections.Generic; -using System.Threading.Tasks; using Json.Patch; using Microsoft.AspNetCore.SignalR; using NosCore.Data.WebApi; using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Services.MailService; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.MailHub { @@ -35,6 +22,6 @@ public class MailHub(IMailService mailService) : Hub, IMailHub public Task ViewMailAsync(long id, JsonPatch mailData) => mailService.EditMailAsync(id, mailData); - public Task SendMailAsync( MailRequest mail) => mailService.SendMailAsync(mail.Mail!, mail.VNum, mail.Amount, mail.Rare, mail.Upgrade); + public Task SendMailAsync(MailRequest mail) => mailService.SendMailAsync(mail.Mail!, mail.VNum, mail.Amount, mail.Rare, mail.Upgrade); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHubClient.cs index 7adec906d..dd448bb72 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/MailHub/MailHubClient.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Json.Patch; using NosCore.Data.WebApi; using NosCore.GameObject.InterChannelCommunication.Messages; using Serilog; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.MailHub { diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/IPubSubHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/IPubSubHub.cs index 7292e0d3e..bc19f26ad 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/IPubSubHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/IPubSubHub.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using NosCore.Data.WebApi; +using NosCore.GameObject.InterChannelCommunication.Messages; using System; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Data.WebApi; -using NosCore.GameObject.InterChannelCommunication.Messages; namespace NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; @@ -47,4 +34,4 @@ public interface IPubSubHubClient : IPubSubHub Task StopAsync(); bool IsConnected { get; } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHub.cs index 9aeb11c85..723d985dc 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHub.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using Microsoft.AspNetCore.SignalR; +using NosCore.Data.WebApi; +using NosCore.GameObject.InterChannelCommunication.Messages; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; -using NosCore.Data.WebApi; -using NosCore.GameObject.InterChannelCommunication.Messages; namespace NosCore.GameObject.InterChannelCommunication.Hubs.PubSub { @@ -71,4 +58,4 @@ public Task UnsubscribeAsync(long id) return Task.FromResult(masterClientList.ConnectedAccounts[Context.UserIdentifier].TryRemove(id, out _)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHubClient.cs index 44a9453fb..618e6194c 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/PubSub/PubSubHubClient.cs @@ -1,13 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR.Client; +using Microsoft.AspNetCore.SignalR.Client; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.Shared.I18N; using Serilog; +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.PubSub { diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/IWarehouseHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/IWarehouseHub.cs index 3e06a3630..b8247eede 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/IWarehouseHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/IWarehouseHub.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.Data.Enumerations.Miniland; +using NosCore.Data.WebApi; using System; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Data.Enumerations.Miniland; -using NosCore.Data.WebApi; namespace NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; @@ -30,4 +17,4 @@ public interface IWarehouseHub Task> GetWarehouseItems(Guid? id, long? ownerId, WarehouseType warehouseType, byte? slot); Task DeleteWarehouseItemAsync(Guid id); Task AddWarehouseItemAsync(WareHouseDepositRequest depositRequest); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHub.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHub.cs index 32a06d5b2..13fca367c 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHub.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHub.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using NosCore.Data.Enumerations.Miniland; using NosCore.Data.WebApi; using NosCore.GameObject.Services.WarehouseService; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub { @@ -33,6 +20,6 @@ public class WarehouseHub(IWarehouseService warehouseService) : Hub, IWarehouseH public Task DeleteWarehouseItemAsync(Guid id) => warehouseService.WithdrawItemAsync(id); - public Task AddWarehouseItemAsync( WareHouseDepositRequest depositRequest) => warehouseService.DepositItemAsync(depositRequest.OwnerId, depositRequest.WarehouseType, depositRequest.ItemInstance, depositRequest.Slot); + public Task AddWarehouseItemAsync(WareHouseDepositRequest depositRequest) => warehouseService.DepositItemAsync(depositRequest.OwnerId, depositRequest.WarehouseType, depositRequest.ItemInstance, depositRequest.Slot); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHubClient.cs b/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHubClient.cs index d17494cca..9a927f487 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHubClient.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Hubs/WarehouseHub/WarehouseHubClient.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using NosCore.Data.Enumerations.Miniland; using NosCore.Data.WebApi; using Serilog; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub { diff --git a/src/NosCore.GameObject/InterChannelCommunication/MasterClientList.cs b/src/NosCore.GameObject/InterChannelCommunication/MasterClientList.cs index 8dd26f209..10360775f 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/MasterClientList.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/MasterClientList.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Collections.Concurrent; using NosCore.Core; using NosCore.Data.WebApi; +using System.Collections.Concurrent; namespace NosCore.GameObject.InterChannelCommunication; @@ -32,4 +19,4 @@ public class MasterClientList public ConcurrentDictionary ReadyForAuth { get; } = new(); public ConcurrentDictionary AuthCodes { get; } = new(); -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Messages/IMessage.cs b/src/NosCore.GameObject/InterChannelCommunication/Messages/IMessage.cs index 13add2e7a..2075be620 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Messages/IMessage.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Messages/IMessage.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; @@ -25,4 +12,4 @@ public interface IMessage { public Guid Id { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Messages/MailData.cs b/src/NosCore.GameObject/InterChannelCommunication/Messages/MailData.cs index 17b904410..79538b841 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Messages/MailData.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Messages/MailData.cs @@ -1,30 +1,17 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Globalization; using NosCore.Data.Dto; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; using NosCore.Packets.ServerPackets.Parcel; using NosCore.Packets.ServerPackets.Visibility; using NosCore.Shared.Enumerations; +using System; +using System.Globalization; namespace NosCore.GameObject.InterChannelCommunication.Messages { @@ -115,4 +102,4 @@ public PostPacket GeneratePostMessage(int type) public Guid Id { get; set; } = Guid.NewGuid(); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Messages/PostedPacket.cs b/src/NosCore.GameObject/InterChannelCommunication/Messages/PostedPacket.cs index 8310b95d7..bc1285fbd 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Messages/PostedPacket.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Messages/PostedPacket.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; using NosCore.Data.Enumerations.Interaction; +using System; namespace NosCore.GameObject.InterChannelCommunication.Messages { @@ -35,4 +22,4 @@ public class PostedPacket : IMessage public ReceiverType ReceiverType { get; set; } public Guid Id { get; set; } = Guid.NewGuid(); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/Messages/StatData.cs b/src/NosCore.GameObject/InterChannelCommunication/Messages/StatData.cs index 2b8eb7530..ffa12a62f 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/Messages/StatData.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/Messages/StatData.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; using NosCore.Data.Enumerations; +using System; namespace NosCore.GameObject.InterChannelCommunication.Messages { @@ -31,4 +18,4 @@ public class StatData : IMessage public long Data { get; set; } //TODO: find other type(s) public Guid Id { get; set; } = Guid.NewGuid(); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/InterChannelCommunication/PolymorphicConverter.cs b/src/NosCore.GameObject/InterChannelCommunication/PolymorphicConverter.cs index 5198bbf20..d31df3e5f 100644 --- a/src/NosCore.GameObject/InterChannelCommunication/PolymorphicConverter.cs +++ b/src/NosCore.GameObject/InterChannelCommunication/PolymorphicConverter.cs @@ -1,27 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System; using System.Text.Json; using System.Text.Json.Serialization; namespace NosCore.GameObject.InterChannelCommunication; + public class PolymorphicJsonConverter : JsonConverter { //Inspired by https://learn.microsoft.com/en-us/dotnet/standard/serialization/system-text-json/converters-how-to?pivots=dotnet-6-0#support-polymorphic-deserialization @@ -90,4 +78,4 @@ public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions JsonSerializer.Serialize(writer, value, value.GetType()); writer.WriteEndObject(); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Map/Map.cs b/src/NosCore.GameObject/Map/Map.cs index 406d729c6..37f0b102f 100644 --- a/src/NosCore.GameObject/Map/Map.cs +++ b/src/NosCore.GameObject/Map/Map.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.StaticEntities; using NosCore.PathFinder.Interfaces; @@ -137,4 +124,4 @@ private static bool IsWalkable(byte value) return (value == 0) || (value == 2) || ((value >= 16) && (value <= 19)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Networking/Broadcaster.cs b/src/NosCore.GameObject/Networking/Broadcaster.cs index c217141d9..cb0a294b0 100644 --- a/src/NosCore.GameObject/Networking/Broadcaster.cs +++ b/src/NosCore.GameObject/Networking/Broadcaster.cs @@ -1,30 +1,17 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.WebApi; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.Networking.SessionGroup; using NosCore.Packets.Interfaces; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using NosCore.Networking.SessionGroup; namespace NosCore.GameObject.Networking { @@ -110,4 +97,4 @@ public List ConnectedAccounts() }).ToList(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Networking/ClientSession/ClientSession.cs b/src/NosCore.GameObject/Networking/ClientSession/ClientSession.cs index 569863a7e..1f5c39830 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/ClientSession.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/ClientSession.cs @@ -3,40 +3,27 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Core.I18N; using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.ComponentEntities.Entities; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.Services.BroadcastService; +using NosCore.GameObject.Services.CharacterService; +using NosCore.GameObject.Services.PacketHandlerService; +using NosCore.Networking; +using NosCore.Networking.Encoding; using NosCore.Packets.Attributes; using NosCore.Packets.Interfaces; +using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.Services.BroadcastService; -using NosCore.GameObject.Services.CharacterService; -using NosCore.GameObject.Services.PacketHandlerService; -using NosCore.Networking; -using NosCore.Networking.Encoding; -using NosCore.Shared.I18N; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Networking.ClientSession { diff --git a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/ExchangeDisconnectHandler.cs b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/ExchangeDisconnectHandler.cs index 720414a20..a3eb6dae6 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/ExchangeDisconnectHandler.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/ExchangeDisconnectHandler.cs @@ -3,25 +3,12 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.ExchangeService; using NosCore.Packets.Enumerations; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession.DisconnectHandlers; diff --git a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/FriendNotificationDisconnectHandler.cs b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/FriendNotificationDisconnectHandler.cs index a31281806..19e8a4f74 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/FriendNotificationDisconnectHandler.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/FriendNotificationDisconnectHandler.cs @@ -3,25 +3,12 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.Packets.Interfaces; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession.DisconnectHandlers; diff --git a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/GroupDisconnectHandler.cs b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/GroupDisconnectHandler.cs index 0c34ea22b..2a8ef854f 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/GroupDisconnectHandler.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/GroupDisconnectHandler.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Threading.Tasks; diff --git a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MapDisconnectHandler.cs b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MapDisconnectHandler.cs index ec5f33819..349eff6fe 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MapDisconnectHandler.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MapDisconnectHandler.cs @@ -3,23 +3,10 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.Networking; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession.DisconnectHandlers; diff --git a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MinilandDisconnectHandler.cs b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MinilandDisconnectHandler.cs index 9ae60a205..ad16510c9 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MinilandDisconnectHandler.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/MinilandDisconnectHandler.cs @@ -3,24 +3,11 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Threading.Tasks; using NosCore.GameObject.Services.MapInstanceGenerationService; using NosCore.GameObject.Services.MinilandService; +using System; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession.DisconnectHandlers; diff --git a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/SaveDisconnectHandler.cs b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/SaveDisconnectHandler.cs index eda5522f6..0137dbc6b 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/SaveDisconnectHandler.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/DisconnectHandlers/SaveDisconnectHandler.cs @@ -3,22 +3,9 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.GameObject.Services.SaveService; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession.DisconnectHandlers; diff --git a/src/NosCore.GameObject/Networking/ClientSession/IPacketHandlingStrategy.cs b/src/NosCore.GameObject/Networking/ClientSession/IPacketHandlingStrategy.cs index 806932269..7f14efb80 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/IPacketHandlingStrategy.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/IPacketHandlingStrategy.cs @@ -3,22 +3,9 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.Packets.Interfaces; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession; diff --git a/src/NosCore.GameObject/Networking/ClientSession/ISessionDisconnectHandler.cs b/src/NosCore.GameObject/Networking/ClientSession/ISessionDisconnectHandler.cs index d4ae8e7e1..902b0fe68 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/ISessionDisconnectHandler.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/ISessionDisconnectHandler.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Threading.Tasks; diff --git a/src/NosCore.GameObject/Networking/ClientSession/LoginPacketHandlingStrategy.cs b/src/NosCore.GameObject/Networking/ClientSession/LoginPacketHandlingStrategy.cs index aa1fc7660..eea1ebcaf 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/LoginPacketHandlingStrategy.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/LoginPacketHandlingStrategy.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.Data.Enumerations.I18N; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; using NosCore.Shared.I18N; using Serilog; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession; diff --git a/src/NosCore.GameObject/Networking/ClientSession/RequestData.cs b/src/NosCore.GameObject/Networking/ClientSession/RequestData.cs index bf62dd386..eeebff4d9 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/RequestData.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/RequestData.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.GameObject.Networking.ClientSession { @@ -46,4 +33,4 @@ public RequestData() : this(null!) public interface IRequestData { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Networking/ClientSession/WorldPacketHandlingStrategy.cs b/src/NosCore.GameObject/Networking/ClientSession/WorldPacketHandlingStrategy.cs index 95c3cc822..2bbbe5b1a 100644 --- a/src/NosCore.GameObject/Networking/ClientSession/WorldPacketHandlingStrategy.cs +++ b/src/NosCore.GameObject/Networking/ClientSession/WorldPacketHandlingStrategy.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.Infastructure; @@ -29,6 +15,7 @@ using NosCore.Packets.Interfaces; using NosCore.Shared.I18N; using Serilog; +using System.Threading.Tasks; namespace NosCore.GameObject.Networking.ClientSession; diff --git a/src/NosCore.GameObject/Services/AuthService/AuthCodeService.cs b/src/NosCore.GameObject/Services/AuthService/AuthCodeService.cs index 4c480c607..de38f38d0 100644 --- a/src/NosCore.GameObject/Services/AuthService/AuthCodeService.cs +++ b/src/NosCore.GameObject/Services/AuthService/AuthCodeService.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Collections.Concurrent; diff --git a/src/NosCore.GameObject/Services/AuthService/IAuthCodeService.cs b/src/NosCore.GameObject/Services/AuthService/IAuthCodeService.cs index 6fe84a151..131dec9c1 100644 --- a/src/NosCore.GameObject/Services/AuthService/IAuthCodeService.cs +++ b/src/NosCore.GameObject/Services/AuthService/IAuthCodeService.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . namespace NosCore.GameObject.Services.AuthService { diff --git a/src/NosCore.GameObject/Services/BattleService/BattleService.cs b/src/NosCore.GameObject/Services/BattleService/BattleService.cs index d9c1330c3..d729a802f 100644 --- a/src/NosCore.GameObject/Services/BattleService/BattleService.cs +++ b/src/NosCore.GameObject/Services/BattleService/BattleService.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; -using System.Threading.Tasks; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.Networking; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Battle; using NosCore.Shared.Enumerations; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.BattleService; @@ -203,4 +190,4 @@ await character.SendPacketAsync(new CancelPacket() } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/BattleService/CharacterSkill.cs b/src/NosCore.GameObject/Services/BattleService/CharacterSkill.cs index d2671091e..73b6b4954 100644 --- a/src/NosCore.GameObject/Services/BattleService/CharacterSkill.cs +++ b/src/NosCore.GameObject/Services/BattleService/CharacterSkill.cs @@ -1,6 +1,6 @@ -using System; -using NosCore.Data.Dto; +using NosCore.Data.Dto; using NosCore.Data.StaticEntities; +using System; namespace NosCore.GameObject.Services.BattleService { diff --git a/src/NosCore.GameObject/Services/BattleService/DamageResult.cs b/src/NosCore.GameObject/Services/BattleService/DamageResult.cs index d28a47e43..e47684d40 100644 --- a/src/NosCore.GameObject/Services/BattleService/DamageResult.cs +++ b/src/NosCore.GameObject/Services/BattleService/DamageResult.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Packets.Enumerations; namespace NosCore.GameObject.Services.BattleService; -public record DamageResult(int Damage, SuPacketHitMode HitMode); \ No newline at end of file +public record DamageResult(int Damage, SuPacketHitMode HitMode); diff --git a/src/NosCore.GameObject/Services/BattleService/HitArguments.cs b/src/NosCore.GameObject/Services/BattleService/HitArguments.cs index 464a3277a..7475ab4a0 100644 --- a/src/NosCore.GameObject/Services/BattleService/HitArguments.cs +++ b/src/NosCore.GameObject/Services/BattleService/HitArguments.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.GameObject.Services.BattleService; @@ -24,4 +11,4 @@ public record HitArguments() public short? MapX { get; set; } public short? MapY { get; set; } public long SkillId { get; set; } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/BattleService/SkillResult.cs b/src/NosCore.GameObject/Services/BattleService/SkillResult.cs index e3a259972..e0ee55592 100644 --- a/src/NosCore.GameObject/Services/BattleService/SkillResult.cs +++ b/src/NosCore.GameObject/Services/BattleService/SkillResult.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.GameObject.Services.BattleService; @@ -27,4 +14,4 @@ public record SkillResult public int SkillEffect { get; set; } public int SkillTypeMinusOne { get; set; } public long CastId { get; set; } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/BazaarService/BazaarRegistry.cs b/src/NosCore.GameObject/Services/BazaarService/BazaarRegistry.cs index 312102aab..cf4691e29 100644 --- a/src/NosCore.GameObject/Services/BazaarService/BazaarRegistry.cs +++ b/src/NosCore.GameObject/Services/BazaarService/BazaarRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Dao.Interfaces; using NosCore.Data.Dto; diff --git a/src/NosCore.GameObject/Services/BazaarService/BazaarService.cs b/src/NosCore.GameObject/Services/BazaarService/BazaarService.cs index 9944f9c6d..fc812325c 100644 --- a/src/NosCore.GameObject/Services/BazaarService/BazaarService.cs +++ b/src/NosCore.GameObject/Services/BazaarService/BazaarService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Json.More; using NodaTime; @@ -270,4 +257,4 @@ public async Task AddBazaarAsync(Guid itemInstanceId, long characte return item; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/BazaarService/IBazaarRegistry.cs b/src/NosCore.GameObject/Services/BazaarService/IBazaarRegistry.cs index ef1c74d7d..4646b7b25 100644 --- a/src/NosCore.GameObject/Services/BazaarService/IBazaarRegistry.cs +++ b/src/NosCore.GameObject/Services/BazaarService/IBazaarRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Data.WebApi; using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/BazaarService/IBazaarService.cs b/src/NosCore.GameObject/Services/BazaarService/IBazaarService.cs index 5471a668e..37b18cdad 100644 --- a/src/NosCore.GameObject/Services/BazaarService/IBazaarService.cs +++ b/src/NosCore.GameObject/Services/BazaarService/IBazaarService.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.Packets.Enumerations; +using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -37,4 +24,4 @@ List GetBazaar(long id, byte? index, byte? pageSize, BazaarListType? Task ModifyBazaarAsync(long id, Json.Patch.JsonPatch bzMod); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/BlackListService/BlacklistService.cs b/src/NosCore.GameObject/Services/BlackListService/BlacklistService.cs index ca02eefa3..89533278e 100644 --- a/src/NosCore.GameObject/Services/BlackListService/BlacklistService.cs +++ b/src/NosCore.GameObject/Services/BlackListService/BlacklistService.cs @@ -2,33 +2,20 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.Packets.Enumerations; +using NosCore.Shared.Enumerations; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.Shared.Enumerations; namespace NosCore.GameObject.Services.BlackListService @@ -41,7 +28,7 @@ public async Task BlacklistPlayerAsync(long characterId, long secon { var servers = await channelHub.GetCommunicationChannels(); var accounts = await pubSubHub.GetSubscribersAsync(); - var character = accounts.FirstOrDefault(s =>s.ConnectedCharacter?.Id == characterId && servers.Where(c => c.Type == ServerType.WorldServer).Any(x => x.Id == s.ChannelId)); + var character = accounts.FirstOrDefault(s => s.ConnectedCharacter?.Id == characterId && servers.Where(c => c.Type == ServerType.WorldServer).Any(x => x.Id == s.ChannelId)); var targetCharacter = accounts.FirstOrDefault(s => s.ConnectedCharacter?.Id == secondCharacterId && servers.Where(c => c.Type == ServerType.WorldServer).Any(x => x.Id == s.ChannelId)); @@ -83,7 +70,7 @@ public async Task> GetBlacklistedListAsync(long id var charList = new List(); var list = characterRelationDao .Where(s => (s.CharacterId == id) && (s.RelationType == CharacterRelationType.Blocked)); - + if (list == null) { return charList; @@ -120,4 +107,4 @@ public async Task UnblacklistAsync(Guid id) return true; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/BlackListService/IBlacklistService.cs b/src/NosCore.GameObject/Services/BlackListService/IBlacklistService.cs index 08dd5daac..63c5d126f 100644 --- a/src/NosCore.GameObject/Services/BlackListService/IBlacklistService.cs +++ b/src/NosCore.GameObject/Services/BlackListService/IBlacklistService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; @@ -31,4 +18,4 @@ public interface IBlacklistService Task> GetBlacklistedListAsync(long id); Task UnblacklistAsync(Guid id); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/BroadcastService/IPacketBroadcaster.cs b/src/NosCore.GameObject/Services/BroadcastService/IPacketBroadcaster.cs index ca6dcde68..d3d48ec66 100644 --- a/src/NosCore.GameObject/Services/BroadcastService/IPacketBroadcaster.cs +++ b/src/NosCore.GameObject/Services/BroadcastService/IPacketBroadcaster.cs @@ -3,23 +3,10 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using NosCore.Packets.Interfaces; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Packets.Interfaces; namespace NosCore.GameObject.Services.BroadcastService { diff --git a/src/NosCore.GameObject/Services/BroadcastService/IPacketSender.cs b/src/NosCore.GameObject/Services/BroadcastService/IPacketSender.cs index b5b9f050f..d9fb4a449 100644 --- a/src/NosCore.GameObject/Services/BroadcastService/IPacketSender.cs +++ b/src/NosCore.GameObject/Services/BroadcastService/IPacketSender.cs @@ -3,23 +3,10 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using NosCore.Packets.Interfaces; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Packets.Interfaces; namespace NosCore.GameObject.Services.BroadcastService { diff --git a/src/NosCore.GameObject/Services/BroadcastService/IPacketTarget.cs b/src/NosCore.GameObject/Services/BroadcastService/IPacketTarget.cs index 4901f4c66..f7647b913 100644 --- a/src/NosCore.GameObject/Services/BroadcastService/IPacketTarget.cs +++ b/src/NosCore.GameObject/Services/BroadcastService/IPacketTarget.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System; diff --git a/src/NosCore.GameObject/Services/BroadcastService/ISessionRegistry.cs b/src/NosCore.GameObject/Services/BroadcastService/ISessionRegistry.cs index 620619c28..2a4fd4b2a 100644 --- a/src/NosCore.GameObject/Services/BroadcastService/ISessionRegistry.cs +++ b/src/NosCore.GameObject/Services/BroadcastService/ISessionRegistry.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using NosCore.Data.WebApi; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.Packets.Interfaces; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.BroadcastService { diff --git a/src/NosCore.GameObject/Services/BroadcastService/PacketBroadcaster.cs b/src/NosCore.GameObject/Services/BroadcastService/PacketBroadcaster.cs index 748adbabe..4ae32b92a 100644 --- a/src/NosCore.GameObject/Services/BroadcastService/PacketBroadcaster.cs +++ b/src/NosCore.GameObject/Services/BroadcastService/PacketBroadcaster.cs @@ -3,24 +3,11 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using NosCore.Packets.Interfaces; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.Packets.Interfaces; namespace NosCore.GameObject.Services.BroadcastService { diff --git a/src/NosCore.GameObject/Services/BroadcastService/SessionRegistry.cs b/src/NosCore.GameObject/Services/BroadcastService/SessionRegistry.cs index c40debc7c..91f5b2019 100644 --- a/src/NosCore.GameObject/Services/BroadcastService/SessionRegistry.cs +++ b/src/NosCore.GameObject/Services/BroadcastService/SessionRegistry.cs @@ -3,29 +3,16 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using NosCore.Data.WebApi; +using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.Packets.Interfaces; +using Serilog; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.Data.WebApi; -using NosCore.GameObject.ComponentEntities.Interfaces; -using NosCore.Packets.Interfaces; -using Serilog; namespace NosCore.GameObject.Services.BroadcastService { diff --git a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageChannelCommunicationMessageHandler.cs b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageChannelCommunicationMessageHandler.cs index 2fcb859c5..4598baaac 100644 --- a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageChannelCommunicationMessageHandler.cs +++ b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageChannelCommunicationMessageHandler.cs @@ -1,6 +1,6 @@ -using System.Threading.Tasks; -using NosCore.Packets.ServerPackets.Parcel; using NosCore.GameObject.Services.BroadcastService; +using NosCore.Packets.ServerPackets.Parcel; +using System.Threading.Tasks; using DeleteMailData = NosCore.GameObject.InterChannelCommunication.Messages.DeleteMailData; namespace NosCore.GameObject.Services.ChannelCommunicationService.Handlers diff --git a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageChannelCommunicationMessageHandler.cs b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageChannelCommunicationMessageHandler.cs index 841d0d23e..c291b2b47 100644 --- a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageChannelCommunicationMessageHandler.cs +++ b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageChannelCommunicationMessageHandler.cs @@ -1,5 +1,5 @@ -using System.Threading.Tasks; using NosCore.GameObject.Services.BroadcastService; +using System.Threading.Tasks; using DisconnectData = NosCore.GameObject.InterChannelCommunication.Messages.DisconnectData; namespace NosCore.GameObject.Services.ChannelCommunicationService.Handlers diff --git a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/IChannelCommunicationMessageHandler.cs b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/IChannelCommunicationMessageHandler.cs index 8e8c8aab7..4ab3a7a2f 100644 --- a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/IChannelCommunicationMessageHandler.cs +++ b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/IChannelCommunicationMessageHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Threading.Tasks; using IMessage = NosCore.GameObject.InterChannelCommunication.Messages.IMessage; @@ -35,4 +22,4 @@ public Task Handle(IMessage message) { return Handle((T)message); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/MailDataMessageChannelCommunicationMessageHandler.cs b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/MailDataMessageChannelCommunicationMessageHandler.cs index 33ccdfd6b..1245d21a7 100644 --- a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/MailDataMessageChannelCommunicationMessageHandler.cs +++ b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/MailDataMessageChannelCommunicationMessageHandler.cs @@ -1,10 +1,9 @@ -using System.Threading.Tasks; using NosCore.Core.I18N; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; -using NosCore.Packets.Enumerations; using NosCore.GameObject.Services.BroadcastService; - +using NosCore.Packets.Enumerations; +using System.Threading.Tasks; using MailData = NosCore.GameObject.InterChannelCommunication.Messages.MailData; namespace NosCore.GameObject.Services.ChannelCommunicationService.Handlers diff --git a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/PostedPacketMessageChannelCommunicationMessageHandler.cs b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/PostedPacketMessageChannelCommunicationMessageHandler.cs index 4c9df0d9d..753141687 100644 --- a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/PostedPacketMessageChannelCommunicationMessageHandler.cs +++ b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/PostedPacketMessageChannelCommunicationMessageHandler.cs @@ -1,12 +1,11 @@ -using System.Threading.Tasks; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Interaction; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.Interfaces; using NosCore.Shared.I18N; using Serilog; -using NosCore.GameObject.Services.BroadcastService; - +using System.Threading.Tasks; using PostedPacket = NosCore.GameObject.InterChannelCommunication.Messages.PostedPacket; namespace NosCore.GameObject.Services.ChannelCommunicationService.Handlers diff --git a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/StatDataMessageChannelCommunicationMessageHandler.cs b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/StatDataMessageChannelCommunicationMessageHandler.cs index 0e8be7585..f7f57d812 100644 --- a/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/StatDataMessageChannelCommunicationMessageHandler.cs +++ b/src/NosCore.GameObject/Services/ChannelCommunicationService/Handlers/StatDataMessageChannelCommunicationMessageHandler.cs @@ -1,14 +1,13 @@ -using System.Threading.Tasks; using Microsoft.Extensions.Options; using NosCore.Core.Configuration; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Services.BroadcastService; using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; -using NosCore.GameObject.Services.BroadcastService; - +using System.Threading.Tasks; using StatData = NosCore.GameObject.InterChannelCommunication.Messages.StatData; namespace NosCore.GameObject.Services.ChannelCommunicationService.Handlers diff --git a/src/NosCore.GameObject/Services/ChannelService/ChannelService.cs b/src/NosCore.GameObject/Services/ChannelService/ChannelService.cs index dd2ed86ee..55d99a328 100644 --- a/src/NosCore.GameObject/Services/ChannelService/ChannelService.cs +++ b/src/NosCore.GameObject/Services/ChannelService/ChannelService.cs @@ -2,28 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; -using System.Threading.Tasks; using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; using NosCore.GameObject.Services.SaveService; using NosCore.Packets.ServerPackets.Login; using NosCore.Shared.Enumerations; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.ChannelService { @@ -56,4 +43,4 @@ await clientSession.SendPacketAsync(new ItPacket } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ChannelService/IChannelService.cs b/src/NosCore.GameObject/Services/ChannelService/IChannelService.cs index bebbc91ce..461d07823 100644 --- a/src/NosCore.GameObject/Services/ChannelService/IChannelService.cs +++ b/src/NosCore.GameObject/Services/ChannelService/IChannelService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using System.Threading.Tasks; @@ -25,4 +12,4 @@ public interface IChannelService { Task MoveChannelAsync(Networking.ClientSession.ClientSession clientSession, int channelId); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/CharacterService/CharacterInitializationService.cs b/src/NosCore.GameObject/Services/CharacterService/CharacterInitializationService.cs index a9effb414..0cd6e7db4 100644 --- a/src/NosCore.GameObject/Services/CharacterService/CharacterInitializationService.cs +++ b/src/NosCore.GameObject/Services/CharacterService/CharacterInitializationService.cs @@ -3,24 +3,11 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Services.MapInstanceGenerationService; using NosCore.GameObject.Services.MinilandService; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.CharacterService { diff --git a/src/NosCore.GameObject/Services/CharacterService/ICharacterInitializationService.cs b/src/NosCore.GameObject/Services/CharacterService/ICharacterInitializationService.cs index e2583f6d5..2432cd605 100644 --- a/src/NosCore.GameObject/Services/CharacterService/ICharacterInitializationService.cs +++ b/src/NosCore.GameObject/Services/CharacterService/ICharacterInitializationService.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.GameObject.ComponentEntities.Entities; using System.Threading.Tasks; diff --git a/src/NosCore.GameObject/Services/EventLoaderService/Clock.cs b/src/NosCore.GameObject/Services/EventLoaderService/Clock.cs index e1a3265be..64aa3d2b1 100644 --- a/src/NosCore.GameObject/Services/EventLoaderService/Clock.cs +++ b/src/NosCore.GameObject/Services/EventLoaderService/Clock.cs @@ -1,22 +1,10 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; using System; @@ -24,7 +12,6 @@ using System.Reactive.Subjects; using System.Threading; using System.Threading.Tasks; -using NodaTime; namespace NosCore.GameObject.Services.EventLoaderService { diff --git a/src/NosCore.GameObject/Services/EventLoaderService/EventLoaderService.cs b/src/NosCore.GameObject/Services/EventLoaderService/EventLoaderService.cs index 8247ce8a6..7b80bff48 100644 --- a/src/NosCore.GameObject/Services/EventLoaderService/EventLoaderService.cs +++ b/src/NosCore.GameObject/Services/EventLoaderService/EventLoaderService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Infastructure; @@ -53,4 +40,4 @@ public void LoadHandlers(T1 item) item.Requests[typeof(TEventType)] = handlersRequest; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/EventLoaderService/Handlers/ChannelCommunicationRunner.cs b/src/NosCore.GameObject/Services/EventLoaderService/Handlers/ChannelCommunicationRunner.cs index c2ab97c5c..3539cde37 100644 --- a/src/NosCore.GameObject/Services/EventLoaderService/Handlers/ChannelCommunicationRunner.cs +++ b/src/NosCore.GameObject/Services/EventLoaderService/Handlers/ChannelCommunicationRunner.cs @@ -2,33 +2,20 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using JetBrains.Annotations; -using System; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Microsoft.Extensions.Hosting; -using NosCore.GameObject.Services.ChannelCommunicationService.Handlers; -using System.Collections.Generic; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.Services.ChannelCommunicationService.Handlers; using NosCore.Shared.I18N; using Serilog; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; using IMessage = NosCore.GameObject.InterChannelCommunication.Messages.IMessage; namespace NosCore.GameObject.Services.EventLoaderService.Handlers @@ -90,4 +77,4 @@ public async Task StopAsync(CancellationToken cancellationToken) await _pubSubHubClient.StopAsync(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/EventLoaderService/Handlers/RemoveTimeoutStaticBonuses.cs b/src/NosCore.GameObject/Services/EventLoaderService/Handlers/RemoveTimeoutStaticBonuses.cs index a4505eb8b..15dcd08d8 100644 --- a/src/NosCore.GameObject/Services/EventLoaderService/Handlers/RemoveTimeoutStaticBonuses.cs +++ b/src/NosCore.GameObject/Services/EventLoaderService/Handlers/RemoveTimeoutStaticBonuses.cs @@ -1,31 +1,18 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using JetBrains.Annotations; +using NodaTime; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.UI; using System; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Services.BroadcastService; -using NosCore.Packets.ServerPackets.UI; namespace NosCore.GameObject.Services.EventLoaderService.Handlers { @@ -43,7 +30,7 @@ public RemoveTimeoutStaticBonuses(IClock clock, ISessionRegistry sessionRegistry private Instant _lastRun; private readonly IClock _clock; - + public bool Condition(Clock condition) => condition.LastTick.Minus(_lastRun).ToTimeSpan() >= TimeSpan.FromMinutes(5); public Task ExecuteAsync(RequestData runTime) @@ -63,4 +50,4 @@ public Task ExecuteAsync(RequestData runTime) })); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/EventLoaderService/Handlers/SaveAll.cs b/src/NosCore.GameObject/Services/EventLoaderService/Handlers/SaveAll.cs index 900a89b07..2517b8dde 100644 --- a/src/NosCore.GameObject/Services/EventLoaderService/Handlers/SaveAll.cs +++ b/src/NosCore.GameObject/Services/EventLoaderService/Handlers/SaveAll.cs @@ -1,33 +1,20 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using JetBrains.Annotations; -using NosCore.Data.Enumerations.I18N; -using NosCore.GameObject.Networking.ClientSession; -using System; -using System.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.Logging; using NodaTime; +using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.SaveService; using NosCore.Shared.I18N; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.EventLoaderService.Handlers { @@ -64,4 +51,4 @@ public async Task ExecuteAsync(RequestData runTime) _lastRun = runTime.Data; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/EventLoaderService/IEventLoaderService.cs b/src/NosCore.GameObject/Services/EventLoaderService/IEventLoaderService.cs index 22c5a8c20..9501a1f6f 100644 --- a/src/NosCore.GameObject/Services/EventLoaderService/IEventLoaderService.cs +++ b/src/NosCore.GameObject/Services/EventLoaderService/IEventLoaderService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.GameObject.Services.EventLoaderService { @@ -23,4 +10,4 @@ public interface IEventLoaderService { void LoadHandlers(T1 item); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/EventLoaderService/ITimedEventHandler.cs b/src/NosCore.GameObject/Services/EventLoaderService/ITimedEventHandler.cs index b46fec88e..124e8f9c1 100644 --- a/src/NosCore.GameObject/Services/EventLoaderService/ITimedEventHandler.cs +++ b/src/NosCore.GameObject/Services/EventLoaderService/ITimedEventHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NodaTime; using NosCore.GameObject.Infastructure; @@ -25,4 +12,4 @@ namespace NosCore.GameObject.Services.EventLoaderService public interface ITimedEventHandler : IEventHandler { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ExchangeService/ExchangeData.cs b/src/NosCore.GameObject/Services/ExchangeService/ExchangeData.cs index 4063bc3db..ef31c5d6d 100644 --- a/src/NosCore.GameObject/Services/ExchangeService/ExchangeData.cs +++ b/src/NosCore.GameObject/Services/ExchangeService/ExchangeData.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.GameObject.Services.InventoryService; using System.Collections.Concurrent; diff --git a/src/NosCore.GameObject/Services/ExchangeService/ExchangeRequestRegistry.cs b/src/NosCore.GameObject/Services/ExchangeService/ExchangeRequestRegistry.cs index db7099b60..73ca33b42 100644 --- a/src/NosCore.GameObject/Services/ExchangeService/ExchangeRequestRegistry.cs +++ b/src/NosCore.GameObject/Services/ExchangeService/ExchangeRequestRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/ExchangeService/ExchangeService.cs b/src/NosCore.GameObject/Services/ExchangeService/ExchangeService.cs index 01040dcfb..da9b85360 100644 --- a/src/NosCore.GameObject/Services/ExchangeService/ExchangeService.cs +++ b/src/NosCore.GameObject/Services/ExchangeService/ExchangeService.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using Microsoft.Extensions.Options; using NosCore.Core.Configuration; diff --git a/src/NosCore.GameObject/Services/ExchangeService/IExchangeRequestRegistry.cs b/src/NosCore.GameObject/Services/ExchangeService/IExchangeRequestRegistry.cs index 5ef24ec37..5d24a908c 100644 --- a/src/NosCore.GameObject/Services/ExchangeService/IExchangeRequestRegistry.cs +++ b/src/NosCore.GameObject/Services/ExchangeService/IExchangeRequestRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/ExchangeService/IExchangeService.cs b/src/NosCore.GameObject/Services/ExchangeService/IExchangeService.cs index 0edec565d..98fd7b929 100644 --- a/src/NosCore.GameObject/Services/ExchangeService/IExchangeService.cs +++ b/src/NosCore.GameObject/Services/ExchangeService/IExchangeService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; @@ -49,4 +36,4 @@ public interface IExchangeService List> ProcessExchange(long firstUser, long secondUser, IInventoryService sessionInventory, IInventoryService targetInventory); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/FriendService/CharacterRelation.cs b/src/NosCore.GameObject/Services/FriendService/CharacterRelation.cs index 804614951..0239e1c9f 100644 --- a/src/NosCore.GameObject/Services/FriendService/CharacterRelation.cs +++ b/src/NosCore.GameObject/Services/FriendService/CharacterRelation.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Data.Dto; diff --git a/src/NosCore.GameObject/Services/FriendService/FriendRequestRegistry.cs b/src/NosCore.GameObject/Services/FriendService/FriendRequestRegistry.cs index 1acf513e5..13a890a78 100644 --- a/src/NosCore.GameObject/Services/FriendService/FriendRequestRegistry.cs +++ b/src/NosCore.GameObject/Services/FriendService/FriendRequestRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System; using System.Collections.Concurrent; diff --git a/src/NosCore.GameObject/Services/FriendService/FriendService.cs b/src/NosCore.GameObject/Services/FriendService/FriendService.cs index fdf9c2b95..131f1555b 100644 --- a/src/NosCore.GameObject/Services/FriendService/FriendService.cs +++ b/src/NosCore.GameObject/Services/FriendService/FriendService.cs @@ -3,34 +3,21 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.Packets.Enumerations; +using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.Shared.Enumerations; namespace NosCore.GameObject.Services.FriendService diff --git a/src/NosCore.GameObject/Services/FriendService/IFriendRequestRegistry.cs b/src/NosCore.GameObject/Services/FriendService/IFriendRequestRegistry.cs index 003d5b3e9..9152ffa32 100644 --- a/src/NosCore.GameObject/Services/FriendService/IFriendRequestRegistry.cs +++ b/src/NosCore.GameObject/Services/FriendService/IFriendRequestRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System; using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/FriendService/IFriendService.cs b/src/NosCore.GameObject/Services/FriendService/IFriendService.cs index 6de72df00..545803d25 100644 --- a/src/NosCore.GameObject/Services/FriendService/IFriendService.cs +++ b/src/NosCore.GameObject/Services/FriendService/IFriendService.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; +using NosCore.Packets.Enumerations; using System; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Packets.Enumerations; namespace NosCore.GameObject.Services.FriendService { @@ -34,4 +21,4 @@ public interface IFriendService Task DeleteAsync(Guid id); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/GroupService/Group.cs b/src/NosCore.GameObject/Services/GroupService/Group.cs index 4916f1a80..99d3f136c 100644 --- a/src/NosCore.GameObject/Services/GroupService/Group.cs +++ b/src/NosCore.GameObject/Services/GroupService/Group.cs @@ -3,23 +3,11 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Data.Enumerations.Group; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.Networking.SessionGroup; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; using NosCore.Packets.ServerPackets.Groups; @@ -29,7 +17,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using NosCore.Networking.SessionGroup; namespace NosCore.GameObject.Services.GroupService diff --git a/src/NosCore.GameObject/Services/GroupService/GroupRegistry.cs b/src/NosCore.GameObject/Services/GroupService/GroupRegistry.cs index 40b84fcf1..0b6be7899 100644 --- a/src/NosCore.GameObject/Services/GroupService/GroupRegistry.cs +++ b/src/NosCore.GameObject/Services/GroupService/GroupRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Collections.Concurrent; using System.Threading; diff --git a/src/NosCore.GameObject/Services/GroupService/IGroupRegistry.cs b/src/NosCore.GameObject/Services/GroupService/IGroupRegistry.cs index d2eddf9b3..184a7cf7d 100644 --- a/src/NosCore.GameObject/Services/GroupService/IGroupRegistry.cs +++ b/src/NosCore.GameObject/Services/GroupService/IGroupRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . namespace NosCore.GameObject.Services.GroupService { diff --git a/src/NosCore.GameObject/Services/GuriRunnerService/GuriRunnerService.cs b/src/NosCore.GameObject/Services/GuriRunnerService/GuriRunnerService.cs index 3944a8f65..65c5f79f3 100644 --- a/src/NosCore.GameObject/Services/GuriRunnerService/GuriRunnerService.cs +++ b/src/NosCore.GameObject/Services/GuriRunnerService/GuriRunnerService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; @@ -46,4 +33,4 @@ public void GuriLaunch(ClientSession clientSession, GuriPacket data) handlersRequest.OnNext(new RequestData(clientSession, data)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/EmoticonHandler.cs b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/EmoticonHandler.cs index c106da430..a686da69b 100644 --- a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/EmoticonHandler.cs +++ b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/EmoticonHandler.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Packets.ClientPackets.UI; using NosCore.Packets.Enumerations; using System; using System.Threading.Tasks; -using NosCore.Networking; namespace NosCore.GameObject.Services.GuriRunnerService.Handlers @@ -52,4 +39,4 @@ public Task ExecuteAsync(RequestData requestData) return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/MfaGuriHandler.cs b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/MfaGuriHandler.cs index d1f95630a..2ead9f957 100644 --- a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/MfaGuriHandler.cs +++ b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/MfaGuriHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.GameObject.Networking.ClientSession; @@ -63,4 +50,4 @@ await requestData.ClientSession.SendPacketAsync(new NosCore.Packets.ServerPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/SpeakerGuriHandler.cs b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/SpeakerGuriHandler.cs index ee2f8d904..0c6322d9a 100644 --- a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/SpeakerGuriHandler.cs +++ b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/SpeakerGuriHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Core.I18N; using NosCore.Data.Enumerations; @@ -23,15 +10,15 @@ using NosCore.Data.Enumerations.Items; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.InventoryService; using NosCore.Packets.ClientPackets.UI; using NosCore.Packets.Enumerations; +using NosCore.Shared.I18N; using Serilog; using System; using System.Linq; using System.Threading.Tasks; -using NosCore.Shared.I18N; -using NosCore.GameObject.Services.BroadcastService; namespace NosCore.GameObject.Services.GuriRunnerService.Handlers { @@ -94,4 +81,4 @@ public async Task ExecuteAsync(RequestData requestData) await requestData.ClientSession.Character.SendPacketAsync(inv.GeneratePocketChange(PocketType.Etc, (short)(requestData.Data.VisualId ?? 0))); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/TitleGuriHandler.cs b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/TitleGuriHandler.cs index dd6ffa214..469e0da26 100644 --- a/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/TitleGuriHandler.cs +++ b/src/NosCore.GameObject/Services/GuriRunnerService/Handlers/TitleGuriHandler.cs @@ -2,32 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Items; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System; using System.Linq; using System.Threading.Tasks; -using NosCore.Networking; using GuriPacket = NosCore.Packets.ClientPackets.UI.GuriPacket; namespace NosCore.GameObject.Services.GuriRunnerService.Handlers @@ -63,4 +50,4 @@ public async Task ExecuteAsync(RequestData requestData) await requestData.ClientSession.SendPacketAsync(inv.GeneratePocketChange((PocketType)inv.Type, inv.Slot)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/GuriRunnerService/IGuriEventHandler.cs b/src/NosCore.GameObject/Services/GuriRunnerService/IGuriEventHandler.cs index f0b0b9106..b1faad3e3 100644 --- a/src/NosCore.GameObject/Services/GuriRunnerService/IGuriEventHandler.cs +++ b/src/NosCore.GameObject/Services/GuriRunnerService/IGuriEventHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Infastructure; using NosCore.Packets.ClientPackets.UI; @@ -25,4 +12,4 @@ namespace NosCore.GameObject.Services.GuriRunnerService public interface IGuriEventHandler : IEventHandler { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/GuriRunnerService/IGuriRunnerService.cs b/src/NosCore.GameObject/Services/GuriRunnerService/IGuriRunnerService.cs index 1497edc80..8d457f710 100644 --- a/src/NosCore.GameObject/Services/GuriRunnerService/IGuriRunnerService.cs +++ b/src/NosCore.GameObject/Services/GuriRunnerService/IGuriRunnerService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.UI; @@ -26,4 +13,4 @@ public interface IGuriRunnerService { void GuriLaunch(ClientSession clientSession, GuriPacket data); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/InventoryService/IInventoryService.cs b/src/NosCore.GameObject/Services/InventoryService/IInventoryService.cs index 18e597e4e..c86237061 100644 --- a/src/NosCore.GameObject/Services/InventoryService/IInventoryService.cs +++ b/src/NosCore.GameObject/Services/InventoryService/IInventoryService.cs @@ -1,24 +1,10 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; -using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.GameObject.Services.ItemStorage; using System; using System.Collections.Generic; @@ -51,4 +37,4 @@ public interface IInventoryService : IDictionary, InventoryItemInstance? RemoveItemAmountFromInventory(short amount, Guid id); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/InventoryService/InventoryItemInstance.cs b/src/NosCore.GameObject/Services/InventoryService/InventoryItemInstance.cs index 64bfc129f..06abe3157 100644 --- a/src/NosCore.GameObject/Services/InventoryService/InventoryItemInstance.cs +++ b/src/NosCore.GameObject/Services/InventoryService/InventoryItemInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.Data.Enumerations; @@ -60,4 +47,4 @@ public static InventoryItemInstance Create(IItemInstance it, long characterId, }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/InventoryService/InventoryService.cs b/src/NosCore.GameObject/Services/InventoryService/InventoryService.cs index 15826ec69..515f7fa51 100644 --- a/src/NosCore.GameObject/Services/InventoryService/InventoryService.cs +++ b/src/NosCore.GameObject/Services/InventoryService/InventoryService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; @@ -549,4 +536,4 @@ int ISlotBasedStorage.CountBySlotType( return itemInstance; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BackPackHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BackPackHandler.cs index bf1fe4eb6..6f29ba8ed 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BackPackHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BackPackHandler.cs @@ -2,22 +2,10 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; +using NodaTime; using NosCore.Core.Configuration; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Buff; @@ -27,12 +15,11 @@ using NosCore.GameObject.Services.InventoryService; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; +using NosCore.Shared.Enumerations; using System; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.Shared.Enumerations; namespace NosCore.GameObject.Services.ItemGenerationService.Handlers { @@ -98,4 +85,4 @@ await requestData.ClientSession.SendPacketAsync( await requestData.ClientSession.SendPacketAsync(requestData.ClientSession.Character.GenerateExts(conf)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BazaarMedalsHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BazaarMedalsHandler.cs index e6510131e..a695a958c 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BazaarMedalsHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BazaarMedalsHandler.cs @@ -2,21 +2,9 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Buff; using NosCore.Data.Enumerations.Items; @@ -25,12 +13,11 @@ using NosCore.GameObject.Services.InventoryService; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; +using NosCore.Shared.Enumerations; using System; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.Shared.Enumerations; namespace NosCore.GameObject.Services.ItemGenerationService.Handlers { @@ -73,4 +60,4 @@ await requestData.ClientSession.SendPacketAsync(new SayiPacket requestData.ClientSession.Character.InventoryService.RemoveItemAmountFromInventory(1, itemInstance.ItemInstanceId); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/MinilandBellHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/MinilandBellHandler.cs index 887dec4c4..7fcdd4027 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/MinilandBellHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/MinilandBellHandler.cs @@ -2,26 +2,14 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Items; using NosCore.Data.Enumerations.Map; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; +using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.MinilandService; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; @@ -30,7 +18,6 @@ using NosCore.Shared.Enumerations; using System; using System.Threading.Tasks; -using NosCore.GameObject.Services.MapChangeService; namespace NosCore.GameObject.Services.ItemGenerationService.Handlers { @@ -85,4 +72,4 @@ await requestData.ClientSession.SendPacketAsync(new DelayPacket await mapChangeService.ChangeMapInstanceAsync(requestData.ClientSession, miniland.MapInstanceId, 5, 8); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpRechargerHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpRechargerHandler.cs index 1b81df2dd..873d939c5 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpRechargerHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpRechargerHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; @@ -61,4 +48,4 @@ await requestData.ClientSession.Character.SendPacketAsync(new MsgiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpeakerHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpeakerHandler.cs index d49b62d8b..ace3dcba6 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpeakerHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpeakerHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Items; using NosCore.GameObject.Networking.ClientSession; @@ -44,4 +31,4 @@ await requestData.ClientSession.SendPacketAsync(new GuriPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/TitleHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/TitleHandler.cs index cea99bf70..60ad0b96f 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/TitleHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/TitleHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Items; using NosCore.GameObject.Networking.ClientSession; @@ -46,4 +33,4 @@ public Task ExecuteAsync(RequestData }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/VehicleHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/VehicleHandler.cs index 3ca3f35ad..56022512e 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/VehicleHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/VehicleHandler.cs @@ -2,34 +2,21 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Items; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; +using NosCore.GameObject.Services.TransformationService; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; +using NosCore.Shared.I18N; using Serilog; using System; using System.Threading.Tasks; -using NosCore.GameObject.Services.TransformationService; -using NosCore.Shared.I18N; namespace NosCore.GameObject.Services.ItemGenerationService.Handlers { @@ -74,4 +61,4 @@ await requestData.ClientSession.SendPacketAsync(new DelayPacket await transformationService.RemoveVehicleAsync(requestData.ClientSession.Character); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/WearHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/WearHandler.cs index 318096545..7b119feed 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/WearHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Handlers/WearHandler.cs @@ -2,21 +2,9 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Items; @@ -24,17 +12,16 @@ using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService.Item; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; using NosCore.Shared.Enumerations; +using NosCore.Shared.I18N; using Serilog; using System; using System.Threading.Tasks; -using NodaTime; -using NosCore.Networking; -using NosCore.Shared.I18N; namespace NosCore.GameObject.Services.ItemGenerationService.Handlers { @@ -203,4 +190,4 @@ await requestData.ClientSession.Character.MapInstance.SendPacketAsync( } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/IItemGenerationService.cs b/src/NosCore.GameObject/Services/ItemGenerationService/IItemGenerationService.cs index f482e7de6..67a8f0008 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/IItemGenerationService.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/IItemGenerationService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.GameObject.Services.ItemGenerationService.Item; @@ -33,4 +20,4 @@ public interface IItemGenerationService IItemInstance Convert(IItemInstanceDto k); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/IUseItemEventHandler.cs b/src/NosCore.GameObject/Services/ItemGenerationService/IUseItemEventHandler.cs index 8a05c4601..e8ad8ea5d 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/IUseItemEventHandler.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/IUseItemEventHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.InventoryService; @@ -27,4 +14,4 @@ namespace NosCore.GameObject.Services.ItemGenerationService public interface IUseItemEventHandler : IEventHandler> { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Item/BoxInstance.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Item/BoxInstance.cs index 8aba19b7c..9d5e80d6b 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Item/BoxInstance.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Item/BoxInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using System; @@ -43,4 +30,4 @@ public object Clone() return (BoxInstance)MemberwiseClone(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Item/IItemInstance.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Item/IItemInstance.cs index d358b0479..76cc99ae4 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Item/IItemInstance.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Item/IItemInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; @@ -26,4 +13,4 @@ public interface IItemInstance : IItemInstanceDto Item Item { get; set; } object Clone(); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Item/Item.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Item/Item.cs index edd47cf63..b0555455b 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Item/Item.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Item/Item.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.StaticEntities; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -38,4 +25,4 @@ public class Item : ItemDto, IRequestableEntity>>() }; } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Item/ItemInstance.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Item/ItemInstance.cs index f7f5ea541..9c16bfae9 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Item/ItemInstance.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Item/ItemInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using System; @@ -43,4 +30,4 @@ public object Clone() return (ItemInstance)MemberwiseClone(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Item/SpecialistInstance.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Item/SpecialistInstance.cs index ef6bba849..4f5a14e6e 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Item/SpecialistInstance.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Item/SpecialistInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using System; @@ -43,4 +30,4 @@ public object Clone() return (SpecialistInstance)MemberwiseClone(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Item/UsableInstance.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Item/UsableInstance.cs index 668ba4d92..e365a9537 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Item/UsableInstance.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Item/UsableInstance.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; using NosCore.Data.Dto; +using System; namespace NosCore.GameObject.Services.ItemGenerationService.Item { @@ -41,4 +28,4 @@ public object Clone() return (UsableInstance)MemberwiseClone(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/Item/WearableInstance.cs b/src/NosCore.GameObject/Services/ItemGenerationService/Item/WearableInstance.cs index 9016bcb73..424bb6870 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/Item/WearableInstance.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/Item/WearableInstance.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; @@ -141,4 +128,4 @@ public void SetRarityPoint() } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemGenerationService/ItemGenerationService.cs b/src/NosCore.GameObject/Services/ItemGenerationService/ItemGenerationService.cs index 764a9658d..d5fcae7be 100644 --- a/src/NosCore.GameObject/Services/ItemGenerationService/ItemGenerationService.cs +++ b/src/NosCore.GameObject/Services/ItemGenerationService/ItemGenerationService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; using NosCore.Data.Dto; @@ -157,4 +144,4 @@ public IItemInstance Generate(short itemToCreateVNum, short amount, sbyte rare, } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/ItemStorage/ISlotBasedStorage.cs b/src/NosCore.GameObject/Services/ItemStorage/ISlotBasedStorage.cs index 312223c90..eb287bfa8 100644 --- a/src/NosCore.GameObject/Services/ItemStorage/ISlotBasedStorage.cs +++ b/src/NosCore.GameObject/Services/ItemStorage/ISlotBasedStorage.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.GameObject.Services.ItemGenerationService.Item; using System; diff --git a/src/NosCore.GameObject/Services/ItemStorage/ISlotItem.cs b/src/NosCore.GameObject/Services/ItemStorage/ISlotItem.cs index ce764f72d..68f987594 100644 --- a/src/NosCore.GameObject/Services/ItemStorage/ISlotItem.cs +++ b/src/NosCore.GameObject/Services/ItemStorage/ISlotItem.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.GameObject.Services.ItemGenerationService.Item; using System; diff --git a/src/NosCore.GameObject/Services/ItemStorage/SlotStorageHelper.cs b/src/NosCore.GameObject/Services/ItemStorage/SlotStorageHelper.cs index 328f662e5..ff44e92e6 100644 --- a/src/NosCore.GameObject/Services/ItemStorage/SlotStorageHelper.cs +++ b/src/NosCore.GameObject/Services/ItemStorage/SlotStorageHelper.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.GameObject.Services.ItemGenerationService.Item; using System; diff --git a/src/NosCore.GameObject/Services/LoginService/ILoginService.cs b/src/NosCore.GameObject/Services/LoginService/ILoginService.cs index a5ba972e3..a693549e1 100644 --- a/src/NosCore.GameObject/Services/LoginService/ILoginService.cs +++ b/src/NosCore.GameObject/Services/LoginService/ILoginService.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Threading.Tasks; using NosCore.Packets.ClientPackets.Login; using NosCore.Shared.Enumerations; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.LoginService { @@ -28,4 +15,4 @@ public interface ILoginService Task LoginAsync(string? username, string md5String, ClientVersionSubPacket clientVersion, Networking.ClientSession.ClientSession clientSession, string passwordToken, bool useApiAuth, RegionType language); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/LoginService/LoginService.cs b/src/NosCore.GameObject/Services/LoginService/LoginService.cs index fda5d4c00..c3f396775 100644 --- a/src/NosCore.GameObject/Services/LoginService/LoginService.cs +++ b/src/NosCore.GameObject/Services/LoginService/LoginService.cs @@ -2,25 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.Options; using NosCore.Core.Configuration; using NosCore.Dao.Interfaces; @@ -34,6 +17,10 @@ using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Login; using NosCore.Shared.Enumerations; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.LoginService @@ -112,7 +99,7 @@ await clientSession.SendPacketAsync(new FailcPacket var connectedAccount = await pubSubHub.GetSubscribersAsync(); var comChannels = await channelHub.GetCommunicationChannels(); var servers = comChannels.Where(x => x.Type == ServerType.WorldServer).ToList(); - if (connectedAccount.Any(x=>x.Name == acc.Name)) + if (connectedAccount.Any(x => x.Name == acc.Name)) { await clientSession.SendPacketAsync(new FailcPacket { @@ -165,7 +152,7 @@ await clientSession.SendPacketAsync(new FailcPacket } var channelcolor = - (int)Math.Round(connectedAccount.Count(x=>x.ChannelId == server.ServerId) / (server.ConnectedAccountLimit + 1) * 20D) + (int)Math.Round(connectedAccount.Count(x => x.ChannelId == server.ServerId) / (server.ConnectedAccountLimit + 1) * 20D) + 1; subpacket.Add(new NsTeStSubPacket { @@ -211,4 +198,4 @@ await clientSession.SendPacketAsync(new FailcPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MailService/Gift.cs b/src/NosCore.GameObject/Services/MailService/Gift.cs index d7770e3f0..cfa28ba0a 100644 --- a/src/NosCore.GameObject/Services/MailService/Gift.cs +++ b/src/NosCore.GameObject/Services/MailService/Gift.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . namespace NosCore.GameObject.Services.MailService { diff --git a/src/NosCore.GameObject/Services/MailService/GiftHelper.cs b/src/NosCore.GameObject/Services/MailService/GiftHelper.cs index 9c1f8f01d..b1d4a735f 100644 --- a/src/NosCore.GameObject/Services/MailService/GiftHelper.cs +++ b/src/NosCore.GameObject/Services/MailService/GiftHelper.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NodaTime; using NosCore.Data.Dto; diff --git a/src/NosCore.GameObject/Services/MailService/IMailService.cs b/src/NosCore.GameObject/Services/MailService/IMailService.cs index 507de6c68..76f35acbf 100644 --- a/src/NosCore.GameObject/Services/MailService/IMailService.cs +++ b/src/NosCore.GameObject/Services/MailService/IMailService.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Json.Patch; +using NosCore.Data.Dto; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Data.Dto; using MailData = NosCore.GameObject.InterChannelCommunication.Messages.MailData; namespace NosCore.GameObject.Services.MailService @@ -35,4 +22,4 @@ public interface IMailService Task SendMailAsync(MailDto mail, short? vNum, short? amount, sbyte? rare, byte? upgrade); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MailService/IParcelRegistry.cs b/src/NosCore.GameObject/Services/MailService/IParcelRegistry.cs index 807a11ce3..f6a2e2b44 100644 --- a/src/NosCore.GameObject/Services/MailService/IParcelRegistry.cs +++ b/src/NosCore.GameObject/Services/MailService/IParcelRegistry.cs @@ -3,22 +3,9 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Concurrent; using NosCore.GameObject.InterChannelCommunication.Messages; +using System.Collections.Concurrent; namespace NosCore.GameObject.Services.MailService { diff --git a/src/NosCore.GameObject/Services/MailService/MailService.cs b/src/NosCore.GameObject/Services/MailService/MailService.cs index 60f1274c9..60a5b6665 100644 --- a/src/NosCore.GameObject/Services/MailService/MailService.cs +++ b/src/NosCore.GameObject/Services/MailService/MailService.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Json.Patch; using NodaTime; @@ -26,18 +13,17 @@ using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; using NosCore.Data.WebApi; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Services.ItemGenerationService; +using NosCore.Shared.Enumerations; using System; using System.Collections.Generic; using System.Linq; using System.Text.Json; using System.Threading.Tasks; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.Shared.Enumerations; using DeleteMailData = NosCore.GameObject.InterChannelCommunication.Messages.DeleteMailData; - using MailData = NosCore.GameObject.InterChannelCommunication.Messages.MailData; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; namespace NosCore.GameObject.Services.MailService { @@ -204,7 +190,7 @@ public async Task SendMailAsync(MailDto mail, short? vNum, short? amount, mailref = await mailDao.TryInsertOrUpdateAsync(mailref); var mailDataCopy = await GenerateMailDataAsync(mailref, (short?)it?.ItemType ?? -1, itemInstance!, receiverName); parcelRegistry.AddMail(mailref.ReceiverId, mailDataCopy.MailDto.IsSenderCopy, mailDataCopy.MailId, mailDataCopy); - await NotifyAsync(0, receiver, mailDataCopy); + await NotifyAsync(0, receiver, mailDataCopy); return true; } @@ -252,4 +238,4 @@ await pubSubHub.SendMessageAsync(new DeleteMailData() } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MailService/ParcelRegistry.cs b/src/NosCore.GameObject/Services/MailService/ParcelRegistry.cs index 1542ed2f3..8be1f3b27 100644 --- a/src/NosCore.GameObject/Services/MailService/ParcelRegistry.cs +++ b/src/NosCore.GameObject/Services/MailService/ParcelRegistry.cs @@ -3,29 +3,16 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.StaticEntities; +using NosCore.GameObject.InterChannelCommunication.Messages; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.InterChannelCommunication.Messages; namespace NosCore.GameObject.Services.MailService { diff --git a/src/NosCore.GameObject/Services/MapChangeService/IMapChangeService.cs b/src/NosCore.GameObject/Services/MapChangeService/IMapChangeService.cs index f8c6940ee..5c45c815b 100644 --- a/src/NosCore.GameObject/Services/MapChangeService/IMapChangeService.cs +++ b/src/NosCore.GameObject/Services/MapChangeService/IMapChangeService.cs @@ -1,6 +1,6 @@ -using System; +using NosCore.GameObject.Networking.ClientSession; +using System; using System.Threading.Tasks; -using NosCore.GameObject.Networking.ClientSession; namespace NosCore.GameObject.Services.MapChangeService { diff --git a/src/NosCore.GameObject/Services/MapChangeService/MapChangeService.cs b/src/NosCore.GameObject/Services/MapChangeService/MapChangeService.cs index b2f193eea..15a665fb7 100644 --- a/src/NosCore.GameObject/Services/MapChangeService/MapChangeService.cs +++ b/src/NosCore.GameObject/Services/MapChangeService/MapChangeService.cs @@ -1,7 +1,4 @@ -using System; -using System.Linq; -using System.Threading.Tasks; using NodaTime; using NosCore.Algorithm.ExperienceService; using NosCore.Algorithm.HeroExperienceService; @@ -25,6 +22,9 @@ using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.MapChangeService { @@ -56,7 +56,7 @@ public async Task ChangeMapAsync(ClientSession session, short? mapId = null, sho session.Character.MapInstance = mapInstance; } - + mapInstanceAccessorService.GetMapInstance(session.Character.MapInstanceId); await ChangeMapInstanceAsync(session, session.Character.MapInstanceId, mapX, mapY); } @@ -88,7 +88,7 @@ public async Task ChangeMapInstanceAsync(ClientSession session, Guid mapInstance { session.Character.IsSitting = false; } - + session.Character.MapInstance = mapInstanceAccessorService.GetMapInstance(mapInstanceId)!; if (session.Character.MapInstance.MapInstanceType == MapInstanceType.BaseMapInstance) diff --git a/src/NosCore.GameObject/Services/MapInstanceAccessService/IMapInstanceAccessService.cs b/src/NosCore.GameObject/Services/MapInstanceAccessService/IMapInstanceAccessService.cs index 199cd3cb9..bebe9d935 100644 --- a/src/NosCore.GameObject/Services/MapInstanceAccessService/IMapInstanceAccessService.cs +++ b/src/NosCore.GameObject/Services/MapInstanceAccessService/IMapInstanceAccessService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Services.MapInstanceGenerationService; using System; @@ -28,4 +15,4 @@ public interface IMapInstanceAccessorService MapInstance? GetBaseMapById(short mapId); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapInstanceAccessService/MapInstanceAccessService.cs b/src/NosCore.GameObject/Services/MapInstanceAccessService/MapInstanceAccessService.cs index d4c418de3..73b1b5e36 100644 --- a/src/NosCore.GameObject/Services/MapInstanceAccessService/MapInstanceAccessService.cs +++ b/src/NosCore.GameObject/Services/MapInstanceAccessService/MapInstanceAccessService.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.GameObject.Services.MapInstanceGenerationService; using System; diff --git a/src/NosCore.GameObject/Services/MapInstanceGenerationService/Handlers/MinilandEntranceHandler.cs b/src/NosCore.GameObject/Services/MapInstanceGenerationService/Handlers/MinilandEntranceHandler.cs index be0635372..558e76ef9 100644 --- a/src/NosCore.GameObject/Services/MapInstanceGenerationService/Handlers/MinilandEntranceHandler.cs +++ b/src/NosCore.GameObject/Services/MapInstanceGenerationService/Handlers/MinilandEntranceHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; @@ -78,4 +65,4 @@ await requestData.ClientSession.SendPacketAsync(new SayiPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceEntranceEventHandler.cs b/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceEntranceEventHandler.cs index dba89c6df..0889dc769 100644 --- a/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceEntranceEventHandler.cs +++ b/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceEntranceEventHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.Infastructure; @@ -24,4 +11,4 @@ namespace NosCore.GameObject.Services.MapInstanceGenerationService public interface IMapInstanceEntranceEventHandler : IEventHandler { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceGenerationService.cs b/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceGenerationService.cs index 40fe419cf..a85011945 100644 --- a/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceGenerationService.cs +++ b/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceGenerationService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Map; using System; @@ -30,4 +17,4 @@ public interface IMapInstanceGeneratorService void RemoveMap(Guid guid); MapInstance CreateMapInstance(Map.Map map, Guid guid, bool shopAllowed, MapInstanceType normalInstance); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceRegistry.cs b/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceRegistry.cs index d59cf114e..554edff9b 100644 --- a/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceRegistry.cs +++ b/src/NosCore.GameObject/Services/MapInstanceGenerationService/IMapInstanceRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System; using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstance.cs b/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstance.cs index 103b7f8be..baa8d0fa6 100644 --- a/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstance.cs +++ b/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstance.cs @@ -2,27 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Map; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.ItemGenerationService.Item; +using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.MapItemGenerationService; +using NosCore.Networking.SessionGroup; using NosCore.Packets.Interfaces; using NosCore.Packets.ServerPackets.MiniMap; using NosCore.Shared.Enumerations; @@ -35,11 +27,6 @@ using System.Reactive.Linq; using System.Reactive.Subjects; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Services.BroadcastService; -using NosCore.GameObject.Services.MapChangeService; -using NosCore.Networking.SessionGroup; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.MapInstanceGenerationService @@ -331,4 +318,4 @@ protected virtual void Dispose(bool disposing) Life = null; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceGenerationService.cs b/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceGenerationService.cs index 47bb467b7..fc9201f5c 100644 --- a/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceGenerationService.cs +++ b/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceGenerationService.cs @@ -3,40 +3,27 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using Mapster; +using NodaTime; using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Map; using NosCore.Data.StaticEntities; +using NosCore.GameObject.ComponentEntities.Entities; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.EventLoaderService; +using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.MapInstanceAccessService; using NosCore.GameObject.Services.MapItemGenerationService; +using NosCore.Networking.SessionGroup; +using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Services.MapChangeService; -using NosCore.Shared.I18N; -using NosCore.Networking.SessionGroup; -using NosCore.GameObject.Services.BroadcastService; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.MapInstanceGenerationService { diff --git a/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceRegistry.cs b/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceRegistry.cs index 4e641d63d..06e5609aa 100644 --- a/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceRegistry.cs +++ b/src/NosCore.GameObject/Services/MapInstanceGenerationService/MapInstanceRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Data.Enumerations.Map; using System; diff --git a/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/DropHandler.cs b/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/DropHandler.cs index 6288b0cec..07284196b 100644 --- a/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/DropHandler.cs +++ b/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/DropHandler.cs @@ -2,36 +2,23 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Items; using NosCore.Data.Enumerations.Map; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Drops; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; using NosCore.Shared.Enumerations; using System; using System.Linq; using System.Threading.Tasks; -using NosCore.Networking; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.MapItemGenerationService.Handlers { @@ -96,4 +83,4 @@ await requestData.ClientSession.SendPacketAsync(new MsgiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/GoldDropHandler.cs b/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/GoldDropHandler.cs index 978df6eb4..c4deba217 100644 --- a/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/GoldDropHandler.cs +++ b/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/GoldDropHandler.cs @@ -2,34 +2,21 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Drops; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; using NosCore.Shared.Enumerations; using System; using System.Threading.Tasks; -using NosCore.Networking; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.MapItemGenerationService.Handlers { @@ -82,4 +69,4 @@ await requestData.ClientSession.Character.MapInstance.SendPacketAsync( requestData.ClientSession.Character.GenerateGet(requestData.Data.Item1.VisualId)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/SpChargerHandler.cs b/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/SpChargerHandler.cs index fac50efc2..610e0f3ea 100644 --- a/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/SpChargerHandler.cs +++ b/src/NosCore.GameObject/Services/MapItemGenerationService/Handlers/SpChargerHandler.cs @@ -2,29 +2,16 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.Items; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Drops; using System; using System.Threading.Tasks; -using NosCore.Networking; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.MapItemGenerationService.Handlers { @@ -45,4 +32,4 @@ await requestData.ClientSession.Character.MapInstance.SendPacketAsync( requestData.ClientSession.Character.GenerateGet(requestData.Data.Item1.VisualId)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapItemGenerationService/IGetMapItemEventHandler.cs b/src/NosCore.GameObject/Services/MapItemGenerationService/IGetMapItemEventHandler.cs index a2fe5274f..c8c0d8315 100644 --- a/src/NosCore.GameObject/Services/MapItemGenerationService/IGetMapItemEventHandler.cs +++ b/src/NosCore.GameObject/Services/MapItemGenerationService/IGetMapItemEventHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Infastructure; @@ -27,4 +14,4 @@ namespace NosCore.GameObject.Services.MapItemGenerationService public interface IGetMapItemEventHandler : IEventHandler> { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapItemGenerationService/IMapItemGenerationService.cs b/src/NosCore.GameObject/Services/MapItemGenerationService/IMapItemGenerationService.cs index 523be0b93..ee5b977af 100644 --- a/src/NosCore.GameObject/Services/MapItemGenerationService/IMapItemGenerationService.cs +++ b/src/NosCore.GameObject/Services/MapItemGenerationService/IMapItemGenerationService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Services.ItemGenerationService.Item; @@ -27,4 +14,4 @@ public interface IMapItemGenerationService { MapItem Create(MapInstance mapInstance, IItemInstance itemInstance, short positionX, short positionY); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MapItemGenerationService/MapItemGenerationService.cs b/src/NosCore.GameObject/Services/MapItemGenerationService/MapItemGenerationService.cs index a581a4eb7..44d980fbb 100644 --- a/src/NosCore.GameObject/Services/MapItemGenerationService/MapItemGenerationService.cs +++ b/src/NosCore.GameObject/Services/MapItemGenerationService/MapItemGenerationService.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.Core.Services.IdService; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.GameObject.Services.MapInstanceGenerationService; using NosCore.Packets.ClientPackets.Drops; using System; -using NosCore.Core.Services.IdService; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.MapItemGenerationService { @@ -47,4 +34,4 @@ public MapItem Create(MapInstance mapInstance, IItemInstance itemInstance, short return mapItem; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MinilandService/IMinilandRegistry.cs b/src/NosCore.GameObject/Services/MinilandService/IMinilandRegistry.cs index f6fbc7c73..67cce21d5 100644 --- a/src/NosCore.GameObject/Services/MinilandService/IMinilandRegistry.cs +++ b/src/NosCore.GameObject/Services/MinilandService/IMinilandRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System; using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/MinilandService/IMinilandService.cs b/src/NosCore.GameObject/Services/MinilandService/IMinilandService.cs index f91fda2c8..e63c2239e 100644 --- a/src/NosCore.GameObject/Services/MinilandService/IMinilandService.cs +++ b/src/NosCore.GameObject/Services/MinilandService/IMinilandService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Services.InventoryService; @@ -37,4 +24,4 @@ public interface IMinilandService void AddMinilandObject(MapDesignObject mapObject, long characterId, InventoryItemInstance minilandobject); Task SetStateAsync(long characterId, MinilandState state); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MinilandService/Miniland.cs b/src/NosCore.GameObject/Services/MinilandService/Miniland.cs index baf90576f..31f9d5bba 100644 --- a/src/NosCore.GameObject/Services/MinilandService/Miniland.cs +++ b/src/NosCore.GameObject/Services/MinilandService/Miniland.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -60,4 +47,4 @@ public MlinfoPacket GenerateMlinfo() }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MinilandService/MinilandHelper.cs b/src/NosCore.GameObject/Services/MinilandService/MinilandHelper.cs index 57697c6a3..106370a78 100644 --- a/src/NosCore.GameObject/Services/MinilandService/MinilandHelper.cs +++ b/src/NosCore.GameObject/Services/MinilandService/MinilandHelper.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Services.MailService; using System; using System.Collections.Generic; using System.Linq; -using NosCore.GameObject.Services.MailService; namespace NosCore.GameObject.Services.MinilandService { @@ -262,4 +249,4 @@ private MinilandHelper() return _gifts[game][point].OrderBy(s => rand.Next()).FirstOrDefault(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/MinilandService/MinilandRegistry.cs b/src/NosCore.GameObject/Services/MinilandService/MinilandRegistry.cs index 10c8b5a0c..152efb7a6 100644 --- a/src/NosCore.GameObject/Services/MinilandService/MinilandRegistry.cs +++ b/src/NosCore.GameObject/Services/MinilandService/MinilandRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System; using System.Collections.Concurrent; diff --git a/src/NosCore.GameObject/Services/MinilandService/MinilandService.cs b/src/NosCore.GameObject/Services/MinilandService/MinilandService.cs index a1e5f4c54..687ed8f96 100644 --- a/src/NosCore.GameObject/Services/MinilandService/MinilandService.cs +++ b/src/NosCore.GameObject/Services/MinilandService/MinilandService.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using Mapster; using NosCore.Dao.Interfaces; @@ -24,6 +11,8 @@ using NosCore.Data.Enumerations.Items; using NosCore.Data.Enumerations.Map; using NosCore.Data.StaticEntities; +using NosCore.GameObject.ComponentEntities.Entities; +using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.MapInstanceAccessService; using NosCore.GameObject.Services.MapInstanceGenerationService; @@ -32,8 +21,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.MinilandService { diff --git a/src/NosCore.GameObject/Services/NRunService/Handlers/BazaarHandler.cs b/src/NosCore.GameObject/Services/NRunService/Handlers/BazaarHandler.cs index d3c743600..fa8862472 100644 --- a/src/NosCore.GameObject/Services/NRunService/Handlers/BazaarHandler.cs +++ b/src/NosCore.GameObject/Services/NRunService/Handlers/BazaarHandler.cs @@ -1,23 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Buff; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Npcs; @@ -26,8 +15,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.NRunService.Handlers { @@ -56,4 +43,4 @@ public Task ExecuteAsync(RequestData> requestDat }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/NRunService/Handlers/ChangeClassHandler.cs b/src/NosCore.GameObject/Services/NRunService/Handlers/ChangeClassHandler.cs index f2fca680b..7482e85f0 100644 --- a/src/NosCore.GameObject/Services/NRunService/Handlers/ChangeClassHandler.cs +++ b/src/NosCore.GameObject/Services/NRunService/Handlers/ChangeClassHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -25,10 +12,10 @@ using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; using NosCore.Shared.Enumerations; -using System; -using System.Threading.Tasks; using NosCore.Shared.I18N; using Serilog; +using System; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.NRunService.Handlers { @@ -88,4 +75,4 @@ await requestData.ClientSession.SendPacketAsync(new SayiPacket await requestData.ClientSession.Character.ChangeClassAsync(classType); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/NRunService/Handlers/OpenShopHandler.cs b/src/NosCore.GameObject/Services/NRunService/Handlers/OpenShopHandler.cs index ec4c6af5e..7d2bd1e6c 100644 --- a/src/NosCore.GameObject/Services/NRunService/Handlers/OpenShopHandler.cs +++ b/src/NosCore.GameObject/Services/NRunService/Handlers/OpenShopHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; @@ -48,4 +35,4 @@ public Task ExecuteAsync(RequestData> requestDat }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/NRunService/Handlers/TeleporterHandler.cs b/src/NosCore.GameObject/Services/NRunService/Handlers/TeleporterHandler.cs index 32c18dd8b..ad6b22162 100644 --- a/src/NosCore.GameObject/Services/NRunService/Handlers/TeleporterHandler.cs +++ b/src/NosCore.GameObject/Services/NRunService/Handlers/TeleporterHandler.cs @@ -2,32 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.MapChangeService; using NosCore.Packets.ClientPackets.Npcs; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; +using NosCore.Shared.Enumerations; using NosCore.Shared.Helpers; using System; using System.Threading.Tasks; -using NosCore.GameObject.Services.MapChangeService; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.Shared.Enumerations; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.NRunService.Handlers { @@ -72,4 +59,4 @@ await clientSession.SendPacketAsync(new SayiPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/NRunService/INrunEventHandler.cs b/src/NosCore.GameObject/Services/NRunService/INrunEventHandler.cs index 7487f1690..90095a75d 100644 --- a/src/NosCore.GameObject/Services/NRunService/INrunEventHandler.cs +++ b/src/NosCore.GameObject/Services/NRunService/INrunEventHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Infastructure; @@ -27,4 +14,4 @@ namespace NosCore.GameObject.Services.NRunService public interface INrunEventHandler : IEventHandler, Tuple> { } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/NRunService/INrunService.cs b/src/NosCore.GameObject/Services/NRunService/INrunService.cs index 2376121e8..7c2199aa2 100644 --- a/src/NosCore.GameObject/Services/NRunService/INrunService.cs +++ b/src/NosCore.GameObject/Services/NRunService/INrunService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Networking.ClientSession; @@ -29,4 +16,4 @@ public interface INrunService { Task NRunLaunchAsync(ClientSession clientSession, Tuple data); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/NRunService/NrunService.cs b/src/NosCore.GameObject/Services/NRunService/NrunService.cs index 26c2c78a1..3b5fe972d 100644 --- a/src/NosCore.GameObject/Services/NRunService/NrunService.cs +++ b/src/NosCore.GameObject/Services/NRunService/NrunService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Infastructure; @@ -57,4 +44,4 @@ public Task NRunLaunchAsync(ClientSession clientSession, Tuple. -using System; using NosCore.GameObject.Infastructure; using NosCore.Packets.Attributes; +using System; namespace NosCore.GameObject.Services.PacketHandlerService { diff --git a/src/NosCore.GameObject/Services/PacketHandlerService/PacketHandlerRegistry.cs b/src/NosCore.GameObject/Services/PacketHandlerService/PacketHandlerRegistry.cs index 01c0b6409..bd023ce8e 100644 --- a/src/NosCore.GameObject/Services/PacketHandlerService/PacketHandlerRegistry.cs +++ b/src/NosCore.GameObject/Services/PacketHandlerService/PacketHandlerRegistry.cs @@ -3,25 +3,12 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using NosCore.GameObject.Infastructure; +using NosCore.Packets.Attributes; using System; using System.Collections.Generic; using System.Reflection; -using NosCore.GameObject.Infastructure; -using NosCore.Packets.Attributes; namespace NosCore.GameObject.Services.PacketHandlerService { diff --git a/src/NosCore.GameObject/Services/QuestService/IQuestService.cs b/src/NosCore.GameObject/Services/QuestService/IQuestService.cs index 5fce6cc43..9e89691e2 100644 --- a/src/NosCore.GameObject/Services/QuestService/IQuestService.cs +++ b/src/NosCore.GameObject/Services/QuestService/IQuestService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Entities; using NosCore.Packets.ClientPackets.Quest; @@ -28,4 +15,4 @@ public interface IQuestService Task RunScriptAsync(Character character); Task RunScriptAsync(Character character, ScriptClientPacket? packet); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/QuestService/Quest.cs b/src/NosCore.GameObject/Services/QuestService/Quest.cs index f9cbf286e..622c7e6a3 100644 --- a/src/NosCore.GameObject/Services/QuestService/Quest.cs +++ b/src/NosCore.GameObject/Services/QuestService/Quest.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; using NosCore.Data.StaticEntities; @@ -84,4 +71,4 @@ public TargetOffPacket GenerateTargetOffPacket() public List QuestObjectives { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/QuestService/QuestService.cs b/src/NosCore.GameObject/Services/QuestService/QuestService.cs index d41311226..32ba2d769 100644 --- a/src/NosCore.GameObject/Services/QuestService/QuestService.cs +++ b/src/NosCore.GameObject/Services/QuestService/QuestService.cs @@ -2,26 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; using Microsoft.Extensions.Options; +using NodaTime; using NosCore.Core.Configuration; using NosCore.Data.Enumerations.I18N; using NosCore.Data.StaticEntities; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.Packets.ClientPackets.Quest; @@ -29,14 +18,12 @@ using NosCore.Packets.ServerPackets.CharacterSelectionScreen; using NosCore.Packets.ServerPackets.Quest; using NosCore.Packets.ServerPackets.UI; +using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.Shared.I18N; -using NosCore.GameObject.ComponentEntities.Entities; namespace NosCore.GameObject.Services.QuestService { @@ -328,4 +315,4 @@ public async Task ValidateQuestAsync(ICharacterEntity character, short que return isValid; } } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/SaveService/ISaveService.cs b/src/NosCore.GameObject/Services/SaveService/ISaveService.cs index 6a3903af4..a2f0a9f34 100644 --- a/src/NosCore.GameObject/Services/SaveService/ISaveService.cs +++ b/src/NosCore.GameObject/Services/SaveService/ISaveService.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Threading.Tasks; using NosCore.GameObject.ComponentEntities.Interfaces; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.SaveService { diff --git a/src/NosCore.GameObject/Services/SaveService/SaveService.cs b/src/NosCore.GameObject/Services/SaveService/SaveService.cs index 5c61e1107..42c7c3d3b 100644 --- a/src/NosCore.GameObject/Services/SaveService/SaveService.cs +++ b/src/NosCore.GameObject/Services/SaveService/SaveService.cs @@ -2,24 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Linq; -using System.Threading.Tasks; using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; @@ -28,6 +12,9 @@ using NosCore.GameObject.Services.MinilandService; using NosCore.Shared.I18N; using Serilog; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.SaveService { diff --git a/src/NosCore.GameObject/Services/ShopService/IShopRegistry.cs b/src/NosCore.GameObject/Services/ShopService/IShopRegistry.cs index f15209c0f..89d25d71b 100644 --- a/src/NosCore.GameObject/Services/ShopService/IShopRegistry.cs +++ b/src/NosCore.GameObject/Services/ShopService/IShopRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/ShopService/Shop.cs b/src/NosCore.GameObject/Services/ShopService/Shop.cs index f026020d9..6b80fc1e8 100644 --- a/src/NosCore.GameObject/Services/ShopService/Shop.cs +++ b/src/NosCore.GameObject/Services/ShopService/Shop.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Data.Dto; using NosCore.Data.StaticEntities; diff --git a/src/NosCore.GameObject/Services/ShopService/ShopItem.cs b/src/NosCore.GameObject/Services/ShopService/ShopItem.cs index 06e2c303b..25289ba86 100644 --- a/src/NosCore.GameObject/Services/ShopService/ShopItem.cs +++ b/src/NosCore.GameObject/Services/ShopService/ShopItem.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Data.StaticEntities; using NosCore.GameObject.Services.ItemGenerationService.Item; diff --git a/src/NosCore.GameObject/Services/ShopService/ShopRegistry.cs b/src/NosCore.GameObject/Services/ShopService/ShopRegistry.cs index f9766a4e0..43d213a30 100644 --- a/src/NosCore.GameObject/Services/ShopService/ShopRegistry.cs +++ b/src/NosCore.GameObject/Services/ShopService/ShopRegistry.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/NosCore.GameObject/Services/SkillService/SkillService.cs b/src/NosCore.GameObject/Services/SkillService/SkillService.cs index 149aca184..a350d89ad 100644 --- a/src/NosCore.GameObject/Services/SkillService/SkillService.cs +++ b/src/NosCore.GameObject/Services/SkillService/SkillService.cs @@ -1,13 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Mapster; +using Mapster; using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.StaticEntities; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Services.BattleService; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.SkillService { diff --git a/src/NosCore.GameObject/Services/SpeedCalculationService/ISpeedCalculationService.cs b/src/NosCore.GameObject/Services/SpeedCalculationService/ISpeedCalculationService.cs index 391b83475..005abbb77 100644 --- a/src/NosCore.GameObject/Services/SpeedCalculationService/ISpeedCalculationService.cs +++ b/src/NosCore.GameObject/Services/SpeedCalculationService/ISpeedCalculationService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Interfaces; diff --git a/src/NosCore.GameObject/Services/SpeedCalculationService/SpeedCalculationService.cs b/src/NosCore.GameObject/Services/SpeedCalculationService/SpeedCalculationService.cs index e7af9545c..769e6c2bf 100644 --- a/src/NosCore.GameObject/Services/SpeedCalculationService/SpeedCalculationService.cs +++ b/src/NosCore.GameObject/Services/SpeedCalculationService/SpeedCalculationService.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Algorithm.SpeedService; using NosCore.GameObject.ComponentEntities.Interfaces; diff --git a/src/NosCore.GameObject/Services/TransformationService/ITransformationService.cs b/src/NosCore.GameObject/Services/TransformationService/ITransformationService.cs index f61acb4d1..a510b6a21 100644 --- a/src/NosCore.GameObject/Services/TransformationService/ITransformationService.cs +++ b/src/NosCore.GameObject/Services/TransformationService/ITransformationService.cs @@ -1,25 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Threading.Tasks; using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Services.ItemGenerationService.Item; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.TransformationService { diff --git a/src/NosCore.GameObject/Services/TransformationService/TransformationService.cs b/src/NosCore.GameObject/Services/TransformationService/TransformationService.cs index 4dd641774..6d7df9ecc 100644 --- a/src/NosCore.GameObject/Services/TransformationService/TransformationService.cs +++ b/src/NosCore.GameObject/Services/TransformationService/TransformationService.cs @@ -2,24 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Reactive.Linq; -using System.Threading.Tasks; using NodaTime; using NosCore.Algorithm.ExperienceService; using NosCore.Algorithm.HeroExperienceService; @@ -37,6 +21,9 @@ using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; +using System; +using System.Reactive.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Services.TransformationService { @@ -147,10 +134,10 @@ public async Task ChangeVehicleAsync(Character character, Item item) character.VehicleSpeed = item.Speed; character.MorphUpgrade = 0; character.MorphDesign = 0; - character.Morph = item.SecondMorph == 0 - ? (short)((short)character.Gender + item.Morph) - : character.Gender == GenderType.Male - ? item.Morph + character.Morph = item.SecondMorph == 0 + ? (short)((short)character.Gender + item.Morph) + : character.Gender == GenderType.Male + ? item.Morph : item.SecondMorph; await character.MapInstance.SendPacketAsync( diff --git a/src/NosCore.GameObject/Services/WarehouseService/IWarehouseService.cs b/src/NosCore.GameObject/Services/WarehouseService/IWarehouseService.cs index ce3bb7b44..c3208369f 100644 --- a/src/NosCore.GameObject/Services/WarehouseService/IWarehouseService.cs +++ b/src/NosCore.GameObject/Services/WarehouseService/IWarehouseService.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.Data.Dto; using NosCore.Data.Enumerations.Miniland; using NosCore.Data.WebApi; using NosCore.GameObject.Services.ItemGenerationService.Item; using System; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.Data.Dto; namespace NosCore.GameObject.Services.WarehouseService { @@ -49,4 +36,4 @@ public interface IWarehouseService Task MoveItemAsync(long ownerId, WarehouseType warehouseType, short sourceSlot, short destinationSlot); } -} \ No newline at end of file +} diff --git a/src/NosCore.GameObject/Services/WarehouseService/WarehouseItem.cs b/src/NosCore.GameObject/Services/WarehouseService/WarehouseItem.cs index 52b01f60d..cabb1b36f 100644 --- a/src/NosCore.GameObject/Services/WarehouseService/WarehouseItem.cs +++ b/src/NosCore.GameObject/Services/WarehouseService/WarehouseItem.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using NosCore.Data.Dto; using NosCore.Data.Enumerations.Miniland; diff --git a/src/NosCore.GameObject/Services/WarehouseService/WarehouseService.cs b/src/NosCore.GameObject/Services/WarehouseService/WarehouseService.cs index 029e09727..b60f646e8 100644 --- a/src/NosCore.GameObject/Services/WarehouseService/WarehouseService.cs +++ b/src/NosCore.GameObject/Services/WarehouseService/WarehouseService.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using Mapster; using NosCore.Dao.Interfaces; diff --git a/src/NosCore.LoginServer/LoginServer.cs b/src/NosCore.LoginServer/LoginServer.cs index ca961cd10..6a14a104d 100644 --- a/src/NosCore.LoginServer/LoginServer.cs +++ b/src/NosCore.LoginServer/LoginServer.cs @@ -2,36 +2,23 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; +using NosCore.Core; using NosCore.Core.Configuration; using NosCore.Data.Enumerations.I18N; using NosCore.Database; -using System; -using System.Runtime.InteropServices; -using System.Threading; -using System.Threading.Tasks; -using NosCore.Core; using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; using NosCore.Networking; using NosCore.Shared.I18N; using Polly; +using System; +using System.Runtime.InteropServices; +using System.Threading; +using System.Threading.Tasks; namespace NosCore.LoginServer { @@ -71,4 +58,4 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) await Task.WhenAny(connectTask, networkManager.RunServerAsync()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.LoginServer/LoginServerBootstrap.cs b/src/NosCore.LoginServer/LoginServerBootstrap.cs index 61aefae0a..d527eec3b 100644 --- a/src/NosCore.LoginServer/LoginServerBootstrap.cs +++ b/src/NosCore.LoginServer/LoginServerBootstrap.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Autofac; using Autofac.Extensions.DependencyInjection; @@ -30,16 +17,27 @@ using Microsoft.Extensions.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using NodaTime; using NosCore.Core; using NosCore.Core.Configuration; using NosCore.Core.Encryption; +using NosCore.Core.Services.IdService; using NosCore.Dao; using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Database; using NosCore.Database.Entities; using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication; +using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.LoginService; +using NosCore.Networking; +using NosCore.Networking.Encoding; +using NosCore.Networking.Encoding.Filter; +using NosCore.Networking.SessionRef; using NosCore.PacketHandlers.Login; using NosCore.Packets; using NosCore.Packets.Attributes; @@ -48,6 +46,7 @@ using NosCore.Shared.Authentication; using NosCore.Shared.Configuration; using NosCore.Shared.Enumerations; +using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Generic; @@ -56,18 +55,6 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Threading.Tasks; -using NodaTime; -using NosCore.Core.Services.IdService; -using NosCore.GameObject.InterChannelCommunication; -using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.Services.LoginService; -using NosCore.Networking; -using NosCore.Networking.Encoding; -using NosCore.Networking.Encoding.Filter; -using NosCore.Networking.SessionRef; -using NosCore.Shared.I18N; namespace NosCore.LoginServer { @@ -208,11 +195,11 @@ private static IHost BuildHost(string[] args) { Console.Title = Title; } - + InitializeConfiguration(args, services); services.AddI18NLogs(); services.AddLogging(builder => builder.AddFilter("Microsoft", LogLevel.Warning)); - + services.RemoveAll(); services.Configure(o => o.SuppressStatusMessages = true); services.AddHostedService(); @@ -222,4 +209,4 @@ private static IHost BuildHost(string[] args) .Build(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.MasterServer/MasterConfiguration.cs b/src/NosCore.MasterServer/MasterConfiguration.cs index 9f68e0621..915ba497a 100644 --- a/src/NosCore.MasterServer/MasterConfiguration.cs +++ b/src/NosCore.MasterServer/MasterConfiguration.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Configuration; using System.ComponentModel.DataAnnotations; @@ -30,4 +17,4 @@ public class MasterConfiguration : LanguageConfiguration [Required] public SqlConnectionConfiguration Database { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.MasterServer/MasterServer.cs b/src/NosCore.MasterServer/MasterServer.cs index 33b3ec9fa..0ab4cb1b2 100644 --- a/src/NosCore.MasterServer/MasterServer.cs +++ b/src/NosCore.MasterServer/MasterServer.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; @@ -46,4 +33,4 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.MasterServer/MasterServerBootstrap.cs b/src/NosCore.MasterServer/MasterServerBootstrap.cs index 5d800ce4d..d32842d91 100644 --- a/src/NosCore.MasterServer/MasterServerBootstrap.cs +++ b/src/NosCore.MasterServer/MasterServerBootstrap.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; @@ -55,4 +42,4 @@ private static IWebHost BuildWebHost(string[] args) .Build(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.MasterServer/Startup.cs b/src/NosCore.MasterServer/Startup.cs index a0854807b..0eadc6360 100644 --- a/src/NosCore.MasterServer/Startup.cs +++ b/src/NosCore.MasterServer/Startup.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Autofac; using Autofac.Extensions.DependencyInjection; @@ -47,10 +34,21 @@ using NosCore.Data.StaticEntities; using NosCore.Database; using NosCore.Database.Entities; +using NosCore.GameObject.InterChannelCommunication; +using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; +using NosCore.GameObject.InterChannelCommunication.Messages; +using NosCore.GameObject.Services.AuthService; using NosCore.GameObject.Services.BazaarService; +using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.FriendService; using NosCore.GameObject.Services.MailService; -using NosCore.GameObject.Services.EventLoaderService; using NosCore.Shared.Authentication; using NosCore.Shared.Configuration; using NosCore.Shared.Enumerations; @@ -64,17 +62,6 @@ using System.Threading.Tasks; using ConfigureJwtBearerOptions = NosCore.Core.ConfigureJwtBearerOptions; using ILogger = Serilog.ILogger; -using NosCore.GameObject.InterChannelCommunication; -using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; -using NosCore.GameObject.InterChannelCommunication.Messages; -using NosCore.GameObject.Services.AuthService; namespace NosCore.MasterServer { @@ -224,7 +211,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services) services.AddDbContext( conf => conf.UseNpgsql(masterConfiguration.Database.ConnectionString, options => { options.UseNodaTime(); })); services.ConfigureOptions(); - + services.RemoveAll(); services.AddLogging(builder => builder.AddFilter("Microsoft", LogLevel.Warning)); services.AddAuthentication(config => config.DefaultScheme = JwtBearerDefaults.AuthenticationScheme).AddJwtBearer(); diff --git a/src/NosCore.PacketHandlers/Battle/UseSkillPacketHandler.cs b/src/NosCore.PacketHandlers/Battle/UseSkillPacketHandler.cs index c74d644fc..f014adebb 100644 --- a/src/NosCore.PacketHandlers/Battle/UseSkillPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Battle/UseSkillPacketHandler.cs @@ -1,36 +1,23 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using NosCore.GameObject.Networking.ClientSession; -using System.Threading.Tasks; -using NosCore.Packets.ClientPackets.Battle; -using NosCore.Packets.Enumerations; using NosCore.Data.Enumerations.I18N; -using NosCore.Packets.ServerPackets.Battle; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; using NosCore.GameObject.Infastructure; +using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BattleService; +using NosCore.GameObject.Services.BroadcastService; +using NosCore.Packets.ClientPackets.Battle; +using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Battle; using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; -using NosCore.GameObject.Services.BroadcastService; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Battle { @@ -97,4 +84,4 @@ await clientSession.SendPacketAsync(new CancelPacket() } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Bazaar/CBListPacketHandler.cs b/src/NosCore.PacketHandlers/Bazaar/CBListPacketHandler.cs index c8dae4743..2de891374 100644 --- a/src/NosCore.PacketHandlers/Bazaar/CBListPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Bazaar/CBListPacketHandler.cs @@ -2,22 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Bazaar; using NosCore.Packets.ServerPackets.Auction; @@ -25,9 +15,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using static NosCore.Packets.ServerPackets.Auction.RcbListPacket; namespace NosCore.PacketHandlers.Bazaar @@ -94,4 +81,4 @@ await clientSession.SendPacketAsync(new RcbListPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Bazaar/CBuyPacketHandler.cs b/src/NosCore.PacketHandlers/Bazaar/CBuyPacketHandler.cs index d55753d21..2374a2bab 100644 --- a/src/NosCore.PacketHandlers/Bazaar/CBuyPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Bazaar/CBuyPacketHandler.cs @@ -1,26 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -36,8 +25,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; namespace NosCore.PacketHandlers.Bazaar { diff --git a/src/NosCore.PacketHandlers/Bazaar/CModPacketHandler.cs b/src/NosCore.PacketHandlers/Bazaar/CModPacketHandler.cs index 41ef7b966..bbdd5a726 100644 --- a/src/NosCore.PacketHandlers/Bazaar/CModPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Bazaar/CModPacketHandler.cs @@ -2,26 +2,14 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using Json.More; using Json.Patch; using Json.Pointer; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Bazaar; using NosCore.Packets.Enumerations; @@ -30,9 +18,8 @@ using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; +using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; namespace NosCore.PacketHandlers.Bazaar { @@ -42,7 +29,7 @@ public class CModPacketHandler(IBazaarHub bazaarHttpClient, ILogger logger, { public override async Task ExecuteAsync(CModPacket packet, ClientSession clientSession) { - var bzs = await bazaarHttpClient.GetBazaar(packet.BazaarId,null,null,null,null,null,null,null,null); + var bzs = await bazaarHttpClient.GetBazaar(packet.BazaarId, null, null, null, null, null, null, null, null); var bz = bzs.FirstOrDefault(); if ((bz != null) && (bz.SellerName == clientSession.Character.Name) && (bz.BazaarItem?.Price != packet.NewPrice)) @@ -64,7 +51,7 @@ await clientSession.SendPacketAsync(new ModaliPacket if ((bzMod != null) && (bzMod.BazaarItem?.Price != bz.BazaarItem.Price)) { - await clientSession.HandlePacketsAsync(new[] {new CSListPacket {Index = 0, Filter = BazaarStatusType.Default}}); + await clientSession.HandlePacketsAsync(new[] { new CSListPacket { Index = 0, Filter = BazaarStatusType.Default } }); await clientSession.SendPacketAsync(new SayiPacket { VisualType = VisualType.Player, @@ -91,4 +78,4 @@ await clientSession.SendPacketAsync(new ModaliPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Bazaar/CRegPacketHandler.cs b/src/NosCore.PacketHandlers/Bazaar/CRegPacketHandler.cs index e0431f4f1..deb009938 100644 --- a/src/NosCore.PacketHandlers/Bazaar/CRegPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Bazaar/CRegPacketHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; @@ -26,6 +13,8 @@ using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.Packets.ClientPackets.Bazaar; @@ -37,8 +26,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; namespace NosCore.PacketHandlers.Bazaar { @@ -195,4 +182,4 @@ await clientSession.SendPacketAsync(new MsgiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Bazaar/CSListPacketHandler.cs b/src/NosCore.PacketHandlers/Bazaar/CSListPacketHandler.cs index 91dfbb0ae..d2639504d 100644 --- a/src/NosCore.PacketHandlers/Bazaar/CSListPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Bazaar/CSListPacketHandler.cs @@ -2,21 +2,11 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Bazaar; using NosCore.Packets.Enumerations; @@ -24,9 +14,6 @@ using NosCore.Packets.ServerPackets.Inventory; using System.Collections.Generic; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; namespace NosCore.PacketHandlers.Bazaar { @@ -87,4 +74,4 @@ await clientSession.SendPacketAsync(new RcsListPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Bazaar/CScalcPacketHandler.cs b/src/NosCore.PacketHandlers/Bazaar/CScalcPacketHandler.cs index 25623178c..32f5c41bc 100644 --- a/src/NosCore.PacketHandlers/Bazaar/CScalcPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Bazaar/CScalcPacketHandler.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; @@ -23,6 +10,8 @@ using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -35,10 +24,8 @@ using NosCore.Shared.I18N; using Serilog; using System; -using System.Threading.Tasks; -using NosCore.GameObject.InterChannelCommunication.Hubs.BazaarHub; using System.Linq; -using NosCore.GameObject.Infastructure; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Bazaar { @@ -81,7 +68,7 @@ await clientSession.SendPacketAsync(new SayiPacket Game18NArguments = { price } }); await clientSession.SendPacketAsync(clientSession.Character.GenerateGold()); - + if (bz.ItemInstance.Amount > 0) { var itemInstance = await itemInstanceDao.FirstOrDefaultAsync(s => s!.Id == bz.ItemInstance.Id); @@ -151,4 +138,4 @@ await clientSession.SendPacketAsync(new RCScalcPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Bazaar/CSkillPacketHandler.cs b/src/NosCore.PacketHandlers/Bazaar/CSkillPacketHandler.cs index 96f3e55b8..8fc5c7ed4 100644 --- a/src/NosCore.PacketHandlers/Bazaar/CSkillPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Bazaar/CSkillPacketHandler.cs @@ -2,30 +2,17 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Buff; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Bazaar; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Bazaar { @@ -62,4 +49,4 @@ await clientSession.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/CharacterScreen/CharNewJobPacketHandler.cs b/src/NosCore.PacketHandlers/CharacterScreen/CharNewJobPacketHandler.cs index 0dd125807..e77db08a4 100644 --- a/src/NosCore.PacketHandlers/CharacterScreen/CharNewJobPacketHandler.cs +++ b/src/NosCore.PacketHandlers/CharacterScreen/CharNewJobPacketHandler.cs @@ -2,32 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; +using Microsoft.Extensions.Options; +using NosCore.Core.Configuration; using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Character; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.CharacterSelectionScreen; using NosCore.Shared.Enumerations; using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using NosCore.Core.Configuration; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.CharacterScreen { @@ -60,4 +47,4 @@ public override async Task ExecuteAsync(CharNewJobPacket packet, ClientSession c await clientSession.HandlePacketsAsync(new[] { packet.Adapt() }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/CharacterScreen/CharNewPacketHandler.cs b/src/NosCore.PacketHandlers/CharacterScreen/CharNewPacketHandler.cs index 79dead9a4..1d12bb7e2 100644 --- a/src/NosCore.PacketHandlers/CharacterScreen/CharNewPacketHandler.cs +++ b/src/NosCore.PacketHandlers/CharacterScreen/CharNewPacketHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; using Microsoft.Extensions.Options; @@ -26,6 +13,7 @@ using NosCore.Data.CommandPackets; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Character; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -40,7 +28,6 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.CharacterScreen { @@ -155,7 +142,7 @@ public override async Task ExecuteAsync(CharNewPacket packet, ClientSession clie foreach (var skillToAdd in skillsToAdd) { await characterSkillDao.TryInsertOrUpdateAsync(new CharacterSkillDto - { CharacterId = chara.CharacterId, SkillVNum = skillToAdd, Id = Guid.NewGuid()}); + { CharacterId = chara.CharacterId, SkillVNum = skillToAdd, Id = Guid.NewGuid() }); } await quicklistEntryDao.TryInsertOrUpdateAsync(new[] { @@ -223,4 +210,4 @@ await clientSession.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/CharacterScreen/CharRenPacketHandler.cs b/src/NosCore.PacketHandlers/CharacterScreen/CharRenPacketHandler.cs index e184b9739..cf563e159 100644 --- a/src/NosCore.PacketHandlers/CharacterScreen/CharRenPacketHandler.cs +++ b/src/NosCore.PacketHandlers/CharacterScreen/CharRenPacketHandler.cs @@ -2,25 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using Microsoft.Extensions.Options; +using NosCore.Core.Configuration; using NosCore.Dao.Interfaces; using NosCore.Data.CommandPackets; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Character; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.CharacterSelectionScreen; using NosCore.Packets.Enumerations; @@ -28,9 +18,6 @@ using NosCore.Packets.ServerPackets.UI; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using NosCore.Core.Configuration; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.CharacterScreen { @@ -85,4 +72,4 @@ await clientSession.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/CharacterScreen/CharacterDeletePacketHandler.cs b/src/NosCore.PacketHandlers/CharacterScreen/CharacterDeletePacketHandler.cs index 2b7fba2fc..34d764b1b 100644 --- a/src/NosCore.PacketHandlers/CharacterScreen/CharacterDeletePacketHandler.cs +++ b/src/NosCore.PacketHandlers/CharacterScreen/CharacterDeletePacketHandler.cs @@ -2,34 +2,21 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using Microsoft.Extensions.Options; +using NosCore.Core.Configuration; using NosCore.Dao.Interfaces; using NosCore.Data.CommandPackets; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Character; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.CharacterSelectionScreen; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using NosCore.Shared.Authentication; using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using NosCore.Core.Configuration; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.CharacterScreen { @@ -78,4 +65,4 @@ await clientSession.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/CharacterScreen/DacPacketHandler.cs b/src/NosCore.PacketHandlers/CharacterScreen/DacPacketHandler.cs index 908421ea5..819a1bc4d 100644 --- a/src/NosCore.PacketHandlers/CharacterScreen/DacPacketHandler.cs +++ b/src/NosCore.PacketHandlers/CharacterScreen/DacPacketHandler.cs @@ -2,34 +2,21 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; -using NosCore.GameObject.Networking.ClientSession; -using NosCore.Packets.ClientPackets.CharacterSelectionScreen; -using NosCore.Packets.ClientPackets.Infrastructure; -using Serilog; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.Networking.ClientSession; using NosCore.Networking.SessionRef; +using NosCore.Packets.ClientPackets.CharacterSelectionScreen; +using NosCore.Packets.ClientPackets.Infrastructure; using NosCore.Shared.I18N; +using Serilog; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.CharacterScreen { @@ -54,4 +41,4 @@ await EntryPointPacketHandler.VerifyConnectionAsync(clientSession, logger, authH clientSession.Account.Name); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/CharacterScreen/EntryPointPacketHandler.cs b/src/NosCore.PacketHandlers/CharacterScreen/EntryPointPacketHandler.cs index 36095f974..1ac18cb5f 100644 --- a/src/NosCore.PacketHandlers/CharacterScreen/EntryPointPacketHandler.cs +++ b/src/NosCore.PacketHandlers/CharacterScreen/EntryPointPacketHandler.cs @@ -2,47 +2,34 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; +using Microsoft.Extensions.Options; +using NosCore.Core.Configuration; using NosCore.Core.Encryption; using NosCore.Dao.Interfaces; using NosCore.Data.CommandPackets; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Character; using NosCore.Data.Enumerations.I18N; +using NosCore.Data.WebApi; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.ItemGenerationService.Item; +using NosCore.Networking; +using NosCore.Networking.SessionRef; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.CharacterSelectionScreen; using NosCore.Packets.ServerPackets.UI; +using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using NosCore.Core.Configuration; -using NosCore.Networking; -using NosCore.Networking.SessionRef; -using NosCore.Shared.I18N; -using NosCore.Data.WebApi; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; namespace NosCore.PacketHandlers.CharacterScreen { @@ -57,7 +44,7 @@ public static async Task VerifyConnectionAsync(ClientSession clientSession, ILog IDao accountDao, IPubSubHub pubSubHub, bool passwordLessConnection, string accountName, string password, int sessionId, ISessionRefHolder sessionRefHolder, ILogLanguageLocalizer logLanguage) { var subscribers = await pubSubHub.GetSubscribersAsync(); - var alreadyConnnected = subscribers.Any(x=>x.Name == accountName); + var alreadyConnnected = subscribers.Any(x => x.Name == accountName); if (alreadyConnnected) { @@ -220,4 +207,4 @@ await clientSession.SendPacketAsync(new ClistPacket await clientSession.SendPacketAsync(new ClistEndPacket()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/CharacterScreen/SelectPacketHandler.cs b/src/NosCore.PacketHandlers/CharacterScreen/SelectPacketHandler.cs index 59b86e028..5bf9eb2fa 100644 --- a/src/NosCore.PacketHandlers/CharacterScreen/SelectPacketHandler.cs +++ b/src/NosCore.PacketHandlers/CharacterScreen/SelectPacketHandler.cs @@ -2,28 +2,20 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; +using Microsoft.Extensions.Options; +using NosCore.Core.Configuration; using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Character; using NosCore.Data.Enumerations.I18N; using NosCore.Data.StaticEntities; +using NosCore.Data.WebApi; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -31,18 +23,13 @@ using NosCore.GameObject.Services.QuestService; using NosCore.Packets.ClientPackets.CharacterSelectionScreen; using NosCore.Packets.ServerPackets.CharacterSelectionScreen; +using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.Extensions.Options; -using NosCore.Core.Configuration; -using NosCore.Shared.I18N; -using NosCore.Data.WebApi; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; namespace NosCore.PacketHandlers.CharacterScreen { @@ -147,4 +134,4 @@ await pubSubHub.SubscribeAsync(new Subscriber } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Chat/BtkPacketHandler.cs b/src/NosCore.PacketHandlers/Chat/BtkPacketHandler.cs index b66d49354..355275fd0 100644 --- a/src/NosCore.PacketHandlers/Chat/BtkPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Chat/BtkPacketHandler.cs @@ -2,27 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Core; using NosCore.Core.I18N; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Interaction; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Chat; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; @@ -30,12 +22,7 @@ using Serilog; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; using Character = NosCore.Data.WebApi.Character; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; -using NosCore.GameObject.Services.BroadcastService; namespace NosCore.PacketHandlers.Chat { @@ -96,4 +83,4 @@ await packetHttpClient.SendMessageAsync(new PostedPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Chat/ClientSayPacketHandler.cs b/src/NosCore.PacketHandlers/Chat/ClientSayPacketHandler.cs index 5cdae48ab..943cbed12 100644 --- a/src/NosCore.PacketHandlers/Chat/ClientSayPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Chat/ClientSayPacketHandler.cs @@ -1,31 +1,18 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; +using NosCore.Networking.SessionGroup.ChannelMatcher; using NosCore.Packets.ClientPackets.Chat; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; -using NosCore.Networking.SessionGroup.ChannelMatcher; namespace NosCore.PacketHandlers.Chat { @@ -42,4 +29,4 @@ public override Task ExecuteAsync(ClientSayPacket clientSayPacket, ClientSession }), new EveryoneBut(session.Channel!.Id)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Chat/WhisperPacketHandler.cs b/src/NosCore.PacketHandlers/Chat/WhisperPacketHandler.cs index 6ecb4e8d4..d68d1c31d 100644 --- a/src/NosCore.PacketHandlers/Chat/WhisperPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Chat/WhisperPacketHandler.cs @@ -2,26 +2,17 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Core; using NosCore.Core.I18N; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Interaction; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Chat; @@ -35,10 +26,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Chat @@ -126,4 +113,4 @@ await pubSubHub.SendMessageAsync(new PostedPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/ChangeChannelPacketHandler.cs b/src/NosCore.PacketHandlers/Command/ChangeChannelPacketHandler.cs index 4303a1699..fe19b7637 100644 --- a/src/NosCore.PacketHandlers/Command/ChangeChannelPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/ChangeChannelPacketHandler.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; -using NosCore.GameObject.Networking.ClientSession; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; +using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.ChannelService; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Command { @@ -33,4 +20,4 @@ public override Task ExecuteAsync(ChangeChannelPacket changeClassPacket, ClientS return loginService.MoveChannelAsync(session, changeClassPacket.ChannelId); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/ChangeClassPacketHandler.cs b/src/NosCore.PacketHandlers/Command/ChangeClassPacketHandler.cs index 40d676507..63c1be28c 100644 --- a/src/NosCore.PacketHandlers/Command/ChangeClassPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/ChangeClassPacketHandler.cs @@ -2,31 +2,18 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; +using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Command @@ -64,4 +51,4 @@ await session.SendPacketAsync(new InfoiPacket await pubSubHub.SendMessageAsync(data); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/CreateItemPacketHandler.cs b/src/NosCore.PacketHandlers/Command/CreateItemPacketHandler.cs index ddc0fc4c5..9284de01e 100644 --- a/src/NosCore.PacketHandlers/Command/CreateItemPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/CreateItemPacketHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; @@ -25,6 +12,7 @@ using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -37,7 +25,6 @@ using Serilog; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Command { @@ -169,4 +156,4 @@ await session.SendPacketAsync(new SayiPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/EffectCommandPacketHandler.cs b/src/NosCore.PacketHandlers/Command/EffectCommandPacketHandler.cs index 8aca028f8..8dd3401d0 100644 --- a/src/NosCore.PacketHandlers/Command/EffectCommandPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/EffectCommandPacketHandler.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.GameObject.ComponentEntities.Extensions; -using NosCore.GameObject.Networking.ClientSession; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; +using NosCore.GameObject.Networking.ClientSession; using NosCore.Networking; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Command @@ -35,4 +22,4 @@ public override Task ExecuteAsync(EffectCommandPacket effectCommandpacket, Clien session.Character.GenerateEff(effectCommandpacket.EffectId)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/GiftPacketHandler.cs b/src/NosCore.PacketHandlers/Command/GiftPacketHandler.cs index c72f6d192..8c0c9742f 100644 --- a/src/NosCore.PacketHandlers/Command/GiftPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/GiftPacketHandler.cs @@ -2,34 +2,21 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; +using NodaTime; using NosCore.Data.CommandPackets; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.MailService; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; using NosCore.Shared.Enumerations; +using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Services.MailService; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; namespace NosCore.PacketHandlers.Command { @@ -51,7 +38,7 @@ await session.SendPacketAsync(new InfoiPacket return; } - await mailHttpClient.SendMailAsync(GiftHelper.GenerateMailRequest(clock, session.Character, receiver.ConnectedCharacter!.Id,null, giftPacket.VNum, + await mailHttpClient.SendMailAsync(GiftHelper.GenerateMailRequest(clock, session.Character, receiver.ConnectedCharacter!.Id, null, giftPacket.VNum, giftPacket.Amount, giftPacket.Rare, giftPacket.Upgrade, false, null, null)); await session.SendPacketAsync(new SayiPacket { @@ -62,6 +49,6 @@ await session.SendPacketAsync(new SayiPacket }); } - + } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/HelpPacketHandler.cs b/src/NosCore.PacketHandlers/Command/HelpPacketHandler.cs index ab2c1150f..5f2b6c128 100644 --- a/src/NosCore.PacketHandlers/Command/HelpPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/HelpPacketHandler.cs @@ -2,30 +2,17 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Core.Extensions; using NosCore.Data.CommandPackets; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Command { @@ -56,4 +43,4 @@ await session.SendPacketAsync(session.Character.GenerateSay("-------------Help c } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/InvisibleCommandPacketHandler.cs b/src/NosCore.PacketHandlers/Command/InvisibleCommandPacketHandler.cs index 765e0d1e3..af6b3d5ba 100644 --- a/src/NosCore.PacketHandlers/Command/InvisibleCommandPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/InvisibleCommandPacketHandler.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.GameObject.ComponentEntities.Extensions; -using NosCore.GameObject.Networking.ClientSession; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; +using NosCore.GameObject.Networking.ClientSession; using NosCore.Networking; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Command @@ -37,4 +24,4 @@ public override Task ExecuteAsync(InvisibleCommandPacket changeClassPacket, Clie //Session.SendPacket(Session.Character.GenerateEq()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/KickPacketHandler.cs b/src/NosCore.PacketHandlers/Command/KickPacketHandler.cs index 59dda293e..c82dcad3c 100644 --- a/src/NosCore.PacketHandlers/Command/KickPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/KickPacketHandler.cs @@ -2,29 +2,16 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using NosCore.Data.CommandPackets; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; +using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; namespace NosCore.PacketHandlers.Command { @@ -48,4 +35,4 @@ await session.SendPacketAsync(new InfoiPacket await pubSubHub.UnsubscribeAsync(receiver.ConnectedCharacter!.Id); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/PositionPacketHandler.cs b/src/NosCore.PacketHandlers/Command/PositionPacketHandler.cs index 71d292039..fe03ffc4b 100644 --- a/src/NosCore.PacketHandlers/Command/PositionPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/PositionPacketHandler.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Command { @@ -36,4 +23,4 @@ public override Task ExecuteAsync(PositionPacket _, ClientSession session) SayColorType.Green)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SetGoldCommandPacketHandler.cs b/src/NosCore.PacketHandlers/Command/SetGoldCommandPacketHandler.cs index a7b3a32fe..e2e0de028 100644 --- a/src/NosCore.PacketHandlers/Command/SetGoldCommandPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SetGoldCommandPacketHandler.cs @@ -2,31 +2,18 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; +using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Command @@ -58,4 +45,4 @@ await session.SendPacketAsync(new InfoiPacket await pubSubHub.SendMessageAsync(data); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SetHeroLevelCommandPacketHandler.cs b/src/NosCore.PacketHandlers/Command/SetHeroLevelCommandPacketHandler.cs index ef3ff27e5..fe38599c9 100644 --- a/src/NosCore.PacketHandlers/Command/SetHeroLevelCommandPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SetHeroLevelCommandPacketHandler.cs @@ -2,33 +2,20 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; using Character = NosCore.Data.WebApi.Character; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; namespace NosCore.PacketHandlers.Command { @@ -66,4 +53,4 @@ await session.SendPacketAsync(new InfoiPacket await pubSubHub.SendMessageAsync(data); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SetJobLevelCommandPacketHandler.cs b/src/NosCore.PacketHandlers/Command/SetJobLevelCommandPacketHandler.cs index dd8117ba1..6393911b4 100644 --- a/src/NosCore.PacketHandlers/Command/SetJobLevelCommandPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SetJobLevelCommandPacketHandler.cs @@ -2,32 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; +using System.Linq; using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; -using System.Linq; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; namespace NosCore.PacketHandlers.Command { @@ -64,4 +51,4 @@ await session.SendPacketAsync(new InfoiPacket await pubSubHub.SendMessageAsync(data); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SetLevelCommandPacketHandler.cs b/src/NosCore.PacketHandlers/Command/SetLevelCommandPacketHandler.cs index 0ae40431c..66f19692b 100644 --- a/src/NosCore.PacketHandlers/Command/SetLevelCommandPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SetLevelCommandPacketHandler.cs @@ -2,32 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations; -using NosCore.GameObject.Networking.ClientSession; -using NosCore.Packets.Enumerations; -using NosCore.Packets.ServerPackets.UI; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.InterChannelCommunication.Messages; +using NosCore.GameObject.Networking.ClientSession; +using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.UI; +using System.Linq; +using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Command @@ -66,4 +53,4 @@ await session.SendPacketAsync(new InfoiPacket await pubSubHub.SendMessageAsync(data); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SetMaintenancePacketHandler.cs b/src/NosCore.PacketHandlers/Command/SetMaintenancePacketHandler.cs index ea15e5b9b..bcedefe65 100644 --- a/src/NosCore.PacketHandlers/Command/SetMaintenancePacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SetMaintenancePacketHandler.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; -using NosCore.GameObject.Networking.ClientSession; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.Networking.ClientSession; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Command { @@ -34,4 +21,4 @@ public override async Task ExecuteAsync(SetMaintenancePacket setMaintenancePacke await channelHttpClient.SetMaintenance(setMaintenancePacket.IsGlobal, setMaintenancePacket.MaintenanceMode); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SetReputationPacketHandler.cs b/src/NosCore.PacketHandlers/Command/SetReputationPacketHandler.cs index bc66ed0b6..21ffad9a9 100644 --- a/src/NosCore.PacketHandlers/Command/SetReputationPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SetReputationPacketHandler.cs @@ -2,32 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; +using System.Linq; using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; -using System.Linq; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; namespace NosCore.PacketHandlers.Command { @@ -63,4 +50,4 @@ await session.SendPacketAsync(new InfoiPacket await pubSubHub.SendMessageAsync(data); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/ShoutPacketHandler.cs b/src/NosCore.PacketHandlers/Command/ShoutPacketHandler.cs index 145a4a88c..3e612d27d 100644 --- a/src/NosCore.PacketHandlers/Command/ShoutPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/ShoutPacketHandler.cs @@ -2,25 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Core.I18N; using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Interaction; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; @@ -29,9 +19,6 @@ using NosCore.Shared.Enumerations; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.InterChannelCommunication.Messages; using Character = NosCore.Data.WebApi.Character; //TODO stop using obsolete @@ -82,4 +69,4 @@ public override async Task ExecuteAsync(ShoutPacket shoutPacket, ClientSession s await packetHttpClient.SendMessagesAsync(new List(new[] { sayPostedPacket, msgPostedPacket })); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SizePacketHandler.cs b/src/NosCore.PacketHandlers/Command/SizePacketHandler.cs index d4eaf9df1..2a78643e1 100644 --- a/src/NosCore.PacketHandlers/Command/SizePacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SizePacketHandler.cs @@ -1,33 +1,20 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Shared.Enumerations; +using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; -using NosCore.Shared.I18N; namespace NosCore.PacketHandlers.Command { @@ -64,4 +51,4 @@ public override Task ExecuteAsync(SizePacket sizePacket, ClientSession session) return session.Character.MapInstance.SendPacketAsync(entity.GenerateCharSc()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/SpeedPacketHandler.cs b/src/NosCore.PacketHandlers/Command/SpeedPacketHandler.cs index dbfdfc26d..1bd08463c 100644 --- a/src/NosCore.PacketHandlers/Command/SpeedPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/SpeedPacketHandler.cs @@ -1,28 +1,15 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Command { @@ -39,4 +26,4 @@ public override Task ExecuteAsync(SpeedPacket speedPacket, ClientSession session return session.SendPacketAsync(session.Character.GenerateCond()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Command/TeleportPacketHandler.cs b/src/NosCore.PacketHandlers/Command/TeleportPacketHandler.cs index 51547da8c..0de960242 100644 --- a/src/NosCore.PacketHandlers/Command/TeleportPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Command/TeleportPacketHandler.cs @@ -1,31 +1,18 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Core.I18N; using NosCore.Data.CommandPackets; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; +using NosCore.GameObject.Services.MapChangeService; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.MapChangeService; namespace NosCore.PacketHandlers.Command { @@ -56,4 +43,4 @@ public override Task ExecuteAsync(TeleportPacket teleportPacket, ClientSession s return mapChangeService.ChangeMapAsync(session, mapId, teleportPacket.MapX, teleportPacket.MapY); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Exchange/ExcListPacketHandler.cs b/src/NosCore.PacketHandlers/Exchange/ExcListPacketHandler.cs index 51c2852e4..9ac979741 100644 --- a/src/NosCore.PacketHandlers/Exchange/ExcListPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Exchange/ExcListPacketHandler.cs @@ -2,25 +2,14 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.ExchangeService; using NosCore.Packets.ClientPackets.Exchanges; using NosCore.Packets.Enumerations; @@ -29,8 +18,6 @@ using Serilog; using System.Collections.Generic; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.BroadcastService; namespace NosCore.PacketHandlers.Exchange { @@ -107,4 +94,4 @@ await clientSession.SendPacketAsync(exchangeService.CloseExchange(clientSession. clientSession.Character.GenerateServerExcListPacket(packet.Gold, packet.BankGold, subPacketList))); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Exchange/ExchangeRequestPacketHandler.cs b/src/NosCore.PacketHandlers/Exchange/ExchangeRequestPacketHandler.cs index 00c249cd5..dd3ea6eec 100644 --- a/src/NosCore.PacketHandlers/Exchange/ExchangeRequestPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Exchange/ExchangeRequestPacketHandler.cs @@ -2,23 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; @@ -34,8 +23,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.ComponentEntities.Entities; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Exchange { @@ -268,4 +255,4 @@ await clientSession.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Friend/BlDelPacketHandler.cs b/src/NosCore.PacketHandlers/Friend/BlDelPacketHandler.cs index c87940dc7..bb9b93bf8 100644 --- a/src/NosCore.PacketHandlers/Friend/BlDelPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Friend/BlDelPacketHandler.cs @@ -2,31 +2,18 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using NosCore.Core.I18N; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Relations; using NosCore.Packets.ServerPackets.UI; +using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; namespace NosCore.PacketHandlers.Friend { @@ -53,4 +40,4 @@ await session.SendPacketAsync(new InfoPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Friend/BlInsPacketHandler.cs b/src/NosCore.PacketHandlers/Friend/BlInsPacketHandler.cs index e075a3aae..c9edf16c4 100644 --- a/src/NosCore.PacketHandlers/Friend/BlInsPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Friend/BlInsPacketHandler.cs @@ -2,24 +2,13 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Relations; using NosCore.Packets.Enumerations; @@ -27,8 +16,6 @@ using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; namespace NosCore.PacketHandlers.Friend { @@ -67,4 +54,4 @@ await session.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Friend/BlPacketHandler.cs b/src/NosCore.PacketHandlers/Friend/BlPacketHandler.cs index e36b3fb87..c584b7d89 100644 --- a/src/NosCore.PacketHandlers/Friend/BlPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Friend/BlPacketHandler.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Relations; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Friend { @@ -51,4 +38,4 @@ public override Task ExecuteAsync(BlPacket finsPacket, ClientSession session) return session.HandlePacketsAsync(new[] { blinsPacket }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Friend/FdelPacketHandler.cs b/src/NosCore.PacketHandlers/Friend/FdelPacketHandler.cs index e1012dfbe..3efc201bd 100644 --- a/src/NosCore.PacketHandlers/Friend/FdelPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Friend/FdelPacketHandler.cs @@ -2,34 +2,21 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using NosCore.Core.I18N; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Relations; using NosCore.Packets.ServerPackets.UI; +using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; namespace NosCore.PacketHandlers.Friend { @@ -61,4 +48,4 @@ await session.SendPacketAsync(new InfoPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Friend/FinsPacketHandler.cs b/src/NosCore.PacketHandlers/Friend/FinsPacketHandler.cs index c48dea5e0..ecae391c3 100644 --- a/src/NosCore.PacketHandlers/Friend/FinsPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Friend/FinsPacketHandler.cs @@ -2,24 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Relations; @@ -27,10 +18,6 @@ using NosCore.Packets.ServerPackets.UI; using System; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; namespace NosCore.PacketHandlers.Friend { @@ -120,4 +107,4 @@ await targetCharacter.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Friend/FlPacketHandler.cs b/src/NosCore.PacketHandlers/Friend/FlPacketHandler.cs index 4f38c8717..15dd670c3 100644 --- a/src/NosCore.PacketHandlers/Friend/FlPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Friend/FlPacketHandler.cs @@ -2,29 +2,16 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.CommandPackets; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Relations; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Friend { @@ -54,4 +41,4 @@ await session.SendPacketAsync(new InfoiPacket await session.HandlePacketsAsync(new[] { fins }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Game/GameStartPacketHandler.cs b/src/NosCore.PacketHandlers/Game/GameStartPacketHandler.cs index 6efc7537e..35990c470 100644 --- a/src/NosCore.PacketHandlers/Game/GameStartPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Game/GameStartPacketHandler.cs @@ -2,27 +2,22 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; using NosCore.Data.Enumerations.Buff; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; +using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.QuestService; +using NosCore.GameObject.Services.SkillService; using NosCore.Packets.ClientPackets.CharacterSelectionScreen; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; @@ -31,14 +26,6 @@ using NosCore.Shared.Enumerations; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; -using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; -using NosCore.GameObject.Services.MapChangeService; -using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; -using NosCore.GameObject.Services.SkillService; namespace NosCore.PacketHandlers.Game { @@ -253,4 +240,4 @@ await session.SendPacketAsync(new SayiPacket // } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Game/GuriPacketHandler.cs b/src/NosCore.PacketHandlers/Game/GuriPacketHandler.cs index 0bc3c23d5..632d983b4 100644 --- a/src/NosCore.PacketHandlers/Game/GuriPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Game/GuriPacketHandler.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.GuriRunnerService; using NosCore.Packets.ClientPackets.UI; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Game { @@ -33,4 +20,4 @@ public override Task ExecuteAsync(GuriPacket guriPacket, ClientSession session) return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Game/NcifPacketHandler.cs b/src/NosCore.PacketHandlers/Game/NcifPacketHandler.cs index 20ee79755..227c7ed11 100644 --- a/src/NosCore.PacketHandlers/Game/NcifPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Game/NcifPacketHandler.cs @@ -2,24 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Battle; @@ -27,7 +15,6 @@ using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Game { @@ -62,4 +49,4 @@ public override async Task ExecuteAsync(NcifPacket ncifPacket, ClientSession ses } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Game/PulsePacketHandler.cs b/src/NosCore.PacketHandlers/Game/PulsePacketHandler.cs index 26aba9eea..72d15a911 100644 --- a/src/NosCore.PacketHandlers/Game/PulsePacketHandler.cs +++ b/src/NosCore.PacketHandlers/Game/PulsePacketHandler.cs @@ -2,25 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Movement; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Game { @@ -35,4 +22,4 @@ public override async Task ExecuteAsync(PulsePacket pulsePacket, ClientSession s } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Game/QSetPacketHandler.cs b/src/NosCore.PacketHandlers/Game/QSetPacketHandler.cs index 51fd8f971..d2012733d 100644 --- a/src/NosCore.PacketHandlers/Game/QSetPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Game/QSetPacketHandler.cs @@ -2,29 +2,16 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Dto; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Quicklist; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Quicklist; using System; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Game { @@ -119,4 +106,4 @@ public override async Task ExecuteAsync(QsetPacket qSetPacket, ClientSession ses } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Game/TitEqPacketHandler.cs b/src/NosCore.PacketHandlers/Game/TitEqPacketHandler.cs index 01beef97a..5ea5235bc 100644 --- a/src/NosCore.PacketHandlers/Game/TitEqPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Game/TitEqPacketHandler.cs @@ -2,30 +2,17 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Player; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; namespace NosCore.PacketHandlers.Game @@ -70,4 +57,4 @@ await session.SendPacketAsync(new InfoiPacket await session.Character.SendPacketAsync(session.Character.GenerateTitle()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Group/GroupTalkPacketHandler.cs b/src/NosCore.PacketHandlers/Group/GroupTalkPacketHandler.cs index 758c7409e..0a37eb7be 100644 --- a/src/NosCore.PacketHandlers/Group/GroupTalkPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Group/GroupTalkPacketHandler.cs @@ -1,30 +1,17 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Chat; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; namespace NosCore.PacketHandlers.Group @@ -43,4 +30,4 @@ public override Task ExecuteAsync(GroupTalkPacket groupTalkPacket, ClientSession { Message = groupTalkPacket.Message, SpeakType = SpeakType.Group })); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Group/PjoinPacketHandler.cs b/src/NosCore.PacketHandlers/Group/PjoinPacketHandler.cs index 8f65c349c..e9d52fd8c 100644 --- a/src/NosCore.PacketHandlers/Group/PjoinPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Group/PjoinPacketHandler.cs @@ -2,42 +2,29 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Core.I18N; +using NosCore.Core.Services.IdService; using NosCore.Data.Enumerations.Group; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; +using NosCore.Networking; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.Groups; using NosCore.Packets.ServerPackets.UI; +using NosCore.Shared.Enumerations; +using NosCore.Shared.I18N; using Serilog; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.Core.Services.IdService; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; -using NosCore.Shared.I18N; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.Shared.Enumerations; -using NosCore.GameObject.InterChannelCommunication.Hubs.BlacklistHub; namespace NosCore.PacketHandlers.Group { @@ -341,4 +328,4 @@ await clientSession.SendPacketAsync(new Msgi2Packet } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Group/PleavePacketHandler.cs b/src/NosCore.PacketHandlers/Group/PleavePacketHandler.cs index fd491d895..6b791757d 100644 --- a/src/NosCore.PacketHandlers/Group/PleavePacketHandler.cs +++ b/src/NosCore.PacketHandlers/Group/PleavePacketHandler.cs @@ -2,35 +2,22 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.Core.Services.IdService; using NosCore.Data.Enumerations.Group; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Groups; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.Core.Services.IdService; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; namespace NosCore.PacketHandlers.Group { @@ -113,4 +100,4 @@ await targetsession.SendPacketAsync(new MsgiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/BiPacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/BiPacketHandler.cs index 23cd2b98f..c38e12267 100644 --- a/src/NosCore.PacketHandlers/Inventory/BiPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/BiPacketHandler.cs @@ -2,24 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; @@ -27,7 +15,6 @@ using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Inventory { @@ -94,4 +81,4 @@ await clientSession.SendPacketAsync( } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/GetPacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/GetPacketHandler.cs index 6357acac8..29ab7994c 100644 --- a/src/NosCore.PacketHandlers/Inventory/GetPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/GetPacketHandler.cs @@ -2,36 +2,23 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.ComponentEntities.Entities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.MapItemGenerationService; using NosCore.Packets.ClientPackets.Drops; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; using NosCore.PathFinder.Interfaces; using NosCore.Shared.Enumerations; +using NosCore.Shared.I18N; using Serilog; using System; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.ComponentEntities.Entities; -using NosCore.GameObject.Infastructure; -using NosCore.Shared.I18N; -using NosCore.Packets.ServerPackets.Chats; namespace NosCore.PacketHandlers.Inventory { @@ -89,4 +76,4 @@ await clientSession.SendPacketAsync(new SayiPacket await Task.WhenAll(mapItem.HandlerTasks); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/MvePacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/MvePacketHandler.cs index 9b6d6c76e..2414149e4 100644 --- a/src/NosCore.PacketHandlers/Inventory/MvePacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/MvePacketHandler.cs @@ -2,28 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.Packets.ClientPackets.Inventory; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Inventory { @@ -40,4 +27,4 @@ await clientSession.SendPacketAsync( ((InventoryItemInstance?)null).GeneratePocketChange(mvePacket.InventoryType, mvePacket.Slot)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/MviPacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/MviPacketHandler.cs index 89f25eb6d..143500ed0 100644 --- a/src/NosCore.PacketHandlers/Inventory/MviPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/MviPacketHandler.cs @@ -2,27 +2,14 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Inventory; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Inventory { @@ -39,4 +26,4 @@ await clientSession.SendPacketAsync( await clientSession.SendPacketAsync(previousInventory.GeneratePocketChange(mviPacket.InventoryType, mviPacket.Slot)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/PutPacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/PutPacketHandler.cs index baf30edf0..78eef6d37 100644 --- a/src/NosCore.PacketHandlers/Inventory/PutPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/PutPacketHandler.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; @@ -23,15 +10,15 @@ using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; -using NosCore.GameObject.Networking.ClientSession; -using NosCore.Packets.ClientPackets.Inventory; -using NosCore.Packets.ServerPackets.UI; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; +using NosCore.GameObject.Networking.ClientSession; using NosCore.Networking; -using NosCore.Packets.ServerPackets.Chats; +using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; +using NosCore.Packets.ServerPackets.UI; using NosCore.Shared.Enumerations; +using System.Threading.Tasks; //TODO stop using obsolete @@ -104,4 +91,4 @@ await clientSession.SendPacketAsync(new SayiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/RemovePacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/RemovePacketHandler.cs index 7ad857f57..c3e0239ce 100644 --- a/src/NosCore.PacketHandlers/Inventory/RemovePacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/RemovePacketHandler.cs @@ -2,31 +2,18 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.ClientPackets.Specialists; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; namespace NosCore.PacketHandlers.Inventory @@ -76,4 +63,4 @@ await clientSession.Character.MapInstance.SendPacketAsync( } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/SpTransformPacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/SpTransformPacketHandler.cs index 78484b0ac..4259e64b4 100644 --- a/src/NosCore.PacketHandlers/Inventory/SpTransformPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/SpTransformPacketHandler.cs @@ -2,35 +2,22 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Core.I18N; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.ItemGenerationService.Item; +using NosCore.GameObject.Services.TransformationService; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Specialists; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; using System; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.TransformationService; -using NosCore.Networking; //TODO stop using obsolete @@ -130,4 +117,4 @@ await clientSession.SendPacketAsync(new MsgiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/UseItemPacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/UseItemPacketHandler.cs index 80634ffac..e1bec62cf 100644 --- a/src/NosCore.PacketHandlers/Inventory/UseItemPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/UseItemPacketHandler.cs @@ -1,30 +1,17 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; using NosCore.Packets.ClientPackets.Inventory; using System; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Inventory { @@ -42,4 +29,4 @@ public override Task ExecuteAsync(UseItemPacket useItemPacket, ClientSession cli return inv?.ItemInstance?.Item?.Requests == null ? Task.CompletedTask : Task.WhenAll(inv.ItemInstance.Item.HandlerTasks); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Inventory/WearPacketHandler.cs b/src/NosCore.PacketHandlers/Inventory/WearPacketHandler.cs index 39a2bfb5a..a3de6d488 100644 --- a/src/NosCore.PacketHandlers/Inventory/WearPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Inventory/WearPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Inventory; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Inventory { @@ -38,4 +25,4 @@ public override Task ExecuteAsync(WearPacket wearPacket, ClientSession clientSes }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Login/NoS0575PacketHandler.cs b/src/NosCore.PacketHandlers/Login/NoS0575PacketHandler.cs index 30a95970b..300fc6973 100644 --- a/src/NosCore.PacketHandlers/Login/NoS0575PacketHandler.cs +++ b/src/NosCore.PacketHandlers/Login/NoS0575PacketHandler.cs @@ -1,32 +1,19 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.LoginService; using NosCore.Packets.ClientPackets.Login; using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.LoginService; namespace NosCore.PacketHandlers.Login { @@ -48,4 +35,4 @@ public override Task ExecuteAsync(NoS0575Packet packet, ClientSession clientSess } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Login/NoS0577PacketHandler.cs b/src/NosCore.PacketHandlers/Login/NoS0577PacketHandler.cs index 624e12c1e..6b0e1bf13 100644 --- a/src/NosCore.PacketHandlers/Login/NoS0577PacketHandler.cs +++ b/src/NosCore.PacketHandlers/Login/NoS0577PacketHandler.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.LoginService; using NosCore.Packets.ClientPackets.Login; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.LoginService; namespace NosCore.PacketHandlers.Login { @@ -33,4 +20,4 @@ public override Task ExecuteAsync(NoS0577Packet packet, ClientSession clientSess packet.AuthToken!, true, packet.RegionType); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Miniland/AddobjPacketHandler.cs b/src/NosCore.PacketHandlers/Miniland/AddobjPacketHandler.cs index 037da4ce1..236881020 100644 --- a/src/NosCore.PacketHandlers/Miniland/AddobjPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Miniland/AddobjPacketHandler.cs @@ -2,23 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Items; +using NosCore.GameObject.ComponentEntities.Entities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.MinilandService; using NosCore.Packets.ClientPackets.Miniland; @@ -28,8 +17,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.ComponentEntities.Entities; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Miniland { @@ -98,4 +85,4 @@ await clientSession.SendPacketAsync(new MinilandPointPacket await clientSession.SendPacketAsync(minilandobj.GenerateMapDesignObject()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Miniland/MJoinPacketHandler.cs b/src/NosCore.PacketHandlers/Miniland/MJoinPacketHandler.cs index 81b21fece..1ff761c20 100644 --- a/src/NosCore.PacketHandlers/Miniland/MJoinPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Miniland/MJoinPacketHandler.cs @@ -2,32 +2,19 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.MinilandService; using NosCore.Packets.ClientPackets.Miniland; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.UI; -using NosCore.GameObject.Services.BroadcastService; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Miniland { @@ -65,4 +52,4 @@ await session.SendPacketAsync(new InfoiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Miniland/MinilandObjects/MgPacketHandler.cs b/src/NosCore.PacketHandlers/Miniland/MinilandObjects/MgPacketHandler.cs index 49b781b1c..19c2cd570 100644 --- a/src/NosCore.PacketHandlers/Miniland/MinilandObjects/MgPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Miniland/MinilandObjects/MgPacketHandler.cs @@ -2,40 +2,27 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; +using NosCore.GameObject.Services.MailService; using NosCore.GameObject.Services.MinilandService; +using NosCore.Networking; using NosCore.Packets.ClientPackets.Miniland; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; +using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.Miniland; using NosCore.Packets.ServerPackets.UI; +using NosCore.Shared.Enumerations; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.ComponentEntities.Entities; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.MailService; -using NosCore.Networking; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.Shared.Enumerations; //TODO stop using obsolete @@ -417,4 +404,4 @@ private async Task PlayAsync(byte game) await _clientSession.SendPacketAsync(new MloStPacket { Game = game }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Miniland/MinilandObjects/UseobjPacketHandler.cs b/src/NosCore.PacketHandlers/Miniland/MinilandObjects/UseobjPacketHandler.cs index b090d426a..faea972ac 100644 --- a/src/NosCore.PacketHandlers/Miniland/MinilandObjects/UseobjPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Miniland/MinilandObjects/UseobjPacketHandler.cs @@ -2,39 +2,26 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Collections.Generic; +using Mapster; +using NosCore.Dao.Interfaces; +using NosCore.Data.Dto; using NosCore.Data.Enumerations.Miniland; -using NosCore.GameObject.Services.MinilandService; +using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.ItemGenerationService; +using NosCore.GameObject.Services.MinilandService; +using NosCore.GameObject.Services.WarehouseService; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Miniland; using NosCore.Packets.ServerPackets.Warehouse; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Mapster; -using NosCore.Data.Dto; -using NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; -using NosCore.GameObject.ComponentEntities.Extensions; -using NosCore.Dao.Interfaces; -using NosCore.GameObject.Services.ItemGenerationService; -using System; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.WarehouseService; namespace NosCore.PacketHandlers.Miniland.MinilandObjects { @@ -121,4 +108,4 @@ await clientSession.SendPacketAsync(new StashAllPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Miniland/MlobjPacketHandler.cs b/src/NosCore.PacketHandlers/Miniland/MlobjPacketHandler.cs index 4ba039b20..ab621bea1 100644 --- a/src/NosCore.PacketHandlers/Miniland/MlobjPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Miniland/MlobjPacketHandler.cs @@ -2,21 +2,9 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.MinilandService; using NosCore.Packets.ClientPackets.Miniland; @@ -24,7 +12,6 @@ using NosCore.Packets.ServerPackets.Miniland; using NosCore.Packets.ServerPackets.UI; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Miniland { @@ -83,4 +70,4 @@ await clientSession.SendPacketAsync(new MsgiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Miniland/RmvobjPacketHandler.cs b/src/NosCore.PacketHandlers/Miniland/RmvobjPacketHandler.cs index bcbe0ee7e..a2d631885 100644 --- a/src/NosCore.PacketHandlers/Miniland/RmvobjPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Miniland/RmvobjPacketHandler.cs @@ -2,22 +2,10 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.MinilandService; using NosCore.Packets.ClientPackets.Miniland; @@ -25,7 +13,6 @@ using NosCore.Packets.ServerPackets.Miniland; using NosCore.Packets.ServerPackets.UI; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Miniland { @@ -64,4 +51,4 @@ await clientSession.SendPacketAsync(new MinilandPointPacket await clientSession.SendPacketAsync(minilandObject.GenerateMapDesignObject(true)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Movement/ClientDirPacketHandler.cs b/src/NosCore.PacketHandlers/Movement/ClientDirPacketHandler.cs index df83924c4..1db6b71e6 100644 --- a/src/NosCore.PacketHandlers/Movement/ClientDirPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Movement/ClientDirPacketHandler.cs @@ -1,32 +1,19 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Movement; using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Movement { @@ -50,4 +37,4 @@ public override Task ExecuteAsync(ClientDirPacket dirpacket, ClientSession sessi return entity.ChangeDirAsync(dirpacket.Direction); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Movement/PreqPacketHandler.cs b/src/NosCore.PacketHandlers/Movement/PreqPacketHandler.cs index 8300b9dd9..359841412 100644 --- a/src/NosCore.PacketHandlers/Movement/PreqPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Movement/PreqPacketHandler.cs @@ -2,37 +2,24 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.Map; +using NosCore.GameObject.ComponentEntities.Entities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.MapChangeService; using NosCore.GameObject.Services.MapInstanceAccessService; using NosCore.GameObject.Services.MinilandService; using NosCore.Packets.ClientPackets.Movement; using NosCore.Packets.Enumerations; +using NosCore.Packets.ServerPackets.Chats; using NosCore.PathFinder.Interfaces; +using NosCore.Shared.Enumerations; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.ComponentEntities.Entities; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.MapChangeService; -using NosCore.Packets.ServerPackets.Chats; -using NosCore.Shared.Enumerations; namespace NosCore.PacketHandlers.Movement { @@ -90,4 +77,4 @@ await mapChangeService.ChangeMapInstanceAsync(session, portal.DestinationMapInst } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Movement/SitPacketHandler.cs b/src/NosCore.PacketHandlers/Movement/SitPacketHandler.cs index 550d11f6b..1c794d017 100644 --- a/src/NosCore.PacketHandlers/Movement/SitPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Movement/SitPacketHandler.cs @@ -1,34 +1,21 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Movement; using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.BroadcastService; namespace NosCore.PacketHandlers.Movement { @@ -64,4 +51,4 @@ public override Task ExecuteAsync(SitPacket sitpacket, ClientSession clientSessi })); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Movement/WalkPacketHandler.cs b/src/NosCore.PacketHandlers/Movement/WalkPacketHandler.cs index 3a38cf7c1..dabae82a0 100644 --- a/src/NosCore.PacketHandlers/Movement/WalkPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Movement/WalkPacketHandler.cs @@ -2,34 +2,21 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NodaTime; using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Map; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.Networking; +using NosCore.Networking.SessionGroup.ChannelMatcher; using NosCore.Packets.ClientPackets.Movement; using NosCore.PathFinder.Interfaces; +using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Infastructure; -using NosCore.Networking; -using NosCore.Networking.SessionGroup.ChannelMatcher; -using NosCore.Shared.I18N; namespace NosCore.PacketHandlers.Movement { diff --git a/src/NosCore.PacketHandlers/NoAction/CClosePacketHandler.cs b/src/NosCore.PacketHandlers/NoAction/CClosePacketHandler.cs index 2666239f3..b52c35024 100644 --- a/src/NosCore.PacketHandlers/NoAction/CClosePacketHandler.cs +++ b/src/NosCore.PacketHandlers/NoAction/CClosePacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Shops; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.NoAction { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(CClosePacket packet, ClientSession clientSessi return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/NoAction/LbsPacketHandler.cs b/src/NosCore.PacketHandlers/NoAction/LbsPacketHandler.cs index 72ec52722..c9925acb7 100644 --- a/src/NosCore.PacketHandlers/NoAction/LbsPacketHandler.cs +++ b/src/NosCore.PacketHandlers/NoAction/LbsPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.NoAction { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(LbsPacket packet, ClientSession clientSession) return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/NoAction/SnapPacketHandler.cs b/src/NosCore.PacketHandlers/NoAction/SnapPacketHandler.cs index c0bef62f6..04e680037 100644 --- a/src/NosCore.PacketHandlers/NoAction/SnapPacketHandler.cs +++ b/src/NosCore.PacketHandlers/NoAction/SnapPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Player; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.NoAction { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(SnapPacket packet, ClientSession clientSession return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/NoAction/ZeroPacketHandler.cs b/src/NosCore.PacketHandlers/NoAction/ZeroPacketHandler.cs index bb9f134e3..a57d91f9c 100644 --- a/src/NosCore.PacketHandlers/NoAction/ZeroPacketHandler.cs +++ b/src/NosCore.PacketHandlers/NoAction/ZeroPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Infrastructure; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.NoAction { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(ZeroPacket packet, ClientSession clientSession return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Parcel/PclPacketHandler.cs b/src/NosCore.PacketHandlers/Parcel/PclPacketHandler.cs index 03026ce9a..22e00c0d8 100644 --- a/src/NosCore.PacketHandlers/Parcel/PclPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Parcel/PclPacketHandler.cs @@ -2,23 +2,12 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -31,8 +20,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; namespace NosCore.PacketHandlers.Parcel { @@ -69,7 +56,7 @@ await clientSession.SendPacketAsync(new SayiPacket ArgumentType = 2, Game18NArguments = { newInv.ItemInstance.Item.VNum.ToString(), newInv.ItemInstance.Amount } }); - + await clientSession.SendPacketAsync( new ParcelPacket { Type = 2, Unknown = 1, Id = (short)getGiftPacket.GiftId }); await mailHttpClient.DeleteMailAsync(getGiftPacket.GiftId, clientSession.Character.VisualId, isCopy); @@ -91,4 +78,4 @@ await clientSession.SendPacketAsync(new MsgiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Parcel/PstClientPacketHandler.cs b/src/NosCore.PacketHandlers/Parcel/PstClientPacketHandler.cs index d51285115..8c566947f 100644 --- a/src/NosCore.PacketHandlers/Parcel/PstClientPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Parcel/PstClientPacketHandler.cs @@ -2,37 +2,24 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Linq; using Json.More; using Json.Patch; using Json.Pointer; +using NodaTime; using NosCore.Dao.Interfaces; using NosCore.Data.Dto; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.MailService; using NosCore.Packets.ClientPackets.Parcel; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using NosCore.Shared.Enumerations; +using System.Linq; using System.Threading.Tasks; -using NodaTime; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Hubs.MailHub; -using NosCore.GameObject.Services.MailService; namespace NosCore.PacketHandlers.Parcel { @@ -106,4 +93,4 @@ await clientSession.SendPacketAsync(new SayiPacket } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Quest/QTPacketHandler.cs b/src/NosCore.PacketHandlers/Quest/QTPacketHandler.cs index f736c77f4..7d204c391 100644 --- a/src/NosCore.PacketHandlers/Quest/QTPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Quest/QTPacketHandler.cs @@ -2,21 +2,9 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.QuestService; using NosCore.Packets.ClientPackets.Quest; @@ -25,7 +13,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Quest { diff --git a/src/NosCore.PacketHandlers/Quest/ScriptPacketHandler.cs b/src/NosCore.PacketHandlers/Quest/ScriptPacketHandler.cs index a8dab9cf2..9d327b645 100644 --- a/src/NosCore.PacketHandlers/Quest/ScriptPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Quest/ScriptPacketHandler.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.QuestService; using NosCore.Packets.ClientPackets.Quest; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Quest { diff --git a/src/NosCore.PacketHandlers/Shops/BuyPacketHandler.cs b/src/NosCore.PacketHandlers/Shops/BuyPacketHandler.cs index e300e2177..2fa97eebd 100644 --- a/src/NosCore.PacketHandlers/Shops/BuyPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Shops/BuyPacketHandler.cs @@ -1,24 +1,12 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Shops; @@ -26,7 +14,6 @@ using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Shops { @@ -62,4 +49,4 @@ public override Task ExecuteAsync(BuyPacket buyPacket, ClientSession clientSessi } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Shops/MShopPacketHandler.cs b/src/NosCore.PacketHandlers/Shops/MShopPacketHandler.cs index a8254a4b2..e58c798a1 100644 --- a/src/NosCore.PacketHandlers/Shops/MShopPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Shops/MShopPacketHandler.cs @@ -2,26 +2,17 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Group; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.NRunService; +using NosCore.GameObject.Services.ShopService; +using NosCore.Networking; +using NosCore.Networking.SessionGroup.ChannelMatcher; using NosCore.Packets.ClientPackets.Shops; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; @@ -32,10 +23,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.ShopService; -using NosCore.Networking; -using NosCore.Networking.SessionGroup.ChannelMatcher; namespace NosCore.PacketHandlers.Shops { @@ -43,7 +30,7 @@ public class MShopPacketHandler(IHeuristic distanceCalculator) : PacketHandler + var portal = clientSession.Character.MapInstance.Portals.Find(port => distanceCalculator.GetDistance((clientSession.Character.PositionX, clientSession.Character.PositionY), (port.SourceX, port.SourceY)) <= 6); if (portal != null) @@ -188,4 +175,4 @@ await clientSession.Character.MapInstance.SendPacketAsync(clientSession.Characte } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Shops/NrunPacketHandler.cs b/src/NosCore.PacketHandlers/Shops/NrunPacketHandler.cs index a65c7ef72..11dee6667 100644 --- a/src/NosCore.PacketHandlers/Shops/NrunPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Shops/NrunPacketHandler.cs @@ -2,24 +2,13 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.NRunService; using NosCore.Packets.ClientPackets.Npcs; using NosCore.Shared.Enumerations; @@ -27,8 +16,6 @@ using Serilog; using System; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.BroadcastService; namespace NosCore.PacketHandlers.Shops { @@ -68,4 +55,4 @@ public override async Task ExecuteAsync(NrunPacket nRunPacket, ClientSession cli await nRunRunnerService.NRunLaunchAsync(clientSession, new Tuple(aliveEntity!, nRunPacket)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Shops/RequestNpcPacketHandler.cs b/src/NosCore.PacketHandlers/Shops/RequestNpcPacketHandler.cs index 4f5b2fb6b..2f57744d9 100644 --- a/src/NosCore.PacketHandlers/Shops/RequestNpcPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Shops/RequestNpcPacketHandler.cs @@ -1,33 +1,20 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.NRunService; using NosCore.Packets.ClientPackets.Npcs; using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.Services.BroadcastService; namespace NosCore.PacketHandlers.Shops { @@ -63,4 +50,4 @@ public override Task ExecuteAsync(RequestNpcPacket requestNpcPacket, ClientSessi return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Shops/SellPacketHandler.cs b/src/NosCore.PacketHandlers/Shops/SellPacketHandler.cs index ac9c6d24f..e85ada9a7 100644 --- a/src/NosCore.PacketHandlers/Shops/SellPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Shops/SellPacketHandler.cs @@ -2,33 +2,20 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Options; using NosCore.Core.Configuration; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Items; using NosCore.GameObject.ComponentEntities.Extensions; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Shops; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Shop; using NosCore.Packets.ServerPackets.UI; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Shops { @@ -95,4 +82,4 @@ await clientSession.SendPacketAsync(new SMemoiPacket await clientSession.SendPacketAsync(inv.GeneratePocketChange((PocketType)inv.Type, inv.Slot)); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Shops/ShoppingPacketHandler.cs b/src/NosCore.PacketHandlers/Shops/ShoppingPacketHandler.cs index fe7356380..b62f184db 100644 --- a/src/NosCore.PacketHandlers/Shops/ShoppingPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Shops/ShoppingPacketHandler.cs @@ -2,25 +2,13 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Algorithm.DignityService; using NosCore.Data.Enumerations.I18N; using NosCore.GameObject.ComponentEntities.Extensions; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.BroadcastService; using NosCore.Packets.ClientPackets.Shops; @@ -28,7 +16,6 @@ using NosCore.Shared.I18N; using Serilog; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Shops { @@ -78,4 +65,4 @@ await clientSession.SendPacketAsync(aliveEntity.GenerateNInv(percent, shoppingPa } } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/DepositPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/DepositPacketHandler.cs index d2506aca8..aa3f57568 100644 --- a/src/NosCore.PacketHandlers/Warehouse/DepositPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/DepositPacketHandler.cs @@ -1,32 +1,19 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using Mapster; +using NosCore.Data.Dto; using NosCore.Data.Enumerations.Miniland; +using NosCore.Data.WebApi; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.Data.WebApi; -using NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; -using Mapster; -using NosCore.Data.Dto; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -50,4 +37,4 @@ public override Task ExecuteAsync(DepositPacket depositPacket, ClientSession cli }); } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/FDepositPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/FDepositPacketHandler.cs index efd7a21f2..8702c10b5 100644 --- a/src/NosCore.PacketHandlers/Warehouse/FDepositPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/FDepositPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(FDepositPacket fdepositPacket, ClientSession c return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/FReposPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/FReposPacketHandler.cs index 404669eb0..93facaa85 100644 --- a/src/NosCore.PacketHandlers/Warehouse/FReposPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/FReposPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(FReposPacket freposPacket, ClientSession clien return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/FStashEndPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/FStashEndPacketHandler.cs index 872651d02..3a01e5a0d 100644 --- a/src/NosCore.PacketHandlers/Warehouse/FStashEndPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/FStashEndPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(FStashEndPacket packet, ClientSession clientSe return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/FWithdrawPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/FWithdrawPacketHandler.cs index 964be03d3..b023e3c19 100644 --- a/src/NosCore.PacketHandlers/Warehouse/FWithdrawPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/FWithdrawPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(FWithdrawPacket fwithdrawPacket, ClientSession return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/ReposPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/ReposPacketHandler.cs index 2ca3ff453..41c0885c1 100644 --- a/src/NosCore.PacketHandlers/Warehouse/ReposPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/ReposPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -35,4 +22,4 @@ public override Task ExecuteAsync(ReposPacket reposPacket, ClientSession clientS return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/StashEndPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/StashEndPacketHandler.cs index edcacfe8d..7306b2c42 100644 --- a/src/NosCore.PacketHandlers/Warehouse/StashEndPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/StashEndPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(StashEndPacket packet, ClientSession clientSes return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.PacketHandlers/Warehouse/WithdrawPacketHandler.cs b/src/NosCore.PacketHandlers/Warehouse/WithdrawPacketHandler.cs index 6eca4d316..e60e5f125 100644 --- a/src/NosCore.PacketHandlers/Warehouse/WithdrawPacketHandler.cs +++ b/src/NosCore.PacketHandlers/Warehouse/WithdrawPacketHandler.cs @@ -1,26 +1,13 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Warehouse; using System.Threading.Tasks; -using NosCore.GameObject.Infastructure; namespace NosCore.PacketHandlers.Warehouse { @@ -31,4 +18,4 @@ public override Task ExecuteAsync(WithdrawPacket withdrawPacket, ClientSession c return Task.CompletedTask; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/ImportFactory.cs b/src/NosCore.Parser/ImportFactory.cs index 2d68a7eac..cd50be3c1 100644 --- a/src/NosCore.Parser/ImportFactory.cs +++ b/src/NosCore.Parser/ImportFactory.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Core.Encryption; using NosCore.Dao.Interfaces; @@ -197,4 +184,4 @@ public void SetFolder(string folder) _folder = folder; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parser.cs b/src/NosCore.Parser/Parser.cs index 19cd4fb30..b3d492f85 100644 --- a/src/NosCore.Parser/Parser.cs +++ b/src/NosCore.Parser/Parser.cs @@ -2,29 +2,16 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// +using Microsoft.Extensions.Hosting; using NosCore.Data.Enumerations.I18N; +using NosCore.Shared.I18N; using Serilog; using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; -using NosCore.Shared.I18N; namespace NosCore.Parser { @@ -255,4 +242,4 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) } } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/ParserBootstrap.cs b/src/NosCore.Parser/ParserBootstrap.cs index 163940198..a6823d4be 100644 --- a/src/NosCore.Parser/ParserBootstrap.cs +++ b/src/NosCore.Parser/ParserBootstrap.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Autofac; using Autofac.Extensions.DependencyInjection; @@ -31,7 +18,10 @@ using NosCore.Data.Dto; using NosCore.Database; using NosCore.Database.Entities; +using NosCore.Database.Entities.Base; +using NosCore.Parser.Parsers; using NosCore.Shared.Configuration; +using NosCore.Shared.I18N; using Serilog; using System; using System.Collections.Generic; @@ -39,9 +29,6 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using NosCore.Database.Entities.Base; -using NosCore.Parser.Parsers; -using NosCore.Shared.I18N; namespace NosCore.Parser { @@ -154,4 +141,4 @@ private static IHost BuildHost(string[] args) .Build(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/ParserConfiguration.cs b/src/NosCore.Parser/ParserConfiguration.cs index a7970932d..f0f69c5a8 100644 --- a/src/NosCore.Parser/ParserConfiguration.cs +++ b/src/NosCore.Parser/ParserConfiguration.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Shared.Configuration; using System.ComponentModel.DataAnnotations; @@ -27,4 +14,4 @@ public class ParserConfiguration : LanguageConfiguration [Required] public SqlConnectionConfiguration Database { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/ActParser.cs b/src/NosCore.Parser/Parsers/ActParser.cs index 1840dfec3..fbbd3e25a 100644 --- a/src/NosCore.Parser/Parsers/ActParser.cs +++ b/src/NosCore.Parser/Parsers/ActParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -100,4 +87,4 @@ public async Task ImportActAsync(string folder) logger.Information(logLanguage[LogLanguageKey.ACTS_PARTS_PARSED], actParts.Count); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/CardParser.cs b/src/NosCore.Parser/Parsers/CardParser.cs index 334a2dedd..eede1d379 100644 --- a/src/NosCore.Parser/Parsers/CardParser.cs +++ b/src/NosCore.Parser/Parsers/CardParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.Buff; @@ -104,4 +91,4 @@ public List AddBCards(Dictionary chunks) return list; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/DropParser.cs b/src/NosCore.Parser/Parsers/DropParser.cs index f3757267d..35835de44 100644 --- a/src/NosCore.Parser/Parsers/DropParser.cs +++ b/src/NosCore.Parser/Parsers/DropParser.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.Map; @@ -550,4 +537,4 @@ public Task InsertDropAsync() return dropDao.TryInsertOrUpdateAsync(dropDtos); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/Generic/GenericParser.cs b/src/NosCore.Parser/Parsers/Generic/GenericParser.cs index c537a21d4..39e56195d 100644 --- a/src/NosCore.Parser/Parsers/Generic/GenericParser.cs +++ b/src/NosCore.Parser/Parsers/Generic/GenericParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using FastMember; using NosCore.Data.Enumerations.I18N; diff --git a/src/NosCore.Parser/Parsers/I18NParser.cs b/src/NosCore.Parser/Parsers/I18NParser.cs index 461324bdd..716ab4414 100644 --- a/src/NosCore.Parser/Parsers/I18NParser.cs +++ b/src/NosCore.Parser/Parsers/I18NParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; diff --git a/src/NosCore.Parser/Parsers/ItemParser.cs b/src/NosCore.Parser/Parsers/ItemParser.cs index 99249c1dd..09563ca63 100644 --- a/src/NosCore.Parser/Parsers/ItemParser.cs +++ b/src/NosCore.Parser/Parsers/ItemParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations; @@ -668,4 +655,4 @@ var x when (x >= 4055 && x <= 4061) || (x > 4172 && x < 4176) || (x > 4045 && x }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/MapMonsterParser.cs b/src/NosCore.Parser/Parsers/MapMonsterParser.cs index c3943057b..cd4a20558 100644 --- a/src/NosCore.Parser/Parsers/MapMonsterParser.cs +++ b/src/NosCore.Parser/Parsers/MapMonsterParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; @@ -77,4 +64,4 @@ public async Task InsertMapMonsterAsync(List packetList) monsters.Count); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/MapNpcParser.cs b/src/NosCore.Parser/Parsers/MapNpcParser.cs index 84d123a99..88f9cab4f 100644 --- a/src/NosCore.Parser/Parsers/MapNpcParser.cs +++ b/src/NosCore.Parser/Parsers/MapNpcParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; @@ -84,4 +71,4 @@ public async Task InsertMapNpcsAsync(List packetList) logger.Information(logLanguage[LogLanguageKey.NPCS_PARSED], npcCounter); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/MapParser.cs b/src/NosCore.Parser/Parsers/MapParser.cs index b3e17003e..5f794103d 100644 --- a/src/NosCore.Parser/Parsers/MapParser.cs +++ b/src/NosCore.Parser/Parsers/MapParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -70,4 +57,4 @@ public async Task InsertOrUpdateMapsAsync(string folder, List packetLi logger.Information(logLanguage[LogLanguageKey.MAPS_PARSED], maps.Count); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/MapTypeMapParser.cs b/src/NosCore.Parser/Parsers/MapTypeMapParser.cs index 825d4f562..fe8caad25 100644 --- a/src/NosCore.Parser/Parsers/MapTypeMapParser.cs +++ b/src/NosCore.Parser/Parsers/MapTypeMapParser.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.Map; @@ -196,4 +183,4 @@ internal Task InsertMapTypeMapsAsync() return mapTypeMapDao.TryInsertOrUpdateAsync(mapDtos); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/MapTypeParser.cs b/src/NosCore.Parser/Parsers/MapTypeParser.cs index dbb895a2f..231b2edf9 100644 --- a/src/NosCore.Parser/Parsers/MapTypeParser.cs +++ b/src/NosCore.Parser/Parsers/MapTypeParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -224,4 +211,4 @@ internal async Task InsertMapTypesAsync() logger.Information(logLanguage[LogLanguageKey.MAPTYPES_PARSED]); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/NpcMonsterParser.cs b/src/NosCore.Parser/Parsers/NpcMonsterParser.cs index 8554f8e01..0a0b89828 100644 --- a/src/NosCore.Parser/Parsers/NpcMonsterParser.cs +++ b/src/NosCore.Parser/Parsers/NpcMonsterParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -485,4 +472,4 @@ private bool ShouldLoadPetinfo(Dictionary chunk) } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/NpcTalkParser.cs b/src/NosCore.Parser/Parsers/NpcTalkParser.cs index 3eb5cf27f..8e9fa2126 100644 --- a/src/NosCore.Parser/Parsers/NpcTalkParser.cs +++ b/src/NosCore.Parser/Parsers/NpcTalkParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -67,4 +54,4 @@ public async Task ParseAsync(string folder) } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/PortalParser.cs b/src/NosCore.Parser/Parsers/PortalParser.cs index 5d80bbb03..4aaeec990 100644 --- a/src/NosCore.Parser/Parsers/PortalParser.cs +++ b/src/NosCore.Parser/Parsers/PortalParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -187,4 +174,4 @@ public async Task InsertPortalsAsync(List packetList) portalsDtos.Count + portalCounter); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/QuestParser.cs b/src/NosCore.Parser/Parsers/QuestParser.cs index b42348790..a23bd8ef3 100644 --- a/src/NosCore.Parser/Parsers/QuestParser.cs +++ b/src/NosCore.Parser/Parsers/QuestParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -132,4 +119,4 @@ private List ImportQuestObjectives(Dictionary. +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -99,4 +86,4 @@ private int ImportAmount(Dictionary chunk) }; } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/RespawnMapTypeParser.cs b/src/NosCore.Parser/Parsers/RespawnMapTypeParser.cs index 011f70018..68401cf44 100644 --- a/src/NosCore.Parser/Parsers/RespawnMapTypeParser.cs +++ b/src/NosCore.Parser/Parsers/RespawnMapTypeParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -97,4 +84,4 @@ internal async Task InsertRespawnMapTypeAsync() respawnmaptypemaps.Count()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/ScriptParser.cs b/src/NosCore.Parser/Parsers/ScriptParser.cs index 053869d61..f8ab20eb7 100644 --- a/src/NosCore.Parser/Parsers/ScriptParser.cs +++ b/src/NosCore.Parser/Parsers/ScriptParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -77,4 +64,4 @@ public async Task InsertScriptsAsync(string folder) logger.Information(logLanguage[LogLanguageKey.SCRIPTS_PARSED], scripts.Count); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/ShopItemParser.cs b/src/NosCore.Parser/Parsers/ShopItemParser.cs index 2d64119c6..52a6be30c 100644 --- a/src/NosCore.Parser/Parsers/ShopItemParser.cs +++ b/src/NosCore.Parser/Parsers/ShopItemParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -104,4 +91,4 @@ public async Task InsertShopItemsAsync(List packetList) itemCounter); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/ShopParser.cs b/src/NosCore.Parser/Parsers/ShopParser.cs index 0c256214f..7accf99ad 100644 --- a/src/NosCore.Parser/Parsers/ShopParser.cs +++ b/src/NosCore.Parser/Parsers/ShopParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Dto; @@ -81,4 +68,4 @@ public async Task InsertShopsAsync(List packetList) shopCounter); } } -} \ No newline at end of file +} diff --git a/src/NosCore.Parser/Parsers/SkillParser.cs b/src/NosCore.Parser/Parsers/SkillParser.cs index 2b4f5af5c..0eca5d71b 100644 --- a/src/NosCore.Parser/Parsers/SkillParser.cs +++ b/src/NosCore.Parser/Parsers/SkillParser.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using NosCore.Dao.Interfaces; using NosCore.Data.Enumerations.I18N; @@ -177,4 +164,4 @@ private List AddCombos(Dictionary chunks) return list; } } -} \ No newline at end of file +} diff --git a/src/NosCore.WebApi/ApiConfiguration.cs b/src/NosCore.WebApi/ApiConfiguration.cs index a67765145..19999b9aa 100644 --- a/src/NosCore.WebApi/ApiConfiguration.cs +++ b/src/NosCore.WebApi/ApiConfiguration.cs @@ -1,24 +1,11 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.ComponentModel.DataAnnotations; using NosCore.Shared.Configuration; +using System.ComponentModel.DataAnnotations; namespace NosCore.WebApi { @@ -30,4 +17,4 @@ public class ApiConfiguration : ServerConfiguration [Required] public SqlConnectionConfiguration Database { get; set; } = null!; } -} \ No newline at end of file +} diff --git a/src/NosCore.WebApi/Controllers/AuthController.cs b/src/NosCore.WebApi/Controllers/AuthController.cs index d6102903c..fe95ebf13 100644 --- a/src/NosCore.WebApi/Controllers/AuthController.cs +++ b/src/NosCore.WebApi/Controllers/AuthController.cs @@ -2,29 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.ComponentModel.DataAnnotations; -using System.Globalization; -using System.IdentityModel.Tokens.Jwt; -using System.Linq; -using System.Security.Claims; -using System.Text; -using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; @@ -40,6 +19,14 @@ using NosCore.Shared.Configuration; using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; +using System; +using System.ComponentModel.DataAnnotations; +using System.Globalization; +using System.IdentityModel.Tokens.Jwt; +using System.Linq; +using System.Security.Claims; +using System.Text; +using System.Threading.Tasks; using TwoFactorAuthNet; namespace NosCore.WebApi.Controllers @@ -179,4 +166,4 @@ public class ApiPlatformGameAccount { public string? PlatformGameAccountId { get; set; } } -} \ No newline at end of file +} diff --git a/src/NosCore.WebApi/Controllers/NosmallController.cs b/src/NosCore.WebApi/Controllers/NosmallController.cs index f06114ae3..27f4751ce 100644 --- a/src/NosCore.WebApi/Controllers/NosmallController.cs +++ b/src/NosCore.WebApi/Controllers/NosmallController.cs @@ -1,8 +1,8 @@ -using System; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using System; using System.Security.Cryptography; using System.Text; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; namespace NosCore.WebApi.Controllers { diff --git a/src/NosCore.WebApi/WebApiBootstrap.cs b/src/NosCore.WebApi/WebApiBootstrap.cs index 27341017d..3fa093a61 100644 --- a/src/NosCore.WebApi/WebApiBootstrap.cs +++ b/src/NosCore.WebApi/WebApiBootstrap.cs @@ -2,43 +2,30 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Autofac; using Autofac.Extensions.DependencyInjection; +using AutofacSerilogIntegration; using Microsoft.AspNetCore.Builder; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; +using NosCore.Core.Configuration; using NosCore.Core.Encryption; -using NosCore.Dao.Interfaces; using NosCore.Dao; +using NosCore.Dao.Interfaces; using NosCore.Data.Dto; +using NosCore.Database; +using NosCore.Database.Entities; using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; +using NosCore.GameObject.Services.AuthService; using NosCore.Shared.Authentication; using NosCore.Shared.Configuration; using NosCore.Shared.Enumerations; -using NosCore.Database.Entities; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using NosCore.Core.Configuration; -using NosCore.Database; -using AutofacSerilogIntegration; using NosCore.Shared.I18N; -using NosCore.GameObject.Services.AuthService; namespace NosCore.WebApi { @@ -96,4 +83,4 @@ public static void Main(string[] args) app.Run(); } } -} \ No newline at end of file +} diff --git a/src/NosCore.WorldServer/WorldServer.cs b/src/NosCore.WorldServer/WorldServer.cs index 1ba303ad2..25f223a9e 100644 --- a/src/NosCore.WorldServer/WorldServer.cs +++ b/src/NosCore.WorldServer/WorldServer.cs @@ -2,43 +2,30 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using NodaTime; +using NosCore.Core; using NosCore.Core.Configuration; using NosCore.Data.Enumerations.I18N; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.Networking; +using NosCore.GameObject.Services.BroadcastService; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.EventLoaderService.Handlers; using NosCore.GameObject.Services.MapInstanceGenerationService; -using System; -using System.Runtime.InteropServices; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using NodaTime; -using NosCore.Core; using NosCore.GameObject.Services.SaveService; using NosCore.Networking; using NosCore.Networking.SessionGroup; using NosCore.Shared.I18N; using Polly; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; -using NosCore.GameObject.Networking; -using NosCore.GameObject.Services.BroadcastService; +using System; +using System.Runtime.InteropServices; +using System.Threading; +using System.Threading.Tasks; namespace NosCore.WorldServer { @@ -77,4 +64,4 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) await Task.WhenAny(connectTask, clock.Run(stoppingToken), networkManager.RunServerAsync()); } } -} \ No newline at end of file +} diff --git a/src/NosCore.WorldServer/WorldServerBootstrap.cs b/src/NosCore.WorldServer/WorldServerBootstrap.cs index fb4789e6c..d555af150 100644 --- a/src/NosCore.WorldServer/WorldServerBootstrap.cs +++ b/src/NosCore.WorldServer/WorldServerBootstrap.cs @@ -2,93 +2,80 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using Autofac.Extensions.DependencyInjection; using Autofac; +using Autofac.Extensions.DependencyInjection; +using AutofacSerilogIntegration; +using FastExpressionCompiler; +using FastMember; +using Mapster; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Http; +using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using NodaTime; +using NosCore.Algorithm.ExperienceService; +using NosCore.Core; using NosCore.Core.Configuration; +using NosCore.Core.Encryption; +using NosCore.Core.I18N; using NosCore.Core.Services.IdService; -using NosCore.Core; -using NosCore.Dao.Interfaces; using NosCore.Dao; -using NosCore.Database.Entities; +using NosCore.Dao.Interfaces; +using NosCore.Data; +using NosCore.Data.CommandPackets; +using NosCore.Data.DataAttributes; +using NosCore.Data.Dto; +using NosCore.Data.Enumerations.I18N; +using NosCore.Data.Resource; using NosCore.Database; -using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.Database.Entities; +using NosCore.Database.Entities.Base; +using NosCore.GameObject.ComponentEntities.Entities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.InterChannelCommunication; +using NosCore.GameObject.InterChannelCommunication.Hubs.ChannelHub; +using NosCore.GameObject.InterChannelCommunication.Messages; using NosCore.GameObject.Networking.ClientSession; -using NosCore.Networking.Encoding.Filter; -using NosCore.Networking.Encoding; -using NosCore.Networking.SessionRef; +using NosCore.GameObject.Services.ChannelCommunicationService.Handlers; +using NosCore.GameObject.Services.EventLoaderService; +using NosCore.GameObject.Services.ExchangeService; +using NosCore.GameObject.Services.GroupService; +using NosCore.GameObject.Services.InventoryService; +using NosCore.GameObject.Services.MapInstanceGenerationService; +using NosCore.GameObject.Services.MinilandService; using NosCore.Networking; +using NosCore.Networking.Encoding; +using NosCore.Networking.Encoding.Filter; using NosCore.Networking.SessionGroup; +using NosCore.Networking.SessionRef; using NosCore.PacketHandlers.Login; +using NosCore.Packets; +using NosCore.Packets.Attributes; +using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; +using NosCore.PathFinder.Heuristic; +using NosCore.PathFinder.Interfaces; using NosCore.Shared.Authentication; using NosCore.Shared.Configuration; +using NosCore.Shared.Enumerations; +using NosCore.Shared.I18N; using Serilog; using System; +using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Reflection; using System.Runtime.InteropServices; using System.Threading.Tasks; -using AutofacSerilogIntegration; -using FastExpressionCompiler; -using Mapster; -using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Http; -using Microsoft.Extensions.Localization; -using NosCore.Core.Encryption; -using NosCore.Core.I18N; -using NosCore.Data.Dto; -using NosCore.Data.Enumerations.I18N; -using NosCore.Data.Resource; -using NosCore.Database.Entities.Base; -using NosCore.Packets.Attributes; -using NosCore.Shared.Enumerations; -using NosCore.Shared.I18N; -using NosCore.Algorithm.ExperienceService; -using NosCore.Data.CommandPackets; -using NosCore.GameObject.Services.ChannelCommunicationService.Handlers; -using NosCore.GameObject.Services.EventLoaderService; -using NosCore.GameObject.Services.InventoryService; -using NosCore.PathFinder.Heuristic; -using NosCore.PathFinder.Interfaces; -using System.Collections.Generic; -using FastMember; -using Microsoft.Extensions.Options; -using NosCore.Data.DataAttributes; -using NosCore.Data; -using NosCore.GameObject.ComponentEntities.Entities; -using NosCore.GameObject.Infastructure; -using NosCore.GameObject.InterChannelCommunication.Messages; -using NosCore.Packets; -using ILogger = Serilog.ILogger; using Character = NosCore.GameObject.ComponentEntities.Entities.Character; -using NosCore.Packets.Enumerations; -using NosCore.GameObject.Services.GroupService; -using NosCore.GameObject.Services.MapInstanceGenerationService; -using NosCore.GameObject.Services.MinilandService; -using NosCore.GameObject.Services.ExchangeService; +using ILogger = Serilog.ILogger; namespace NosCore.WorldServer { diff --git a/test/NosCore.Core.Tests/LogLanguageTests.cs b/test/NosCore.Core.Tests/LogLanguageTests.cs index 6e83d6a9c..c3745a099 100644 --- a/test/NosCore.Core.Tests/LogLanguageTests.cs +++ b/test/NosCore.Core.Tests/LogLanguageTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Globalization; -using System.Linq; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -29,6 +13,9 @@ using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using SpecLight; +using System; +using System.Globalization; +using System.Linq; namespace NosCore.Core.Tests { diff --git a/test/NosCore.Database.Tests/DatabaseTests.cs b/test/NosCore.Database.Tests/DatabaseTests.cs index 7bad1f31c..bc42aa097 100644 --- a/test/NosCore.Database.Tests/DatabaseTests.cs +++ b/test/NosCore.Database.Tests/DatabaseTests.cs @@ -3,28 +3,15 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +using Microsoft.EntityFrameworkCore; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using SpecLight; using System; using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using System.Text; -using Microsoft.EntityFrameworkCore; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using SpecLight; namespace NosCore.Database.Tests { diff --git a/test/NosCore.GameObject.Tests/BazaarTests.cs b/test/NosCore.GameObject.Tests/BazaarTests.cs index 3d0612526..66980a993 100644 --- a/test/NosCore.GameObject.Tests/BazaarTests.cs +++ b/test/NosCore.GameObject.Tests/BazaarTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; using AutoFixture; using Json.More; using Json.Patch; @@ -36,6 +19,10 @@ using NosCore.Tests.Shared; using NosCore.Tests.Shared.AutoFixture; using SpecLight; +using System; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests { diff --git a/test/NosCore.GameObject.Tests/GroupTests.cs b/test/NosCore.GameObject.Tests/GroupTests.cs index 8e6376a1e..4a69222d7 100644 --- a/test/NosCore.GameObject.Tests/GroupTests.cs +++ b/test/NosCore.GameObject.Tests/GroupTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Algorithm.DignityService; @@ -40,6 +26,7 @@ using NosCore.Tests.Shared; using NosCore.Tests.Shared.AutoFixture; using SpecLight; +using System.Linq; namespace NosCore.GameObject.Tests { diff --git a/test/NosCore.GameObject.Tests/Services/AuthService/AuthCodeServiceTests.cs b/test/NosCore.GameObject.Tests/Services/AuthService/AuthCodeServiceTests.cs index a66172d92..d8c93ee82 100644 --- a/test/NosCore.GameObject.Tests/Services/AuthService/AuthCodeServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/AuthService/AuthCodeServiceTests.cs @@ -3,24 +3,11 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.AuthService; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.AuthService { diff --git a/test/NosCore.GameObject.Tests/Services/BattleService/BattleServiceTests.cs b/test/NosCore.GameObject.Tests/Services/BattleService/BattleServiceTests.cs index 264e83856..c4e5886a8 100644 --- a/test/NosCore.GameObject.Tests/Services/BattleService/BattleServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/BattleService/BattleServiceTests.cs @@ -3,25 +3,12 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.BattleService; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.BattleService { diff --git a/test/NosCore.GameObject.Tests/Services/BazaarService/BazaarRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/BazaarService/BazaarRegistryTests.cs index b79f92d16..237c5ccfc 100644 --- a/test/NosCore.GameObject.Tests/Services/BazaarService/BazaarRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/BazaarService/BazaarRegistryTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -28,6 +11,10 @@ using NosCore.Data.WebApi; using NosCore.GameObject.Services.BazaarService; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.BazaarService { diff --git a/test/NosCore.GameObject.Tests/Services/BlacklistService/BlacklistServiceTests.cs b/test/NosCore.GameObject.Tests/Services/BlacklistService/BlacklistServiceTests.cs index 40272ebbf..6b35d3868 100644 --- a/test/NosCore.GameObject.Tests/Services/BlacklistService/BlacklistServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/BlacklistService/BlacklistServiceTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -34,6 +17,10 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.BlacklistService { diff --git a/test/NosCore.GameObject.Tests/Services/BroadcastService/SessionRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/BroadcastService/SessionRegistryTests.cs index 2aadf480e..1f4c659f3 100644 --- a/test/NosCore.GameObject.Tests/Services/BroadcastService/SessionRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/BroadcastService/SessionRegistryTests.cs @@ -3,29 +3,15 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using NosCore.Data.WebApi; using NosCore.GameObject.Services.BroadcastService; using Serilog; using SpecLight; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.BroadcastService { diff --git a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageHandlerTests.cs index ff8e6a7b2..a1cbc0f60 100644 --- a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DeleteMailDataMessageHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -30,6 +15,8 @@ using NosCore.Packets.ServerPackets.Parcel; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ChannelCommunicationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageHandlerTests.cs index 8b477785c..2b90a536f 100644 --- a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/DisconnectDataMessageHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -28,6 +14,7 @@ using NosCore.GameObject.Services.ChannelCommunicationService.Handlers; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ChannelCommunicationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/MailDataMessageHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/MailDataMessageHandlerTests.cs index 69f45e449..c8bc62a56 100644 --- a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/MailDataMessageHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/MailDataMessageHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.Localization; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -35,6 +20,8 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ChannelCommunicationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/PostedPacketMessageHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/PostedPacketMessageHandlerTests.cs index d20051ea6..cfa641c3d 100644 --- a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/PostedPacketMessageHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/PostedPacketMessageHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations.I18N; @@ -35,6 +20,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ChannelCommunicationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/StatDataMessageHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/StatDataMessageHandlerTests.cs index 542e6a92e..962604a33 100644 --- a/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/StatDataMessageHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ChannelCommunicationService/Handlers/StatDataMessageHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -34,6 +20,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ChannelCommunicationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/ChannelService/ChannelServiceTests.cs b/test/NosCore.GameObject.Tests/Services/ChannelService/ChannelServiceTests.cs index 14249f8cc..94100ab5d 100644 --- a/test/NosCore.GameObject.Tests/Services/ChannelService/ChannelServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ChannelService/ChannelServiceTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -32,6 +16,9 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ChannelService { diff --git a/test/NosCore.GameObject.Tests/Services/CharacterService/CharacterInitializationServiceTests.cs b/test/NosCore.GameObject.Tests/Services/CharacterService/CharacterInitializationServiceTests.cs index 38aa96906..dff1015c3 100644 --- a/test/NosCore.GameObject.Tests/Services/CharacterService/CharacterInitializationServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/CharacterService/CharacterInitializationServiceTests.cs @@ -3,37 +3,21 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Dto; using NosCore.Data.StaticEntities; using NosCore.Data.WebApi; -using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.CharacterService; -using NosCore.GameObject.Services.MapInstanceGenerationService; using NosCore.GameObject.Services.MinilandService; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.CharacterService { diff --git a/test/NosCore.GameObject.Tests/Services/EventLoaderService/EventLoaderServiceTests.cs b/test/NosCore.GameObject.Tests/Services/EventLoaderService/EventLoaderServiceTests.cs index 5451302cf..57f4971c4 100644 --- a/test/NosCore.GameObject.Tests/Services/EventLoaderService/EventLoaderServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/EventLoaderService/EventLoaderServiceTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Infastructure; @@ -29,6 +13,9 @@ using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.Packets.ClientPackets.Inventory; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.EventLoaderService { diff --git a/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeRequestRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeRequestRegistryTests.cs index f1e3d2c32..920f6d5cb 100644 --- a/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeRequestRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeRequestRegistryTests.cs @@ -3,25 +3,12 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.ExchangeService; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ExchangeService { diff --git a/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeServiceTests.cs b/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeServiceTests.cs index fdb923131..d4e7b6051 100644 --- a/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ExchangeService/ExchangeServiceTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -36,6 +20,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; using ExchangeRequestRegistry = NosCore.GameObject.Services.ExchangeService.ExchangeRequestRegistry; namespace NosCore.GameObject.Tests.Services.ExchangeService diff --git a/test/NosCore.GameObject.Tests/Services/FriendService/FriendRequestRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/FriendService/FriendRequestRegistryTests.cs index 352ee5832..6bd65c12f 100644 --- a/test/NosCore.GameObject.Tests/Services/FriendService/FriendRequestRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/FriendService/FriendRequestRegistryTests.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.FriendService; using SpecLight; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.FriendService { diff --git a/test/NosCore.GameObject.Tests/Services/FriendService/FriendServiceTests.cs b/test/NosCore.GameObject.Tests/Services/FriendService/FriendServiceTests.cs index a6f6ebcab..e70d02095 100644 --- a/test/NosCore.GameObject.Tests/Services/FriendService/FriendServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/FriendService/FriendServiceTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -35,6 +18,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.FriendService { diff --git a/test/NosCore.GameObject.Tests/Services/GroupService/GroupRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/GroupService/GroupRegistryTests.cs index 63244b118..382c04ba4 100644 --- a/test/NosCore.GameObject.Tests/Services/GroupService/GroupRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/GroupService/GroupRegistryTests.cs @@ -3,27 +3,14 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations.Group; using NosCore.GameObject.Services.GroupService; using NosCore.Networking.SessionGroup; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.GroupService { diff --git a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/GuriRunnerServiceTests.cs b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/GuriRunnerServiceTests.cs index 97f10e70d..351d51e8c 100644 --- a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/GuriRunnerServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/GuriRunnerServiceTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Infastructure; @@ -27,6 +12,8 @@ using NosCore.Packets.ClientPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.GuriRunnerService { diff --git a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/GuriEventHandlerTestsBase.cs b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/GuriEventHandlerTestsBase.cs index 526a40d80..a4d5e0348 100644 --- a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/GuriEventHandlerTestsBase.cs +++ b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/GuriEventHandlerTestsBase.cs @@ -1,27 +1,14 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.ClientPackets.UI; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.GuriRunnerService.Handlers { @@ -39,4 +26,4 @@ protected Task ExecuteGuriEventHandlerAsync(GuriPacket guriPacket) guriPacket)); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/SpeakerGuriHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/SpeakerGuriHandlerTests.cs index 0dd2778ed..251377951 100644 --- a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/SpeakerGuriHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/SpeakerGuriHandlerTests.cs @@ -2,30 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; +using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.GuriRunnerService.Handlers; using NosCore.GameObject.Services.InventoryService; @@ -34,10 +19,12 @@ using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; -using NosCore.GameObject.Networking.ClientSession; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using GuriPacket = NosCore.Packets.ClientPackets.UI.GuriPacket; namespace NosCore.GameObject.Tests.Services.GuriRunnerService.Handlers @@ -137,4 +124,4 @@ await ExecuteGuriEventHandlerAsync(new GuriPacket Assert.IsNull(saypacket); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/TitleGuriHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/TitleGuriHandlerTests.cs index c0bf327ff..5567b5654 100644 --- a/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/TitleGuriHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/GuriRunnerService/Handlers/TitleGuriHandlerTests.cs @@ -2,31 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Dto; using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.GuriRunnerService.Handlers; using NosCore.GameObject.Services.InventoryService; @@ -37,7 +21,10 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using GuriPacket = NosCore.Packets.ClientPackets.UI.GuriPacket; namespace NosCore.GameObject.Tests.Services.GuriRunnerService.Handlers @@ -105,4 +92,4 @@ await ExecuteGuriEventHandlerAsync(new GuriPacket Assert.AreEqual(0, Session.Character.Titles.Count); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/InventoryService/InventoryServiceTests.cs b/test/NosCore.GameObject.Tests/Services/InventoryService/InventoryServiceTests.cs index 966f780e1..1eff0f8eb 100644 --- a/test/NosCore.GameObject.Tests/Services/InventoryService/InventoryServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/InventoryService/InventoryServiceTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -27,6 +11,7 @@ using NosCore.Data.Enumerations; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -36,7 +21,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; namespace NosCore.GameObject.Tests.Services.InventoryService { diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BackPackHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BackPackHandlerTests.cs index 82ff1b4a2..1eed6ec1c 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BackPackHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BackPackHandlerTests.cs @@ -2,25 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -30,6 +13,7 @@ using NosCore.Data.Enumerations.Buff; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -39,7 +23,10 @@ using NosCore.Packets.ServerPackets.Inventory; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -127,4 +114,4 @@ public async Task TestBackPackTicketAsync() Assert.AreEqual(0, Session.Character.InventoryService.Count); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BazaarMedalsHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BazaarMedalsHandlerTests.cs index 11f8c65f4..5ac475a1e 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BazaarMedalsHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/BazaarMedalsHandlerTests.cs @@ -2,24 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NodaTime; @@ -27,6 +11,7 @@ using NosCore.Data.Enumerations.Buff; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -35,7 +20,9 @@ using NosCore.Packets.ClientPackets.Inventory; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -99,4 +86,4 @@ public async Task TestAddMedalAsync() Assert.AreEqual(1, Session.Character.StaticBonusList.Count); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/MinilandBellHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/MinilandBellHandlerTests.cs index 6504479ac..5269d8b69 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/MinilandBellHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/MinilandBellHandlerTests.cs @@ -2,29 +2,13 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -39,7 +23,10 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -113,8 +100,8 @@ public async Task TestMinilandAsync() var itemInstance = InventoryItemInstance.Create(ItemProvider!.Create(1), Session!.Character.CharacterId); Session.Character.InventoryService.AddItemToPocket(itemInstance); await ExecuteInventoryItemInstanceEventHandlerAsync(itemInstance); - mapChangeService.Verify(x=>x.ChangeMapInstanceAsync(Session, TestHelpers.Instance.MinilandId, 5, 8), Times.Once); + mapChangeService.Verify(x => x.ChangeMapInstanceAsync(Session, TestHelpers.Instance.MinilandId, 5, 8), Times.Once); Assert.AreEqual(0, Session.Character.InventoryService.Count); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpRechargerHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpRechargerHandlerTests.cs index 211417bcd..7a96b893a 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpRechargerHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpRechargerHandlerTests.cs @@ -2,31 +2,15 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core.Configuration; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -37,7 +21,10 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -84,4 +71,4 @@ public async Task TestSpRechargerAsync() Assert.AreEqual(0, Session.Character.InventoryService.Count); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpeakerHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpeakerHandlerTests.cs index db80613a0..fd571a695 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpeakerHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/SpeakerHandlerTests.cs @@ -2,29 +2,13 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -34,7 +18,10 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -68,4 +55,4 @@ public async Task TestSpeakerItemHandlerAsync() Assert.IsNotNull(lastpacket); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/TitleHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/TitleHandlerTests.cs index 35a2ccba7..92144c623 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/TitleHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/TitleHandlerTests.cs @@ -2,29 +2,13 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -34,7 +18,10 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -69,4 +56,4 @@ public async Task TestTitleItemHandlerAsync() Assert.IsTrue(lastpacket.YesPacket!.GetType() == typeof(GuriPacket)); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/UseItemEventHandlerTestsBase.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/UseItemEventHandlerTestsBase.cs index 501f4ae93..29b60b5c1 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/UseItemEventHandlerTestsBase.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/UseItemEventHandlerTestsBase.cs @@ -1,29 +1,16 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Threading.Tasks; using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.Packets.ClientPackets.Inventory; +using System; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -43,4 +30,4 @@ protected Task ExecuteInventoryItemInstanceEventHandlerAsync(InventoryItemInstan ))); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/VehicleHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/VehicleHandlerTests.cs index 8f91a9901..e5addadfd 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/VehicleHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/VehicleHandlerTests.cs @@ -2,25 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Algorithm.ExperienceService; @@ -30,17 +13,20 @@ using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; using NosCore.GameObject.Services.ItemGenerationService.Handlers; using NosCore.GameObject.Services.ItemGenerationService.Item; -using NosCore.GameObject.Services.TransformationService; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -103,4 +89,4 @@ public async Task TestVehicleRemoveAsync() Assert.IsFalse(Session.Character.IsVehicled); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/WearHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/WearHandlerTests.cs index 14b4beeff..c5831b6f2 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/WearHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/Handlers/WearHandlerTests.cs @@ -2,25 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NodaTime; @@ -28,6 +11,7 @@ using NosCore.Data.Enumerations.I18N; using NosCore.Data.Enumerations.Items; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Services.EventLoaderService; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -43,7 +27,10 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ItemGenerationService.Handlers { @@ -265,4 +252,4 @@ public async Task TestUseAmuletAsync() Assert.AreEqual(TestHelpers.Instance.Clock.GetCurrentInstant().Plus(Duration.FromSeconds(itemInstance.ItemInstance.Item.ItemValidTime)), itemInstance.ItemInstance.ItemDeleteTime); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/ItemGenerationServiceTests.cs b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/ItemGenerationServiceTests.cs index c8fb26b0c..1f6aeab8d 100644 --- a/test/NosCore.GameObject.Tests/Services/ItemGenerationService/ItemGenerationServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ItemGenerationService/ItemGenerationServiceTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations; @@ -33,6 +18,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; namespace NosCore.GameObject.Tests.Services.ItemGenerationService { diff --git a/test/NosCore.GameObject.Tests/Services/LoginService/LoginServiceTests.cs b/test/NosCore.GameObject.Tests/Services/LoginService/LoginServiceTests.cs index cacbbaa55..565473a89 100644 --- a/test/NosCore.GameObject.Tests/Services/LoginService/LoginServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/LoginService/LoginServiceTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -30,6 +16,7 @@ using NosCore.Packets.ClientPackets.Login; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.LoginService { diff --git a/test/NosCore.GameObject.Tests/Services/MailService/MailServiceTests.cs b/test/NosCore.GameObject.Tests/Services/MailService/MailServiceTests.cs index 11766b5c0..5a8410ca8 100644 --- a/test/NosCore.GameObject.Tests/Services/MailService/MailServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MailService/MailServiceTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -32,6 +15,10 @@ using NosCore.GameObject.Services.MailService; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Threading.Tasks; using MailData = NosCore.GameObject.InterChannelCommunication.Messages.MailData; namespace NosCore.GameObject.Tests.Services.MailService diff --git a/test/NosCore.GameObject.Tests/Services/MapChangeService/MapChangeServiceTests.cs b/test/NosCore.GameObject.Tests/Services/MapChangeService/MapChangeServiceTests.cs index 503b61617..afd910d01 100644 --- a/test/NosCore.GameObject.Tests/Services/MapChangeService/MapChangeServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MapChangeService/MapChangeServiceTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Algorithm.ExperienceService; @@ -29,6 +15,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MapChangeService { diff --git a/test/NosCore.GameObject.Tests/Services/MapInstanceAccessService/MapInstanceAccessServiceTests.cs b/test/NosCore.GameObject.Tests/Services/MapInstanceAccessService/MapInstanceAccessServiceTests.cs index ab13856f7..87b018f71 100644 --- a/test/NosCore.GameObject.Tests/Services/MapInstanceAccessService/MapInstanceAccessServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MapInstanceAccessService/MapInstanceAccessServiceTests.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.MapInstanceAccessService; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MapInstanceAccessService { diff --git a/test/NosCore.GameObject.Tests/Services/MapInstanceGenerationService/MapInstanceRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/MapInstanceGenerationService/MapInstanceRegistryTests.cs index 659fc0fdd..0002a522b 100644 --- a/test/NosCore.GameObject.Tests/Services/MapInstanceGenerationService/MapInstanceRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MapInstanceGenerationService/MapInstanceRegistryTests.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.MapInstanceGenerationService; using SpecLight; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MapInstanceGenerationService { diff --git a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/DropHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/DropHandlerTests.cs index 2f9eb9465..d91f2012d 100644 --- a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/DropHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/DropHandlerTests.cs @@ -3,26 +3,9 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Core.Services.IdService; -using NosCore.Data.Enumerations.Items; using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -35,6 +18,9 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MapItemGenerationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/GoldDropHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/GoldDropHandlerTests.cs index 75fefa1ad..f47711f8f 100644 --- a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/GoldDropHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/GoldDropHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Core.Services.IdService; using NosCore.GameObject.ComponentEntities.Entities; @@ -28,6 +14,7 @@ using NosCore.GameObject.Services.MapItemGenerationService.Handlers; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MapItemGenerationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/SpChargerHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/SpChargerHandlerTests.cs index 791430069..c8ce18b4e 100644 --- a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/SpChargerHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/Handlers/SpChargerHandlerTests.cs @@ -3,35 +3,18 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Core.Services.IdService; -using NosCore.Data.Enumerations.Items; using NosCore.GameObject.ComponentEntities.Entities; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.ItemGenerationService; using NosCore.GameObject.Services.ItemGenerationService.Item; using NosCore.GameObject.Services.MapItemGenerationService.Handlers; -using NosCore.Packets.ClientPackets.Drops; -using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MapItemGenerationService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/MapItemGenerationServiceTests.cs b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/MapItemGenerationServiceTests.cs index a5ed01225..84ec9c6bd 100644 --- a/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/MapItemGenerationServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MapItemGenerationService/MapItemGenerationServiceTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core.Services.IdService; @@ -35,6 +19,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MapItemGenerationService { diff --git a/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandRegistryTests.cs index 448cab37e..8140ef1c7 100644 --- a/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandRegistryTests.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.MinilandService; using SpecLight; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MinilandService { diff --git a/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandServiceTests.cs b/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandServiceTests.cs index b7c9b37ad..186488581 100644 --- a/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/MinilandService/MinilandServiceTests.cs @@ -3,35 +3,21 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Dto; using NosCore.Data.StaticEntities; using NosCore.Data.WebApi; using NosCore.GameObject.InterChannelCommunication.Hubs.FriendHub; -using NosCore.GameObject.Map; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.MinilandService; using NosCore.Packets.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.MinilandService { diff --git a/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/ChangeClassTests.cs b/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/ChangeClassTests.cs index 919371cfe..ed1ec955e 100644 --- a/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/ChangeClassTests.cs +++ b/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/ChangeClassTests.cs @@ -2,29 +2,13 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations; using NosCore.GameObject.ComponentEntities.Interfaces; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; @@ -37,7 +21,10 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using Serilog; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; //TODO stop using obsolete #pragma warning disable 618 @@ -99,7 +86,7 @@ public async Task UserCantChangeClassLowJobLevelAsync(int characterClassInt) VisualId = 0, Type = (byte)characterClass }))); - + var msgiPacket = (MsgiPacket?)Session.LastPackets.FirstOrDefault(s => s is MsgiPacket); Assert.IsTrue(msgiPacket?.Type == MessageType.Default && msgiPacket?.Message == Game18NConstString.CanNotChangeJobAtThisLevel); } @@ -137,7 +124,7 @@ public async Task UserCantChangeToBadClassAsync(int characterClassInt) VisualId = 0, Type = (byte)characterClass }))); - + Assert.IsTrue((Session.Character.Class == CharacterClassType.Adventurer) && (Session.Character.Level == 15) && (Session.Character.JobLevel == 20)); @@ -188,4 +175,4 @@ public async Task UserCanNotChangeClassWhenEquipmentAsync(int characterClassInt) Assert.IsTrue(packet?.VisualType == VisualType.Player && packet?.VisualId == Session.Character.CharacterId && packet?.Type == SayColorType.Yellow && packet?.Message == Game18NConstString.RemoveEquipment); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/OpenShopHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/OpenShopHandlerTests.cs index f0d8860cc..54b01547a 100644 --- a/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/OpenShopHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/OpenShopHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.StaticEntities; @@ -34,6 +18,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.NRunService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/TeleporterHandlerTests.cs b/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/TeleporterHandlerTests.cs index d36899808..4e3484004 100644 --- a/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/TeleporterHandlerTests.cs +++ b/test/NosCore.GameObject.Tests/Services/NRunService/Handlers/TeleporterHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.StaticEntities; @@ -33,10 +16,13 @@ using NosCore.Packets.ClientPackets.Npcs; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; -using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.NRunService.Handlers { diff --git a/test/NosCore.GameObject.Tests/Services/NRunService/NrunServiceTests.cs b/test/NosCore.GameObject.Tests/Services/NRunService/NrunServiceTests.cs index 584d9e164..4745edc17 100644 --- a/test/NosCore.GameObject.Tests/Services/NRunService/NrunServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/NRunService/NrunServiceTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -29,6 +13,9 @@ using NosCore.Packets.ClientPackets.Npcs; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.NRunService { diff --git a/test/NosCore.GameObject.Tests/Services/PacketHandlerService/PacketHandlerRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/PacketHandlerService/PacketHandlerRegistryTests.cs index f35fe4fc5..0040ea892 100644 --- a/test/NosCore.GameObject.Tests/Services/PacketHandlerService/PacketHandlerRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/PacketHandlerService/PacketHandlerRegistryTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking.ClientSession; @@ -26,6 +11,8 @@ using NosCore.Packets.Attributes; using NosCore.Packets.ClientPackets.Chat; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.PacketHandlerService { diff --git a/test/NosCore.GameObject.Tests/Services/QuestService/QuestServiceTests.cs b/test/NosCore.GameObject.Tests/Services/QuestService/QuestServiceTests.cs index 7e2b9ec2d..7963e4d2b 100644 --- a/test/NosCore.GameObject.Tests/Services/QuestService/QuestServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/QuestService/QuestServiceTests.cs @@ -3,25 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.StaticEntities; @@ -31,6 +13,11 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.QuestService { diff --git a/test/NosCore.GameObject.Tests/Services/SaveService/SaveServiceTests.cs b/test/NosCore.GameObject.Tests/Services/SaveService/SaveServiceTests.cs index 32d796e6a..1f4c8ed37 100644 --- a/test/NosCore.GameObject.Tests/Services/SaveService/SaveServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/SaveService/SaveServiceTests.cs @@ -3,27 +3,11 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao; -using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Database; using NosCore.Database.Entities; @@ -34,6 +18,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.SaveService { diff --git a/test/NosCore.GameObject.Tests/Services/ShopService/ShopRegistryTests.cs b/test/NosCore.GameObject.Tests/Services/ShopService/ShopRegistryTests.cs index ed3e8359c..14a2a4463 100644 --- a/test/NosCore.GameObject.Tests/Services/ShopService/ShopRegistryTests.cs +++ b/test/NosCore.GameObject.Tests/Services/ShopService/ShopRegistryTests.cs @@ -3,25 +3,12 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Services.ShopService; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.ShopService { diff --git a/test/NosCore.GameObject.Tests/Services/SkillService/SkillServiceTests.cs b/test/NosCore.GameObject.Tests/Services/SkillService/SkillServiceTests.cs index 7ea268e2f..51d223cd8 100644 --- a/test/NosCore.GameObject.Tests/Services/SkillService/SkillServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/SkillService/SkillServiceTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -30,6 +14,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.SkillService { diff --git a/test/NosCore.GameObject.Tests/Services/SpeedCalculationService/SpeedCalculationServiceTests.cs b/test/NosCore.GameObject.Tests/Services/SpeedCalculationService/SpeedCalculationServiceTests.cs index 46bd57200..58a5e9373 100644 --- a/test/NosCore.GameObject.Tests/Services/SpeedCalculationService/SpeedCalculationServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/SpeedCalculationService/SpeedCalculationServiceTests.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; diff --git a/test/NosCore.GameObject.Tests/Services/TransformationService/TransformationServiceTests.cs b/test/NosCore.GameObject.Tests/Services/TransformationService/TransformationServiceTests.cs index f55d35368..b81cb3c1e 100644 --- a/test/NosCore.GameObject.Tests/Services/TransformationService/TransformationServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/TransformationService/TransformationServiceTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Algorithm.ExperienceService; @@ -28,6 +14,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.TransformationService { diff --git a/test/NosCore.GameObject.Tests/Services/WarehouseService/WarehouseServiceTests.cs b/test/NosCore.GameObject.Tests/Services/WarehouseService/WarehouseServiceTests.cs index 054877fbf..fe4818306 100644 --- a/test/NosCore.GameObject.Tests/Services/WarehouseService/WarehouseServiceTests.cs +++ b/test/NosCore.GameObject.Tests/Services/WarehouseService/WarehouseServiceTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -28,13 +11,14 @@ using NosCore.Dao.Interfaces; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Miniland; -using NosCore.Data.WebApi; using NosCore.Database; -using NosCore.Database.Entities; using NosCore.GameObject.Services.WarehouseService; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests.Services.WarehouseService { diff --git a/test/NosCore.GameObject.Tests/SetupAssemblyInitializer.cs b/test/NosCore.GameObject.Tests/SetupAssemblyInitializer.cs index fd5e397c6..14cb44b0f 100644 --- a/test/NosCore.GameObject.Tests/SetupAssemblyInitializer.cs +++ b/test/NosCore.GameObject.Tests/SetupAssemblyInitializer.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -28,11 +15,11 @@ namespace NosCore.GameObject.Tests public class SetupAssemblyInitializer { [AssemblyInitialize] - public static void AssemblyInit(TestContext _) + public static void AssemblyInit(TestContext _) { TestHelpers.Instance.InitDatabase(); TypeAdapterConfig.GlobalSettings.ForDestinationType() .IgnoreMember((member, side) => typeof(I18NString).IsAssignableFrom(member.Type)); } } -} \ No newline at end of file +} diff --git a/test/NosCore.GameObject.Tests/ShopTests.cs b/test/NosCore.GameObject.Tests/ShopTests.cs index 28eb535fa..3bece10c4 100644 --- a/test/NosCore.GameObject.Tests/ShopTests.cs +++ b/test/NosCore.GameObject.Tests/ShopTests.cs @@ -3,25 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Enumerations; using NosCore.Data.StaticEntities; @@ -38,6 +20,11 @@ using NosCore.Tests.Shared; using NosCore.Tests.Shared.BDD; using SpecLight; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.GameObject.Tests { diff --git a/test/NosCore.PacketHandlers.Tests/Battle/UseSkillPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Battle/UseSkillPacketHandlerTests.cs index 167fd60e7..c11d968fb 100644 --- a/test/NosCore.PacketHandlers.Tests/Battle/UseSkillPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Battle/UseSkillPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -26,12 +11,13 @@ using NosCore.GameObject.Services.BattleService; using NosCore.PacketHandlers.Battle; using NosCore.Packets.ClientPackets.Battle; -using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Battle; using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Battle { diff --git a/test/NosCore.PacketHandlers.Tests/Bazaar/CBListPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Bazaar/CBListPacketHandlerTests.cs index 79a973e21..584f1e806 100644 --- a/test/NosCore.PacketHandlers.Tests/Bazaar/CBListPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Bazaar/CBListPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Dto; @@ -36,6 +20,9 @@ using NosCore.Packets.ServerPackets.Auction; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Bazaar { diff --git a/test/NosCore.PacketHandlers.Tests/Bazaar/CBuyPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Bazaar/CBuyPacketHandlerTests.cs index ff471cfaa..68c448a95 100644 --- a/test/NosCore.PacketHandlers.Tests/Bazaar/CBuyPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Bazaar/CBuyPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -42,6 +25,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Bazaar { diff --git a/test/NosCore.PacketHandlers.Tests/Bazaar/CModPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Bazaar/CModPacketHandlerTests.cs index d954dbed4..629c42d27 100644 --- a/test/NosCore.PacketHandlers.Tests/Bazaar/CModPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Bazaar/CModPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Json.Patch; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -37,6 +21,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Bazaar { diff --git a/test/NosCore.PacketHandlers.Tests/Bazaar/CRegPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Bazaar/CRegPacketHandlerTests.cs index 823785cff..f9cbe9790 100644 --- a/test/NosCore.PacketHandlers.Tests/Bazaar/CRegPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Bazaar/CRegPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -34,6 +19,8 @@ using NosCore.Tests.Shared.BDD; using NosCore.Tests.Shared.BDD.Steps; using SpecLight; +using System; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Bazaar { diff --git a/test/NosCore.PacketHandlers.Tests/Bazaar/CSListPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Bazaar/CSListPacketHandlerTests.cs index f2145c9b9..c3b99a876 100644 --- a/test/NosCore.PacketHandlers.Tests/Bazaar/CSListPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Bazaar/CSListPacketHandlerTests.cs @@ -2,20 +2,7 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// namespace NosCore.PacketHandlers.Tests.Bazaar { @@ -34,4 +21,4 @@ namespace NosCore.PacketHandlers.Tests.Bazaar // //TODO list tests //} -} \ No newline at end of file +} diff --git a/test/NosCore.PacketHandlers.Tests/Bazaar/CScalcPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Bazaar/CScalcPacketHandlerTests.cs index a777fc714..db326b6fc 100644 --- a/test/NosCore.PacketHandlers.Tests/Bazaar/CScalcPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Bazaar/CScalcPacketHandlerTests.cs @@ -3,25 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -42,6 +24,11 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Bazaar { @@ -83,8 +70,10 @@ public async Task SetupAsync() }}); BazaarHttpClient.Setup(b => b.GetBazaar(1, null, null, null, null, null, null, null, null)).ReturnsAsync(new List()); BazaarHttpClient.Setup(b => b.DeleteBazaarAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(true); - ItemProvider.Setup(s => s.Convert(It.IsAny())).Returns(new ItemInstance(new Item() { VNum = 1012 }) { - Amount = 0, Item = new Item() }); + ItemProvider.Setup(s => s.Convert(It.IsAny())).Returns(new ItemInstance(new Item() { VNum = 1012 }) + { + Amount = 0, Item = new Item() + }); } [TestMethod] diff --git a/test/NosCore.PacketHandlers.Tests/Bazaar/CSkillPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Bazaar/CSkillPacketHandlerTests.cs index d5254465a..9ecf11781 100644 --- a/test/NosCore.PacketHandlers.Tests/Bazaar/CSkillPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Bazaar/CSkillPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Buff; @@ -31,6 +15,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Bazaar { diff --git a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewJobPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewJobPacketHandlerTests.cs index d8ec19d05..a3ed98a67 100644 --- a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewJobPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewJobPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Dto; @@ -28,6 +14,7 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.CharacterScreen { diff --git a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewPacketHandlerTests.cs index 74d90b547..96f81722a 100644 --- a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharNewPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -46,6 +29,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.CharacterScreen { diff --git a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharRenPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharRenPacketHandlerTests.cs index 59c84ad49..3994ebb29 100644 --- a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharRenPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharRenPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core.Services.IdService; @@ -39,6 +23,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.CharacterScreen { diff --git a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharacterDeletePacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharacterDeletePacketHandlerTests.cs index 650ec33fa..30ea4fdb3 100644 --- a/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharacterDeletePacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/CharacterScreen/CharacterDeletePacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Core.Encryption; using NosCore.Data.Enumerations.Character; @@ -28,6 +13,8 @@ using NosCore.Packets.ClientPackets.CharacterSelectionScreen; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.CharacterScreen { diff --git a/test/NosCore.PacketHandlers.Tests/CharacterScreen/DacPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/CharacterScreen/DacPacketHandlerTests.cs index da497af85..3db9f3d75 100644 --- a/test/NosCore.PacketHandlers.Tests/CharacterScreen/DacPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/CharacterScreen/DacPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -34,6 +19,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.CharacterScreen { diff --git a/test/NosCore.PacketHandlers.Tests/CharacterScreen/EntryPointPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/CharacterScreen/EntryPointPacketHandlerTests.cs index 645edafe5..cd957c4ee 100644 --- a/test/NosCore.PacketHandlers.Tests/CharacterScreen/EntryPointPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/CharacterScreen/EntryPointPacketHandlerTests.cs @@ -3,28 +3,10 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using NosCore.Dao.Interfaces; using NosCore.Data.CommandPackets; -using NosCore.Data.Dto; using NosCore.Data.Enumerations.I18N; using NosCore.Data.WebApi; using NosCore.GameObject.InterChannelCommunication.Hubs.AuthHub; @@ -32,11 +14,11 @@ using NosCore.GameObject.Networking.ClientSession; using NosCore.Networking.SessionRef; using NosCore.PacketHandlers.CharacterScreen; -using NosCore.Packets.ServerPackets.CharacterSelectionScreen; -using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.CharacterScreen { diff --git a/test/NosCore.PacketHandlers.Tests/CharacterScreen/SelectPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/CharacterScreen/SelectPacketHandlerTests.cs index 1b600bbdd..6d3c1085b 100644 --- a/test/NosCore.PacketHandlers.Tests/CharacterScreen/SelectPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/CharacterScreen/SelectPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -32,6 +16,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.CharacterScreen { diff --git a/test/NosCore.PacketHandlers.Tests/Chat/BtkPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Chat/BtkPacketHandlerTests.cs index a09bdb4b7..378cea194 100644 --- a/test/NosCore.PacketHandlers.Tests/Chat/BtkPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Chat/BtkPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -37,6 +21,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Chat { diff --git a/test/NosCore.PacketHandlers.Tests/Chat/ClientSayPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Chat/ClientSayPacketHandlerTests.cs index 2ce0b30cc..253071450 100644 --- a/test/NosCore.PacketHandlers.Tests/Chat/ClientSayPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Chat/ClientSayPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -25,6 +11,7 @@ using NosCore.Packets.ClientPackets.Chat; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Chat { diff --git a/test/NosCore.PacketHandlers.Tests/Chat/WhisperPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Chat/WhisperPacketHandlerTests.cs index 3f54702b4..24b54cb64 100644 --- a/test/NosCore.PacketHandlers.Tests/Chat/WhisperPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Chat/WhisperPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -32,11 +16,13 @@ using NosCore.Packets.ClientPackets.Chat; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; -using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Chat { diff --git a/test/NosCore.PacketHandlers.Tests/Command/ChangeClassPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/ChangeClassPacketHandlerTests.cs index 5f39539fd..e9d562ffd 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/ChangeClassPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/ChangeClassPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -34,6 +18,9 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/CreateItemPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/CreateItemPacketHandlerTests.cs index afff50da9..01213dd45 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/CreateItemPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/CreateItemPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -34,10 +18,12 @@ using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; -using NosCore.Shared.I18N; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/EffectCommandPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/EffectCommandPacketHandlerTests.cs index d9b984f10..54b6dfca2 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/EffectCommandPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/EffectCommandPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.CommandPackets; using NosCore.GameObject.Networking; @@ -26,6 +11,8 @@ using NosCore.PacketHandlers.Command; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/GiftPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/GiftPacketHandlerTests.cs index a6187c197..cec53191e 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/GiftPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/GiftPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -28,13 +12,15 @@ using NosCore.GameObject.InterChannelCommunication.Hubs.PubSub; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; -using NosCore.GameObject.Services.MailService; using NosCore.PacketHandlers.Command; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/HelpPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/HelpPacketHandlerTests.cs index b52efd7ce..7e9b44604 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/HelpPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/HelpPacketHandlerTests.cs @@ -3,32 +3,18 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.CommandPackets; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; using NosCore.PacketHandlers.Command; -using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Chats; using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/KickPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/KickPacketHandlerTests.cs index 2033f9277..fac55ad72 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/KickPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/KickPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -32,6 +16,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/PositionPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/PositionPacketHandlerTests.cs index 8741e59c4..87b66e008 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/PositionPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/PositionPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.CommandPackets; using NosCore.GameObject.Networking; @@ -27,6 +12,8 @@ using NosCore.Packets.ServerPackets.Chats; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/SetGoldCommandPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/SetGoldCommandPacketHandlerTests.cs index 9ce1692ab..7b9bf4b23 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/SetGoldCommandPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/SetGoldCommandPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -33,6 +17,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/SetHeroLevelCommandPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/SetHeroLevelCommandPacketHandlerTests.cs index 286a94693..744cd21de 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/SetHeroLevelCommandPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/SetHeroLevelCommandPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -35,6 +19,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/SetJobLevelCommandPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/SetJobLevelCommandPacketHandlerTests.cs index 0c49a9c55..504484981 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/SetJobLevelCommandPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/SetJobLevelCommandPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -33,6 +17,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/SetLevelCommandPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/SetLevelCommandPacketHandlerTests.cs index ac037ea94..9cff52767 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/SetLevelCommandPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/SetLevelCommandPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -35,6 +19,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/SetReputationPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/SetReputationPacketHandlerTests.cs index 668e72d6f..84b0905e2 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/SetReputationPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/SetReputationPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -33,6 +17,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/ShoutPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/ShoutPacketHandlerTests.cs index 278eebec6..8211b56db 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/ShoutPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/ShoutPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -30,6 +15,8 @@ using NosCore.Packets.Interfaces; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/SizePacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/SizePacketHandlerTests.cs index 23816e504..0b99e6aae 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/SizePacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/SizePacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -30,6 +16,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/SpeedPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/SpeedPacketHandlerTests.cs index 3cf100ea5..83dcb4753 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/SpeedPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/SpeedPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.CommandPackets; using NosCore.GameObject.Networking; @@ -27,6 +12,8 @@ using NosCore.Packets.ServerPackets.Chats; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Command/TeleportPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Command/TeleportPacketHandlerTests.cs index 5aa412149..7555218e2 100644 --- a/test/NosCore.PacketHandlers.Tests/Command/TeleportPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Command/TeleportPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.CommandPackets; @@ -28,6 +14,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Command { diff --git a/test/NosCore.PacketHandlers.Tests/Exchange/ExcListPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Exchange/ExcListPacketHandlerTests.cs index accd1a846..6efabe607 100644 --- a/test/NosCore.PacketHandlers.Tests/Exchange/ExcListPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Exchange/ExcListPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations; @@ -40,6 +24,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Exchange { diff --git a/test/NosCore.PacketHandlers.Tests/Exchange/ExchangeRequestPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Exchange/ExchangeRequestPacketHandlerTests.cs index 83227d501..8746f5316 100644 --- a/test/NosCore.PacketHandlers.Tests/Exchange/ExchangeRequestPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Exchange/ExchangeRequestPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.WebApi; @@ -36,6 +20,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Exchange { diff --git a/test/NosCore.PacketHandlers.Tests/Friend/BlDelPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Friend/BlDelPacketHandlerTests.cs index faa08fc21..80d60beb8 100644 --- a/test/NosCore.PacketHandlers.Tests/Friend/BlDelPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Friend/BlDelPacketHandlerTests.cs @@ -3,25 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -41,6 +23,11 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Friend { diff --git a/test/NosCore.PacketHandlers.Tests/Friend/BlInsPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Friend/BlInsPacketHandlerTests.cs index f60ccf2fc..bc4f4106d 100644 --- a/test/NosCore.PacketHandlers.Tests/Friend/BlInsPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Friend/BlInsPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -33,6 +18,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Tests.Friend diff --git a/test/NosCore.PacketHandlers.Tests/Friend/BlPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Friend/BlPacketHandlerTests.cs index 193120307..af02d3f89 100644 --- a/test/NosCore.PacketHandlers.Tests/Friend/BlPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Friend/BlPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -36,6 +20,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Tests.Friend diff --git a/test/NosCore.PacketHandlers.Tests/Friend/FinsPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Friend/FinsPacketHandlerTests.cs index 7381b30cf..dfd9d6f9a 100644 --- a/test/NosCore.PacketHandlers.Tests/Friend/FinsPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Friend/FinsPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -43,6 +26,10 @@ using NosCore.Tests.Shared.AutoFixture; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Tests.Friend diff --git a/test/NosCore.PacketHandlers.Tests/Friend/FlPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Friend/FlPacketHandlerTests.cs index 8865630d3..7553a7da7 100644 --- a/test/NosCore.PacketHandlers.Tests/Friend/FlPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Friend/FlPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core; @@ -36,6 +20,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Tests.Friend diff --git a/test/NosCore.PacketHandlers.Tests/Friend/fDelPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Friend/fDelPacketHandlerTests.cs index 8948d3753..d0f98eab7 100644 --- a/test/NosCore.PacketHandlers.Tests/Friend/fDelPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Friend/fDelPacketHandlerTests.cs @@ -3,25 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -41,6 +23,11 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Tests.Friend diff --git a/test/NosCore.PacketHandlers.Tests/Game/GameStartPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Game/GameStartPacketHandlerTests.cs index 9745e14b6..746ee4d34 100644 --- a/test/NosCore.PacketHandlers.Tests/Game/GameStartPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Game/GameStartPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.WebApi; @@ -41,6 +24,10 @@ using NosCore.Packets.Interfaces; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Game { diff --git a/test/NosCore.PacketHandlers.Tests/Game/GuriPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Game/GuriPacketHandlerTests.cs index 756c5af88..0ee8dfe5d 100644 --- a/test/NosCore.PacketHandlers.Tests/Game/GuriPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Game/GuriPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -28,6 +14,7 @@ using NosCore.Packets.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Game { diff --git a/test/NosCore.PacketHandlers.Tests/Game/NcifPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Game/NcifPacketHandlerTests.cs index 7d6f8424e..f12ff9c6c 100644 --- a/test/NosCore.PacketHandlers.Tests/Game/NcifPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Game/NcifPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -31,6 +16,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Game { diff --git a/test/NosCore.PacketHandlers.Tests/Game/PulsePacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Game/PulsePacketHandlerTests.cs index 7bf6517a9..09978e53e 100644 --- a/test/NosCore.PacketHandlers.Tests/Game/PulsePacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Game/PulsePacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -25,6 +11,7 @@ using NosCore.Packets.ClientPackets.Movement; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Game { diff --git a/test/NosCore.PacketHandlers.Tests/Game/QsetPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Game/QsetPacketHandlerTests.cs index fb9fe7bc2..2c4ffeba4 100644 --- a/test/NosCore.PacketHandlers.Tests/Game/QsetPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Game/QsetPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking.ClientSession; using NosCore.PacketHandlers.Game; @@ -27,6 +12,8 @@ using NosCore.Packets.ServerPackets.Quicklist; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Game { diff --git a/test/NosCore.PacketHandlers.Tests/Game/TitEqPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Game/TitEqPacketHandlerTests.cs index beb4914c5..0b3acda2d 100644 --- a/test/NosCore.PacketHandlers.Tests/Game/TitEqPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Game/TitEqPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Dto; using NosCore.GameObject.Networking; @@ -29,6 +13,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Game { diff --git a/test/NosCore.PacketHandlers.Tests/Group/GroupTalkPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Group/GroupTalkPacketHandlerTests.cs index a510ee505..d9f152230 100644 --- a/test/NosCore.PacketHandlers.Tests/Group/GroupTalkPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Group/GroupTalkPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core.Services.IdService; @@ -33,11 +16,15 @@ using NosCore.PacketHandlers.Group; using NosCore.Packets.ClientPackets.Chat; using NosCore.Packets.Enumerations; -using NosCore.Packets.ServerPackets.Groups; using NosCore.Packets.ServerPackets.Chats; +using NosCore.Packets.ServerPackets.Groups; using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Group { diff --git a/test/NosCore.PacketHandlers.Tests/Group/PJoinPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Group/PJoinPacketHandlerTests.cs index b36fe12af..b72f5fc51 100644 --- a/test/NosCore.PacketHandlers.Tests/Group/PJoinPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Group/PJoinPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core.Services.IdService; @@ -35,6 +19,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Group { diff --git a/test/NosCore.PacketHandlers.Tests/Group/PleavePacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Group/PleavePacketHandlerTests.cs index 44b43013c..97b276a51 100644 --- a/test/NosCore.PacketHandlers.Tests/Group/PleavePacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Group/PleavePacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Core.Services.IdService; @@ -36,6 +20,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Group { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/BiPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/BiPacketHandlerTests.cs index e4f61a3a5..1d1a9fcd6 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/BiPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/BiPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.PacketHandlers.Inventory; using NosCore.Packets.ClientPackets.Inventory; @@ -27,6 +12,8 @@ using NosCore.Tests.Shared; using NosCore.Tests.Shared.BDD; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/GetPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/GetPacketHandlerTests.cs index f220d0cfe..97dc6294f 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/GetPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/GetPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NodaTime; @@ -34,6 +19,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/MvePacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/MvePacketHandlerTests.cs index 4c6d85fa3..d34c25069 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/MvePacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/MvePacketHandlerTests.cs @@ -3,34 +3,18 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Enumerations; -using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; -using NosCore.GameObject.Services.ItemGenerationService; using NosCore.PacketHandlers.Inventory; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Inventory; -using NosCore.Tests.Shared; using NosCore.Tests.Shared.BDD; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/MviPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/MviPacketHandlerTests.cs index ebce6a3ce..9d05a559a 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/MviPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/MviPacketHandlerTests.cs @@ -3,34 +3,18 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Enumerations; -using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; -using NosCore.GameObject.Services.ItemGenerationService; using NosCore.PacketHandlers.Inventory; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; using NosCore.Packets.ServerPackets.Inventory; -using NosCore.Tests.Shared; using NosCore.Tests.Shared.BDD; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/PutPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/PutPacketHandlerTests.cs index 6f052e424..e8ee3a95e 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/PutPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/PutPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; @@ -30,6 +15,8 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/RemovePacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/RemovePacketHandlerTests.cs index e91a98e00..6689c1e24 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/RemovePacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/RemovePacketHandlerTests.cs @@ -3,27 +3,10 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Enumerations; -using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; -using NosCore.GameObject.Services.ItemGenerationService; using NosCore.PacketHandlers.Inventory; using NosCore.Packets.ClientPackets.Inventory; using NosCore.Packets.Enumerations; @@ -32,6 +15,8 @@ using NosCore.Tests.Shared; using NosCore.Tests.Shared.BDD; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/SpTransformPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/SpTransformPacketHandlerTests.cs index e580bd9bc..59d633d3e 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/SpTransformPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/SpTransformPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Algorithm.ExperienceService; @@ -39,6 +24,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Linq; +using System.Threading.Tasks; #pragma warning disable 618 diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/UseItemPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/UseItemPacketHandlerTests.cs index 9cb415259..a1dbf81be 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/UseItemPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/UseItemPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.Data.Enumerations; using NosCore.GameObject.Networking.ClientSession; @@ -31,6 +16,8 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Inventory/WearPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Inventory/WearPacketHandlerTests.cs index cf532e8d2..0c2cd0262 100644 --- a/test/NosCore.PacketHandlers.Tests/Inventory/WearPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Inventory/WearPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations; @@ -42,6 +25,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Inventory { diff --git a/test/NosCore.PacketHandlers.Tests/Login/NoS0575PacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Login/NoS0575PacketHandlerTests.cs index c3861d4a9..7572b03bf 100644 --- a/test/NosCore.PacketHandlers.Tests/Login/NoS0575PacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Login/NoS0575PacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -42,6 +26,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Login { diff --git a/test/NosCore.PacketHandlers.Tests/Login/NoS0577PacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Login/NoS0577PacketHandlerTests.cs index cfbca1a16..183267cd7 100644 --- a/test/NosCore.PacketHandlers.Tests/Login/NoS0577PacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Login/NoS0577PacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -45,6 +28,10 @@ using NosCore.Shared.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Login { diff --git a/test/NosCore.PacketHandlers.Tests/Miniland/AddobjPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Miniland/AddobjPacketHandlerTests.cs index 9ffebadd1..2ba704cc4 100644 --- a/test/NosCore.PacketHandlers.Tests/Miniland/AddobjPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Miniland/AddobjPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -45,6 +28,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Miniland { diff --git a/test/NosCore.PacketHandlers.Tests/Miniland/MJoinPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Miniland/MJoinPacketHandlerTests.cs index 848a4dbb8..f4a6311ff 100644 --- a/test/NosCore.PacketHandlers.Tests/Miniland/MJoinPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Miniland/MJoinPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -40,6 +24,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Character = NosCore.Data.WebApi.Character; namespace NosCore.PacketHandlers.Tests.Miniland diff --git a/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/MgPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/MgPacketHandlerTests.cs index 3952dae43..14d9ee8a4 100644 --- a/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/MgPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/MgPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -47,6 +30,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Miniland.MinilandObjects { diff --git a/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/UseobjPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/UseobjPacketHandlerTests.cs index 5c3b4bc81..9a6014472 100644 --- a/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/UseobjPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Miniland/MinilandObjects/UseobjPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -49,6 +32,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using UseObjPacket = NosCore.Packets.ServerPackets.Miniland.UseObjPacket; namespace NosCore.PacketHandlers.Tests.Miniland.MinilandObjects diff --git a/test/NosCore.PacketHandlers.Tests/Miniland/MlEditPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Miniland/MlEditPacketHandlerTests.cs index 3af819871..e947cfd4c 100644 --- a/test/NosCore.PacketHandlers.Tests/Miniland/MlEditPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Miniland/MlEditPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -39,6 +22,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Miniland { diff --git a/test/NosCore.PacketHandlers.Tests/Miniland/RmvobjPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Miniland/RmvobjPacketHandlerTests.cs index cde040787..ea0eb31cf 100644 --- a/test/NosCore.PacketHandlers.Tests/Miniland/RmvobjPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Miniland/RmvobjPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; @@ -45,6 +28,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Miniland { diff --git a/test/NosCore.PacketHandlers.Tests/Movement/ClientDirPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Movement/ClientDirPacketHandlerTests.cs index 43829c69c..1b37294d5 100644 --- a/test/NosCore.PacketHandlers.Tests/Movement/ClientDirPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Movement/ClientDirPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -28,6 +14,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Movement { diff --git a/test/NosCore.PacketHandlers.Tests/Movement/PreqPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Movement/PreqPacketHandlerTests.cs index fb4767dcf..1594b6b72 100644 --- a/test/NosCore.PacketHandlers.Tests/Movement/PreqPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Movement/PreqPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -33,6 +17,9 @@ using NosCore.PathFinder.Interfaces; using NosCore.Tests.Shared; using SpecLight; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Movement { diff --git a/test/NosCore.PacketHandlers.Tests/Movement/SitPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Movement/SitPacketHandlerTests.cs index 862aeefe1..a9f631f36 100644 --- a/test/NosCore.PacketHandlers.Tests/Movement/SitPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Movement/SitPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -29,6 +14,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Movement { diff --git a/test/NosCore.PacketHandlers.Tests/Movement/WalkPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Movement/WalkPacketHandlerTests.cs index 12a89cc9b..093a9c6f7 100644 --- a/test/NosCore.PacketHandlers.Tests/Movement/WalkPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Movement/WalkPacketHandlerTests.cs @@ -3,24 +3,9 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using NodaTime; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; using NosCore.PacketHandlers.Movement; @@ -29,6 +14,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Movement { diff --git a/test/NosCore.PacketHandlers.Tests/Parcel/PclPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Parcel/PclPacketHandlerTests.cs index e5095d120..821c7f871 100644 --- a/test/NosCore.PacketHandlers.Tests/Parcel/PclPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Parcel/PclPacketHandlerTests.cs @@ -3,25 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Dao.Interfaces; @@ -35,6 +17,11 @@ using NosCore.Packets.ServerPackets.Parcel; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Parcel { diff --git a/test/NosCore.PacketHandlers.Tests/Parcel/PstClientPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Parcel/PstClientPacketHandlerTests.cs index 131646742..6a11d5b3f 100644 --- a/test/NosCore.PacketHandlers.Tests/Parcel/PstClientPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Parcel/PstClientPacketHandlerTests.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/NosCore.PacketHandlers.Tests/Quest/QtPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Quest/QtPacketHandlerTests.cs index b36420ff9..acfb7b260 100644 --- a/test/NosCore.PacketHandlers.Tests/Quest/QtPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Quest/QtPacketHandlerTests.cs @@ -3,25 +3,9 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; -using NosCore.Data.Dto; using NosCore.Data.StaticEntities; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -31,6 +15,8 @@ using NosCore.Packets.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Quest { diff --git a/test/NosCore.PacketHandlers.Tests/Quest/ScriptPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Quest/ScriptPacketHandlerTests.cs index 35ecb4f10..b7769b512 100644 --- a/test/NosCore.PacketHandlers.Tests/Quest/ScriptPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Quest/ScriptPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -28,6 +14,7 @@ using NosCore.Packets.Enumerations; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Quest { diff --git a/test/NosCore.PacketHandlers.Tests/SetupAssemblyInitializer.cs b/test/NosCore.PacketHandlers.Tests/SetupAssemblyInitializer.cs index c21fc1f4d..2faede2ad 100644 --- a/test/NosCore.PacketHandlers.Tests/SetupAssemblyInitializer.cs +++ b/test/NosCore.PacketHandlers.Tests/SetupAssemblyInitializer.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -35,4 +22,4 @@ public static void AssemblyInit(TestContext _) .IgnoreMember((member, side) => typeof(I18NString).IsAssignableFrom(member.Type)); } } -} \ No newline at end of file +} diff --git a/test/NosCore.PacketHandlers.Tests/Shops/BuyPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Shops/BuyPacketHandlerTests.cs index e4a44c215..3ee7bef67 100644 --- a/test/NosCore.PacketHandlers.Tests/Shops/BuyPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Shops/BuyPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -28,6 +14,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Shops { diff --git a/test/NosCore.PacketHandlers.Tests/Shops/MShopPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Shops/MShopPacketHandlerTests.cs index 12a7964d3..77e99129a 100644 --- a/test/NosCore.PacketHandlers.Tests/Shops/MShopPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Shops/MShopPacketHandlerTests.cs @@ -3,24 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations; @@ -45,6 +28,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; #pragma warning disable 618 diff --git a/test/NosCore.PacketHandlers.Tests/Shops/NrunPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Shops/NrunPacketHandlerTests.cs index d0ad20b55..3d6cb9218 100644 --- a/test/NosCore.PacketHandlers.Tests/Shops/NrunPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Shops/NrunPacketHandlerTests.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.ComponentEntities.Interfaces; @@ -33,6 +17,9 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Shops { diff --git a/test/NosCore.PacketHandlers.Tests/Shops/RequestNpcPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Shops/RequestNpcPacketHandlerTests.cs index c238921cb..902c4abb7 100644 --- a/test/NosCore.PacketHandlers.Tests/Shops/RequestNpcPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Shops/RequestNpcPacketHandlerTests.cs @@ -3,22 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.Networking; @@ -29,6 +14,8 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Collections.Generic; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Shops { diff --git a/test/NosCore.PacketHandlers.Tests/Shops/SellPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Shops/SellPacketHandlerTests.cs index fb897e98b..e8378b17f 100644 --- a/test/NosCore.PacketHandlers.Tests/Shops/SellPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Shops/SellPacketHandlerTests.cs @@ -3,28 +3,12 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations; using NosCore.Data.StaticEntities; +using NosCore.GameObject.Infastructure; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.EventLoaderService; @@ -40,7 +24,10 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; -using NosCore.GameObject.Infastructure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Shops { diff --git a/test/NosCore.PacketHandlers.Tests/Shops/ShoppingPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Shops/ShoppingPacketHandlerTests.cs index 0ab7892b3..961fbe914 100644 --- a/test/NosCore.PacketHandlers.Tests/Shops/ShoppingPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Shops/ShoppingPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Algorithm.DignityService; @@ -29,6 +15,7 @@ using NosCore.Tests.Shared; using Serilog; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Shops { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/DepositPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/DepositPacketHandlerTests.cs index 737fd3ed3..cd0a7c2c2 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/DepositPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/DepositPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Enumerations.Miniland; @@ -31,6 +17,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/FDepositPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/FDepositPacketHandlerTests.cs index 8e083a784..82fadd5ab 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/FDepositPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/FDepositPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -27,6 +13,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/FReposPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/FReposPacketHandlerTests.cs index bc54838d0..9ef2cafac 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/FReposPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/FReposPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -25,6 +11,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/FStashEndPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/FStashEndPacketHandlerTests.cs index cdb4ccb7e..e0a3f6089 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/FStashEndPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/FStashEndPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -25,6 +11,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/FWithdrawPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/FWithdrawPacketHandlerTests.cs index 3c9d7b239..af0668f2a 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/FWithdrawPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/FWithdrawPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -27,6 +13,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/ReposPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/ReposPacketHandlerTests.cs index ead0b187e..a22d245db 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/ReposPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/ReposPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -25,6 +11,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/StashEndPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/StashEndPacketHandlerTests.cs index d007e95c6..f4d455f04 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/StashEndPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/StashEndPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -25,6 +11,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/WarehousePacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/WarehousePacketHandlerTests.cs index d1199cd01..defbf5d80 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/WarehousePacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/WarehousePacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.GameObject.InterChannelCommunication.Hubs.WarehouseHub; @@ -27,6 +13,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.PacketHandlers.Tests/Warehouse/WithdrawPacketHandlerTests.cs b/test/NosCore.PacketHandlers.Tests/Warehouse/WithdrawPacketHandlerTests.cs index 5f069c782..e719ca72d 100644 --- a/test/NosCore.PacketHandlers.Tests/Warehouse/WithdrawPacketHandlerTests.cs +++ b/test/NosCore.PacketHandlers.Tests/Warehouse/WithdrawPacketHandlerTests.cs @@ -3,21 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking; using NosCore.GameObject.Networking.ClientSession; @@ -27,6 +13,7 @@ using NosCore.Packets.ClientPackets.Warehouse; using NosCore.Tests.Shared; using SpecLight; +using System.Threading.Tasks; namespace NosCore.PacketHandlers.Tests.Warehouse { diff --git a/test/NosCore.Tests.Shared/AutoFixture/NosCoreFixture.cs b/test/NosCore.Tests.Shared/AutoFixture/NosCoreFixture.cs index eb1fe24f1..aad065988 100644 --- a/test/NosCore.Tests.Shared/AutoFixture/NosCoreFixture.cs +++ b/test/NosCore.Tests.Shared/AutoFixture/NosCoreFixture.cs @@ -3,19 +3,6 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using AutoFixture; using AutoFixture.AutoMoq; diff --git a/test/NosCore.Tests.Shared/BDD/SpecBase.cs b/test/NosCore.Tests.Shared/BDD/SpecBase.cs index 7b5ca7db4..4efb16655 100644 --- a/test/NosCore.Tests.Shared/BDD/SpecBase.cs +++ b/test/NosCore.Tests.Shared/BDD/SpecBase.cs @@ -3,23 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using NosCore.Data.Dto; @@ -40,6 +24,9 @@ using NosCore.Packets.ServerPackets.UI; using NosCore.Tests.Shared.AutoFixture; using Serilog; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.Tests.Shared.BDD { diff --git a/test/NosCore.Tests.Shared/BDD/Steps/InventorySteps.cs b/test/NosCore.Tests.Shared/BDD/Steps/InventorySteps.cs index a9e93721c..eda0ea067 100644 --- a/test/NosCore.Tests.Shared/BDD/Steps/InventorySteps.cs +++ b/test/NosCore.Tests.Shared/BDD/Steps/InventorySteps.cs @@ -3,24 +3,11 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; -using NosCore.GameObject.Networking.ClientSession; using NosCore.Data.Enumerations; +using NosCore.GameObject.Networking.ClientSession; +using System.Linq; namespace NosCore.Tests.Shared.BDD.Steps { diff --git a/test/NosCore.Tests.Shared/BDD/Steps/PacketSteps.cs b/test/NosCore.Tests.Shared/BDD/Steps/PacketSteps.cs index 2a524b390..9e737ff11 100644 --- a/test/NosCore.Tests.Shared/BDD/Steps/PacketSteps.cs +++ b/test/NosCore.Tests.Shared/BDD/Steps/PacketSteps.cs @@ -3,28 +3,15 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Linq; -using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using NosCore.GameObject.Networking.ClientSession; using NosCore.Packets.Enumerations; using NosCore.Packets.Interfaces; using NosCore.Packets.ServerPackets.UI; +using System; +using System.Linq; +using System.Threading.Tasks; namespace NosCore.Tests.Shared.BDD.Steps { diff --git a/test/NosCore.Tests.Shared/BDD/Steps/SessionSteps.cs b/test/NosCore.Tests.Shared/BDD/Steps/SessionSteps.cs index 38726efbc..13e328462 100644 --- a/test/NosCore.Tests.Shared/BDD/Steps/SessionSteps.cs +++ b/test/NosCore.Tests.Shared/BDD/Steps/SessionSteps.cs @@ -3,26 +3,13 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System.Collections.Generic; using NosCore.Data.Dto; using NosCore.Data.Enumerations.Buff; using NosCore.GameObject.Networking.ClientSession; using NosCore.GameObject.Services.InventoryService; using NosCore.GameObject.Services.ItemGenerationService; +using System.Collections.Generic; namespace NosCore.Tests.Shared.BDD.Steps { diff --git a/test/NosCore.Tests.Shared/TestHelpers.cs b/test/NosCore.Tests.Shared/TestHelpers.cs index e6799af1f..3b7fd9844 100644 --- a/test/NosCore.Tests.Shared/TestHelpers.cs +++ b/test/NosCore.Tests.Shared/TestHelpers.cs @@ -2,24 +2,8 @@ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Mapster; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Localization; @@ -90,6 +74,9 @@ using NosCore.Shared.Enumerations; using NosCore.Shared.I18N; using Serilog; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using Character = NosCore.Database.Entities.Character; using InventoryItemInstance = NosCore.Database.Entities.InventoryItemInstance; using Item = NosCore.GameObject.Services.ItemGenerationService.Item.Item; @@ -121,7 +108,7 @@ public class TestHelpers public Mock PubSubHub = new(); public Mock FriendHttpClient = new(); public NosCore.GameObject.Services.BroadcastService.SessionRegistry SessionRegistry = new(new Mock().Object); - public FakeClock Clock = new(Instant.FromUtc(2021,01,01,01,01,01)); + public FakeClock Clock = new(Instant.FromUtc(2021, 01, 01, 01, 01, 01)); public ISessionGroupFactory SessionGroupFactory { get; private set; } = null!; private TestHelpers() { @@ -383,4 +370,4 @@ public static async Task ResetAsync() await Instance.GenerateMapInstanceProviderAsync(); } } -} \ No newline at end of file +} diff --git a/test/NosCore.WebApi.Tests/ApiTests/AuthControllerTests.cs b/test/NosCore.WebApi.Tests/ApiTests/AuthControllerTests.cs index d02f301dc..53dae4852 100644 --- a/test/NosCore.WebApi.Tests/ApiTests/AuthControllerTests.cs +++ b/test/NosCore.WebApi.Tests/ApiTests/AuthControllerTests.cs @@ -3,26 +3,7 @@ // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| // -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; -using System.Text.Json; -using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; @@ -38,6 +19,12 @@ using NosCore.Tests.Shared; using NosCore.WebApi.Controllers; using SpecLight; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Claims; +using System.Text.Json; +using System.Threading.Tasks; using TwoFactorAuthNet; namespace NosCore.WebApi.Tests.ApiTests diff --git a/test/NosCore.WebApi.Tests/SetupAssemblyInitializer.cs b/test/NosCore.WebApi.Tests/SetupAssemblyInitializer.cs index f39c167f0..4d121c643 100644 --- a/test/NosCore.WebApi.Tests/SetupAssemblyInitializer.cs +++ b/test/NosCore.WebApi.Tests/SetupAssemblyInitializer.cs @@ -1,21 +1,8 @@ -// __ _ __ __ ___ __ ___ ___ +// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _| // |_|\__|\__/ |___/ \__/\__/|_|_\___| -// -// Copyright (C) 2019 - NosCore -// -// NosCore is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// using Mapster; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -35,4 +22,4 @@ public static void AssemblyInit(TestContext _) .IgnoreMember((member, side) => typeof(I18NString).IsAssignableFrom(member.Type)); } } -} \ No newline at end of file +} diff --git a/tools/NosCore.DtoGenerator/DtoGenerator.cs b/tools/NosCore.DtoGenerator/DtoGenerator.cs index 760db66ef..caa3aac48 100644 --- a/tools/NosCore.DtoGenerator/DtoGenerator.cs +++ b/tools/NosCore.DtoGenerator/DtoGenerator.cs @@ -17,13 +17,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -using System.IO; -using System.Linq; -using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; +using System.IO; +using System.Linq; +using System.Text; namespace NosCore.DtoGenerator { @@ -199,7 +199,7 @@ public void Execute(GeneratorExecutionContext context) DiagnosticSeverity.Error, true), null)); } - + var code = $@"// __ _ __ __ ___ __ ___ ___ // | \| |/__\ /' _/ / _//__\| _ \ __| // | | ' | \/ |`._`.| \_| \/ | v / _|