Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-16 09:38:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix byaml nodes not adding dictionaries properly in arrays

Browse source
This commit is contained in:
KillzXGaming 2019-04-25 21:59:44 -04:00
parent 38e4cbad6a
commit 46c962ff0a
6 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

4
Switch_FileFormatsMain/FileFormats/Byaml/BYAML.cs
View file

@ -25,6 +25,10 @@ namespace FirstPlugin
{
using (var reader = new Switch_Toolbox.Library.IO.FileReader(stream, true))
{
//File too small to have any data
if (stream.Length <= 16)
return false;
if (reader.CheckSignature(2, "BY") || reader.CheckSignature(2, "YB"))
return true;
else

11
Switch_FileFormatsMain/GUI/Byaml/ByamlEditor.cs
View file

@ -182,6 +182,8 @@ namespace FirstPlugin
{
foreach (dynamic k in list)
{
Console.WriteLine("array item " + k.ToString());
if ((k is Dictionary<string, dynamic>) ||
(k is List<dynamic>) ||
(k is List<ByamlPathPoint>))
@ -200,9 +202,11 @@ namespace FirstPlugin
ValueTypeString = ValueType.ToString();
}
ListViewItem item = new ListViewItem(ValueText);
item.SubItems.Add(ValueTypeString);
item.SubItems.Add(ValueText);
if (k != null) item.Tag = new EditableNode(k, k);
listViewCustom1.Items.Add(item);
}
@ -226,13 +230,13 @@ namespace FirstPlugin
{
current.Text += $" : <Dictionary> {dictionaryIndex++}";
current.Tag = node[k];
// current.Nodes.Add("✯✯dummy✯✯"); //a text that can't be in a byml
current.Nodes.Add("✯✯dummy✯✯"); //a text that can't be in a byml
}
else if (node[k] is IList<dynamic>)
{
current.Text += $" : <Array> {arrayIndex++}";
current.Tag = ((IList<dynamic>)node[k]);
// current.Nodes.Add("✯✯dummy✯✯");
current.Nodes.Add("✯✯dummy✯✯");
}
else if (node[k] is IList<ByamlPathPoint>)
{
@ -273,13 +277,12 @@ namespace FirstPlugin
{
TreeNode current = addto.Add($"<Dictionary> {dictionaryIndex++}");
current.Tag = ((IDictionary<string, dynamic>)k);
// current.Nodes.Add("✯✯dummy✯✯");
current.Nodes.Add("✯✯dummy✯✯");
}
else if (k is IList<dynamic>)
{
TreeNode current = addto.Add($"<Array> {arrayIndex++}");
current.Tag = ((IList<dynamic>)k);
// current.Nodes.Add("✯✯dummy✯✯");
}
else if (k is IList<ByamlPathPoint>)
{

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View file

Binary file not shown.