Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-09-25 10:39:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

just refactoring

Browse Source
This commit is contained in:
Asval
2019-05-07 17:30:48 +02:00
parent 6782fc31fb
commit 6f43219854
18 changed files with 1297 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
FModel/Parser/Banners/BannersParser.cs
View File

@@ -6,15 +6,12 @@
//
// var bannersParser = BannersParser.FromJson(jsonString);
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace FModel.Parser.Banners
{
using System;
using System.Collections.Generic;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
public partial class BannersParser
{
[JsonProperty("export_type")]
@@ -39,7 +36,7 @@ namespace FModel.Parser.Banners
public bool BFullUsageRights { get; set; }
}
public partial class Image
public class Image
{
[JsonProperty("asset_path_name")]
public string AssetPathName { get; set; }
@@ -50,12 +47,12 @@ namespace FModel.Parser.Banners
public partial class BannersParser
{
public static BannersParser FromJson(string json) => JsonConvert.DeserializeObject<BannersParser>(json, FModel.Parser.Banners.Converter.Settings);
public static BannersParser FromJson(string json) => JsonConvert.DeserializeObject<BannersParser>(json, Converter.Settings);
}
public static class Serialize
{
public static string ToJson(this BannersParser self) => JsonConvert.SerializeObject(self, FModel.Parser.Banners.Converter.Settings);
public static string ToJson(this BannersParser self) => JsonConvert.SerializeObject(self, Converter.Settings);
}
internal static class Converter
@@ -67,7 +64,7 @@ namespace FModel.Parser.Banners
Converters =
{
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
},
}
};
}
}

32
FModel/Parser/Challenges/ChallengeBundleIdParser.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace FModel.Parser.Challenges
{
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
public partial class ChallengeBundleIdParser
{
[JsonProperty("export_type")]
@@ -34,7 +28,7 @@ namespace FModel.Parser.Challenges
public LargePreviewImage LargePreviewImage { get; set; }
}
public partial class BundleCompletionReward
public class BundleCompletionReward
{
[JsonProperty("CompletionCount")]
public long CompletionCount { get; set; }
@@ -43,7 +37,7 @@ namespace FModel.Parser.Challenges
public Reward[] Rewards { get; set; }
}
public partial class Reward
public class Reward
{
[JsonProperty("ItemDefinition")]
public LargePreviewImage ItemDefinition { get; set; }
@@ -64,7 +58,7 @@ namespace FModel.Parser.Challenges
public string RewardType { get; set; }
}
public partial class LargePreviewImage
public class LargePreviewImage
{
[JsonProperty("asset_path_name")]
public string AssetPathName { get; set; }
@@ -73,7 +67,7 @@ namespace FModel.Parser.Challenges
public string SubPathString { get; set; }
}
public partial class RewardGiftBox
public class RewardGiftBox
{
[JsonProperty("GiftBoxToUse")]
public LargePreviewImage GiftBoxToUse { get; set; }
@@ -82,7 +76,7 @@ namespace FModel.Parser.Challenges
public object[] GiftBoxFormatData { get; set; }
}
public partial class DisplayStyle
public class DisplayStyle
{
[JsonProperty("PrimaryColor")]
public ColorChallenge PrimaryColor { get; set; }
@@ -97,7 +91,7 @@ namespace FModel.Parser.Challenges
public LargePreviewImage DisplayImage { get; set; }
}
public partial class ColorChallenge
public class ColorChallenge
{
[JsonProperty("r")]
public double R { get; set; }
@@ -112,7 +106,7 @@ namespace FModel.Parser.Challenges
public long A { get; set; }
}
public partial class QuestInfo
public class QuestInfo
{
[JsonProperty("QuestDefinition")]
public LargePreviewImage QuestDefinition { get; set; }
@@ -129,12 +123,12 @@ namespace FModel.Parser.Challenges
public partial class ChallengeBundleIdParser
{
public static ChallengeBundleIdParser[] FromJson(string json) => JsonConvert.DeserializeObject<ChallengeBundleIdParser[]>(json, FModel.Parser.Challenges.Converter.Settings);
public static ChallengeBundleIdParser[] FromJson(string json) => JsonConvert.DeserializeObject<ChallengeBundleIdParser[]>(json, Converter.Settings);
}
public static class Serialize
{
public static string ToJson(this ChallengeBundleIdParser[] self) => JsonConvert.SerializeObject(self, FModel.Parser.Challenges.Converter.Settings);
public static string ToJson(this ChallengeBundleIdParser[] self) => JsonConvert.SerializeObject(self, Converter.Settings);
}
internal static class Converter
@@ -146,7 +140,7 @@ namespace FModel.Parser.Challenges
Converters =
{
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
},
}
};
}
}

26
FModel/Parser/FeaturedParser.cs → FModel/Parser/Featured/FeaturedParser.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace FModel.Parser.Featured
{
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
public partial class FeaturedParser
{
[JsonProperty("export_type")]
@@ -28,7 +22,7 @@ namespace FModel.Parser.Featured
public Background Background { get; set; }
}
public partial class Background
public class Background
{
[JsonProperty("r")]
public double R { get; set; }
@@ -43,7 +37,7 @@ namespace FModel.Parser.Featured
public long A { get; set; }
}
public partial class ImageLol
public class ImageLol
{
[JsonProperty("ImageSize")]
public ImageSize ImageSize { get; set; }
@@ -52,7 +46,7 @@ namespace FModel.Parser.Featured
public string ResourceObject { get; set; }
}
public partial class ImageSize
public class ImageSize
{
[JsonProperty("x")]
public long X { get; set; }
@@ -61,7 +55,7 @@ namespace FModel.Parser.Featured
public long Y { get; set; }
}
public partial class Gradient
public class Gradient
{
[JsonProperty("Start")]
public Background Start { get; set; }
@@ -72,12 +66,12 @@ namespace FModel.Parser.Featured
public partial class FeaturedParser
{
public static FeaturedParser[] FromJson(string json) => JsonConvert.DeserializeObject<FeaturedParser[]>(json, FModel.Parser.Featured.Converter.Settings);
public static FeaturedParser[] FromJson(string json) => JsonConvert.DeserializeObject<FeaturedParser[]>(json, Converter.Settings);
}
public static class Serialize
{
public static string ToJson(this FeaturedParser[] self) => JsonConvert.SerializeObject(self, FModel.Parser.Featured.Converter.Settings);
public static string ToJson(this FeaturedParser[] self) => JsonConvert.SerializeObject(self, Converter.Settings);
}
internal static class Converter
@@ -89,7 +83,7 @@ namespace FModel.Parser.Featured
Converters =
{
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
},
}
};
}
}

30
FModel/Parser/ItemIDParser.cs → FModel/Parser/Items/ItemIDParser.cs
View File

@@ -1,22 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace FModel.Parser.Items
{
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
public partial class ItemsIDParser
public partial class ItemsIdParser
{
[JsonProperty("export_type")]
public string ExportType { get; set; }
[JsonProperty("cosmetic_item")]
public string cosmetic_item { get; set; }
public string CosmeticItem { get; set; }
[JsonProperty("CharacterParts")]
public string[] CharacterParts { get; set; }
@@ -55,13 +49,13 @@ namespace FModel.Parser.Items
public DisplayAssetPath DisplayAssetPath { get; set; }
}
public partial class GameplayTags
public class GameplayTags
{
[JsonProperty("gameplay_tags")]
public string[] GameplayTagsGameplayTags { get; set; }
}
public partial class PreviewImage
public class PreviewImage
{
[JsonProperty("asset_path_name")]
public string AssetPathName { get; set; }
@@ -70,7 +64,7 @@ namespace FModel.Parser.Items
public string SubPathString { get; set; }
}
public partial class DisplayAssetPath
public class DisplayAssetPath
{
[JsonProperty("asset_path_name")]
public string AssetPathName { get; set; }
@@ -79,14 +73,14 @@ namespace FModel.Parser.Items
public string SubPathString { get; set; }
}
public partial class ItemsIDParser
public partial class ItemsIdParser
{
public static ItemsIDParser[] FromJson(string json) => JsonConvert.DeserializeObject<ItemsIDParser[]>(json, FModel.Parser.Items.Converter.Settings);
public static ItemsIdParser[] FromJson(string json) => JsonConvert.DeserializeObject<ItemsIdParser[]>(json, Converter.Settings);
}
public static class Serialize
{
public static string ToJson(this ItemsIDParser[] self) => JsonConvert.SerializeObject(self, FModel.Parser.Items.Converter.Settings);
public static string ToJson(this ItemsIdParser[] self) => JsonConvert.SerializeObject(self, Converter.Settings);
}
internal static class Converter
@@ -98,7 +92,7 @@ namespace FModel.Parser.Items
Converters =
{
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
},
}
};
}
}

77
FModel/Parser/Meshes/MeshesParser.cs
View File

