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

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: SimplePrompt.cs *
* *
@ -15,77 +15,76 @@
using Server.Prompts;
namespace Server.Mobiles
namespace Server.Mobiles;
public class SimplePrompt : Prompt
{
public class SimplePrompt : Prompt
private readonly PromptCallback m_Callback;
private readonly bool m_CallbackHandlesCancel;
private readonly PromptCallback m_CancelCallback;
public SimplePrompt(PromptCallback callback, PromptCallback cancelCallback)
{
private readonly PromptCallback m_Callback;
private readonly bool m_CallbackHandlesCancel;
private readonly PromptCallback m_CancelCallback;
public SimplePrompt(PromptCallback callback, PromptCallback cancelCallback)
{
m_Callback = callback;
m_CancelCallback = cancelCallback;
}
public SimplePrompt(PromptCallback callback, bool callbackHandlesCancel = false)
{
m_Callback = callback;
m_CallbackHandlesCancel = callbackHandlesCancel;
}
public override void OnResponse(Mobile from, string text)
{
m_Callback?.Invoke(from, text);
}
public override void OnCancel(Mobile from)
{
if (m_CallbackHandlesCancel && m_Callback != null)
{
m_Callback(from, "");
}
else
{
m_CancelCallback?.Invoke(from, "");
}
}
m_Callback = callback;
m_CancelCallback = cancelCallback;
}
public class SimpleStatePrompt<T> : Prompt
public SimplePrompt(PromptCallback callback, bool callbackHandlesCancel = false)
{
private readonly PromptStateCallback<T> m_Callback;
private readonly PromptStateCallback<T> m_CancelCallback;
m_Callback = callback;
m_CallbackHandlesCancel = callbackHandlesCancel;
}
private readonly T m_State;
public override void OnResponse(Mobile from, string text)
{
m_Callback?.Invoke(from, text);
}
public SimpleStatePrompt(PromptStateCallback<T> callback, PromptStateCallback<T> cancelCallback, T state)
public override void OnCancel(Mobile from)
{
if (m_CallbackHandlesCancel && m_Callback != null)
{
m_Callback = callback;
m_CancelCallback = cancelCallback;
m_State = state;
m_Callback(from, "");
}
public SimpleStatePrompt(PromptStateCallback<T> callback, bool callbackHandlesCancel, T state)
else
{
m_Callback = callback;
m_State = state;
m_CancelCallback = callbackHandlesCancel ? callback : null;
}
public SimpleStatePrompt(PromptStateCallback<T> callback, T state) : this(callback, false, state)
{
}
public override void OnResponse(Mobile from, string text)
{
m_Callback?.Invoke(from, text, m_State);
}
public override void OnCancel(Mobile from)
{
m_CancelCallback?.Invoke(from, "", m_State);
m_CancelCallback?.Invoke(from, "");
}
}
}
public class SimpleStatePrompt<T> : Prompt
{
private readonly PromptStateCallback<T> m_Callback;
private readonly PromptStateCallback<T> m_CancelCallback;
private readonly T m_State;
public SimpleStatePrompt(PromptStateCallback<T> callback, PromptStateCallback<T> cancelCallback, T state)
{
m_Callback = callback;
m_CancelCallback = cancelCallback;
m_State = state;
}
public SimpleStatePrompt(PromptStateCallback<T> callback, bool callbackHandlesCancel, T state)
{
m_Callback = callback;
m_State = state;
m_CancelCallback = callbackHandlesCancel ? callback : null;
}
public SimpleStatePrompt(PromptStateCallback<T> callback, T state) : this(callback, false, state)
{
}
public override void OnResponse(Mobile from, string text)
{
m_Callback?.Invoke(from, text, m_State);
}
public override void OnCancel(Mobile from)
{
m_CancelCallback?.Invoke(from, "", m_State);
}
}