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 2022-10-10 21:47:08 -07:00 • committed by GitHub
parent 0138d40bda
commit f268d5d4e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
262 changed files with 28527 additions and 28646 deletions

View file

@ -26,7 +26,7 @@ jobs:
- name: Setup .NET 6 - name: Setup .NET 6
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 6.0.400 dotnet-version: 6.0.401
- name: Build - name: Build
run: ./publish.cmd Release run: ./publish.cmd Release
- name: Test - name: Test
@ -54,7 +54,7 @@ jobs:
- name: Setup .NET 6 - name: Setup .NET 6
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 6.0.400 dotnet-version: 6.0.401
- name: Build - name: Build
run: ./publish.cmd Release run: ./publish.cmd Release
- name: Test - name: Test

View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors>Kamron Batman</Authors> <Authors>Kamron Batman</Authors>
<Company>ModernUO</Company> <Company>ModernUO</Company>
<Copyright>2019-2020</Copyright> <Copyright>2019-2022</Copyright>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: VendorSellPackets.cs * * File: VendorSellPackets.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: AssemblyHandler.cs * * File: AssemblyHandler.cs *
* * * *
@ -21,8 +21,8 @@ using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.Loader; using System.Runtime.Loader;
namespace Server namespace Server;
{
public static class AssemblyHandler public static class AssemblyHandler
{ {
private static readonly Dictionary<Assembly, TypeCache> m_TypeCaches = new(); private static readonly Dictionary<Assembly, TypeCache> m_TypeCaches = new();
@ -351,4 +351,3 @@ namespace Server
} }
} }
} }
}

View file

