[Packet parser] Updated parser

BAndysc · Jul 4, 2022 · 5a0c00d · 5a0c00d
1 parent 8d05d68
commit 5a0c00d
Show file tree

Hide file tree

Showing 15 changed files with 191 additions and 35 deletions.
diff --git a/LoaderAvalonia/LoaderAvalonia.csproj b/LoaderAvalonia/LoaderAvalonia.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
     <Import Project="..\Module.props" />    
 
-    <Target Name="CustomAfterBuild" AfterTargets="Build">
+    <Target Condition="$([MSBuild]::IsOSPlatform('OSX'))" Name="CustomAfterBuild" AfterTargets="Build">
         <Copy SourceFiles="$(OutputPath)\runtimes\osx-universal\native\libcimgui.dylib" DestinationFolder="$(OutputPath)\runtimes\osx\native\" ContinueOnError="false" />
     </Target>
 

diff --git a/Rendering/AvaloniaRenderingTester/AvaloniaRenderingTester.csproj b/Rendering/AvaloniaRenderingTester/AvaloniaRenderingTester.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
     <Import Project="..\..\Avalonia.props" />
 
-    <Target Name="CustomAfterBuild" AfterTargets="Build">
+    <Target Condition="$([MSBuild]::IsOSPlatform('OSX'))" Name="CustomAfterBuild" AfterTargets="Build">
         <Copy SourceFiles="$(OutputPath)\runtimes\osx-universal\native\libcimgui.dylib" DestinationFolder="$(OutputPath)\runtimes\osx\native\" ContinueOnError="false" />
     </Target>
 

diff --git a/Rendering/RenderingTester/RenderingTester.csproj b/Rendering/RenderingTester/RenderingTester.csproj
@@ -7,7 +7,7 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
-    <Target Name="CustomAfterBuild" AfterTargets="Build">
+    <Target Condition="$([MSBuild]::IsOSPlatform('OSX'))" Name="CustomAfterBuild" AfterTargets="Build">
         <Copy SourceFiles="$(OutputPath)\runtimes\osx-universal\native\libcimgui.dylib" DestinationFolder="$(OutputPath)\runtimes\osx\native\" ContinueOnError="false" />
     </Target>
 

diff --git a/WDE.MySqlDatabaseCommon/CommonModels/MySqlCreatureAddon.cs b/WDE.MySqlDatabaseCommon/CommonModels/MySqlCreatureAddon.cs
@@ -3,17 +3,15 @@
 
 namespace WDE.MySqlDatabaseCommon.CommonModels;
 
-public class MySqlBaseCreatureAddon : IBaseCreatureAddon
+public abstract class MySqlBaseCreatureAddon : IBaseCreatureAddon
 {
-    [Column(Name = "path_id")]
-    public uint PathId { get; set; }
+    public abstract uint PathId { get; set; }
 
     [Column(Name = "mount")]
     public uint Mount { get; set; }
-
-    [Column(Name = "MountCreatureID")]
-    public uint MountCreatureId { get; set; }
-
+
+    public abstract uint MountCreatureId { get; set; }
+
     [Column(Name = "bytes1")]
     public uint Bytes1 { get; set; }
 
@@ -41,6 +39,12 @@ public class MySqlCreatureAddon : MySqlBaseCreatureAddon, ICreatureAddon
     [Identity]
     [Column(Name = "guid")]
     public uint Guid { get; set; }
+
+    [Column(Name = "path_id")]
+    public override uint PathId { get; set; }
+
+    [Column(Name = "MountCreatureID")]
+    public override uint MountCreatureId { get; set; }
 }
 
 [Table(Name = "creature_template_addon")]
@@ -50,4 +54,68 @@ public class MySqlCreatureTemplateAddon : MySqlBaseCreatureAddon, ICreatureTempl
     [Identity]
     [Column(Name = "entry")]
     public uint Entry { get; set; }
