LegacyConsole/PCK-Studio
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-24 02:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified whitespace and added proper localization support for decimals in GenerateModel]

Browse Source
This commit is contained in:
MattNL
2022-11-04 19:24:32 -04:00
parent 2e9c25af87
commit b4fd3087ad
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PCK-Studio/Forms/Skins-And-Textures/generateModel.cs
View File

@@ -106,7 +106,7 @@ namespace PckStudio
public ValueTuple<string, string> ToProperty()
{
string value = $"{Type} {X} {Y} {Z} {Width} {Height} {Length} {U} {V}";
return new ValueTuple<string, string>("BOX", value);
return new ValueTuple<string, string>("BOX", value.Replace(',', '.'));
}
}
@@ -124,7 +124,7 @@ namespace PckStudio
public ValueTuple<string, string> ToProperty()
{
string value = $"{Name} Y {YOffset}";
return new ValueTuple<string, string>("OFFSET", value);
return new ValueTuple<string, string>("OFFSET", value.Replace(',','.'));
}
}
@@ -153,8 +153,7 @@ namespace PckStudio
{
case "BOX":
{
string temp = Regex.Replace(property.Item2, @"\s+", " ").TrimEnd('\n', '\r', ' ');
string[] Format = ReplaceWhitespace(temp, ",").Split(',');
string[] Format = ReplaceWhitespace(property.Item2, ",").TrimEnd('\n', '\r', ' ').Split(',');
if (Format.Length < 9)
{
Console.WriteLine($"'{property.Item1}' property has too few arguments: {property.Item2}");
@@ -177,12 +176,12 @@ namespace PckStudio
// %f
try
{
float x = float.Parse(Format[1]);
float y = float.Parse(Format[2]);
float z = float.Parse(Format[3]);
float sizeX = float.Parse(Format[4]);
float sizeY = float.Parse(Format[5]);
float sizeZ = float.Parse(Format[6]);
float x = float.Parse(Format[1], System.Globalization.CultureInfo.InvariantCulture);
float y = float.Parse(Format[2], System.Globalization.CultureInfo.InvariantCulture);
float z = float.Parse(Format[3], System.Globalization.CultureInfo.InvariantCulture);
float sizeX = float.Parse(Format[4], System.Globalization.CultureInfo.InvariantCulture);
float sizeY = float.Parse(Format[5], System.Globalization.CultureInfo.InvariantCulture);
float sizeZ = float.Parse(Format[6], System.Globalization.CultureInfo.InvariantCulture);
int u = int.Parse(Format[7]);
int v = int.Parse(Format[8]);
modelParts.Add(new ModelPart(name, x, y, z, sizeX, sizeY, sizeZ, u, v));
@@ -190,7 +189,6 @@ namespace PckStudio
catch (FormatException ex)
{
Console.WriteLine(ex.Message);
Console.WriteLine("\"" + property.Item2 + "\"");
MessageBox.Show("A Format Exception was thrown\nFailed to parse BOX value", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
catch (OverflowException ex)
@@ -211,8 +209,7 @@ namespace PckStudio
case "OFFSET":
{
string temp = Regex.Replace(property.Item2, @"\s+", " ").TrimEnd('\n', '\r', ' ');
string[] offset = ReplaceWhitespace(temp, ",").Split(',');
string[] offset = ReplaceWhitespace(property.Item2, ",").TrimEnd('\n', '\r', ' ').Split(',');
if (offset.Length < 3) continue;
string name = offset[0];
string dimension = offset[1]; // "Y"

2
PCK-Studio/PckStudio.csproj
View File

@@ -3,6 +3,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<LangVersion>preview</LangVersion>
<DisableFody Condition="'$(Configuration)' == 'Debug'">true</DisableFody>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -17,7 +18,6 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<DisableFody Condition="'$(Configuration)' == 'Debug'">true</DisableFody>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>