diff --git a/PCK-Studio/Classes/Conversion/Bedrock/BedrockSkinExporter.cs b/PCK-Studio/Classes/Conversion/Bedrock/BedrockSkinExporter.cs index 59496eb1..dd3e89d2 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/BedrockSkinExporter.cs +++ b/PCK-Studio/Classes/Conversion/Bedrock/BedrockSkinExporter.cs @@ -14,9 +14,8 @@ using OMI.Formats.Pck; using OMI.Workers.Language; using OMI.Workers.Pck; -using PckStudio.Conversion.Bedrock.Json; using PckStudio.Classes.Utils; -using PckStudio.Conversion.Bedrock.JsonDefinitions; +using PckStudio.Conversion.Common.JsonDefinitions; using System.Diagnostics; using System.Linq; @@ -63,7 +62,7 @@ namespace PckStudio.Conversion.Bedrock "uk_UA" }; - static List OffsetNames = new List + static string[] OffsetNames = new string[] { "HEAD", "HELMET", "BODY", "CHEST", "BELT", @@ -228,7 +227,7 @@ namespace PckStudio.Conversion.Bedrock SkinJSON skinJson = new SkinJSON(); // Skins.json JObject geometryJson = new JObject(); // Geometry.json - _loc = AcquireLocFile(skinPck) ?? throw new ArgumentNullException("Loc file acquire fail."); + _loc = AcquireLocFile(skinPck) ?? throw new ArgumentNullException($"{nameof(AcquireLocFile)} failed."); string bedrockPackName = "DummySkinPack"; var packNameTranslations = _loc.GetLocEntries("IDS_DISPLAY_NAME"); diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/Geometry.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/Geometry.cs similarity index 98% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/Geometry.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/Geometry.cs index 997cf7dc..af81af5e 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/Geometry.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/Geometry.cs @@ -19,7 +19,7 @@ using System; using System.Numerics; using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.JsonDefinitions +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class Geometry { diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/GeometryBone.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/GeometryBone.cs similarity index 94% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/GeometryBone.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/GeometryBone.cs index e347d930..e13190b8 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/GeometryBone.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/GeometryBone.cs @@ -18,7 +18,7 @@ using System.Numerics; using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.JsonDefinitions +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class GeometryBone { @@ -35,7 +35,7 @@ namespace PckStudio.Conversion.Bedrock.JsonDefinitions //public string META_BoneType = null; [JsonProperty(PropertyName = "name", NullValueHandling = NullValueHandling.Ignore)] - public string Name = "partName"; + public string Name { get; set; } = "partName"; [JsonProperty(PropertyName = "parent", NullValueHandling = NullValueHandling.Ignore)] public string Parent = "parentName"; diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/GeometryCube.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/GeometryCube.cs similarity index 82% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/GeometryCube.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/GeometryCube.cs index 1d31a906..2e887e27 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/GeometryCube.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/GeometryCube.cs @@ -18,7 +18,7 @@ using System.Numerics; using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.JsonDefinitions +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class GeometryCube { @@ -37,15 +37,13 @@ namespace PckStudio.Conversion.Bedrock.JsonDefinitions [JsonProperty("size")] public float[] Size = { 0, 0, 0 }; - // for whatever reason, uv is a float on LCE, - // so I've kept it a float for the sake of consistency [JsonProperty("uv")] public float[] UV = { 0, 0 }; - [JsonProperty("mirror")] - public bool Mirror = false; + [JsonProperty("mirror", NullValueHandling = NullValueHandling.Ignore)] + public bool Mirror { get; set; } - [JsonProperty("inflate")] - public float Inflate = 0.0f; + [JsonProperty("inflate", NullValueHandling = NullValueHandling.Ignore)] + public float Inflate { get; set; } } } diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/Manifest.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/Manifest.cs similarity index 95% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/Manifest.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/Manifest.cs index a67f6730..589f23af 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/Manifest.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/Manifest.cs @@ -17,7 +17,7 @@ **/ using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.Json +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class Manifest { diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/ManifestHeader.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/ManifestHeader.cs similarity index 96% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/ManifestHeader.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/ManifestHeader.cs index 6466eaf8..df23fc81 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/ManifestHeader.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/ManifestHeader.cs @@ -18,7 +18,7 @@ using System; using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.Json +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class ManifestHeader { diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/ManifestModule.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/ManifestModule.cs similarity index 96% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/ManifestModule.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/ManifestModule.cs index 590ed3ea..6be74f4a 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/ManifestModule.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/ManifestModule.cs @@ -18,7 +18,7 @@ using System; using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.Json +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class ManifestModule { diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/SkinJSON.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/SkinJSON.cs similarity index 95% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/SkinJSON.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/SkinJSON.cs index a64dd754..1d060e6e 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/SkinJSON.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/SkinJSON.cs @@ -17,7 +17,7 @@ **/ using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.Json +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class SkinJSON { diff --git a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/SkinObject.cs b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/SkinObject.cs similarity index 96% rename from PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/SkinObject.cs rename to PCK-Studio/Classes/Conversion/CommonJsonDefinitions/SkinObject.cs index 25b24461..05ff4091 100644 --- a/PCK-Studio/Classes/Conversion/Bedrock/JsonDefinitions/SkinObject.cs +++ b/PCK-Studio/Classes/Conversion/CommonJsonDefinitions/SkinObject.cs @@ -17,7 +17,7 @@ **/ using Newtonsoft.Json; -namespace PckStudio.Conversion.Bedrock.Json +namespace PckStudio.Conversion.Common.JsonDefinitions { internal class SkinObject { diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 836eb087..512c7ac2 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -174,14 +174,14 @@ - - - - - - - - + + + + + + + +