Skip to content

Commit 5a0c00d

Browse files
BAndyscBAndysc
committed
[Packet parser] Updated parser
1 parent 8d05d68 commit 5a0c00d

15 files changed

+191
-35
lines changed

‎LoaderAvalonia/LoaderAvalonia.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414
<Import Project="..\Module.props" />
1515

16-
<Target Name="CustomAfterBuild" AfterTargets="Build">
16+
<Target Condition="$([MSBuild]::IsOSPlatform('OSX'))" Name="CustomAfterBuild" AfterTargets="Build">
1717
<Copy SourceFiles="$(OutputPath)\runtimes\osx-universal\native\libcimgui.dylib" DestinationFolder="$(OutputPath)\runtimes\osx\native\" ContinueOnError="false" />
1818
</Target>
1919

‎Rendering/AvaloniaRenderingTester/AvaloniaRenderingTester.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<Import Project="..\..\Avalonia.props" />
99

10-
<Target Name="CustomAfterBuild" AfterTargets="Build">
10+
<Target Condition="$([MSBuild]::IsOSPlatform('OSX'))" Name="CustomAfterBuild" AfterTargets="Build">
1111
<Copy SourceFiles="$(OutputPath)\runtimes\osx-universal\native\libcimgui.dylib" DestinationFolder="$(OutputPath)\runtimes\osx\native\" ContinueOnError="false" />
1212
</Target>
1313

‎Rendering/RenderingTester/RenderingTester.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

10-
<Target Name="CustomAfterBuild" AfterTargets="Build">
10+
<Target Condition="$([MSBuild]::IsOSPlatform('OSX'))" Name="CustomAfterBuild" AfterTargets="Build">
1111
<Copy SourceFiles="$(OutputPath)\runtimes\osx-universal\native\libcimgui.dylib" DestinationFolder="$(OutputPath)\runtimes\osx\native\" ContinueOnError="false" />
1212
</Target>
1313

‎WDE.MySqlDatabaseCommon/CommonModels/MySqlCreatureAddon.cs

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33

44
namespace WDE.MySqlDatabaseCommon.CommonModels;
55

6-
public class MySqlBaseCreatureAddon : IBaseCreatureAddon
6+
public abstract class MySqlBaseCreatureAddon : IBaseCreatureAddon
77
{
8-
[Column(Name = "path_id")]
9-
public uint PathId { get; set; }
8+
public abstract uint PathId { get; set; }
109

1110
[Column(Name = "mount")]
1211
public uint Mount { get; set; }
13-
14-
[Column(Name = "MountCreatureID")]
15-
public uint MountCreatureId { get; set; }
16-
12+
13+
public abstract uint MountCreatureId { get; set; }
14+
1715
[Column(Name = "bytes1")]
1816
public uint Bytes1 { get; set; }
1917

@@ -41,6 +39,12 @@ public class MySqlCreatureAddon : MySqlBaseCreatureAddon, ICreatureAddon
4139
[Identity]
4240
[Column(Name = "guid")]
4341
public uint Guid { get; set; }
42+
43+
[Column(Name = "path_id")]
44+
public override uint PathId { get; set; }
45+
46+
[Column(Name = "MountCreatureID")]
47+
public override uint MountCreatureId { get; set; }
4448
}
4549

4650
[Table(Name = "creature_template_addon")]
@@ -50,4 +54,68 @@ public class MySqlCreatureTemplateAddon : MySqlBaseCreatureAddon, ICreatureTempl
5054
[Identity]
5155
[Column(Name = "entry")]
5256
public uint Entry { get; set; }
57+
58+
[Column(Name = "path_id")]
59+
public override uint PathId { get; set; }
60+
61+
[Column(Name = "MountCreatureID")]
62+
public override uint MountCreatureId { get; set; }
63+
}
64+
65+
66+
[Table(Name = "creature_addon")]
67+
public class MySqlCreatureAddonCata : MySqlBaseCreatureAddon, ICreatureAddon
68+
{
69+
[PrimaryKey]
70+
[Identity]
71+
[Column(Name = "guid")]
72+
public uint Guid { get; set; }
73+
74+
[Column(Name = "waypointPathId")]
75+
public override uint PathId { get; set; }
76+
77+
public override uint MountCreatureId { get; set; }
78+
}
79+
80+
[Table(Name = "creature_template_addon")]
81+
public class MySqlCreatureTemplateAddonCata : MySqlBaseCreatureAddon, ICreatureTemplateAddon
82+
{
83+
[PrimaryKey]
84+
[Identity]
85+
[Column(Name = "entry")]
86+
public uint Entry { get; set; }
87+
88+
[Column(Name = "waypointPathId")]
89+
public override uint PathId { get; set; }
90+
91+
public override uint MountCreatureId { get; set; }
92+
}
93+
94+
95+
[Table(Name = "creature_addon")]
96+
public class MySqlCreatureAddonAC: MySqlBaseCreatureAddon, ICreatureAddon
97+
{
98+
[PrimaryKey]
99+
[Identity]
100+
[Column(Name = "guid")]
101+
public uint Guid { get; set; }
102+
103+
[Column(Name = "path_id")]
104+
public override uint PathId { get; set; }
105+
106+
public override uint MountCreatureId { get; set; }
107+
}
108+
109+
[Table(Name = "creature_template_addon")]
110+
public class MySqlCreatureTemplateAddonAC : MySqlBaseCreatureAddon, ICreatureTemplateAddon
111+
{
112+
[PrimaryKey]
113+
[Identity]
114+
[Column(Name = "entry")]
115+
public uint Entry { get; set; }
116+
117+
[Column(Name = "path_id")]
118+
public override uint PathId { get; set; }
119+
120+
public override uint MountCreatureId { get; set; }
53121
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/AzerothhMySqlDatabaseProvider.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,28 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
202202
await using var model = Database();
203203
return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
204204
}
205+
206+
public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
207+
{
208+
await using var model = Database();
209+
return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
210+
}
211+
212+
public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
213+
{
214+
await using var model = Database();
215+
return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
216+
}
217+
218+
public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
219+
{
220+
await using var model = Database();
221+
return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
222+
}
223+
224+
public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
225+
{
226+
await using var model = Database();
227+
return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
228+
}
205229
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/BaseTrinityMySqlDatabaseProvider.cs

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -598,17 +598,13 @@ public async Task<List<IEventScriptLine>> GetEventScript(EventScriptType type, u
598598
return await model.SceneTemplates.ToListAsync<ISceneTemplate>();
599599
}
600600

601-
public async Task<IList<ICreatureAddon>> GetCreatureAddons()
602-
{
603-
await using var model = Database();
604-
return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
605-
}
601+
public abstract Task<IList<ICreatureAddon>> GetCreatureAddons();
606602

607-
public async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
608-
{
609-
await using var model = Database();
610-
return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
611-
}
603+
public abstract Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons();
604+
605+
public abstract Task<ICreatureAddon?> GetCreatureAddon(uint guid);
606+
607+
public abstract Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry);
612608