@@ -6,15 +6,13 @@
//
// var meshesParser = MeshesParser.FromJson(jsonString);
using System;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace FModel.Parser.Meshes
{
using System;
using System.Collections.Generic;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
public partial class MeshesParser
{
[JsonProperty("super_object")]
@@ -33,7 +31,7 @@ namespace FModel.Parser.Meshes
public LodModel[] LodModels { get; set; }
}
public partial class ImportedBounds
public class ImportedBounds
{
[JsonProperty("origin")]
public BoxExtend Origin { get; set; }
@@ -45,7 +43,7 @@ namespace FModel.Parser.Meshes
public double SphereRadius { get; set; }
}
public partial class BoxExtend
public class BoxExtend
{
[JsonProperty("x")]
public double X { get; set; }
@@ -60,7 +58,7 @@ namespace FModel.Parser.Meshes
public double? W { get; set; }
}
public partial class LodModel
public class LodModel
{
[JsonProperty("sections")]
public Section[] Sections { get; set; }
@@ -87,13 +85,13 @@ namespace FModel.Parser.Meshes
public object ColourVertexBuffer { get; set; }
}
public partial class Indices
public class Indices
{
[JsonProperty("Indices16")]
public long[] Indices16 { get; set; }
}
public partial class PositionVertexBuffer
public class PositionVertexBuffer
{
[JsonProperty("verts")]
public BoxExtend[] Verts { get; set; }
@@ -105,7 +103,7 @@ namespace FModel.Parser.Meshes
public long NumVerts { get; set; }
}
public partial class Section
public class Section
{
[JsonProperty("material_index")]
public long MaterialIndex { get; set; }
@@ -138,7 +136,7 @@ namespace FModel.Parser.Meshes
public bool Disabled { get; set; }
}
public partial class ClothingData
public class ClothingData
{
[JsonProperty("asset_guid")]
public string AssetGuid { get; set; }
@@ -147,7 +145,7 @@ namespace FModel.Parser.Meshes
public long AssetLodIndex { get; set; }
}
public partial class SkinWeightVertexBuffer
public class SkinWeightVertexBuffer
{
[JsonProperty("weights")]
public Weight[] Weights { get; set; }
@@ -156,7 +154,7 @@ namespace FModel.Parser.Meshes
public long NumVertices { get; set; }
}
public partial class Weight
public class Weight
{
[JsonProperty("bone_index")]
public long[] BoneIndex { get; set; }
@@ -165,7 +163,7 @@ namespace FModel.Parser.Meshes
public long[] BoneWeight { get; set; }
}
public partial class StaticMeshVertexBuffer
public class StaticMeshVertexBuffer
{
[JsonProperty("num_tex_coords")]
public long NumTexCoords { get; set; }
@@ -180,13 +178,13 @@ namespace FModel.Parser.Meshes
public Uvs Uvs { get; set; }
}
public partial class Tangents
public class Tangents
{
[JsonProperty("Low")]
public TangentsLow[] Low { get; set; }
}
public partial class TangentsLow
public class TangentsLow
{
[JsonProperty("normal")]
public BoxExtend Normal { get; set; }
@@ -195,19 +193,19 @@ namespace FModel.Parser.Meshes
public BoxExtend Tangent { get; set; }
}
public partial class Uvs
public class Uvs
{
[JsonProperty("Low")]
public UvsLow[] Low { get; set; }
}
public partial class UvsLow
public class UvsLow
{
[JsonProperty("value")]
public Value Value { get; set; }
}
public partial class Value
public class Value
{
[JsonProperty("x")]
public long X { get; set; }
@@ -216,7 +214,7 @@ namespace FModel.Parser.Meshes
public long Y { get; set; }
}
public partial class Material
public class Material
{
[JsonProperty("material_interface")]
public string MaterialInterface { get; set; }
@@ -228,7 +226,7 @@ namespace FModel.Parser.Meshes
public UvChannelData UvChannelData { get; set; }
}
public partial class UvChannelData
public class UvChannelData
{
[JsonProperty("initialised")]
public bool Initialised { get; set; }
@@ -240,7 +238,7 @@ namespace FModel.Parser.Meshes
public double[] LocalUvDensities { get; set; }
}
public partial class RefSkeleton
public class RefSkeleton
{
[JsonProperty("ref_bone_info")]
public RefBoneInfo[] RefBoneInfo { get; set; }
@@ -252,7 +250,7 @@ namespace FModel.Parser.Meshes
public NameToIndex[][] NameToIndex { get; set; }
}
public partial class RefBoneInfo
public class RefBoneInfo
{
[JsonProperty("name")]
public string Name { get; set; }
@@ -261,7 +259,7 @@ namespace FModel.Parser.Meshes
public long ParentIndex { get; set; }
}
public partial class RefBonePose
public class RefBonePose
{
[JsonProperty("rotation")]
public BoxExtend Rotation { get; set; }
@@ -273,7 +271,7 @@ namespace FModel.Parser.Meshes
public BoxExtend Scale3D { get; set; }
}
public partial class SuperObject
public class SuperObject
{
[JsonProperty("export_type")]
public string ExportType { get; set; }
@@ -294,7 +292,7 @@ namespace FModel.Parser.Meshes
public SamplingInfo SamplingInfo { get; set; }
}
public partial class LodInfo
public class LodInfo
{
[JsonProperty("ScreenSize")]
public MinLod ScreenSize { get; set; }
@@ -341,7 +339,7 @@ namespace FModel.Parser.Meshes
public bool BSupportUniformlyDistributedSampling { get; set; }
}
public partial class ReductionSettings
public class ReductionSettings
{
[JsonProperty("TerminationCriterion")]
public string TerminationCriterion { get; set; }
@@ -404,7 +402,7 @@ namespace FModel.Parser.Meshes
public long BaseLod { get; set; }
}
public partial class MinLod
public class MinLod
{
[JsonProperty("cooked")]
public bool Cooked { get; set; }
@@ -413,19 +411,19 @@ namespace FModel.Parser.Meshes
public double Value { get; set; }
}
public partial class SamplingInfo
public class SamplingInfo
{
[JsonProperty("BuiltData")]
public BuiltData BuiltData { get; set; }
}
public partial class BuiltData
public class BuiltData
{
[JsonProperty("WholeMeshBuiltData")]
public WholeMeshBuiltDatum[] WholeMeshBuiltData { get; set; }
}
public partial class WholeMeshBuiltDatum
public class WholeMeshBuiltDatum
{
[JsonProperty("prob")]
public object[] Prob { get; set; }
@@ -437,23 +435,23 @@ namespace FModel.Parser.Meshes
public long TotalWeight { get; set; }
}
public partial struct NameToIndex
public struct NameToIndex
{
public long? Integer;
public string String;
public static implicit operator NameToIndex(long Integer) => new NameToIndex { Integer = Integer };
public static implicit operator NameToIndex(long integer) => new NameToIndex { Integer = integer };
public static implicit operator NameToIndex(string String) => new NameToIndex { String = String };
}
public partial class MeshesParser
{
public static MeshesParser[] FromJson(string json) => JsonConvert.DeserializeObject<MeshesParser[]>(json, FModel.Parser.Meshes.Converter.Settings);
public static MeshesParser[] FromJson(string json) => JsonConvert.DeserializeObject<MeshesParser[]>(json, Converter.Settings);
}
public static class Serialize
{
public static string ToJson(this MeshesParser[] self) => JsonConvert.SerializeObject(self, FModel.Parser.Meshes.Converter.Settings);
public static string ToJson(this MeshesParser[] self) => JsonConvert.SerializeObject(self, Converter.Settings);
}
internal static class Converter
@@ -466,7 +464,7 @@ namespace FModel.Parser.Meshes
{
NameToIndexConverter.Singleton,
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
},
}
};
}
@@ -533,7 +531,6 @@ namespace FModel.Parser.Meshes
}
var value = (long)untypedValue;
serializer.Serialize(writer, value.ToString());
return;
}
public static readonly ParseStringConverter Singleton = new ParseStringConverter();