@ -2,8 +2,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
namespace Server namespace Server;
{
[AttributeUsage(AttributeTargets.Property)] [AttributeUsage(AttributeTargets.Property)]
public class HueAttribute : Attribute public class HueAttribute : Attribute
{ {
@ -138,4 +138,3 @@ namespace Server
public bool ReadOnly { get; } public bool ReadOnly { get; }
public bool CanModify { get; } public bool CanModify { get; }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: CircularBuffer.cs * * File: CircularBuffer.cs *
* * * *
@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/ *************************************************************************/
namespace System.Buffers namespace System.Buffers;
{
public readonly ref struct CircularBuffer<T> public readonly ref struct CircularBuffer<T>
{ {
private readonly Span<T> _first; private readonly Span<T> _first;
@ -137,4 +137,3 @@ namespace System.Buffers
return index == 0 ? _first : _second; return index == 0 ? _first : _second;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: PacketReader.cs * * File: PacketReader.cs *
* * * *
@ -21,8 +21,8 @@ using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using Server.Text; using Server.Text;
namespace Server.Network namespace Server.Network;
{
public ref struct CircularBufferReader public ref struct CircularBufferReader
{ {
private readonly ReadOnlySpan<byte> _first; private readonly ReadOnlySpan<byte> _first;
@ -392,4 +392,3 @@ namespace Server.Network
return _second.Length <= 0 || _second.TryCopyTo(bytes[_first.Length..]); return _second.Length <= 0 || _second.TryCopyTo(bytes[_first.Length..]);
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: CircularBufferWriter.cs * * File: CircularBufferWriter.cs *
* * * *
@ -19,8 +19,8 @@ using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using Server.Text; using Server.Text;
namespace System.Buffers namespace System.Buffers;
{
public ref struct CircularBufferWriter public ref struct CircularBufferWriter
{ {
private readonly Span<byte> _first; private readonly Span<byte> _first;
@ -520,4 +520,3 @@ namespace System.Buffers
_ => Position + offset // Current _ => Position + offset // Current
}; };
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: SpanReader.cs * * File: SpanReader.cs *
* * * *
@ -21,8 +21,8 @@ using System.Text;
using Server; using Server;
using Server.Text; using Server.Text;
namespace System.Buffers namespace System.Buffers;
{
public ref struct SpanReader public ref struct SpanReader
{ {
private readonly ReadOnlySpan<byte> _buffer; private readonly ReadOnlySpan<byte> _buffer;
@ -290,4 +290,3 @@ namespace System.Buffers
return _buffer.TryCopyTo(bytes); return _buffer.TryCopyTo(bytes);
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: CityInfo.cs * * File: CityInfo.cs *
* * * *
@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/ *************************************************************************/
namespace Server namespace Server;
{
public sealed class CityInfo public sealed class CityInfo
{ {
private Point3D m_Location; private Point3D m_Location;
@ -80,4 +80,3 @@ namespace Server
public Map Map { get; set; } public Map Map { get; set; }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ArrayEnumerator.cs * * File: ArrayEnumerator.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
namespace Server.Collections namespace Server.Collections;
{
/// <summary> /// <summary>
/// Non-thread safe, non-guarded enumerator for classes that have internal arrays. /// Non-thread safe, non-guarded enumerator for classes that have internal arrays.
/// Recommended to copy this and use it as a nested struct. /// Recommended to copy this and use it as a nested struct.
@ -76,4 +76,3 @@ namespace Server.Collections
_current = default; _current = default;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: CollectionHelpers.cs * * File: CollectionHelpers.cs *
* * * *
@ -16,8 +16,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server.Collections namespace Server.Collections;
{
public static class CollectionHelpers public static class CollectionHelpers
{ {
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@ -29,4 +29,3 @@ namespace Server.Collections
} }
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: CollectionThrowStrings.cs * * File: CollectionThrowStrings.cs *
* * * *

View file

@ -6,8 +6,8 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Microsoft.Collections.Extensions namespace Microsoft.Collections.Extensions;
{
internal static class HashHelpers internal static class HashHelpers
{ {
@ -122,4 +122,3 @@ namespace Microsoft.Collections.Extensions
return highbits; return highbits;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: OrderedHashSet.cs * * File: OrderedHashSet.cs *
* * * *
@ -20,8 +20,8 @@ using System.Diagnostics;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Microsoft.Collections.Extensions; using Microsoft.Collections.Extensions;
namespace Server.Collections namespace Server.Collections;
{
[DebuggerDisplay("Count = {Count}")] [DebuggerDisplay("Count = {Count}")]
public class OrderedHashSet<TValue> : IList<TValue> public class OrderedHashSet<TValue> : IList<TValue>
{ {
@ -576,4 +576,3 @@ namespace Server.Collections
} }
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: PooledOrderedHashSet.cs * * File: PooledOrderedHashSet.cs *
* * * *

View file

@ -2,8 +2,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public delegate void CommandEventHandler(CommandEventArgs e); public delegate void CommandEventHandler(CommandEventArgs e);
public class CommandEventArgs public class CommandEventArgs
@ -251,4 +251,3 @@ namespace Server
return true; return true;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: DescendingComparer.cs * * File: DescendingComparer.cs *
* * * *
@ -16,9 +16,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Server namespace Server;
{
public class DescendingComparer<T> : IComparer<T> where T : IComparable<T> { public class DescendingComparer<T> : IComparer<T> where T : IComparable<T> {
public int Compare(T x, T y) => y?.CompareTo(x) ?? 1; public int Compare(T x, T y) => y?.CompareTo(x) ?? 1;
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: LocationComparer.cs * * File: LocationComparer.cs *
* * * *
@ -15,8 +15,8 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Server namespace Server;
{
public class LocationComparer : IComparer<IPoint3D> public class LocationComparer : IComparer<IPoint3D>
{ {
private static LocationComparer m_Instance; private static LocationComparer m_Instance;
@ -53,4 +53,3 @@ namespace Server
return x * x + y * y + z * z; return x * x + y * y + z * z;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ServerConfiguration.cs * * File: ServerConfiguration.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ServerSettings.cs * * File: ServerSettings.cs *
* * * *
@ -17,8 +17,8 @@ using System.Collections.Generic;
using System.Net; using System.Net;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace Server namespace Server;
{
public class ServerSettings public class ServerSettings
{ {
[JsonPropertyName("assemblyDirectories")] [JsonPropertyName("assemblyDirectories")]
@ -36,4 +36,3 @@ namespace Server
[JsonPropertyName("settings")] [JsonPropertyName("settings")]
public SortedDictionary<string, string> Settings { get; set; } = new(); public SortedDictionary<string, string> Settings { get; set; } = new();
} }
}

View file

@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Server.ContextMenus namespace Server.ContextMenus;
{
/// <summary> /// <summary>
/// Represents the state of an active context menu. This includes who opened the menu, the menu's focus object, and a list /// Represents the state of an active context menu. This includes who opened the menu, the menu's focus object, and a list
/// of /// of
@ -80,4 +80,3 @@ namespace Server.ContextMenus
} }
} }
} }
}

View file

@ -1,7 +1,7 @@
using Server.Network; using Server.Network;
namespace Server.ContextMenus namespace Server.ContextMenus;
{
/// <summary> /// <summary>
/// Represents a single entry of a <see cref="ContextMenu">context menu</see>. /// Represents a single entry of a <see cref="ContextMenu">context menu</see>.
/// <seealso cref="ContextMenu" /> /// <seealso cref="ContextMenu" />
@ -80,4 +80,3 @@ namespace Server.ContextMenus
{ {
} }
} }
}

View file

@ -1,5 +1,5 @@
namespace Server.ContextMenus namespace Server.ContextMenus;
{
public class OpenBackpackEntry : ContextMenuEntry public class OpenBackpackEntry : ContextMenuEntry
{ {
private readonly Mobile m_Mobile; private readonly Mobile m_Mobile;
@ -11,4 +11,3 @@ namespace Server.ContextMenus
m_Mobile.Use(m_Mobile.Backpack); m_Mobile.Use(m_Mobile.Backpack);
} }
} }
}

View file

@ -1,5 +1,5 @@
namespace Server.ContextMenus namespace Server.ContextMenus;
{
public class PaperdollEntry : ContextMenuEntry public class PaperdollEntry : ContextMenuEntry
{ {
private readonly Mobile m_Mobile; private readonly Mobile m_Mobile;
@ -14,4 +14,3 @@ namespace Server.ContextMenus
} }
} }
} }
}

View file

@ -3,8 +3,8 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
namespace Server.Diagnostics namespace Server.Diagnostics;
{
public abstract class BaseProfile public abstract class BaseProfile
{ {
private readonly Stopwatch _stopwatch; private readonly Stopwatch _stopwatch;
@ -77,4 +77,3 @@ namespace Server.Diagnostics
); );
} }
} }
}

View file

@ -1,8 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Server.Diagnostics namespace Server.Diagnostics;
{
public class GumpProfile : BaseProfile public class GumpProfile : BaseProfile
{ {
private static readonly Dictionary<Type, GumpProfile> _profiles = new(); private static readonly Dictionary<Type, GumpProfile> _profiles = new();
@ -28,4 +28,3 @@ namespace Server.Diagnostics
return prof; return prof;
} }
} }
}

View file

@ -4,8 +4,8 @@ using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Threading; using System.Threading;
namespace Server.Diagnostics namespace Server.Diagnostics;
{
public abstract class BasePacketProfile : BaseProfile public abstract class BasePacketProfile : BaseProfile
{ {
protected BasePacketProfile(string name) : base(name) protected BasePacketProfile(string name) : base(name)
@ -89,4 +89,3 @@ namespace Server.Diagnostics
return prof; return prof;
} }
} }
}

View file

@ -1,8 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Server.Diagnostics namespace Server.Diagnostics;
{
public class TargetProfile : BaseProfile public class TargetProfile : BaseProfile
{ {
private static readonly Dictionary<Type, TargetProfile> _profiles = new(); private static readonly Dictionary<Type, TargetProfile> _profiles = new();
@ -29,4 +29,3 @@ namespace Server.Diagnostics
return prof; return prof;
} }
} }
}

View file

@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace Server.Diagnostics namespace Server.Diagnostics;
{
public class TimerProfile : BaseProfile public class TimerProfile : BaseProfile
{ {
private static readonly Dictionary<string, TimerProfile> _profiles = new(); private static readonly Dictionary<string, TimerProfile> _profiles = new();
@ -42,4 +42,3 @@ namespace Server.Diagnostics
op.Write("\t{0,12:N0} {1,12:N0} {2,-12:N0}", Created, Started, Stopped); op.Write("\t{0,12:N0} {1,12:N0} {2,-12:N0}", Created, Started, Stopped);
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Effects.cs * * File: Effects.cs *
* * * *
@ -16,8 +16,8 @@
using System; using System;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public enum EffectType public enum EffectType
{ {
Moving, Moving,
@ -500,4 +500,3 @@ namespace Server
eable.Free(); eable.Free();
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: EventLoopTasks.cs * * File: EventLoopTasks.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Threading; using System.Threading;
namespace Server namespace Server;
{
public sealed class EventLoopContext : SynchronizationContext public sealed class EventLoopContext : SynchronizationContext
{ {
private readonly ConcurrentQueue<Action> _queue; private readonly ConcurrentQueue<Action> _queue;
@ -73,4 +73,3 @@ namespace Server
} }
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: AccountLoginEvent.cs * * File: AccountLoginEvent.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public class AccountLoginEventArgs public class AccountLoginEventArgs
{ {
public AccountLoginEventArgs(NetState state, string username, string password) public AccountLoginEventArgs(NetState state, string username, string password)
@ -46,4 +46,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeAccountLogin(AccountLoginEventArgs e) => AccountLogin?.Invoke(e); public static void InvokeAccountLogin(AccountLoginEventArgs e) => AccountLogin?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: AggressiveActionEvent.cs * * File: AggressiveActionEvent.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server namespace Server;
{
public class AggressiveActionEventArgs : EventArgs public class AggressiveActionEventArgs : EventArgs
{ {
private static readonly Queue<AggressiveActionEventArgs> m_Pool = new(); private static readonly Queue<AggressiveActionEventArgs> m_Pool = new();
@ -69,4 +69,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeAggressiveAction(AggressiveActionEventArgs e) => AggressiveAction?.Invoke(e); public static void InvokeAggressiveAction(AggressiveActionEventArgs e) => AggressiveAction?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: CharacterCreatedEvent.cs * * File: CharacterCreatedEvent.cs *
* * * *
@ -18,8 +18,8 @@ using System.Runtime.CompilerServices;
using Server.Accounting; using Server.Accounting;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public class CharacterCreatedEventArgs public class CharacterCreatedEventArgs
{ {
public CharacterCreatedEventArgs( public CharacterCreatedEventArgs(
@ -91,4 +91,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeCharacterCreated(CharacterCreatedEventArgs e) => CharacterCreated?.Invoke(e); public static void InvokeCharacterCreated(CharacterCreatedEventArgs e) => CharacterCreated?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: EventSink.cs * * File: EventSink.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public static partial class EventSink public static partial class EventSink
{ {
public static event Action<Mobile> OpenDoorMacroUsed; public static event Action<Mobile> OpenDoorMacroUsed;
@ -158,4 +158,3 @@ namespace Server
public static void InvokeTargetByResourceMacro(Mobile m, Item item, short resourceType) => public static void InvokeTargetByResourceMacro(Mobile m, Item item, short resourceType) =>
TargetByResourceMacro?.Invoke(m, item, resourceType); TargetByResourceMacro?.Invoke(m, item, resourceType);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: FastwalkEvent.cs * * File: FastwalkEvent.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public class FastWalkEventArgs public class FastWalkEventArgs
{ {
public FastWalkEventArgs(NetState state) => NetState = state; public FastWalkEventArgs(NetState state) => NetState = state;
@ -35,4 +35,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeFastWalk(FastWalkEventArgs e) => FastWalk?.Invoke(e); public static void InvokeFastWalk(FastWalkEventArgs e) => FastWalk?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: GameLoginEvent.cs * * File: GameLoginEvent.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public class GameLoginEventArgs public class GameLoginEventArgs
{ {
public GameLoginEventArgs(NetState state, string un, string pw) public GameLoginEventArgs(NetState state, string un, string pw)
@ -46,4 +46,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeGameLogin(GameLoginEventArgs e) => GameLogin?.Invoke(e); public static void InvokeGameLogin(GameLoginEventArgs e) => GameLogin?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: MovementEvent.cs * * File: MovementEvent.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server namespace Server;
{
public class MovementEventArgs : EventArgs public class MovementEventArgs : EventArgs
{ {
private static readonly Queue<MovementEventArgs> m_Pool = new(); private static readonly Queue<MovementEventArgs> m_Pool = new();
@ -68,4 +68,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeMovement(MovementEventArgs e) => Movement?.Invoke(e); public static void InvokeMovement(MovementEventArgs e) => Movement?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ServerCrashedEvent.cs * * File: ServerCrashedEvent.cs *
* * * *
@ -16,8 +16,8 @@
using System; using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server namespace Server;
{
public class ServerCrashedEventArgs public class ServerCrashedEventArgs
{ {
public ServerCrashedEventArgs(Exception e) => Exception = e; public ServerCrashedEventArgs(Exception e) => Exception = e;
@ -34,4 +34,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeServerCrashed(ServerCrashedEventArgs e) => ServerCrashed?.Invoke(e); public static void InvokeServerCrashed(ServerCrashedEventArgs e) => ServerCrashed?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ServerListEvent.cs * * File: ServerListEvent.cs *
* * * *
@ -20,8 +20,8 @@ using System.Runtime.CompilerServices;
using Server.Accounting; using Server.Accounting;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public class ServerListEventArgs public class ServerListEventArgs
{ {
public ServerListEventArgs(NetState state, IAccount account) public ServerListEventArgs(NetState state, IAccount account)
@ -57,4 +57,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeServerList(ServerListEventArgs e) => ServerList?.Invoke(e); public static void InvokeServerList(ServerListEventArgs e) => ServerList?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: SocketConnectionEvent.cs * * File: SocketConnectionEvent.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Net.Sockets; using System.Net.Sockets;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server namespace Server;
{
public class SocketConnectEventArgs public class SocketConnectEventArgs
{ {
public SocketConnectEventArgs(Socket c) public SocketConnectEventArgs(Socket c)
@ -39,4 +39,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeSocketConnect(SocketConnectEventArgs e) => SocketConnect?.Invoke(e); public static void InvokeSocketConnect(SocketConnectEventArgs e) => SocketConnect?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: SpeechEvent.cs * * File: SpeechEvent.cs *
* * * *
@ -17,8 +17,8 @@ using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public class SpeechEventArgs public class SpeechEventArgs
{ {
public SpeechEventArgs(Mobile mobile, string speech, MessageType type, int hue, int[] keywords) public SpeechEventArgs(Mobile mobile, string speech, MessageType type, int hue, int[] keywords)
@ -65,4 +65,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void InvokeSpeech(SpeechEventArgs e) => Speech?.Invoke(e); public static void InvokeSpeech(SpeechEventArgs e) => Speech?.Invoke(e);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ExceptionExtensions.cs * * File: ExceptionExtensions.cs *
* * * *
@ -18,8 +18,8 @@ using System.Diagnostics;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
namespace Server.Exceptions namespace Server.Exceptions;
{
public static class ExceptionExtensions public static class ExceptionExtensions
{ {
public static Exception SetStackTrace(this Exception target, StackTrace stack) => _setStackTrace(target, stack); public static Exception SetStackTrace(this Exception target, StackTrace stack) => _setStackTrace(target, stack);
@ -39,4 +39,3 @@ namespace Server.Exceptions
return Expression.Lambda<Func<Exception, StackTrace, Exception>>(Expression.Block(assign, target), target, stack).Compile(); return Expression.Lambda<Func<Exception, StackTrace, Exception>>(Expression.Block(assign, target), target, stack).Compile();
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: InvalidThreadException.cs * * File: InvalidThreadException.cs *
* * * *
@ -15,12 +15,11 @@
using System; using System;
namespace Server.Exceptions namespace Server.Exceptions;
{
public class InvalidThreadException : Exception public class InvalidThreadException : Exception
{ {
public InvalidThreadException(string methodName) : base($"{methodName} executed on an invalid thread.") public InvalidThreadException(string methodName) : base($"{methodName} executed on an invalid thread.")
{ {
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: MaxConnectionsException.cs * * File: MaxConnectionsException.cs *
* * * *
@ -15,12 +15,11 @@
using System; using System;
namespace Server.Exceptions namespace Server.Exceptions;
{
public class MaxConnectionsException : Exception public class MaxConnectionsException : Exception
{ {
public MaxConnectionsException() : base("Maximum connections exceeded") public MaxConnectionsException() : base("Maximum connections exceeded")
{ {
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ExpansionInfo.cs * * File: ExpansionInfo.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Point2D.cs * * File: Point2D.cs *
* * * *
@ -15,8 +15,8 @@
using System; using System;
namespace Server namespace Server;
{
[Parsable] [Parsable]
public struct Point2D public struct Point2D
: IPoint2D, IComparable<Point2D>, IComparable<IPoint2D>, IEquatable<object>, IEquatable<Point2D>, : IPoint2D, IComparable<Point2D>, IComparable<IPoint2D>, IEquatable<object>, IEquatable<Point2D>,
@ -113,4 +113,3 @@ namespace Server
return xComparison != 0 ? xComparison : m_Y.CompareTo(other.Y); return xComparison != 0 ? xComparison : m_Y.CompareTo(other.Y);
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Point3D.cs * * File: Point3D.cs *
* * * *
@ -16,8 +16,8 @@
using System; using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server namespace Server;
{
[Parsable] [Parsable]
public struct Point3D public struct Point3D
: IPoint3D, IComparable<Point3D>, IComparable<IPoint3D>, IEquatable<object>, IEquatable<Point3D>, : IPoint3D, IComparable<Point3D>, IComparable<IPoint3D>, IEquatable<object>, IEquatable<Point3D>,
@ -165,4 +165,3 @@ namespace Server
return m_Z.CompareTo(other.Z); return m_Z.CompareTo(other.Z);
} }
} }
}

View file

@ -1,7 +1,7 @@
using System; using System;
namespace Server namespace Server;
{
public class Point3DList public class Point3DList
{ {
private static readonly Point3D[] m_EmptyList = Array.Empty<Point3D>(); private static readonly Point3D[] m_EmptyList = Array.Empty<Point3D>();
@ -81,4 +81,3 @@ namespace Server
return list; return list;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Rectangle2D.cs * * File: Rectangle2D.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Rectangle3D.cs * * File: Rectangle3D.cs *
* * * *
@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/ *************************************************************************/
namespace Server namespace Server;
{
[NoSort] [NoSort]
[PropertyObject] [PropertyObject]
public struct Rectangle3D public struct Rectangle3D
@ -139,4 +139,3 @@ namespace Server
&& p.Z >= m_Start.m_Z && p.Z >= m_Start.m_Z
&& p.Z < m_End.m_Z; && p.Z < m_End.m_Z;
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: WorldLocation.cs * * File: WorldLocation.cs *
* * * *
@ -16,8 +16,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Server namespace Server;
{
[Parsable] [Parsable]
public struct WorldLocation public struct WorldLocation
: IPoint3D, IComparable<WorldLocation>, IEquatable<object>, IEquatable<WorldLocation>, IEquatable<IEntity> : IPoint3D, IComparable<WorldLocation>, IEquatable<object>, IEquatable<WorldLocation>, IEquatable<IEntity>
@ -165,4 +165,3 @@ namespace Server
return new WorldLocation(x, y, z, map); return new WorldLocation(x, y, z, map);
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Guild.cs * * File: Guild.cs *
* * * *
@ -16,8 +16,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Server.Guilds namespace Server.Guilds;
{
public enum GuildType public enum GuildType
{ {
Regular, Regular,
@ -137,4 +137,3 @@ namespace Server.Guilds
public override string ToString() => $"{Serial} \"{Name} [{Abbreviation}]\""; public override string ToString() => $"{Serial} \"{Name} [{Abbreviation}]\"";
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: GumpECHandleInput.cs * * File: GumpECHandleInput.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: GumpMasterGump.cs * * File: GumpMasterGump.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: GumpSpriteImage.cs * * File: GumpSpriteImage.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: GumpTooltip.cs * * File: GumpTooltip.cs *
* * * *

View file

@ -1,7 +1,7 @@
using Server.Network; using Server.Network;
namespace Server.HuePickers namespace Server.HuePickers;
{
public class HuePicker public class HuePicker
{ {
private static Serial _nextSerial = (Serial)1; private static Serial _nextSerial = (Serial)1;
@ -30,4 +30,3 @@ namespace Server.HuePickers
state.AddHuePicker(this); state.AddHuePicker(this);
} }
} }
}

View file

@ -1,7 +1,7 @@
using System; using System;
namespace Server.Accounting namespace Server.Accounting;
{
public static class AccountGold public static class AccountGold
{ {
public static bool Enabled { get; private set; } public static bool Enabled { get; private set; }
@ -110,4 +110,3 @@ namespace Server.Accounting
void SetPassword(string password); void SetPassword(string password);
bool CheckPassword(string password); bool CheckPassword(string password);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: IEntity.cs * * File: IEntity.cs *
* * * *
@ -15,8 +15,8 @@
using System; using System;
namespace Server namespace Server;
{
public interface IEntity : IPoint3D, ISerializable public interface IEntity : IPoint3D, ISerializable
{ {
Point3D Location { get; } Point3D Location { get; }
@ -121,4 +121,3 @@ namespace Server
{ {
} }
} }
}

View file

@ -1,7 +1,7 @@
using System; using System;
namespace Server namespace Server;
{
public interface IPoint2D public interface IPoint2D
{ {
int X { get; } int X { get; }
@ -72,4 +72,3 @@ namespace Server
void OnBeforeSpawn(Point3D location, Map map); void OnBeforeSpawn(Point3D location, Map map);
void OnAfterSpawn(); void OnAfterSpawn();
} }
}

View file

@ -1,8 +1,8 @@
using System; using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server.Items namespace Server.Items;
{
public abstract class BaseMulti : Item public abstract class BaseMulti : Item
{ {
public BaseMulti(int itemID) : base(itemID) => Movable = false; public BaseMulti(int itemID) : base(itemID) => Movable = false;
@ -123,4 +123,3 @@ namespace Server.Items
} }
} }
} }
}

View file

@ -5,8 +5,8 @@ using Server.Collections;
using Server.Logging; using Server.Logging;
using Server.Network; using Server.Network;
namespace Server.Items namespace Server.Items;
{
public delegate void OnItemConsumed(Item item, int amount); public delegate void OnItemConsumed(Item item, int amount);
public delegate int CheckItemGroup(Item a, Item b); public delegate int CheckItemGroup(Item a, Item b);
@ -1916,4 +1916,3 @@ namespace Server.Items
return data ?? Default; return data ?? Default;
} }
} }
}

View file

@ -1,8 +1,8 @@
using Server.Accounting; using Server.Accounting;
using Server.Network; using Server.Network;
namespace Server.Items namespace Server.Items;
{
public class BankBox : Container public class BankBox : Container
{ {
public BankBox(Serial serial) : base(serial) public BankBox(Serial serial) : base(serial)
@ -123,4 +123,3 @@ namespace Server.Items
return base.GetTotal(type); return base.GetTotal(type);
} }
} }
}

View file

@ -7,8 +7,8 @@ using Server.Logging;
using Server.Network; using Server.Network;
using Server.Targeting; using Server.Targeting;
namespace Server namespace Server;
{
/// <summary> /// <summary>
/// Internal flags used to signal how the item should be updated and resent to nearby clients. /// Internal flags used to signal how the item should be updated and resent to nearby clients.
/// </summary> /// </summary>
@ -4353,4 +4353,3 @@ namespace Server
NullWeight = 0x04000000 NullWeight = 0x04000000
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Layer.cs * * File: Layer.cs *
* * * *
@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/ *************************************************************************/
namespace Server namespace Server;
{
/// <summary> /// <summary>
/// Enumeration of item layer values. /// Enumeration of item layer values.
/// </summary> /// </summary>
@ -185,4 +185,3 @@ namespace Server
/// </summary> /// </summary>
LastValid = 0x1D LastValid = 0x1D
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: LightType.cs * * File: LightType.cs *
* * * *
@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/ *************************************************************************/
namespace Server namespace Server;
{
public enum LightType public enum LightType
{ {
/// <summary> /// <summary>
@ -300,4 +300,3 @@ namespace Server
/// </summary> /// </summary>
NorthWestBig2 NorthWestBig2
} }
}

View file

@ -1,8 +1,8 @@
using Server.Accounting; using Server.Accounting;
using Server.Network; using Server.Network;
namespace Server.Items namespace Server.Items;
{
public class SecureTradeContainer : Container public class SecureTradeContainer : Container
{ {
public SecureTradeContainer(SecureTrade trade) : base(0x1E5E) public SecureTradeContainer(SecureTrade trade) : base(0x1E5E)
@ -110,4 +110,3 @@ namespace Server.Items
var version = reader.ReadInt(); var version = reader.ReadInt();
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: VirtualCheck.cs * * File: VirtualCheck.cs *
* * * *
@ -16,8 +16,8 @@
using Server.Gumps; using Server.Gumps;
using Server.Network; using Server.Network;
namespace Server.Items namespace Server.Items;
{
public sealed class VirtualCheck : Item public sealed class VirtualCheck : Item
{ {
public static bool UseEditGump { get; private set; } public static bool UseEditGump { get; private set; }
@ -394,4 +394,3 @@ namespace Server.Items
} }
} }
} }
}

View file

@ -3,8 +3,8 @@ using System.Buffers;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public static class OutgoingVirtualHairPackets public static class OutgoingVirtualHairPackets
{ {
public const int EquipUpdatePacketLength = 15; public const int EquipUpdatePacketLength = 15;
@ -145,4 +145,3 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static uint FakeSerial(Serial m) => 0x7FFFFFFF - 0x400 - 1 - m.Value* 4; public static uint FakeSerial(Serial m) => 0x7FFFFFFF - 0x400 - 1 - m.Value* 4;
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ClientVersionConverterFactory.cs * * File: ClientVersionConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: GuidConverter.cs * * File: GuidConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: GuidConverterFactory.cs * * File: GuidConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: IPEndPointConverter.cs * * File: IPEndPointConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: IPEndPointConverterFactory.cs * * File: IPEndPointConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: MapConverter.cs * * File: MapConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: MapConverterFactory.cs * * File: MapConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Point2DConverter.cs * * File: Point2DConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Point2DConverterFactory.cs * * File: Point2DConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Point3DConverter.cs * * File: Point3DConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Point3DConverterFactory.cs * * File: Point3DConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Rectangle3DConverter.cs * * File: Rectangle3DConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Rectangle3DConverterFactory.cs * * File: Rectangle3DConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: TimeSpanConverter.cs * * File: TimeSpanConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: TimeSpanConverterFactory.cs * * File: TimeSpanConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: TypeConverter.cs * * File: TypeConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: TypeConverterFactory.cs * * File: TypeConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: WorldLocationConverter.cs * * File: WorldLocationConverter.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: WorldLocationConverterFactory.cs * * File: WorldLocationConverterFactory.cs *
* * * *

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: DynamicJson.cs * * File: DynamicJson.cs *
* * * *
@ -18,8 +18,8 @@ using System.Collections.Generic;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace Server.Json namespace Server.Json;
{
public class DynamicJson public class DynamicJson
{ {
public static DynamicJson Create(Type type) => new() public static DynamicJson Create(Type type) => new()
@ -64,4 +64,3 @@ namespace Server.Json
return false; return false;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: JsonConfig.cs * * File: JsonConfig.cs *
* * * *
@ -21,8 +21,8 @@ using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Server.Text; using Server.Text;
namespace Server.Json namespace Server.Json;
{
public static class JsonConfig public static class JsonConfig
{ {
public static readonly JsonSerializerOptions DefaultOptions = GetOptions(); public static readonly JsonSerializerOptions DefaultOptions = GetOptions();
@ -110,4 +110,3 @@ namespace Server.Json
return document.RootElement.ToObject<T>(options); return document.RootElement.ToObject<T>(options);
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: JsonPropertySorter.cs * * File: JsonPropertySorter.cs *
* * * *
@ -20,8 +20,8 @@ using System.Text;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
namespace Server.Json namespace Server.Json;
{
public static class JsonUtilities public static class JsonUtilities
{ {
public static string SortByPropertyName(string jsonStr) public static string SortByPropertyName(string jsonStr)
@ -97,4 +97,3 @@ namespace Server.Json
} }
} }
} }
}

View file

@ -1,7 +1,7 @@
using System; using System;
namespace Server namespace Server;
{
public class KeywordList public class KeywordList
{ {
private static readonly int[] m_EmptyInts = Array.Empty<int>(); private static readonly int[] m_EmptyInts = Array.Empty<int>();
@ -62,4 +62,3 @@ namespace Server
return keywords; return keywords;
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: ILogger.cs * * File: ILogger.cs *
* * * *
@ -15,8 +15,8 @@
using System; using System;
namespace Server.Logging namespace Server.Logging;
{
public interface ILogger public interface ILogger
{ {
void Debug(string message, params object[] args); void Debug(string message, params object[] args);
@ -34,4 +34,3 @@ namespace Server.Logging
void Fatal(string message, params object[] args); void Fatal(string message, params object[] args);
void Fatal(Exception exception, string message, params object[] args); void Fatal(Exception exception, string message, params object[] args);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: SerilogLogger.cs * * File: SerilogLogger.cs *
* * * *
@ -16,8 +16,8 @@
using System; using System;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
namespace Server.Logging namespace Server.Logging;
{
public class SerilogLogger : ILogger public class SerilogLogger : ILogger
{ {
private readonly Serilog.ILogger serilogLogger; private readonly Serilog.ILogger serilogLogger;
@ -47,7 +47,7 @@ namespace Server.Logging
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Warning(Exception exception, string message, params object[] args) => public void Warning(Exception exception, string message, params object[] args) =>
serilogLogger.Information(exception, message, args); serilogLogger.Warning(exception, message, args);
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Error(string message, params object[] args) => public void Error(string message, params object[] args) =>
@ -65,4 +65,3 @@ namespace Server.Logging
public void Fatal(Exception exception, string message, params object[] args) => public void Fatal(Exception exception, string message, params object[] args) =>
serilogLogger.Fatal(exception, message, args); serilogLogger.Fatal(exception, message, args);
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright 2019-2020 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: Main.cs * * File: Main.cs *
* * * *
@ -30,8 +30,8 @@ using Server.Json;
using Server.Logging; using Server.Logging;
using Server.Network; using Server.Network;
namespace Server namespace Server;
{
public static class Core public static class Core
{ {
private static readonly ILogger logger = LogFactory.GetLogger(typeof(Core)); private static readonly ILogger logger = LogFactory.GetLogger(typeof(Core));
@ -443,7 +443,7 @@ namespace Server
Utility.PopColor(); Utility.PopColor();
Utility.PushColor(ConsoleColor.DarkGray); Utility.PushColor(ConsoleColor.DarkGray);
Console.WriteLine(@"Copyright 2019-2020 ModernUO Development Team Console.WriteLine(@"Copyright 2019-2022 ModernUO Development Team
This program comes with ABSOLUTELY NO WARRANTY; This program comes with ABSOLUTELY NO WARRANTY;
This is free software, and you are welcome to redistribute it under certain conditions. This is free software, and you are welcome to redistribute it under certain conditions.
@ -688,4 +688,3 @@ namespace Server
} }
} }
} }
}

View file

@ -1,6 +1,6 @@
/************************************************************************* /*************************************************************************
* ModernUO * * ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team * * Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com * * Email: hi@modernuo.com *
* File: MapLoader.cs * * File: MapLoader.cs *
* * * *
@ -22,8 +22,8 @@ using System.Text.Json.Serialization;
using Server.Json; using Server.Json;
using Server.Logging; using Server.Logging;
namespace Server namespace Server;
{
public static class MapLoader public static class MapLoader
{ {
private static readonly ILogger logger = LogFactory.GetLogger(typeof(MapLoader)); private static readonly ILogger logger = LogFactory.GetLogger(typeof(MapLoader));
@ -143,4 +143,3 @@ namespace Server
public MapRules Rules { get; set; } public MapRules Rules { get; set; }
} }
} }
}

View file

@ -1,7 +1,7 @@
using Server.Network; using Server.Network;
namespace Server.Menus namespace Server.Menus;
{
public interface IMenu public interface IMenu
{ {
int Serial { get; } int Serial { get; }
@ -10,4 +10,3 @@ namespace Server.Menus
void OnCancel(NetState state); void OnCancel(NetState state);
void OnResponse(NetState state, int index); void OnResponse(NetState state, int index);
} }
}

View file

@ -1,7 +1,7 @@
using Server.Network; using Server.Network;
namespace Server.Menus.ItemLists namespace Server.Menus.ItemLists;
{
public class ItemListEntry public class ItemListEntry
{ {
public ItemListEntry(string name, int itemID, int hue = 0) public ItemListEntry(string name, int itemID, int hue = 0)
@ -58,4 +58,3 @@ namespace Server.Menus.ItemLists
state.SendDisplayItemListMenu(this); state.SendDisplayItemListMenu(this);
} }
} }
}

Some files were not shown because too many files have changed in this diff Show more