613609
public async Task<IList<ICreatureEquipmentTemplate>?> GetCreatureEquipmentTemplates()
614610
{
@@ -652,18 +648,6 @@ public async Task<IList<IGameEventGameObject>> GetGameEventGameObjectsAsync()
652648

653649
public abstract Task<ICreature?> GetCreaturesByGuidAsync(uint guid);
654650

655-
public async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
656-
{
657-
await using var model = Database();
658-
return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
659-
}
660-
661-
public async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
662-
{
663-
await using var model = Database();
664-
return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
665-
}
666-
667651
public async Task<IList<IAuthRbacPermission>> GetRbacPermissionsAsync()
668652
{
669653
if (!Supports<IAuthRbacPermission>())

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityCataMySqlDatabaseProvider.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,28 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
238238
await using var model = Database();
239239
return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
240240
}
241+
242+
public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
243+
{
244+
await using var model = Database();
245+
return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
246+
}
247+
248+
public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
249+
{
250+
await using var model = Database();
251+
return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
252+
}
253+
254+
public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
255+
{
256+
await using var model = Database();
257+
return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
258+
}
259+
260+
public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
261+
{
262+
await using var model = Database();
263+
return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
264+
}
241265
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,29 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
213213
await using var model = Database();
214214
return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
215215
}
216+
217+
218+
public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
219+
{
220+
await using var model = Database();
221+
return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
222+
}
223+
224+
public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
225+
{
226+
await using var model = Database();
227+
return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
228+
}
229+
230+
public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
231+
{
232+
await using var model = Database();
233+
return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
234+
}
235+
236+
public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
237+
{
238+
await using var model = Database();
239+
return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
240+
}
216241
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityWrathMySqlDatabaseProvider.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,4 +208,29 @@ public override async Task<IList<ICreatureModelInfo>> GetCreatureModelInfoAsync(
208208
await using var model = Database();
209209
return await model.Creature.FirstOrDefaultAsync(x => x.Guid == guid);
210210
}
211+
212+
213+
public override async Task<IList<ICreatureAddon>> GetCreatureAddons()
214+
{
215+
await using var model = Database();
216+
return await model.CreatureAddon.ToListAsync<ICreatureAddon>();
217+
}
218+
219+
public override async Task<IList<ICreatureTemplateAddon>> GetCreatureTemplateAddons()
220+
{
221+
await using var model = Database();
222+
return await model.CreatureTemplateAddon.ToListAsync<ICreatureTemplateAddon>();
223+
}
224+
225+
public override async Task<ICreatureAddon?> GetCreatureAddon(uint guid)
226+
{
227+
await using var model = Database();
228+
return await model.CreatureAddon.FirstOrDefaultAsync<ICreatureAddon>(x => x.Guid == guid);
229+
}
230+
231+
public override async Task<ICreatureTemplateAddon?> GetCreatureTemplateAddon(uint entry)
232+
{
233+
await using var model = Database();
234+
return await model.CreatureTemplateAddon.FirstOrDefaultAsync<ICreatureTemplateAddon>(x => x.Entry == entry);
235+
}
211236
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/AzerothDatabase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ public class AzerothDatabase : BaseTrinityDatabase
1313
public ITable<MySqlGameObjectWrath> GameObject => GetTable<MySqlGameObjectWrath>();
1414
public ITable<MySqlItemTemplate> ItemTemplate => GetTable<MySqlItemTemplate>();
1515
public ITable<MySqlCreatureModelInfo> CreatureModelInfo => GetTable<MySqlCreatureModelInfo>();
16+
public ITable<MySqlCreatureAddonAC> CreatureAddon => GetTable<MySqlCreatureAddonAC>();
17+
public ITable<MySqlCreatureTemplateAddonAC> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddonAC>();
1618
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/BaseTrinityDatabase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ public BaseTrinityDatabase() : base("Trinity")
4141
public ITable<MySqlSpellScriptLine> SpellScripts => GetTable<MySqlSpellScriptLine>();
4242
public ITable<MySqlAreaTriggerCreateProperties> AreaTriggerCreateProperties => GetTable<MySqlAreaTriggerCreateProperties>();
4343
public ITable<MySqlSceneTemplate> SceneTemplates => GetTable<MySqlSceneTemplate>();
44-
public ITable<MySqlCreatureAddon> CreatureAddon => GetTable<MySqlCreatureAddon>();
45-
public ITable<MySqlCreatureTemplateAddon> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddon>();
4644
public ITable<MySqlCreatureEquipmentTemplate> EquipmentTemplate => GetTable<MySqlCreatureEquipmentTemplate>();
4745
public ITable<MySqlGameEventCreature> GameEventCreature => GetTable<MySqlGameEventCreature>();
4846
public ITable<MySqlGameEventGameObject> GameEventGameObject => GetTable<MySqlGameEventGameObject>();

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityCataDatabase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ public class TrinityCataDatabase : BaseTrinityDatabase
1515
public ITable<MySqlCataQuestTemplate> CataQuestTemplate => GetTable<MySqlCataQuestTemplate>();
1616
public ITable<MySqlCataQuestTemplateAddon> CataQuestTemplateAddon => GetTable<MySqlCataQuestTemplateAddon>();
1717
public ITable<MySqlCreatureModelInfo> CreatureModelInfo => GetTable<MySqlCreatureModelInfo>();
18+
public ITable<MySqlCreatureAddonCata> CreatureAddon => GetTable<MySqlCreatureAddonCata>();
19+
public ITable<MySqlCreatureTemplateAddonCata> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddonCata>();
1820
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityMasterDatabase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ public class TrinityMasterDatabase : BaseTrinityDatabase
1212
public ITable<TrinityMasterMySqlServersideSpell> SpellDbc => GetTable<TrinityMasterMySqlServersideSpell>();
1313
public ITable<MySqlGameObjectCata> GameObject => GetTable<MySqlGameObjectCata>();
1414
public ITable<MySqlCreatureModelInfoShadowlands> CreatureModelInfo => GetTable<MySqlCreatureModelInfoShadowlands>();
15+
public ITable<MySqlCreatureAddon> CreatureAddon => GetTable<MySqlCreatureAddon>();
16+
public ITable<MySqlCreatureTemplateAddon> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddon>();
1517
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityWrathDatabase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ public class TrinityWrathDatabase : BaseTrinityDatabase
1414
public ITable<MySqlItemTemplate> ItemTemplate => GetTable<MySqlItemTemplate>();
1515
public ITable<MySqlSpawnGroupTemplate> SpawnGroupTemplate => GetTable<MySqlSpawnGroupTemplate>();
1616
public ITable<MySqlCreatureModelInfo> CreatureModelInfo => GetTable<MySqlCreatureModelInfo>();
17+
public ITable<MySqlCreatureAddon> CreatureAddon => GetTable<MySqlCreatureAddon>();
18+
public ITable<MySqlCreatureTemplateAddon> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddon>();
1719
}

‎WoWPacketParser

Submodule WoWPacketParser updated 19 files

0 commit comments

Comments
 (0)