36
FModel/Parser/Challenges/QuestParser.cs → FModel/Parser/Quests/QuestParser.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace FModel.Parser.Quest
namespace FModel.Parser.Quests
{
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
public partial class QuestParser
{
[JsonProperty("export_type")]
@@ -55,13 +49,13 @@ namespace FModel.Parser.Quest
public LargePreviewImage LargePreviewImage { get; set; }
}
public partial class GameplayTags
public class GameplayTags
{
[JsonProperty("gameplay_tags")]
public string[] GameplayTagsGameplayTags { get; set; }
}
public partial class LargePreviewImage
public class LargePreviewImage
{
[JsonProperty("asset_path_name")]
public string AssetPathName { get; set; }
@@ -70,7 +64,7 @@ namespace FModel.Parser.Quest
public string SubPathString { get; set; }
}
public partial class Objective
public class Objective
{
[JsonProperty("BackendName")]
public string BackendName { get; set; }
@@ -142,7 +136,7 @@ namespace FModel.Parser.Quest
public LargePreviewImage ScriptedAction { get; set; }
}
public partial class ObjectiveStatHandle
public class ObjectiveStatHandle
{
[JsonProperty("DataTable")]
public string DataTable { get; set; }
@@ -151,7 +145,7 @@ namespace FModel.Parser.Quest
public string RowName { get; set; }
}
public partial class Reward
public class Reward
{
[JsonProperty("ItemPrimaryAssetId")]
public ItemPrimaryAssetId ItemPrimaryAssetId { get; set; }
@@ -160,7 +154,7 @@ namespace FModel.Parser.Quest
public long Quantity { get; set; }
}
public partial class HiddenRewards
public class HiddenRewards
{
[JsonProperty("TemplateId")]
public string TemplateId { get; set; }
@@ -169,7 +163,7 @@ namespace FModel.Parser.Quest
public long Quantity { get; set; }
}
public partial class ItemPrimaryAssetId
public class ItemPrimaryAssetId
{
[JsonProperty("PrimaryAssetType")]
public PrimaryAssetType PrimaryAssetType { get; set; }
@@ -178,7 +172,7 @@ namespace FModel.Parser.Quest
public string PrimaryAssetName { get; set; }
}
public partial class PrimaryAssetType
public class PrimaryAssetType
{
[JsonProperty("Name")]
public string Name { get; set; }
@@ -186,12 +180,12 @@ namespace FModel.Parser.Quest
public partial class QuestParser
{
public static QuestParser[] FromJson(string json) => JsonConvert.DeserializeObject<QuestParser[]>(json, FModel.Parser.Quest.Converter.Settings);
public static QuestParser[] FromJson(string json) => JsonConvert.DeserializeObject<QuestParser[]>(json, Converter.Settings);
}
public static class Serialize
{
public static string ToJson(this QuestParser[] self) => JsonConvert.SerializeObject(self, FModel.Parser.Quest.Converter.Settings);
public static string ToJson(this QuestParser[] self) => JsonConvert.SerializeObject(self, Converter.Settings);
}
internal static class Converter
@@ -203,7 +197,7 @@ namespace FModel.Parser.Quest
Converters =
{
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
},
}
};
}
}

26
FModel/Parser/RenderSwitchMaterial.cs → FModel/Parser/RenderMat/RenderSwitchMaterial.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace FModel.Parser.RenderMat
{
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
public partial class RenderSwitchMaterial
{
[JsonProperty("export_type")]
@@ -28,7 +22,7 @@ namespace FModel.Parser.RenderMat
public BasePropertyOverrides BasePropertyOverrides { get; set; }
}
public partial class BasePropertyOverrides
public class BasePropertyOverrides
{
[JsonProperty("BlendMode")]
public string BlendMode { get; set; }
@@ -40,7 +34,7 @@ namespace FModel.Parser.RenderMat
public double OpacityMaskClipValue { get; set; }
}
public partial class ScalarParameterValue
public class ScalarParameterValue
{
[JsonProperty("ParameterInfo")]
public ParameterInfo ParameterInfo { get; set; }
@@ -52,7 +46,7 @@ namespace FModel.Parser.RenderMat
public string ExpressionGuid { get; set; }
}
public partial class ParameterInfo
public class ParameterInfo
{
[JsonProperty("Name")]
public string Name { get; set; }
@@ -64,7 +58,7 @@ namespace FModel.Parser.RenderMat
public long Index { get; set; }
}
public partial class TextureParameterValue
public class TextureParameterValue
{
[JsonProperty("ParameterInfo")]
public ParameterInfo ParameterInfo { get; set; }
@@ -78,12 +72,12 @@ namespace FModel.Parser.RenderMat
public partial class RenderSwitchMaterial
{
public static RenderSwitchMaterial[] FromJson(string json) => JsonConvert.DeserializeObject<RenderSwitchMaterial[]>(json, FModel.Parser.RenderMat.Converter.Settings);
public static RenderSwitchMaterial[] FromJson(string json) => JsonConvert.DeserializeObject<RenderSwitchMaterial[]>(json, Converter.Settings);
}
public static class Serialize
{
public static string ToJson(this RenderSwitchMaterial[] self) => JsonConvert.SerializeObject(self, FModel.Parser.RenderMat.Converter.Settings);
public static string ToJson(this RenderSwitchMaterial[] self) => JsonConvert.SerializeObject(self, Converter.Settings);
}
internal static class Converter
@@ -95,7 +89,7 @@ namespace FModel.Parser.RenderMat
Converters =
{
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
},
}
};
}
}