adjust namespace for Animations components

pandinocoder · pandinocoder · commit 0826f6f774ac · 2025-02-26T22:27:25.000+01:00
diff --git a/Framework/Intersect.Framework.Core/GameObjects/AnimationBase.cs b/Framework/Intersect.Framework.Core/GameObjects/AnimationBase.cs
@@ -1,4 +1,5 @@
-﻿using Intersect.Models;
+﻿using Intersect.Framework.Core.GameObjects.Animations;
+using Intersect.Models;
 using Newtonsoft.Json;
 
 namespace Intersect.GameObjects;
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationLayer.cs b/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationLayer.cs
@@ -1,8 +1,9 @@
 using System.ComponentModel.DataAnnotations.Schema;
+using Intersect.GameObjects;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 
-namespace Intersect.GameObjects;
+namespace Intersect.Framework.Core.GameObjects.Animations;
 
 [Owned]
 public partial class AnimationLayer
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationSource.cs b/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationSource.cs
@@ -1,5 +1,3 @@
-using Intersect.GameObjects.Animations;
-
 namespace Intersect.Framework.Core.GameObjects.Animations;
 
 public record struct AnimationSource(AnimationSourceType Type, Guid Id);
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationSourceType.cs b/Framework/Intersect.Framework.Core/GameObjects/Animations/AnimationSourceType.cs
@@ -1,4 +1,4 @@
-namespace Intersect.GameObjects.Animations;
+namespace Intersect.Framework.Core.GameObjects.Animations;
 
 public enum AnimationSourceType
 {
diff --git a/Intersect (Core)/Network/Packets/Server/PlayAnimationPacket.cs b/Intersect (Core)/Network/Packets/Server/PlayAnimationPacket.cs
@@ -1,6 +1,6 @@
 ﻿using MessagePack;
 using Intersect.Enums;
-using Intersect.GameObjects.Animations;
+using Intersect.Framework.Core.GameObjects.Animations;
 
 namespace Intersect.Network.Packets.Server;
 
diff --git a/Intersect.Client.Core/Entities/Animation.cs b/Intersect.Client.Core/Entities/Animation.cs
@@ -8,7 +8,6 @@
 using Intersect.Framework.Core;
 using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.GameObjects;
-using Intersect.GameObjects.Animations;
 using Intersect.Utilities;
 
 namespace Intersect.Client.Entities;
diff --git a/Intersect.Client.Core/Entities/Entity.cs b/Intersect.Client.Core/Entities/Entity.cs
@@ -19,7 +19,6 @@
 using Intersect.Framework.Core;
 using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.GameObjects;
-using Intersect.GameObjects.Animations;
 using Intersect.GameObjects.Maps;
 using Intersect.Network.Packets.Server;
 using Intersect.Utilities;
diff --git a/Intersect.Client.Core/Networking/PacketHandler.cs b/Intersect.Client.Core/Networking/PacketHandler.cs
@@ -25,7 +25,6 @@
 using Intersect.Client.Interface.Shared;
 using Intersect.Framework.Core;
 using Intersect.Framework.Core.GameObjects.Animations;
-using Intersect.GameObjects.Animations;
 using Microsoft.Extensions.Logging;
 
 namespace Intersect.Client.Networking;
diff --git a/Intersect.Server.Core/Entities/Npc.cs b/Intersect.Server.Core/Entities/Npc.cs
@@ -2,8 +2,8 @@
 using Intersect.Core;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.GameObjects;
-using Intersect.GameObjects.Animations;
 using Intersect.Network.Packets.Server;
 using Intersect.Server.Database;
 using Intersect.Server.Database.PlayerData.Players;
diff --git a/Intersect.Server.Core/Entities/Player.cs b/Intersect.Server.Core/Entities/Player.cs
@@ -8,9 +8,9 @@
 using Intersect.Enums;
 using Intersect.Framework;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Variables;
 using Intersect.GameObjects;
-using Intersect.GameObjects.Animations;
 using Intersect.GameObjects.Crafting;
 using Intersect.GameObjects.Events;
 using Intersect.GameObjects.Events.Commands;
diff --git a/Intersect.Server.Core/Migrations/Sqlite/Game/SqliteGameContextModelSnapshot.cs b/Intersect.Server.Core/Migrations/Sqlite/Game/SqliteGameContextModelSnapshot.cs
@@ -1263,7 +1263,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Intersect.GameObjects.AnimationBase", b =>
                 {
-                    b.OwnsOne("Intersect.GameObjects.AnimationLayer", "Lower", b1 =>
+                    b.OwnsOne("Intersect.Framework.Core.GameObjects.Animations.AnimationLayer", "Lower", b1 =>
                         {
                             b1.Property<Guid>("AnimationBaseId")
                                 .HasColumnType("TEXT");
@@ -1303,7 +1303,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .HasForeignKey("AnimationBaseId");
                         });
 
-                    b.OwnsOne("Intersect.GameObjects.AnimationLayer", "Upper", b1 =>
+                    b.OwnsOne("Intersect.Framework.Core.GameObjects.Animations.AnimationLayer", "Upper", b1 =>
                         {
                             b1.Property<Guid>("AnimationBaseId")
                                 .HasColumnType("TEXT");
diff --git a/Intersect.Server.Core/Networking/PacketSender.cs b/Intersect.Server.Core/Networking/PacketSender.cs
@@ -2,9 +2,9 @@
 using Intersect.Core;
 using Intersect.Enums;
 using Intersect.Framework.Core;
+using Intersect.Framework.Core.GameObjects.Animations;
 using Intersect.Framework.Core.GameObjects.Variables;
 using Intersect.GameObjects;
-using Intersect.GameObjects.Animations;
 using Intersect.GameObjects.Crafting;
 using Intersect.GameObjects.Events;
 using Intersect.GameObjects.Maps.MapList;
diff --git a/Intersect.Server/Migrations/MySql/Game/MySqlGameContextModelSnapshot.cs b/Intersect.Server/Migrations/MySql/Game/MySqlGameContextModelSnapshot.cs
@@ -1319,7 +1319,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Intersect.GameObjects.AnimationBase", b =>
                 {
-                    b.OwnsOne("Intersect.GameObjects.AnimationLayer", "Lower", b1 =>
+                    b.OwnsOne("Intersect.Framework.Core.GameObjects.Animations.AnimationLayer", "Lower", b1 =>
                         {
                             b1.Property<Guid>("AnimationBaseId")
                                 .HasColumnType("char(36)")
@@ -1360,7 +1360,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                                 .HasForeignKey("AnimationBaseId");
                         });
 
-                    b.OwnsOne("Intersect.GameObjects.AnimationLayer", "Upper", b1 =>
+                    b.OwnsOne("Intersect.Framework.Core.GameObjects.Animations.AnimationLayer", "Upper", b1 =>
                         {
                             b1.Property<Guid>("AnimationBaseId")
                                 .HasColumnType("char(36)")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Intersect.GameObjects.Animations;`
	`1`	`+namespace Intersect.Framework.Core.GameObjects.Animations;`
`2`	`2`
`3`	`3`	`public enum AnimationSourceType`
`4`	`4`	`{`