+
+    [Column(Name = "path_id")]
+    public override uint PathId { get; set; }
+
+    [Column(Name = "MountCreatureID")]
+    public override uint MountCreatureId { get; set; }
+}
+
+
+[Table(Name = "creature_addon")]
+public class MySqlCreatureAddonCata : MySqlBaseCreatureAddon, ICreatureAddon
+{
+    [PrimaryKey]
+    [Identity]
+    [Column(Name = "guid")]
+    public uint Guid { get; set; }
+
+    [Column(Name = "waypointPathId")]
+    public override uint PathId { get; set; }
+
+    public override uint MountCreatureId { get; set; }
+}
+
+[Table(Name = "creature_template_addon")]
+public class MySqlCreatureTemplateAddonCata : MySqlBaseCreatureAddon, ICreatureTemplateAddon
+{
+    [PrimaryKey]
+    [Identity]
+    [Column(Name = "entry")]
+    public uint Entry { get; set; }
+
+    [Column(Name = "waypointPathId")]
+    public override uint PathId { get; set; }
+
+    public override uint MountCreatureId { get; set; }
+}
+
+
+[Table(Name = "creature_addon")]
+public class MySqlCreatureAddonAC: MySqlBaseCreatureAddon, ICreatureAddon
+{
+    [PrimaryKey]
+    [Identity]
+    [Column(Name = "guid")]
+    public uint Guid { get; set; }
+
+    [Column(Name = "path_id")]
+    public override uint PathId { get; set; }
+
+    public override uint MountCreatureId { get; set; }
+}
+
+[Table(Name = "creature_template_addon")]
+public class MySqlCreatureTemplateAddonAC : MySqlBaseCreatureAddon, ICreatureTemplateAddon
+{
+    [PrimaryKey]
+    [Identity]
+    [Column(Name = "entry")]
+    public uint Entry { get; set; }
+
+    [Column(Name = "path_id")]
+    public override uint PathId { get; set; }
+
+    public override uint MountCreatureId { get; set; }
 }
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/AzerothhMySqlDatabaseProvider.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/AzerothhMySqlDatabaseProvider.cs
@@ -202,4 +202,28 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
         await using var model = Database();
         return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
     }
+
+    public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
+    }
+
+    public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
+    }
+
+    public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
+    }
+
+    public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
+    }
 }
diff --git a/...tabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/BaseTrinityMySqlDatabaseProvider.cs b/...tabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/BaseTrinityMySqlDatabaseProvider.cs
@@ -598,17 +598,13 @@ public async Task<List<IEventScriptLine>> GetEventScript(EventScriptType type, u
             return await model.SceneTemplates.ToListAsync<ISceneTemplate>();
         }
 
-        public async Task<IList<ICreatureAddon>> GetCreatureAddons()
-        {
-            await using var model = Database();
-            return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
-        }
+        public abstract Task<IList<ICreatureAddon>> GetCreatureAddons();
 
-        public async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
-        {
-            await using var model = Database();
-            return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
-        }
+        public abstract Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons();
+
+        public abstract Task<ICreatureAddon?> GetCreatureAddon(uint guid);
+
+        public abstract Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry);
 
         public async Task<IList<ICreatureEquipmentTemplate>?> GetCreatureEquipmentTemplates()
         {
@@ -652,18 +648,6 @@ public async Task<IList<IGameEventGameObject>> GetGameEventGameObjectsAsync()
 
         public abstract Task<ICreature?> GetCreaturesByGuidAsync(uint guid);
 
-        public async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
-        {
-            await using var model = Database();
-            return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
-        }
-
-        public async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
-        {
-            await using var model = Database();
-            return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
-        }
-
         public async Task<IList<IAuthRbacPermission>> GetRbacPermissionsAsync()
         {
             if (!Supports<IAuthRbacPermission>())

diff --git a/...tabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityCataMySqlDatabaseProvider.cs b/...tabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityCataMySqlDatabaseProvider.cs
@@ -238,4 +238,28 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
         await using var model = Database();
         return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
     }
+
+    public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
+    }
+
+    public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
+    }
+
+    public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
+    }
+
+    public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
+    }
 }
diff --git a/...baseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs b/...baseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs
@@ -213,4 +213,29 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
         await using var model = Database();
         return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
     }
+
+
+    public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
+    }
+
+    public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
+    }
+
+    public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
+    }
+
+    public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
+    }
 }
diff --git a/...abaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityWrathMySqlDatabaseProvider.cs b/...abaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityWrathMySqlDatabaseProvider.cs
@@ -208,4 +208,29 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
         await using var model = Database();
         return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
     }
+
+
+    public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
+    }
+
+    public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
+    }
+
+    public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
+    {
+        await using var model = Database();
+        return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
+    }
+
+    public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
+    {
+        await using var model = Database();
+        return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
+    }
 }
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/AzerothDatabase.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/AzerothDatabase.cs
@@ -13,4 +13,6 @@ public class AzerothDatabase : BaseTrinityDatabase
     public ITable<MySqlGameObjectWrath> GameObject => GetTable<MySqlGameObjectWrath>();
     public ITable<MySqlItemTemplate> ItemTemplate => GetTable<MySqlItemTemplate>();
     public ITable<MySqlCreatureModelInfo> CreatureModelInfo => GetTable<MySqlCreatureModelInfo>();
+    public ITable<MySqlCreatureAddonAC> CreatureAddon => GetTable<MySqlCreatureAddonAC>();
+    public ITable<MySqlCreatureTemplateAddonAC> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddonAC>();
 }
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/BaseTrinityDatabase.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/BaseTrinityDatabase.cs
@@ -41,8 +41,6 @@ public BaseTrinityDatabase() : base("Trinity")
         public ITable<MySqlSpellScriptLine> SpellScripts => GetTable<MySqlSpellScriptLine>();
         public ITable<MySqlAreaTriggerCreateProperties> AreaTriggerCreateProperties => GetTable<MySqlAreaTriggerCreateProperties>();
         public ITable<MySqlSceneTemplate> SceneTemplates => GetTable<MySqlSceneTemplate>();
-        public ITable<MySqlCreatureAddon> CreatureAddon => GetTable<MySqlCreatureAddon>();
-        public ITable<MySqlCreatureTemplateAddon> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddon>();
         public ITable<MySqlCreatureEquipmentTemplate> EquipmentTemplate => GetTable<MySqlCreatureEquipmentTemplate>();
         public ITable<MySqlGameEventCreature> GameEventCreature => GetTable<MySqlGameEventCreature>();
         public ITable<MySqlGameEventGameObject> GameEventGameObject => GetTable<MySqlGameEventGameObject>();

diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityCataDatabase.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityCataDatabase.cs
@@ -15,4 +15,6 @@ public class TrinityCataDatabase : BaseTrinityDatabase
     public ITable<MySqlCataQuestTemplate> CataQuestTemplate => GetTable<MySqlCataQuestTemplate>();
     public ITable<MySqlCataQuestTemplateAddon> CataQuestTemplateAddon => GetTable<MySqlCataQuestTemplateAddon>();
     public ITable<MySqlCreatureModelInfo> CreatureModelInfo => GetTable<MySqlCreatureModelInfo>();
+    public ITable<MySqlCreatureAddonCata> CreatureAddon => GetTable<MySqlCreatureAddonCata>();
+    public ITable<MySqlCreatureTemplateAddonCata> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddonCata>();
 }
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityMasterDatabase.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityMasterDatabase.cs
@@ -12,4 +12,6 @@ public class TrinityMasterDatabase : BaseTrinityDatabase
     public ITable<TrinityMasterMySqlServersideSpell> SpellDbc => GetTable<TrinityMasterMySqlServersideSpell>();
     public ITable<MySqlGameObjectCata> GameObject => GetTable<MySqlGameObjectCata>();
     public ITable<MySqlCreatureModelInfoShadowlands> CreatureModelInfo => GetTable<MySqlCreatureModelInfoShadowlands>();
+    public ITable<MySqlCreatureAddon> CreatureAddon => GetTable<MySqlCreatureAddon>();
+    public ITable<MySqlCreatureTemplateAddon> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddon>();
 }
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityWrathDatabase.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityWrathDatabase.cs
@@ -14,4 +14,6 @@ public class TrinityWrathDatabase : BaseTrinityDatabase
     public ITable<MySqlItemTemplate> ItemTemplate => GetTable<MySqlItemTemplate>();
     public ITable<MySqlSpawnGroupTemplate> SpawnGroupTemplate => GetTable<MySqlSpawnGroupTemplate>();
     public ITable<MySqlCreatureModelInfo> CreatureModelInfo => GetTable<MySqlCreatureModelInfo>();
+    public ITable<MySqlCreatureAddon> CreatureAddon => GetTable<MySqlCreatureAddon>();
+    public ITable<MySqlCreatureTemplateAddon> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddon>();
 }
diff --git a/WoWPacketParser b/WoWPacketParser