mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-12 18:27:23 +01:00
api10 todo: only use ClientLanguage from Dalamud.Common, move ToLumina() extension into Dalamud.Util
This commit is contained in:
parent
2565f2c3c6
commit
2e731b1eab
18 changed files with 27 additions and 33 deletions
|
|
@ -1,5 +1,8 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
|
|
||||||
using Xunit;
|
using Xunit;
|
||||||
|
|
||||||
// ReSharper disable StringLiteralTypo
|
// ReSharper disable StringLiteralTypo
|
||||||
|
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
using Dalamud.Utility;
|
|
||||||
|
|
||||||
namespace Dalamud;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Enum describing the language the game loads in.
|
|
||||||
/// </summary>
|
|
||||||
[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
|
|
||||||
public enum ClientLanguage
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Indicating a Japanese game client.
|
|
||||||
/// </summary>
|
|
||||||
Japanese,
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Indicating an English game client.
|
|
||||||
/// </summary>
|
|
||||||
English,
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Indicating a German game client.
|
|
||||||
/// </summary>
|
|
||||||
German,
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Indicating a French game client.
|
|
||||||
/// </summary>
|
|
||||||
French,
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.IoC;
|
using Dalamud.IoC;
|
||||||
using Dalamud.IoC.Internal;
|
using Dalamud.IoC.Internal;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
using CheapLoc;
|
using CheapLoc;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Configuration.Internal;
|
using Dalamud.Configuration.Internal;
|
||||||
using Dalamud.Game.ClientState.Conditions;
|
using Dalamud.Game.ClientState.Conditions;
|
||||||
using Dalamud.Game.Gui;
|
using Dalamud.Game.Gui;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Data;
|
using Dalamud.Data;
|
||||||
using Dalamud.Game.ClientState.Conditions;
|
using Dalamud.Game.ClientState.Conditions;
|
||||||
using Dalamud.Game.ClientState.Objects;
|
using Dalamud.Game.ClientState.Objects;
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Data;
|
using Dalamud.Data;
|
||||||
|
|
||||||
using Lumina.Excel;
|
using Lumina.Excel;
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Console;
|
using Dalamud.Console;
|
||||||
using Dalamud.Game.Gui;
|
using Dalamud.Game.Gui;
|
||||||
using Dalamud.Game.Text;
|
using Dalamud.Game.Text;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Game.ClientState.Resolvers;
|
using Dalamud.Game.ClientState.Resolvers;
|
||||||
using Dalamud.Memory;
|
using Dalamud.Memory;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
|
|
||||||
namespace Dalamud.Game.Text.Sanitizer;
|
namespace Dalamud.Game.Text.Sanitizer;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
|
|
||||||
namespace Dalamud.Game.Text.Sanitizer;
|
namespace Dalamud.Game.Text.Sanitizer;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
|
|
||||||
using Lumina.Excel.GeneratedSheets;
|
using Lumina.Excel.GeneratedSheets;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Data;
|
using Dalamud.Data;
|
||||||
using Dalamud.Game.Text.SeStringHandling.Payloads;
|
using Dalamud.Game.Text.SeStringHandling.Payloads;
|
||||||
using Dalamud.Utility;
|
using Dalamud.Utility;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
|
|
||||||
namespace Dalamud.Interface.Textures;
|
namespace Dalamud.Interface.Textures;
|
||||||
|
|
||||||
/// <summary>Represents a lookup for a game icon.</summary>
|
/// <summary>Represents a lookup for a game icon.</summary>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
|
|
||||||
namespace Dalamud.Interface.Textures.Internal;
|
namespace Dalamud.Interface.Textures.Internal;
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
using Dalamud.Common;
|
||||||
using Dalamud.Game.ClientState.Conditions;
|
using Dalamud.Game.ClientState.Conditions;
|
||||||
using Dalamud.Game.ClientState.Objects.SubKinds;
|
using Dalamud.Game.ClientState.Objects.SubKinds;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
using Dalamud.Common;
|
||||||
|
|
||||||
using Lumina;
|
using Lumina;
|
||||||
using Lumina.Data;
|
using Lumina.Data;
|
||||||
using Lumina.Excel;
|
using Lumina.Excel;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
using Dalamud.Utility;
|
using Dalamud.Common;
|
||||||
|
|
||||||
namespace Dalamud;
|
namespace Dalamud.Utility;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Extension methods for the <see cref="ClientLanguage"/> class.
|
/// Extension methods for the <see cref="ClientLanguage"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
|
|
||||||
public static class ClientLanguageExtensions
|
public static class ClientLanguageExtensions
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -28,6 +28,8 @@ using Windows.Win32.Storage.FileSystem;
|
||||||
using Windows.Win32.System.Memory;
|
using Windows.Win32.System.Memory;
|
||||||
using Windows.Win32.System.Ole;
|
using Windows.Win32.System.Ole;
|
||||||
|
|
||||||
|
using Dalamud.Common;
|
||||||
|
|
||||||
using HWND = Windows.Win32.Foundation.HWND;
|
using HWND = Windows.Win32.Foundation.HWND;
|
||||||
using Win32_PInvoke = Windows.Win32.PInvoke;
|
using Win32_PInvoke = Windows.Win32.PInvoke;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue