Update to animationMeta tool

AssetEditor.sln

@@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.TextureEditor", "Ed
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.Audio", "Editors\Audio\Editors.Audio.csproj", "{410AC3F4-021C-4993-BCCA-1810D153075D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.AnimationMeta", "Editors\AnimationMeta\Editors.AnimationMeta.csproj", "{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.AnimationVisualEditors", "Editors\AnimationEditor\Editors.AnimationVisualEditors.csproj", "{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.E2EVerification", "Testing\E2EVerification\Test.E2EVerification.csproj", "{0B14A236-AAE0-4E9B-A41E-4AF9DD976BA7}"
@@ -94,6 +92,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AnimationFragmentEditor", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.AnimationFragmentEditor", "Editors\AnimationFragmentEditor\Editor.AnimationFragmentEditor\Editors.AnimationFragmentEditor.csproj", "{37C9C29E-1353-1519-BBC0-D7827A8AF636}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MetaDataEditor", "MetaDataEditor", "{3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.AnimationMeta", "Editors\MetaDataEditor\AnimationMeta\Editors.AnimationMeta.csproj", "{0FCE7A0E-6478-A603-6491-6FE675F54000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.AnimationMeta", "Editors\AnimationMeta\Test.AnimationMeta\Test.AnimationMeta.csproj", "{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -144,10 +148,6 @@ Global
 		{410AC3F4-021C-4993-BCCA-1810D153075D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{410AC3F4-021C-4993-BCCA-1810D153075D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{410AC3F4-021C-4993-BCCA-1810D153075D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -220,6 +220,14 @@ Global
 		{37C9C29E-1353-1519-BBC0-D7827A8AF636}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37C9C29E-1353-1519-BBC0-D7827A8AF636}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37C9C29E-1353-1519-BBC0-D7827A8AF636}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FCE7A0E-6478-A603-6491-6FE675F54000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FCE7A0E-6478-A603-6491-6FE675F54000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FCE7A0E-6478-A603-6491-6FE675F54000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FCE7A0E-6478-A603-6491-6FE675F54000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -236,7 +244,6 @@ Global
 		{EAFBC3D8-A146-4BA3-8024-DE4E20D3C884} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{8E55B123-C8E5-4D65-AAAA-C4DC4713CB8E} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{410AC3F4-021C-4993-BCCA-1810D153075D} = {4D35FFE2-8490-4694-8981-654016F2BD3D}
-		{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{F513A090-CC3F-4DB4-8332-50EB3FDA5A37} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{0B14A236-AAE0-4E9B-A41E-4AF9DD976BA7} = {18424B6A-CB8A-4CE1-935C-72459F31521B}
 		{E604D1EB-02AC-4E31-9161-531F8830BFDB} = {18424B6A-CB8A-4CE1-935C-72459F31521B}
@@ -263,6 +270,9 @@ Global
 		{328485AF-4B94-47CE-B9EF-5D267F9E3F74} = {786DB586-5DF5-4CF9-A485-A20A7BC184F7}
 		{9859545E-76FC-4790-AF99-E1BCB1D4739D} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
 		{37C9C29E-1353-1519-BBC0-D7827A8AF636} = {9859545E-76FC-4790-AF99-E1BCB1D4739D}
+		{3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
+		{0FCE7A0E-6478-A603-6491-6FE675F54000} = {3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB}
+		{E759BE6D-E0A4-46B8-A02A-E8573F579E2F} = {3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AB5968F3-98ED-4AFF-98EA-0DBEDCACADF2}

AssetEditor/AssetEditor.csproj

@@ -7,6 +7,7 @@
         <ApplicationIcon>AssetEditorIcon.ico</ApplicationIcon>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
       <None Remove="AssetEditorIcon.png" />
@@ -15,11 +16,11 @@
     <ItemGroup>
         <ProjectReference Include="..\Editors\AnimationEditor\Editors.AnimationVisualEditors.csproj" />
         <ProjectReference Include="..\Editors\AnimationFragmentEditor\Editor.AnimationFragmentEditor\Editors.AnimationFragmentEditor.csproj" />
-        <ProjectReference Include="..\Editors\AnimationMeta\Editors.AnimationMeta.csproj" />
         <ProjectReference Include="..\Editors\AnimationReTarget\Editors.AnimatioReTarget\Editors.AnimatioReTarget.csproj" />
         <ProjectReference Include="..\Editors\Audio\Editors.Audio.csproj" />
         <ProjectReference Include="..\Editors\ImportExportEditor\Editors.ImportExport\Editors.ImportExport.csproj" />
         <ProjectReference Include="..\Editors\Kitbashing\KitbasherEditor\Editors.KitbasherEditor.csproj" />
+        <ProjectReference Include="..\Editors\MetaDataEditor\AnimationMeta\Editors.AnimationMeta.csproj" />
         <ProjectReference Include="..\Editors\Reports\Editors.Reports.csproj" />
         <ProjectReference Include="..\Editors\SkeletonEditor\Editor.VisualSkeletonEditor\Editor.VisualSkeletonEditor.csproj" />
         <ProjectReference Include="..\Editors\TextureEditor\Editors.TextureEditor.csproj" />

AssetEditor/DependencyInjectionContainer.cs

@@ -7,8 +7,8 @@
 using Shared.Core.DependencyInjection;
 using Shared.Core.DevConfig;
 using Shared.Core.ErrorHandling.Exceptions;
+using Shared.Core.Events.Global;
 using Shared.Core.ToolCreation;
-using Shared.Ui.Events.UiCommands;
 
 namespace AssetEditor
 {

AssetEditor/ViewModels/EditorShortcutViewModel.cs

@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Shared.Core.Events;
+using Shared.Core.Events.Global;
 using Shared.Core.ToolCreation;
-using Shared.Ui.Events.UiCommands;
 
 namespace AssetEditor.ViewModels
 {

AssetEditor/ViewModels/MainViewModel.cs

@@ -13,7 +13,6 @@
 using Shared.Ui.BaseDialogs.PackFileTree;
 using Shared.Ui.BaseDialogs.PackFileTree.ContextMenu;
 using Shared.Ui.Common;
-using Shared.Ui.Events.UiCommands;
 
 namespace AssetEditor.ViewModels
 {

Editors/AnimationEditor/Editors.AnimationVisualEditors.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TargetFramework>net10.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net10.0-windows</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <UseWPF>true</UseWPF>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\GameWorld\View3D\GameWorld.Core.csproj" />

Editors/AnimationEditor/MountAnimationCreator/MountAnimationCreatorViewModel.cs

@@ -15,7 +15,6 @@
 using Shared.Ui.Common;
 using MessageBox = System.Windows.Forms.MessageBox;
 using Clipboard = System.Windows.Clipboard;
-using Shared.Ui.Events.UiCommands;
 using Shared.Core.Events;
 using GameWorld.Core.Components.Selection;
 using GameWorld.Core.Animation;
@@ -27,6 +26,7 @@
 using Editors.AnimationVisualEditors.MountAnimationCreator.Services;
 using GameWorld.Core.Services;
 using Shared.Core.Services;
+using Shared.Core.Events.Global;
 
 
 namespace AnimationEditor.MountAnimationCreator

Editors/AnimationFragmentEditor/Editor.AnimationFragmentEditor/AnimationPack/AnimPackViewModel.cs

@@ -29,7 +29,7 @@ public partial class AnimPackViewModel : NotifyPropertyChangedImpl, IEditorInter
         private ITextConverter? _activeConverter;
         private readonly ApplicationSettingsService _appSettings;
         private readonly IFileSaveService _packFileSaveService;
-        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
+        private readonly MetaDataFileParser _metaDataFileParser;
 
         public string DisplayName { get; set; } = "Not set";
 
@@ -40,15 +40,19 @@ public partial class AnimPackViewModel : NotifyPropertyChangedImpl, IEditorInter
         SimpleTextEditorViewModel _selectedItemViewModel;
         public SimpleTextEditorViewModel SelectedItemViewModel { get => _selectedItemViewModel; set => SetAndNotify(ref _selectedItemViewModel, value); }
 
-        public AnimPackViewModel(IUiCommandFactory uiCommandFactory, IPackFileService pfs, ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper, ApplicationSettingsService appSettings, IFileSaveService packFileSaveService, MetaDataTagDeSerializer metaDataTagDeSerializer)
+        public AnimPackViewModel(IUiCommandFactory uiCommandFactory, 
+            IPackFileService pfs, 
+            ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper, 
+            ApplicationSettingsService appSettings, 
+            IFileSaveService packFileSaveService,
+            MetaDataFileParser metaDataFileParser)
         {
             _uiCommandFactory = uiCommandFactory;
             _pfs = pfs;
             _skeletonAnimationLookUpHelper = skeletonAnimationLookUpHelper;
             _appSettings = appSettings;
             _packFileSaveService = packFileSaveService;
-            _metaDataTagDeSerializer = metaDataTagDeSerializer;
-
+            _metaDataFileParser = metaDataFileParser;
             AnimationPackItems = new FilterCollection<IAnimationPackFile>(new List<IAnimationPackFile>(), OnItemSelected, BeforeItemSelected)
             {
                 SearchFilter = (value, rx) => { return rx.Match(value.FileName).Success; }
@@ -83,7 +87,7 @@ void OnItemSelected(IAnimationPackFile seletedFile)
             else if (seletedFile is AnimationBin typedBin)
                 _activeConverter = new AnimationBinFileToXmlConverter();
             else if (seletedFile is AnimationBinWh3 wh3Bin)
-                _activeConverter = new AnimationBinWh3FileToXmlConverter(_skeletonAnimationLookUpHelper, _metaDataTagDeSerializer, CurrentFile);
+                _activeConverter = new AnimationBinWh3FileToXmlConverter(_skeletonAnimationLookUpHelper, _metaDataFileParser, CurrentFile);
 
             if (seletedFile == null || _activeConverter == null || seletedFile.IsUnknownFile)
             {

Editors/AnimationFragmentEditor/Editor.AnimationFragmentEditor/AnimationPack/Converters/AnimationBinWh3Converter/AnimationBinWh3FileToXmlConverter.cs

@@ -16,14 +16,14 @@ namespace Editors.AnimationFragmentEditor.AnimationPack.Converters.AnimationBinW
     public class AnimationBinWh3FileToXmlConverter : XmlToBinaryConverter<XmlFormat, AnimationBinWh3>
     {
         private readonly ISkeletonAnimationLookUpHelper _skeletonAnimationLookUpHelper;
-        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
+        private readonly MetaDataFileParser _metaDataTagDeSerializer;
 
         private string _animationPersistanceMetaFileName = "";
         private readonly Dictionary<string, uint> _animationsVersionFoundInPersistenceMeta = [];
 
         private readonly PackFile _animPackToValidate;
 
-        public AnimationBinWh3FileToXmlConverter(ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper, MetaDataTagDeSerializer metaDataTagDeSerializer, PackFile animPackToValidate)
+        public AnimationBinWh3FileToXmlConverter(ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper, MetaDataFileParser metaDataTagDeSerializer, PackFile animPackToValidate)
         {
             _skeletonAnimationLookUpHelper = skeletonAnimationLookUpHelper;
             _metaDataTagDeSerializer = metaDataTagDeSerializer;
@@ -286,7 +286,7 @@ private bool CheckForAnimationVersionsInMeta(string mainAnimationFile, string me
                 return false;
             }
             var data = theFile.DataSource.ReadData();
-            var parsed = new MetaDataFileParser().ParseFile(data, _metaDataTagDeSerializer);
+            var parsed = _metaDataTagDeSerializer.ParseFile(data);
 
             var mainAnimationHeader = GetAnimationHeader(mainAnimationFile, pfs);
             if (mainAnimationHeader == null)
@@ -297,7 +297,7 @@ private bool CheckForAnimationVersionsInMeta(string mainAnimationFile, string me
 
             var mainAnimationVersion = mainAnimationHeader.Version;
 
-            var metaItems = parsed.Items;
+            var metaItems = parsed.Attributes;
 
             foreach (var item in metaItems)
             {

Editors/AnimationFragmentEditor/Editor.AnimationFragmentEditor/DevConfig/AnimPack_WH3.cs

@@ -1,11 +1,11 @@
 using Shared.Core.DevConfig;
 using Shared.Core.Events;
+using Shared.Core.Events.Global;
 using Shared.Core.PackFiles;
 using Shared.Core.PackFiles.Utility;
 using Shared.Core.Settings;
 using Shared.Core.ToolCreation;
 using Shared.EmbeddedResources;
-using Shared.Ui.Events.UiCommands;
 
 namespace Editors.AnimationFragmentEditor.DevConfig
 {