From 16c3037a800bb8fd6f65eb8dcf1f8e8fcdb14112 Mon Sep 17 00:00:00 2001 From: MattNL Date: Thu, 11 May 2023 11:16:56 -0400 Subject: [PATCH 1/2] Removed ModelResources.cs --- PCK-Studio/Forms/Utilities/ModelsResources.cs | 29 ------------------- PCK-Studio/PckStudio.csproj | 1 - 2 files changed, 30 deletions(-) delete mode 100644 PCK-Studio/Forms/Utilities/ModelsResources.cs diff --git a/PCK-Studio/Forms/Utilities/ModelsResources.cs b/PCK-Studio/Forms/Utilities/ModelsResources.cs deleted file mode 100644 index 47795210..00000000 --- a/PCK-Studio/Forms/Utilities/ModelsResources.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Newtonsoft.Json.Linq; -using System.Drawing; -using System.Linq; -using System.IO; - -using PckStudio.Properties; -using PckStudio.Extensions; -using OMI.Formats.Model; -using OMI.Formats.Pck; -using OMI.Workers.Model; - -namespace PckStudio.Forms.Utilities -{ - public static class ModelsResources - { - public static readonly JObject entityData = JObject.Parse(Resources.entityData); - private static Image[] _entityImages; - - public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray(); - - public static byte[] ModelsFileInitializer() - { - using var stream = new MemoryStream(); - var writer = new ModelFileWriter(new ModelContainer()); - writer.WriteToStream(stream); - return stream.ToArray(); - } - } -} diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index a2787bda..d93c16e1 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -368,7 +368,6 @@ InProgressPrompt.cs - From 31521c89b8b2fd9f116b01802d8b2432560501ce Mon Sep 17 00:00:00 2001 From: MattNL Date: Thu, 11 May 2023 11:22:13 -0400 Subject: [PATCH 2/2] Fixed EntityData not loading in the AddEntry form --- .../Additional-Popups/EntityForms/AddEntry.cs | 9 ++++----- PCK-Studio/Forms/Editor/BehaviourEditor.cs | 18 ++++++++++-------- PCK-Studio/Forms/Editor/MaterialsEditor.cs | 12 +++++++----- .../Forms/Utilities/BehaviourResources.cs | 1 - .../Forms/Utilities/MaterialResources.cs | 1 - 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.cs b/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.cs index 1d2ec6f8..596fdf7e 100644 --- a/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.cs +++ b/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.cs @@ -10,15 +10,14 @@ namespace PckStudio.Forms.Additional_Popups.EntityForms { string selectedEntity = ""; - JObject EntityJSONData; + JObject EntityJSONData = JObject.Parse(Properties.Resources.entityData); public string SelectedEntity => selectedEntity; List treeViewEntityCache = new List(); - public AddEntry(JObject entityData, System.Drawing.Image[] entityImages) + public AddEntry(string dataType, System.Drawing.Image[] entityImages) { InitializeComponent(); - EntityJSONData = entityData; ImageList entities = new ImageList(); entities.ColorDepth = ColorDepth.Depth32Bit; entities.ImageSize = new System.Drawing.Size(32, 32); @@ -29,9 +28,9 @@ namespace PckStudio.Forms.Additional_Popups.EntityForms { int i = 0; - if (EntityJSONData["entities"] != null) + if (EntityJSONData[dataType] != null) { - foreach (JObject content in EntityJSONData["entities"].Children()) + foreach (JObject content in EntityJSONData[dataType].Children()) { foreach (JProperty prop in content.Properties()) { diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.cs index 214151fc..8726bf9c 100644 --- a/PCK-Studio/Forms/Editor/BehaviourEditor.cs +++ b/PCK-Studio/Forms/Editor/BehaviourEditor.cs @@ -20,6 +20,8 @@ namespace PckStudio.Forms.Editor private readonly PckFile.FileData _file; BehaviourFile behaviourFile; + private readonly JObject EntityJSONData = JObject.Parse(Properties.Resources.entityData); + void SetUpTree() { treeView1.BeginUpdate(); @@ -28,13 +30,13 @@ namespace PckStudio.Forms.Editor { TreeNode EntryNode = new TreeNode(entry.name); - foreach (JObject content in Utilities.BehaviourResources.entityData["behaviours"].Children()) + foreach (JObject content in EntityJSONData["behaviours"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == entry.name); if (prop is JProperty) { EntryNode.Text = (string)prop.Value; - EntryNode.ImageIndex = Utilities.BehaviourResources.entityData["behaviours"].Children().ToList().IndexOf(content); + EntryNode.ImageIndex = EntityJSONData["behaviours"].Children().ToList().IndexOf(content); EntryNode.SelectedImageIndex = EntryNode.ImageIndex; break; } @@ -149,7 +151,7 @@ namespace PckStudio.Forms.Editor if (treeView1.SelectedNode == null) return; if (!(treeView1.SelectedNode.Tag is BehaviourFile.RiderPositionOverride entry)) return; - var diag = new Additional_Popups.EntityForms.AddEntry(Utilities.BehaviourResources.entityData, Utilities.BehaviourResources.entityImages); + var diag = new AddEntry("behaviours", Utilities.BehaviourResources.entityImages); diag.acceptBtn.Text = "Save"; if (diag.ShowDialog() == DialogResult.OK) @@ -164,13 +166,13 @@ namespace PckStudio.Forms.Editor entry.name = diag.SelectedEntity; treeView1.SelectedNode.Tag = entry; - foreach (JObject content in Utilities.BehaviourResources.entityData["behaviours"].Children()) + foreach (JObject content in EntityJSONData["behaviours"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == entry.name); if (prop is JProperty) { treeView1.SelectedNode.Text = (string)prop.Value; - treeView1.SelectedNode.ImageIndex = Utilities.BehaviourResources.entityData["behaviours"].Children().ToList().IndexOf(content); + treeView1.SelectedNode.ImageIndex = EntityJSONData["behaviours"].Children().ToList().IndexOf(content); treeView1.SelectedNode.SelectedImageIndex = treeView1.SelectedNode.ImageIndex; break; } @@ -203,7 +205,7 @@ namespace PckStudio.Forms.Editor private void addNewEntryToolStripMenuItem_Click(object sender, EventArgs e) { - var diag = new AddEntry(Utilities.BehaviourResources.entityData, Utilities.BehaviourResources.entityImages); + var diag = new AddEntry("behaviours", Utilities.BehaviourResources.entityImages); if(diag.ShowDialog() == DialogResult.OK) { @@ -217,13 +219,13 @@ namespace PckStudio.Forms.Editor TreeNode NewOverrideNode = new TreeNode(NewOverride.name); NewOverrideNode.Tag = NewOverride; - foreach (JObject content in Utilities.BehaviourResources.entityData["behaviours"].Children()) + foreach (JObject content in EntityJSONData["behaviours"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == NewOverride.name); if (prop is JProperty) { NewOverrideNode.Text = (string)prop.Value; - NewOverrideNode.ImageIndex = Utilities.BehaviourResources.entityData["behaviours"].Children().ToList().IndexOf(content); + NewOverrideNode.ImageIndex = EntityJSONData["behaviours"].Children().ToList().IndexOf(content); NewOverrideNode.SelectedImageIndex = NewOverrideNode.ImageIndex; break; } diff --git a/PCK-Studio/Forms/Editor/MaterialsEditor.cs b/PCK-Studio/Forms/Editor/MaterialsEditor.cs index 33f421d5..f8345162 100644 --- a/PCK-Studio/Forms/Editor/MaterialsEditor.cs +++ b/PCK-Studio/Forms/Editor/MaterialsEditor.cs @@ -19,6 +19,8 @@ namespace PckStudio.Forms.Editor private readonly PckFile.FileData _file; MaterialContainer materialFile; + private readonly JObject EntityJSONData = JObject.Parse(Properties.Resources.entityData); + void SetUpTree() { treeView1.BeginUpdate(); @@ -27,13 +29,13 @@ namespace PckStudio.Forms.Editor { TreeNode EntryNode = new TreeNode(entry.Name); - foreach (JObject content in Utilities.MaterialResources.entityData["materials"].Children()) + foreach (JObject content in EntityJSONData["materials"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == entry.Name); if (prop is JProperty) { EntryNode.Text = (string)prop.Value; - EntryNode.ImageIndex = Utilities.MaterialResources.entityData["materials"].Children().ToList().IndexOf(content); + EntryNode.ImageIndex = EntityJSONData["materials"].Children().ToList().IndexOf(content); EntryNode.SelectedImageIndex = EntryNode.ImageIndex; break; } @@ -132,7 +134,7 @@ namespace PckStudio.Forms.Editor private void addToolStripMenuItem_Click(object sender, EventArgs e) { - var diag = new Additional_Popups.EntityForms.AddEntry(Utilities.MaterialResources.entityData, Utilities.MaterialResources.entityImages); + var diag = new Additional_Popups.EntityForms.AddEntry("materials", Utilities.MaterialResources.entityImages); if (diag.ShowDialog() == DialogResult.OK) { @@ -146,13 +148,13 @@ namespace PckStudio.Forms.Editor TreeNode NewEntryNode = new TreeNode(NewEntry.Name); NewEntryNode.Tag = NewEntry; - foreach (JObject content in Utilities.MaterialResources.entityData["materials"].Children()) + foreach (JObject content in EntityJSONData["materials"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == NewEntry.Name); if (prop is JProperty) { NewEntryNode.Text = (string)prop.Value; - NewEntryNode.ImageIndex = Utilities.MaterialResources.entityData["materials"].Children().ToList().IndexOf(content); + NewEntryNode.ImageIndex = EntityJSONData["materials"].Children().ToList().IndexOf(content); NewEntryNode.SelectedImageIndex = NewEntryNode.ImageIndex; break; } diff --git a/PCK-Studio/Forms/Utilities/BehaviourResources.cs b/PCK-Studio/Forms/Utilities/BehaviourResources.cs index 36d295b8..dcaf4431 100644 --- a/PCK-Studio/Forms/Utilities/BehaviourResources.cs +++ b/PCK-Studio/Forms/Utilities/BehaviourResources.cs @@ -12,7 +12,6 @@ namespace PckStudio.Forms.Utilities { public static class BehaviourResources { - public static readonly JObject entityData = JObject.Parse(Resources.entityData); private static Image[] _entityImages; public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray(); diff --git a/PCK-Studio/Forms/Utilities/MaterialResources.cs b/PCK-Studio/Forms/Utilities/MaterialResources.cs index ccc1493d..861dbe6a 100644 --- a/PCK-Studio/Forms/Utilities/MaterialResources.cs +++ b/PCK-Studio/Forms/Utilities/MaterialResources.cs @@ -14,7 +14,6 @@ namespace PckStudio.Forms.Utilities { public static class MaterialResources { - public static readonly JObject entityData = JObject.Parse(Resources.entityData); private static Image[] _entityImages; public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray();