From a4e9440ea0a91b8584bb8ff628a76bdd5ff1205d Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:47:51 +0200 Subject: [PATCH] PckFileDataExtensions - Rename 'Get' to 'GetDeserializedData'/'GetData' respectively --- PCK-Studio/Extensions/PckFileDataExtensions.cs | 8 ++++---- PCK-Studio/Forms/Editor/TextureAtlasEditor.cs | 4 ++-- PCK-Studio/MainForm.cs | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PCK-Studio/Extensions/PckFileDataExtensions.cs b/PCK-Studio/Extensions/PckFileDataExtensions.cs index 2ca8b1a9..97e8df1d 100644 --- a/PCK-Studio/Extensions/PckFileDataExtensions.cs +++ b/PCK-Studio/Extensions/PckFileDataExtensions.cs @@ -28,18 +28,18 @@ namespace PckStudio.Extensions { throw new Exception("File is not suitable to contain image data."); } - return file.Get(ImageDeserializer.DefaultDeserializer); + return file.GetDeserializedData(ImageDeserializer.DefaultDeserializer); } - internal static T Get(this PckFileData file, IPckDeserializer deserializer) + internal static T GetDeserializedData(this PckFileData file, IPckDeserializer deserializer) { return deserializer.Deserialize(file); } - internal static T Get(this PckFileData file, IDataFormatReader deserializer) where T : class + internal static T GetData(this PckFileData file, IDataFormatReader formatReader) where T : class { using var ms = new MemoryStream(file.Data); - return deserializer.FromStream(ms); + return formatReader.FromStream(ms); } internal static void SetData(this PckFileData file, T obj, IPckFileSerializer serializer) diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs index b90b452c..e0f04d62 100644 --- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs +++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs @@ -254,7 +254,7 @@ namespace PckStudio.Forms.Editor hasAnimation && animationFile.Size > 0) { - var animation = animationFile.Get(AnimationDeserializer.DefaultDeserializer); + var animation = animationFile.GetDeserializedData(AnimationDeserializer.DefaultDeserializer); selectTilePictureBox.Start(animation); } } @@ -538,7 +538,7 @@ namespace PckStudio.Forms.Editor PckFileType.TextureFile ); - var animation = file.Get(AnimationDeserializer.DefaultDeserializer); + var animation = file.GetDeserializedData(AnimationDeserializer.DefaultDeserializer); var animationEditor = new AnimationEditor(animation, _selectedTile.Tile.InternalName, GetBlendColor()); if (animationEditor.ShowDialog(this) != DialogResult.OK) diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index fca1e8b9..53ad1913 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -519,7 +519,7 @@ namespace PckStudio !file.Filename.StartsWith(ResourceLocation.GetPathFromCategory(ResourceCategory.BlockAnimation))) return; - Animation animation = file.Get(AnimationDeserializer.DefaultDeserializer); + Animation animation = file.GetDeserializedData(AnimationDeserializer.DefaultDeserializer); string filename = Path.GetFileNameWithoutExtension(file.Filename); var textureInfos = ResourceLocation.GetCategoryFromPath(file.Filename) switch @@ -563,7 +563,7 @@ namespace PckStudio _ => GameRuleFile.CompressionType.Unknown }; - GameRuleFile grf = file.Get(new GameRuleFileReader(compressiontype)); + GameRuleFile grf = file.GetData(new GameRuleFileReader(compressiontype)); using GameRuleFileEditor grfEditor = new GameRuleFileEditor(grf); if (grfEditor.ShowDialog(this) == DialogResult.OK) @@ -2442,7 +2442,7 @@ namespace PckStudio { try { - ModelContainer container = file.Get(new ModelFileReader()); + ModelContainer container = file.GetData(new ModelFileReader()); if (container.Version == version) {