mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git
synced 2026-09-23 09:12:56 +00:00
Made pck parameter serializer consistent globally
-Now only accepts " " instead of ":"
This commit is contained in:
@@ -1388,6 +1388,7 @@ namespace PckStudio.Controls
|
|||||||
{
|
{
|
||||||
importedAsset.DeserializeParameters(File.ReadAllLines(parameterFile));
|
importedAsset.DeserializeParameters(File.ReadAllLines(parameterFile));
|
||||||
}
|
}
|
||||||
|
|
||||||
addedCount++;
|
addedCount++;
|
||||||
}
|
}
|
||||||
Trace.TraceInformation("[{0}] Imported {1} file(s).", nameof(ImportFiles), addedCount);
|
Trace.TraceInformation("[{0}] Imported {1} file(s).", nameof(ImportFiles), addedCount);
|
||||||
@@ -2068,7 +2069,7 @@ namespace PckStudio.Controls
|
|||||||
{
|
{
|
||||||
if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset))
|
if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset))
|
||||||
{
|
{
|
||||||
IEnumerable<string> parameters = asset.SerializeParameters(separator: " ");
|
IEnumerable<string> parameters = asset.SerializeParameters();
|
||||||
using (var input = new MultiTextPrompt(parameters))
|
using (var input = new MultiTextPrompt(parameters))
|
||||||
{
|
{
|
||||||
if (input.ShowDialog(this) == DialogResult.OK)
|
if (input.ShowDialog(this) == DialogResult.OK)
|
||||||
|
|||||||
@@ -211,14 +211,14 @@ namespace PckStudio.Core.Extensions
|
|||||||
IEnumerable<KeyValuePair<string, string>> lines = serializedData
|
IEnumerable<KeyValuePair<string, string>> lines = serializedData
|
||||||
.Select(line => line.Split([' '], 2))
|
.Select(line => line.Split([' '], 2))
|
||||||
.Where (keyValue => keyValue.Length == 2)
|
.Where (keyValue => keyValue.Length == 2)
|
||||||
.Select(keyValue => new KeyValuePair<string, string>(keyValue[0].Replace(":", ""), keyValue[1]));
|
.Select(keyValue => new KeyValuePair<string, string>(keyValue[0], keyValue[1]));
|
||||||
foreach (KeyValuePair<string, string> kv in lines)
|
foreach (KeyValuePair<string, string> kv in lines)
|
||||||
{
|
{
|
||||||
asset.AddParameter(kv);
|
asset.AddParameter(kv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IEnumerable<string> SerializeParameters(this PckAsset asset, string separator = ":")
|
public static IEnumerable<string> SerializeParameters(this PckAsset asset, string separator = " ")
|
||||||
{
|
{
|
||||||
IReadOnlyList<KeyValuePair<string, string>> parameters = asset.GetParameters();
|
IReadOnlyList<KeyValuePair<string, string>> parameters = asset.GetParameters();
|
||||||
return parameters.Select(parameter => parameter.Key + separator + parameter.Value);
|
return parameters.Select(parameter => parameter.Key + separator + parameter.Value);
|
||||||
|
|||||||
Reference in New Issue
Block a user