diff --git a/Penumbra/Game/ActorEquip.cs b/Penumbra.GameData/Structs/ActorEquip.cs similarity index 95% rename from Penumbra/Game/ActorEquip.cs rename to Penumbra.GameData/Structs/ActorEquip.cs index 6a8645ba..8aa63708 100644 --- a/Penumbra/Game/ActorEquip.cs +++ b/Penumbra.GameData/Structs/ActorEquip.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Penumbra.Game +namespace Penumbra.GameData.Structs { [StructLayout( LayoutKind.Sequential, Pack = 1 )] public readonly struct ActorEquip diff --git a/Penumbra/Game/CharEquipment.cs b/Penumbra.GameData/Structs/CharEquipment.cs similarity index 99% rename from Penumbra/Game/CharEquipment.cs rename to Penumbra.GameData/Structs/CharEquipment.cs index c2c0abc5..7861d4a0 100644 --- a/Penumbra/Game/CharEquipment.cs +++ b/Penumbra.GameData/Structs/CharEquipment.cs @@ -4,7 +4,7 @@ using Dalamud.Game.ClientState.Actors.Types; // Read the customization data regarding weapons and displayable equipment from an actor struct. // Stores the data in a 56 bytes, i.e. 7 longs for easier comparison. -namespace Penumbra.Game +namespace Penumbra.GameData.Structs { [StructLayout( LayoutKind.Sequential, Pack = 1 )] public class CharEquipment diff --git a/Penumbra/Game/SetId.cs b/Penumbra.GameData/Structs/SetId.cs similarity index 93% rename from Penumbra/Game/SetId.cs rename to Penumbra.GameData/Structs/SetId.cs index 196a8f8b..58fbb913 100644 --- a/Penumbra/Game/SetId.cs +++ b/Penumbra.GameData/Structs/SetId.cs @@ -1,6 +1,6 @@ using System; -namespace Penumbra.Game +namespace Penumbra.GameData.Structs { public readonly struct SetId : IComparable { diff --git a/Penumbra/Game/StainId.cs b/Penumbra.GameData/Structs/StainId.cs similarity index 95% rename from Penumbra/Game/StainId.cs rename to Penumbra.GameData/Structs/StainId.cs index a16af075..506066a4 100644 --- a/Penumbra/Game/StainId.cs +++ b/Penumbra.GameData/Structs/StainId.cs @@ -1,6 +1,6 @@ using System; -namespace Penumbra.Game +namespace Penumbra.GameData.Structs { public readonly struct StainId : IEquatable { diff --git a/Penumbra/Game/WeaponType.cs b/Penumbra.GameData/Structs/WeaponType.cs similarity index 95% rename from Penumbra/Game/WeaponType.cs rename to Penumbra.GameData/Structs/WeaponType.cs index 2798ec97..d0f99d8f 100644 --- a/Penumbra/Game/WeaponType.cs +++ b/Penumbra.GameData/Structs/WeaponType.cs @@ -1,6 +1,6 @@ using System; -namespace Penumbra.Game +namespace Penumbra.GameData.Structs { public readonly struct WeaponType : IEquatable { diff --git a/Penumbra/Game/ObjectIdentification.cs b/Penumbra/Game/ObjectIdentification.cs index e3f035af..ae2ba3ca 100644 --- a/Penumbra/Game/ObjectIdentification.cs +++ b/Penumbra/Game/ObjectIdentification.cs @@ -4,6 +4,7 @@ using System.Linq; using Dalamud.Plugin; using Lumina.Excel.GeneratedSheets; using Penumbra.Game.Enums; +using Penumbra.GameData.Structs; using Penumbra.GameData.Util; using Penumbra.Util; using Action = Lumina.Excel.GeneratedSheets.Action; diff --git a/Penumbra/Interop/PlayerWatcher.cs b/Penumbra/Interop/PlayerWatcher.cs index 8c983571..56eafaa5 100644 --- a/Penumbra/Interop/PlayerWatcher.cs +++ b/Penumbra/Interop/PlayerWatcher.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Dalamud.Game.ClientState.Actors; using Dalamud.Game.ClientState.Actors.Types; using Dalamud.Plugin; -using Penumbra.Game; +using Penumbra.GameData.Structs; namespace Penumbra.Interop { diff --git a/Penumbra/UI/MenuTabs/TabDebug.cs b/Penumbra/UI/MenuTabs/TabDebug.cs index 22eaf502..2e269132 100644 --- a/Penumbra/UI/MenuTabs/TabDebug.cs +++ b/Penumbra/UI/MenuTabs/TabDebug.cs @@ -9,6 +9,7 @@ using Dalamud.Game.ClientState.Actors.Types; using ImGuiNET; using Penumbra.Game; using Penumbra.Game.Enums; +using Penumbra.GameData.Structs; using Penumbra.GameData.Util; using Penumbra.Interop; using Penumbra.Meta;