ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Expose DataManager.GameData

Browse source 
Why not?
This commit is contained in:
Raymond 2021-08-25 18:40:37 -04:00
parent 8feb0a9c53
commit 14934a890c
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Dalamud/Data/DataManager.cs
View file

@ -29,11 +29,6 @@ namespace Dalamud.Data
{ {
private const string IconFileFormat = "ui/icon/{0:D3}000/{1}{2:D6}.tex"; private const string IconFileFormat = "ui/icon/{0:D3}000/{1}{2:D6}.tex";
/// <summary>
/// A <see cref="Lumina"/> object which gives access to any excel/game data.
/// </summary>
private GameData gameData;
private Thread luminaResourceThread; private Thread luminaResourceThread;
private CancellationTokenSource luminaCancellationTokenSource; private CancellationTokenSource luminaCancellationTokenSource;
@ -64,10 +59,15 @@ namespace Dalamud.Data
[UsedImplicitly] [UsedImplicitly]
public ReadOnlyDictionary<string, ushort> ClientOpCodes { get; private set; } public ReadOnlyDictionary<string, ushort> ClientOpCodes { get; private set; }
/// <summary>
/// Gets a <see cref="Lumina"/> object which gives access to any excel/game data.
/// </summary>
public GameData GameData { get; private set; }
/// <summary> /// <summary>
/// Gets an <see cref="ExcelModule"/> object which gives access to any of the game's sheet data. /// Gets an <see cref="ExcelModule"/> object which gives access to any of the game's sheet data.
/// </summary> /// </summary>
public ExcelModule Excel => this.gameData?.Excel; public ExcelModule Excel => this.GameData?.Excel;
/// <summary> /// <summary>
/// Gets a value indicating whether Game Data is ready to be read. /// Gets a value indicating whether Game Data is ready to be read.
@ -118,7 +118,7 @@ namespace Dalamud.Data
var filePath = GameData.ParseFilePath(path); var filePath = GameData.ParseFilePath(path);
if (filePath == null) if (filePath == null)
return default; return default;
return this.gameData.Repositories.TryGetValue(filePath.Repository, out var repository) ? repository.GetFile<T>(filePath.Category, filePath) : default; return this.GameData.Repositories.TryGetValue(filePath.Repository, out var repository) ? repository.GetFile<T>(filePath.Category, filePath) : default;
} }
/// <summary> /// <summary>
@ -128,7 +128,7 @@ namespace Dalamud.Data
/// <returns>True if the file exists.</returns> /// <returns>True if the file exists.</returns>
public bool FileExists(string path) public bool FileExists(string path)
{ {
return this.gameData.FileExists(path); return this.GameData.FileExists(path);
} }
/// <summary> /// <summary>
@ -312,10 +312,10 @@ namespace Dalamud.Data
var processModule = Process.GetCurrentProcess().MainModule; var processModule = Process.GetCurrentProcess().MainModule;
if (processModule != null) if (processModule != null)
{ {
this.gameData = new GameData(Path.Combine(Path.GetDirectoryName(processModule.FileName), "sqpack"), luminaOptions); this.GameData = new GameData(Path.Combine(Path.GetDirectoryName(processModule.FileName), "sqpack"), luminaOptions);
} }
Log.Information("Lumina is ready: {0}", this.gameData.DataPath); Log.Information("Lumina is ready: {0}", this.GameData.DataPath);
this.IsDataReady = true; this.IsDataReady = true;
@ -326,9 +326,9 @@ namespace Dalamud.Data
{ {
while (!luminaCancellationToken.IsCancellationRequested) while (!luminaCancellationToken.IsCancellationRequested)
{ {
if (this.gameData.FileHandleManager.HasPendingFileLoads) if (this.GameData.FileHandleManager.HasPendingFileLoads)
{ {
this.gameData.ProcessFileHandleQueue(); this.GameData.ProcessFileHandleQueue();
} }
else else
{ {