fix: Cleans up core code (#1187)
**Only one functional change** * Fixes a bug in LogFactory where `Warning` is being logged as `Information` Non-functional changes: * Updates/Fixes copyright headers * Removes namespace scopes for core files. View with [whitespace off](https://github.com/modernuo/ModernUO/pull/1187/files?w=1).
This commit is contained in:
Kamron Batman
GitHub
parent
0138d40bda
commit
f268d5d4e2
262 changed files with 28527 additions and 28646 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2021 - ModernUO Development Team *
|
||||
* Copyright 2019-2022 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: DumpNetStates.cs *
|
||||
* *
|
||||
|
|
@ -15,25 +15,24 @@
|
|||
|
||||
using System.IO;
|
||||
|
||||
namespace Server.Network
|
||||
namespace Server.Network;
|
||||
|
||||
public static class DumpNetStates
|
||||
{
|
||||
public static class DumpNetStates
|
||||
public static void Initialize()
|
||||
{
|
||||
public static void Initialize()
|
||||
CommandSystem.Register("DumpNetStates", AccessLevel.Administrator, DumpNetStatesCommand);
|
||||
}
|
||||
|
||||
public static void DumpNetStatesCommand(CommandEventArgs args)
|
||||
{
|
||||
using var file = new StreamWriter("netstatedump.csv");
|
||||
|
||||
file.WriteLine("NetState, RecvTask, SendTask, ProtocolState, ParserState");
|
||||
|
||||
foreach (var ns in TcpServer.Instances)
|
||||
{
|
||||
CommandSystem.Register("DumpNetStates", AccessLevel.Administrator, DumpNetStatesCommand);
|
||||
}
|
||||
|
||||
public static void DumpNetStatesCommand(CommandEventArgs args)
|
||||
{
|
||||
using var file = new StreamWriter("netstatedump.csv");
|
||||
|
||||
file.WriteLine("NetState, RecvTask, SendTask, ProtocolState, ParserState");
|
||||
|
||||
foreach (var ns in TcpServer.Instances)
|
||||
{
|
||||
file.WriteLine($"{ns}, {ns._protocolState}, {ns._parserState}");
|
||||
}
|
||||
file.WriteLine($"{ns}, {ns._protocolState}, {ns._parserState}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2022 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: NetState.ClientVersion.cs *
|
||||
* *
|
||||
|
|
@ -15,98 +15,97 @@
|
|||
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Server.Network
|
||||
namespace Server.Network;
|
||||
|
||||
public partial class NetState
|
||||
{
|
||||
public partial class NetState
|
||||
public ProtocolChanges ProtocolChanges { get; set; }
|
||||
public ClientFlags Flags { get; set; }
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public bool HasFlag(ClientFlags flag) => (Flags & flag) != 0;
|
||||
|
||||
public ClientVersion Version
|
||||
{
|
||||
public ProtocolChanges ProtocolChanges { get; set; }
|
||||
public ClientFlags Flags { get; set; }
|
||||
get => _version;
|
||||
set => ProtocolChanges = ProtocolChangesByVersion(_version = value);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public bool HasFlag(ClientFlags flag) => (Flags & flag) != 0;
|
||||
|
||||
public ClientVersion Version
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static ProtocolChanges ProtocolChangesByVersion(ClientVersion version) =>
|
||||
version switch
|
||||
{
|
||||
get => _version;
|
||||
set => ProtocolChanges = ProtocolChangesByVersion(_version = value);
|
||||
}
|
||||
var v when v >= ClientVersion.Version70610 => ProtocolChanges.Version70610,
|
||||
var v when v >= ClientVersion.Version70500 => ProtocolChanges.Version70500,
|
||||
var v when v >= ClientVersion.Version704565 => ProtocolChanges.Version704565,
|
||||
var v when v >= ClientVersion.Version70331 => ProtocolChanges.Version70331,
|
||||
var v when v >= ClientVersion.Version70300 => ProtocolChanges.Version70300,
|
||||
var v when v >= ClientVersion.Version70160 => ProtocolChanges.Version70160,
|
||||
var v when v >= ClientVersion.Version70130 => ProtocolChanges.Version70130,
|
||||
var v when v >= ClientVersion.Version7090 => ProtocolChanges.Version7090,
|
||||
var v when v >= ClientVersion.Version7000 => ProtocolChanges.Version7000,
|
||||
var v when v >= ClientVersion.Version60142 => ProtocolChanges.Version60142,
|
||||
var v when v >= ClientVersion.Version6017 => ProtocolChanges.Version6017,
|
||||
var v when v >= ClientVersion.Version6000 => ProtocolChanges.Version6000,
|
||||
var v when v >= ClientVersion.Version502b => ProtocolChanges.Version502b,
|
||||
var v when v >= ClientVersion.Version500a => ProtocolChanges.Version500a,
|
||||
var v when v >= ClientVersion.Version407a => ProtocolChanges.Version407a,
|
||||
var v when v >= ClientVersion.Version400a => ProtocolChanges.Version400a,
|
||||
_ => ProtocolChanges.None
|
||||
};
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static ProtocolChanges ProtocolChangesByVersion(ClientVersion version) =>
|
||||
version switch
|
||||
{
|
||||
var v when v >= ClientVersion.Version70610 => ProtocolChanges.Version70610,
|
||||
var v when v >= ClientVersion.Version70500 => ProtocolChanges.Version70500,
|
||||
var v when v >= ClientVersion.Version704565 => ProtocolChanges.Version704565,
|
||||
var v when v >= ClientVersion.Version70331 => ProtocolChanges.Version70331,
|
||||
var v when v >= ClientVersion.Version70300 => ProtocolChanges.Version70300,
|
||||
var v when v >= ClientVersion.Version70160 => ProtocolChanges.Version70160,
|
||||
var v when v >= ClientVersion.Version70130 => ProtocolChanges.Version70130,
|
||||
var v when v >= ClientVersion.Version7090 => ProtocolChanges.Version7090,
|
||||
var v when v >= ClientVersion.Version7000 => ProtocolChanges.Version7000,
|
||||
var v when v >= ClientVersion.Version60142 => ProtocolChanges.Version60142,
|
||||
var v when v >= ClientVersion.Version6017 => ProtocolChanges.Version6017,
|
||||
var v when v >= ClientVersion.Version6000 => ProtocolChanges.Version6000,
|
||||
var v when v >= ClientVersion.Version502b => ProtocolChanges.Version502b,
|
||||
var v when v >= ClientVersion.Version500a => ProtocolChanges.Version500a,
|
||||
var v when v >= ClientVersion.Version407a => ProtocolChanges.Version407a,
|
||||
var v when v >= ClientVersion.Version400a => ProtocolChanges.Version400a,
|
||||
_ => ProtocolChanges.None
|
||||
};
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public bool HasProtocolChanges(ProtocolChanges changes) => (ProtocolChanges & changes) != 0;
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public bool HasProtocolChanges(ProtocolChanges changes) => (ProtocolChanges & changes) != 0;
|
||||
public bool NewSpellbook => HasProtocolChanges(ProtocolChanges.NewSpellbook);
|
||||
public bool DamagePacket => HasProtocolChanges(ProtocolChanges.DamagePacket);
|
||||
public bool Unpack => HasProtocolChanges(ProtocolChanges.Unpack);
|
||||
public bool BuffIcon => HasProtocolChanges(ProtocolChanges.BuffIcon);
|
||||
public bool NewHaven => HasProtocolChanges(ProtocolChanges.NewHaven);
|
||||
public bool ContainerGridLines => HasProtocolChanges(ProtocolChanges.ContainerGridLines);
|
||||
public bool ExtendedSupportedFeatures => HasProtocolChanges(ProtocolChanges.ExtendedSupportedFeatures);
|
||||
public bool StygianAbyss => HasProtocolChanges(ProtocolChanges.StygianAbyss);
|
||||
public bool HighSeas => HasProtocolChanges(ProtocolChanges.HighSeas);
|
||||
public bool NewCharacterList => HasProtocolChanges(ProtocolChanges.NewCharacterList);
|
||||
public bool NewCharacterCreation => HasProtocolChanges(ProtocolChanges.NewCharacterCreation);
|
||||
public bool ExtendedStatus => HasProtocolChanges(ProtocolChanges.ExtendedStatus);
|
||||
public bool NewMobileIncoming => HasProtocolChanges(ProtocolChanges.NewMobileIncoming);
|
||||
public bool NewSecureTrading => HasProtocolChanges(ProtocolChanges.NewSecureTrading);
|
||||
|
||||
public bool NewSpellbook => HasProtocolChanges(ProtocolChanges.NewSpellbook);
|
||||
public bool DamagePacket => HasProtocolChanges(ProtocolChanges.DamagePacket);
|
||||
public bool Unpack => HasProtocolChanges(ProtocolChanges.Unpack);
|
||||
public bool BuffIcon => HasProtocolChanges(ProtocolChanges.BuffIcon);
|
||||
public bool NewHaven => HasProtocolChanges(ProtocolChanges.NewHaven);
|
||||
public bool ContainerGridLines => HasProtocolChanges(ProtocolChanges.ContainerGridLines);
|
||||
public bool ExtendedSupportedFeatures => HasProtocolChanges(ProtocolChanges.ExtendedSupportedFeatures);
|
||||
public bool StygianAbyss => HasProtocolChanges(ProtocolChanges.StygianAbyss);
|
||||
public bool HighSeas => HasProtocolChanges(ProtocolChanges.HighSeas);
|
||||
public bool NewCharacterList => HasProtocolChanges(ProtocolChanges.NewCharacterList);
|
||||
public bool NewCharacterCreation => HasProtocolChanges(ProtocolChanges.NewCharacterCreation);
|
||||
public bool ExtendedStatus => HasProtocolChanges(ProtocolChanges.ExtendedStatus);
|
||||
public bool NewMobileIncoming => HasProtocolChanges(ProtocolChanges.NewMobileIncoming);
|
||||
public bool NewSecureTrading => HasProtocolChanges(ProtocolChanges.NewSecureTrading);
|
||||
public bool IsUOTDClient =>
|
||||
(Flags & ClientFlags.UOTD) != 0 || _version?.Type == ClientType.UOTD;
|
||||
|
||||
public bool IsUOTDClient =>
|
||||
(Flags & ClientFlags.UOTD) != 0 || _version?.Type == ClientType.UOTD;
|
||||
public bool IsSAClient => _version?.Type == ClientType.SA;
|
||||
|
||||
public bool IsSAClient => _version?.Type == ClientType.SA;
|
||||
private ExpansionInfo m_Expansion;
|
||||
|
||||
private ExpansionInfo m_Expansion;
|
||||
|
||||
public ExpansionInfo ExpansionInfo
|
||||
public ExpansionInfo ExpansionInfo
|
||||
{
|
||||
get
|
||||
{
|
||||
get
|
||||
if (m_Expansion == null)
|
||||
{
|
||||
if (m_Expansion == null)
|
||||
for (var i = ExpansionInfo.Table.Length - 1; i >= 0; i--)
|
||||
{
|
||||
for (var i = ExpansionInfo.Table.Length - 1; i >= 0; i--)
|
||||
var info = ExpansionInfo.Table[i];
|
||||
|
||||
if (info.RequiredClient != null && Version >= info.RequiredClient || (Flags & info.ClientFlags) != 0)
|
||||
{
|
||||
var info = ExpansionInfo.Table[i];
|
||||
|
||||
if (info.RequiredClient != null && Version >= info.RequiredClient || (Flags & info.ClientFlags) != 0)
|
||||
{
|
||||
m_Expansion = info;
|
||||
break;
|
||||
}
|
||||
m_Expansion = info;
|
||||
break;
|
||||
}
|
||||
|
||||
m_Expansion ??= ExpansionInfo.GetInfo(Expansion.None);
|
||||
}
|
||||
|
||||
return m_Expansion;
|
||||
m_Expansion ??= ExpansionInfo.GetInfo(Expansion.None);
|
||||
}
|
||||
|
||||
return m_Expansion;
|
||||
}
|
||||
|
||||
public bool SupportsExpansion(ExpansionInfo info, bool checkCoreExpansion = true) =>
|
||||
info != null && (!checkCoreExpansion || (int)Core.Expansion >= info.ID) && ExpansionInfo.ID >= info.ID;
|
||||
|
||||
public bool SupportsExpansion(Expansion ex, bool checkCoreExpansion = true) =>
|
||||
SupportsExpansion(ExpansionInfo.GetInfo(ex), checkCoreExpansion);
|
||||
}
|
||||
|
||||
public bool SupportsExpansion(ExpansionInfo info, bool checkCoreExpansion = true) =>
|
||||
info != null && (!checkCoreExpansion || (int)Core.Expansion >= info.ID) && ExpansionInfo.ID >= info.ID;
|
||||
|
||||
public bool SupportsExpansion(Expansion ex, bool checkCoreExpansion = true) =>
|
||||
SupportsExpansion(ExpansionInfo.GetInfo(ex), checkCoreExpansion);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2022 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: NetState.Fastwalk.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2022 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: NetState.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2022 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: ProtocolChanges.cs *
|
||||
* *
|
||||
|
|
@ -15,44 +15,43 @@
|
|||
|
||||
using System;
|
||||
|
||||
namespace Server.Network
|
||||
{
|
||||
[Flags]
|
||||
public enum ProtocolChanges
|
||||
{
|
||||
None = 0x00000000,
|
||||
NewSpellbook = 0x00000001,
|
||||
DamagePacket = 0x00000002,
|
||||
Unpack = 0x00000004,
|
||||
BuffIcon = 0x00000008,
|
||||
NewHaven = 0x00000010,
|
||||
ContainerGridLines = 0x00000020,
|
||||
ExtendedSupportedFeatures = 0x00000040,
|
||||
StygianAbyss = 0x00000080,
|
||||
HighSeas = 0x00000100,
|
||||
NewCharacterList = 0x00000200,
|
||||
NewCharacterCreation = 0x00000400,
|
||||
ExtendedStatus = 0x00000800,
|
||||
NewMobileIncoming = 0x00001000,
|
||||
NewSecureTrading = 0x00002000,
|
||||
UltimaStore = 0x00004000,
|
||||
EndlessJourney = 0x00008000,
|
||||
namespace Server.Network;
|
||||
|
||||
Version400a = NewSpellbook,
|
||||
Version407a = Version400a | DamagePacket,
|
||||
Version500a = Version407a | Unpack,
|
||||
Version502b = Version500a | BuffIcon,
|
||||
Version6000 = Version502b | NewHaven,
|
||||
Version6017 = Version6000 | ContainerGridLines,
|
||||
Version60142 = Version6017 | ExtendedSupportedFeatures,
|
||||
Version7000 = Version60142 | StygianAbyss,
|
||||
Version7090 = Version7000 | HighSeas,
|
||||
Version70130 = Version7090 | NewCharacterList,
|
||||
Version70160 = Version70130 | NewCharacterCreation,
|
||||
Version70300 = Version70160 | ExtendedStatus,
|
||||
Version70331 = Version70300 | NewMobileIncoming,
|
||||
Version704565 = Version70331 | NewSecureTrading,
|
||||
Version70500 = Version704565 | UltimaStore,
|
||||
Version70610 = Version70500 | EndlessJourney
|
||||
}
|
||||
[Flags]
|
||||
public enum ProtocolChanges
|
||||
{
|
||||
None = 0x00000000,
|
||||
NewSpellbook = 0x00000001,
|
||||
DamagePacket = 0x00000002,
|
||||
Unpack = 0x00000004,
|
||||
BuffIcon = 0x00000008,
|
||||
NewHaven = 0x00000010,
|
||||
ContainerGridLines = 0x00000020,
|
||||
ExtendedSupportedFeatures = 0x00000040,
|
||||
StygianAbyss = 0x00000080,
|
||||
HighSeas = 0x00000100,
|
||||
NewCharacterList = 0x00000200,
|
||||
NewCharacterCreation = 0x00000400,
|
||||
ExtendedStatus = 0x00000800,
|
||||
NewMobileIncoming = 0x00001000,
|
||||
NewSecureTrading = 0x00002000,
|
||||
UltimaStore = 0x00004000,
|
||||
EndlessJourney = 0x00008000,
|
||||
|
||||
Version400a = NewSpellbook,
|
||||
Version407a = Version400a | DamagePacket,
|
||||
Version500a = Version407a | Unpack,
|
||||
Version502b = Version500a | BuffIcon,
|
||||
Version6000 = Version502b | NewHaven,
|
||||
Version6017 = Version6000 | ContainerGridLines,
|
||||
Version60142 = Version6017 | ExtendedSupportedFeatures,
|
||||
Version7000 = Version60142 | StygianAbyss,
|
||||
Version7090 = Version7000 | HighSeas,
|
||||
Version70130 = Version7090 | NewCharacterList,
|
||||
Version70160 = Version70130 | NewCharacterCreation,
|
||||
Version70300 = Version70160 | ExtendedStatus,
|
||||
Version70331 = Version70300 | NewMobileIncoming,
|
||||
Version704565 = Version70331 | NewSecureTrading,
|
||||
Version70500 = Version704565 | UltimaStore,
|
||||
Version70610 = Version70500 | EndlessJourney
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue