From dec088766c01b8f2df4759cbd8e6ed868b66b1cb Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 26 Nov 2018 17:07:21 -0800 Subject: [PATCH] Update singlefile usage --- pkNX.Containers/SingleFileContainer.cs | 4 ++-- pkNX.WinForms/MainEditor/EditorGG.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkNX.Containers/SingleFileContainer.cs b/pkNX.Containers/SingleFileContainer.cs index 930975f3..89b5de2c 100644 --- a/pkNX.Containers/SingleFileContainer.cs +++ b/pkNX.Containers/SingleFileContainer.cs @@ -35,8 +35,8 @@ public void CancelEdits() } } - public Task GetFiles() => Task.FromResult(new[] {Data}); - public Task GetFile(int file, int subFile = 0) => Task.FromResult(Data); + public Task GetFiles() => Task.FromResult(new[] {this[0]}); + public Task GetFile(int file, int subFile = 0) => Task.FromResult(this[0]); public Task SetFile(int file, byte[] value, int subFile = 0) => Task.FromResult(Data = value); public Task SaveAs(string path, ContainerHandler handler, CancellationToken token) => new Task(() => Dump(path, handler), token); public void Dump(string path, ContainerHandler handler) => File.WriteAllBytes(path ?? FilePath, Data); diff --git a/pkNX.WinForms/MainEditor/EditorGG.cs b/pkNX.WinForms/MainEditor/EditorGG.cs index 2fb32f2b..30382acb 100644 --- a/pkNX.WinForms/MainEditor/EditorGG.cs +++ b/pkNX.WinForms/MainEditor/EditorGG.cs @@ -107,7 +107,7 @@ public void EditMoves() public void EditGift() { var file = ROM[GameFile.EncounterGift]; - var data = file.GetFiles().Result[0]; + var data = file[0]; var objs = data.GetArray(z => new EncounterGift7b(z), EncounterGift7b.SIZE); // binary var names = Enumerable.Range(0, objs.Length).Select(z => $"{z:00}").ToArray(); var cache = new DirectCache(objs); @@ -136,7 +136,7 @@ void Randomize() public void EditTrade() { var file = ROM[GameFile.EncounterTrade]; - var data = file.GetFiles().Result[0]; + var data = file[0]; var objs = data.GetArray(z => new EncounterTrade7b(z), EncounterTrade7b.SIZE); // binary var names = Enumerable.Range(0, objs.Length).Select(z => $"{z:00}").ToArray(); var cache = new DirectCache(objs); @@ -166,7 +166,7 @@ void Randomize() public void EditStatic() { var file = ROM[GameFile.EncounterStatic]; - var data = file.GetFiles().Result[0]; + var data = file[0]; var objs = data.GetArray(z => new EncounterStatic7b(z), EncounterStatic7b.SIZE); // binary var names = Enumerable.Range(0, objs.Length).Select(z => $"{z:00}").ToArray(); var cache = new DirectCache(objs);