From 6fdcdcf9232e48f94c5e8b2b19e5b957914f2369 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Sun, 20 Jan 2019 01:07:52 -0600 Subject: [PATCH] refactors and added forgotten semicolon :/ --- .../NinePatch/NinePatchProcessor.cs | 2 +- .../NinePatch/NinePatchWriter.cs | 2 +- .../TextureAtlas/TextureAtlasProcessor.cs | 2 +- .../TextureAtlas/TextureAtlasWriter.cs | 2 +- .../NinePatchTools/NinePatchCommand.cs | 2 +- .../TextureAtlasTools/TexturePacker.cs | 2 +- .../{Serializable => Data}/NinePatchData.cs | 2 +- .../{Serializable => Data}/SkinData.cs | 32 ++++++++++++++++--- .../TextureAtlasData.cs | 2 +- .../Pipeline/TextureAtlasDataReader.cs | 4 +-- RecrownedAthenaeum/RecrownedAthenaeum.csproj | 8 +++-- 11 files changed, 42 insertions(+), 18 deletions(-) rename RecrownedAthenaeum/{Serializable => Data}/NinePatchData.cs (96%) rename RecrownedAthenaeum/{Serializable => Data}/SkinData.cs (66%) rename RecrownedAthenaeum/{Serializable => Data}/TextureAtlasData.cs (98%) diff --git a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs index 8423259..68b595c 100644 --- a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs +++ b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Newtonsoft.Json; -using RecrownedAthenaeum.Serializable; +using RecrownedAthenaeum.Data; namespace RecrownedAthenaeum.Pipeline.NinePatch { diff --git a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs index 6128377..9bfe219 100644 --- a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs +++ b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs @@ -1,7 +1,7 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler; using Newtonsoft.Json; -using RecrownedAthenaeum.Serializable; +using RecrownedAthenaeum.Data; namespace RecrownedAthenaeum.Pipeline.NinePatch { diff --git a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs index 3241b78..4f02905 100644 --- a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs +++ b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Newtonsoft.Json; -using RecrownedAthenaeum.Serializable; +using RecrownedAthenaeum.Data; namespace RecrownedAthenaeum.Pipeline.TextureAtlas { diff --git a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs index 9afeb0f..d08f542 100644 --- a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs +++ b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs @@ -1,7 +1,7 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler; using Newtonsoft.Json; -using RecrownedAthenaeum.Serializable; +using RecrownedAthenaeum.Data; namespace RecrownedAthenaeum.Pipeline.TextureAtlas { diff --git a/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs b/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs index 1d1c2e2..44a5d01 100644 --- a/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs +++ b/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs @@ -1,5 +1,5 @@ using Newtonsoft.Json; -using RecrownedAthenaeum.Serializable; +using RecrownedAthenaeum.Data; using RecrownedAthenaeum.Tools.CommandProcessor; using System; using System.IO; diff --git a/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs b/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs index b408948..53c0d93 100644 --- a/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs +++ b/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs @@ -1,5 +1,5 @@ using Newtonsoft.Json; -using RecrownedAthenaeum.Serializable; +using RecrownedAthenaeum.Data; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; diff --git a/RecrownedAthenaeum/Serializable/NinePatchData.cs b/RecrownedAthenaeum/Data/NinePatchData.cs similarity index 96% rename from RecrownedAthenaeum/Serializable/NinePatchData.cs rename to RecrownedAthenaeum/Data/NinePatchData.cs index ea8e752..d523f9e 100644 --- a/RecrownedAthenaeum/Serializable/NinePatchData.cs +++ b/RecrownedAthenaeum/Data/NinePatchData.cs @@ -1,4 +1,4 @@ -namespace RecrownedAthenaeum.Serializable +namespace RecrownedAthenaeum.Data { /// /// Represents a data structure for 9patches. diff --git a/RecrownedAthenaeum/Serializable/SkinData.cs b/RecrownedAthenaeum/Data/SkinData.cs similarity index 66% rename from RecrownedAthenaeum/Serializable/SkinData.cs rename to RecrownedAthenaeum/Data/SkinData.cs index e914126..2e30f64 100644 --- a/RecrownedAthenaeum/Serializable/SkinData.cs +++ b/RecrownedAthenaeum/Data/SkinData.cs @@ -1,6 +1,6 @@ using RecrownedAthenaeum.UI.Skin.Definitions; -namespace RecrownedAthenaeum.Serializable +namespace RecrownedAthenaeum.Data { /// /// Data transfer object for game skins. @@ -8,19 +8,41 @@ namespace RecrownedAthenaeum.Serializable public class SkinData { /// - /// Author name. + /// Holds metadata. /// - public string author; + public class Metadata + { + /// + /// Author name. + /// + public string author; + + /// + /// Description of skin. + /// + public string description; + + /// + /// Name of skin. + /// + public string skinName; + } /// - /// Description of skin. + /// The metadata for the skin file. /// - public string description; + public Metadata metadata; /// /// The name of the atlas with extension. /// public string nameOfTextureAtlas; + + /// + /// Name of the region or file designating the cursor. If there is an extension, will check for file first then texture atlas. Otherwise, will just check region. + /// + public string cursorTextureName; + /// /// The color data containing the name of the color, and red, green, and blue values for the color. /// diff --git a/RecrownedAthenaeum/Serializable/TextureAtlasData.cs b/RecrownedAthenaeum/Data/TextureAtlasData.cs similarity index 98% rename from RecrownedAthenaeum/Serializable/TextureAtlasData.cs rename to RecrownedAthenaeum/Data/TextureAtlasData.cs index f3ce9b5..ceacb49 100644 --- a/RecrownedAthenaeum/Serializable/TextureAtlasData.cs +++ b/RecrownedAthenaeum/Data/TextureAtlasData.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework; -namespace RecrownedAthenaeum.Serializable +namespace RecrownedAthenaeum.Data { /// /// Data transfer object for a texture atlas. diff --git a/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs b/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs index 8ed0c45..a9fdd5b 100644 --- a/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs +++ b/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs @@ -1,7 +1,7 @@ using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Graphics; using Newtonsoft.Json; -using RecrownedAthenaeum.Serializable; +using RecrownedAthenaeum.Data; using RecrownedAthenaeum.SpecialTypes; namespace RecrownedAthenaeum.Pipeline @@ -12,7 +12,7 @@ namespace RecrownedAthenaeum.Pipeline { string serialized = input.ReadString(); TextureAtlasData atlasData = JsonConvert.DeserializeObject(serialized); - Texture2D atlasTexture = input.ContentManager.Load(atlasData.textureName) + Texture2D atlasTexture = input.ContentManager.Load(atlasData.textureName); TextureAtlas atlas = new TextureAtlas(atlasTexture, GenerateAtlasRegionsFromData(atlasData, atlasTexture)); return atlas; diff --git a/RecrownedAthenaeum/RecrownedAthenaeum.csproj b/RecrownedAthenaeum/RecrownedAthenaeum.csproj index 169aaaf..d48bb21 100644 --- a/RecrownedAthenaeum/RecrownedAthenaeum.csproj +++ b/RecrownedAthenaeum/RecrownedAthenaeum.csproj @@ -67,9 +67,9 @@ - + - + @@ -90,9 +90,11 @@ + - + +