From 4cfd7f56c0cc6827505cee75b427b5781ff741c4 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sun, 25 Jul 2021 02:30:59 +0200 Subject: [PATCH] Move Enums to GameData. --- .../Game => Penumbra.GameData}/Enums/BodySlot.cs | 2 +- .../Enums/CustomizationType.cs | 2 +- .../Enums/EquipSlot.cs | 2 +- .../Game => Penumbra.GameData}/Enums/FileType.cs | 2 +- .../Enums/ObjectType.cs | 2 +- .../Game => Penumbra.GameData}/Enums/Race.cs | 2 +- .../Enums/RspAttribute.cs | 2 +- Penumbra/Game/EqdpEntry.cs | 2 +- Penumbra/Game/EqpEntry.cs | 2 +- Penumbra/Game/GameObjectInfo.cs | 4 ++-- Penumbra/Game/GamePathParser.cs | 16 ++++++++-------- Penumbra/Game/ObjectIdentification.cs | 6 +++--- Penumbra/Game/RspEntry.cs | 2 +- Penumbra/Importer/TexToolsMeta.cs | 10 ++++------ Penumbra/Meta/Files/CmpFile.cs | 2 +- Penumbra/Meta/Files/EstFile.cs | 2 +- Penumbra/Meta/Files/ImcExtensions.cs | 2 +- Penumbra/Meta/Files/MetaDefaults.cs | 3 +-- Penumbra/Meta/Files/MetaFilenames.cs | 3 +-- Penumbra/Meta/Identifier.cs | 4 +--- Penumbra/Meta/MetaManipulation.cs | 3 +-- Penumbra/UI/MenuTabs/TabDebug.cs | 4 ++-- .../MenuTabs/TabInstalled/TabInstalledDetails.cs | 2 -- .../TabInstalledDetailsManipulations.cs | 8 ++++---- 24 files changed, 40 insertions(+), 49 deletions(-) rename {Penumbra/Game => Penumbra.GameData}/Enums/BodySlot.cs (97%) rename {Penumbra/Game => Penumbra.GameData}/Enums/CustomizationType.cs (98%) rename {Penumbra/Game => Penumbra.GameData}/Enums/EquipSlot.cs (99%) rename {Penumbra/Game => Penumbra.GameData}/Enums/FileType.cs (97%) rename {Penumbra/Game => Penumbra.GameData}/Enums/ObjectType.cs (89%) rename {Penumbra/Game => Penumbra.GameData}/Enums/Race.cs (99%) rename {Penumbra/Game => Penumbra.GameData}/Enums/RspAttribute.cs (98%) diff --git a/Penumbra/Game/Enums/BodySlot.cs b/Penumbra.GameData/Enums/BodySlot.cs similarity index 97% rename from Penumbra/Game/Enums/BodySlot.cs rename to Penumbra.GameData/Enums/BodySlot.cs index 296070a6..0920b5e8 100644 --- a/Penumbra/Game/Enums/BodySlot.cs +++ b/Penumbra.GameData/Enums/BodySlot.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel; -namespace Penumbra.Game.Enums +namespace Penumbra.GameData.Enums { public enum BodySlot : byte { diff --git a/Penumbra/Game/Enums/CustomizationType.cs b/Penumbra.GameData/Enums/CustomizationType.cs similarity index 98% rename from Penumbra/Game/Enums/CustomizationType.cs rename to Penumbra.GameData/Enums/CustomizationType.cs index 34cb05b0..f358c3ce 100644 --- a/Penumbra/Game/Enums/CustomizationType.cs +++ b/Penumbra.GameData/Enums/CustomizationType.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel; -namespace Penumbra.Game.Enums +namespace Penumbra.GameData.Enums { public enum CustomizationType : byte { diff --git a/Penumbra/Game/Enums/EquipSlot.cs b/Penumbra.GameData/Enums/EquipSlot.cs similarity index 99% rename from Penumbra/Game/Enums/EquipSlot.cs rename to Penumbra.GameData/Enums/EquipSlot.cs index 3c942c94..129e8a83 100644 --- a/Penumbra/Game/Enums/EquipSlot.cs +++ b/Penumbra.GameData/Enums/EquipSlot.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel; -namespace Penumbra.Game.Enums +namespace Penumbra.GameData.Enums { public enum EquipSlot : byte { diff --git a/Penumbra/Game/Enums/FileType.cs b/Penumbra.GameData/Enums/FileType.cs similarity index 97% rename from Penumbra/Game/Enums/FileType.cs rename to Penumbra.GameData/Enums/FileType.cs index a6db0cf2..793b3bd6 100644 --- a/Penumbra/Game/Enums/FileType.cs +++ b/Penumbra.GameData/Enums/FileType.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Penumbra.Game.Enums +namespace Penumbra.GameData.Enums { public enum FileType : byte { diff --git a/Penumbra/Game/Enums/ObjectType.cs b/Penumbra.GameData/Enums/ObjectType.cs similarity index 89% rename from Penumbra/Game/Enums/ObjectType.cs rename to Penumbra.GameData/Enums/ObjectType.cs index b2884512..8b62e42b 100644 --- a/Penumbra/Game/Enums/ObjectType.cs +++ b/Penumbra.GameData/Enums/ObjectType.cs @@ -1,4 +1,4 @@ -namespace Penumbra.Game.Enums +namespace Penumbra.GameData.Enums { public enum ObjectType : byte { diff --git a/Penumbra/Game/Enums/Race.cs b/Penumbra.GameData/Enums/Race.cs similarity index 99% rename from Penumbra/Game/Enums/Race.cs rename to Penumbra.GameData/Enums/Race.cs index 9542f587..1f706319 100644 --- a/Penumbra/Game/Enums/Race.cs +++ b/Penumbra.GameData/Enums/Race.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; -namespace Penumbra.Game.Enums +namespace Penumbra.GameData.Enums { public enum Gender : byte { diff --git a/Penumbra/Game/Enums/RspAttribute.cs b/Penumbra.GameData/Enums/RspAttribute.cs similarity index 98% rename from Penumbra/Game/Enums/RspAttribute.cs rename to Penumbra.GameData/Enums/RspAttribute.cs index bb902061..c78ecf53 100644 --- a/Penumbra/Game/Enums/RspAttribute.cs +++ b/Penumbra.GameData/Enums/RspAttribute.cs @@ -1,4 +1,4 @@ -namespace Penumbra.Game.Enums +namespace Penumbra.GameData.Enums { public enum RspAttribute : byte { diff --git a/Penumbra/Game/EqdpEntry.cs b/Penumbra/Game/EqdpEntry.cs index 91b7a76f..6982a79a 100644 --- a/Penumbra/Game/EqdpEntry.cs +++ b/Penumbra/Game/EqdpEntry.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.Meta; namespace Penumbra.Game diff --git a/Penumbra/Game/EqpEntry.cs b/Penumbra/Game/EqpEntry.cs index 98ca2e6d..1f34f6c8 100644 --- a/Penumbra/Game/EqpEntry.cs +++ b/Penumbra/Game/EqpEntry.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.Meta; namespace Penumbra.Game diff --git a/Penumbra/Game/GameObjectInfo.cs b/Penumbra/Game/GameObjectInfo.cs index c6666735..15838b20 100644 --- a/Penumbra/Game/GameObjectInfo.cs +++ b/Penumbra/Game/GameObjectInfo.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; using Dalamud; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; namespace Penumbra.Game { @@ -123,7 +123,7 @@ namespace Penumbra.Game public GenderRace GenderRace { - get => Penumbra.Game.Enums.GameData.GenderRaceFromByte( _genderRaceByte ); + get => GameData.Enums.GameData.GenderRaceFromByte( _genderRaceByte ); set => _genderRaceByte = value.ToByte(); } diff --git a/Penumbra/Game/GamePathParser.cs b/Penumbra/Game/GamePathParser.cs index cd28f18f..680e2cea 100644 --- a/Penumbra/Game/GamePathParser.cs +++ b/Penumbra/Game/GamePathParser.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; using Dalamud.Plugin; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.GameData.Util; using Penumbra.Util; @@ -122,7 +122,7 @@ namespace Penumbra.Game private static (FileType, ObjectType, Match?) ParseGamePath( GamePath path ) { - if( !Penumbra.Game.Enums.GameData.ExtensionToFileType.TryGetValue( Extension( path ), out var fileType ) ) + if( !GameData.Enums.GameData.ExtensionToFileType.TryGetValue( Extension( path ), out var fileType ) ) { fileType = FileType.Unknown; } @@ -165,8 +165,8 @@ namespace Penumbra.Game return GameObjectInfo.Equipment( fileType, setId ); } - var gr = Penumbra.Game.Enums.GameData.GenderRaceFromCode( groups[ "race" ].Value ); - var slot = Penumbra.Game.Enums.GameData.SuffixToEquipSlot[ groups[ "slot" ].Value ]; + var gr = GameData.Enums.GameData.GenderRaceFromCode( groups[ "race" ].Value ); + var slot = GameData.Enums.GameData.SuffixToEquipSlot[ groups[ "slot" ].Value ]; if( fileType == FileType.Model ) { return GameObjectInfo.Equipment( fileType, setId, gr, slot ); @@ -211,7 +211,7 @@ namespace Penumbra.Game return GameObjectInfo.DemiHuman( fileType, demiHumanId, equipId ); } - var slot = Penumbra.Game.Enums.GameData.SuffixToEquipSlot[ groups[ "slot" ].Value ]; + var slot = GameData.Enums.GameData.SuffixToEquipSlot[ groups[ "slot" ].Value ]; if( fileType == FileType.Model ) { return GameObjectInfo.DemiHuman( fileType, demiHumanId, equipId, slot ); @@ -236,9 +236,9 @@ namespace Penumbra.Game return GameObjectInfo.Customization( fileType, tmpType, id ); } - var gr = Penumbra.Game.Enums.GameData.GenderRaceFromCode( groups[ "race" ].Value ); - var bodySlot = Penumbra.Game.Enums.GameData.StringToBodySlot[ groups[ "type" ].Value ]; - var type = groups[ "slot" ].Success ? Penumbra.Game.Enums.GameData.SuffixToCustomizationType[ groups[ "slot" ].Value ] : CustomizationType.Skin; + var gr = GameData.Enums.GameData.GenderRaceFromCode( groups[ "race" ].Value ); + var bodySlot = GameData.Enums.GameData.StringToBodySlot[ groups[ "type" ].Value ]; + var type = groups[ "slot" ].Success ? GameData.Enums.GameData.SuffixToCustomizationType[ groups[ "slot" ].Value ] : CustomizationType.Skin; if( fileType == FileType.Material ) { var variant = byte.Parse( groups[ "variant" ].Value ); diff --git a/Penumbra/Game/ObjectIdentification.cs b/Penumbra/Game/ObjectIdentification.cs index ae2ba3ca..9a95f95d 100644 --- a/Penumbra/Game/ObjectIdentification.cs +++ b/Penumbra/Game/ObjectIdentification.cs @@ -3,12 +3,12 @@ using System.ComponentModel; using System.Linq; using Dalamud.Plugin; using Lumina.Excel.GeneratedSheets; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.GameData.Structs; using Penumbra.GameData.Util; using Penumbra.Util; using Action = Lumina.Excel.GeneratedSheets.Action; -using Race = Penumbra.Game.Enums.Race; +using Race = Penumbra.GameData.Enums.Race; namespace Penumbra.Game { @@ -314,4 +314,4 @@ namespace Penumbra.Game } } } -} \ No newline at end of file +} diff --git a/Penumbra/Game/RspEntry.cs b/Penumbra/Game/RspEntry.cs index 64faea47..f260b08f 100644 --- a/Penumbra/Game/RspEntry.cs +++ b/Penumbra/Game/RspEntry.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using System.IO; using System.Runtime.InteropServices; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; namespace Penumbra.Game { diff --git a/Penumbra/Importer/TexToolsMeta.cs b/Penumbra/Importer/TexToolsMeta.cs index d5728f7f..3bd313db 100644 --- a/Penumbra/Importer/TexToolsMeta.cs +++ b/Penumbra/Importer/TexToolsMeta.cs @@ -5,13 +5,11 @@ using System.Text.RegularExpressions; using Dalamud.Plugin; using Lumina.Data.Files; using Penumbra.Game; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.GameData.Util; using Penumbra.Meta; using Penumbra.Meta.Files; using Penumbra.Util; -using static Penumbra.Game.Enums.GameData; -using GameData = Penumbra.Game.Enums.GameData; namespace Penumbra.Importer { @@ -114,14 +112,14 @@ namespace Penumbra.Importer { case ObjectType.Equipment: case ObjectType.Accessory: - if( Penumbra.Game.Enums.GameData.SuffixToEquipSlot.TryGetValue( match.Groups[ "Slot" ].Value, out var tmpSlot ) ) + if( GameData.Enums.GameData.SuffixToEquipSlot.TryGetValue( match.Groups[ "Slot" ].Value, out var tmpSlot ) ) { EquipSlot = tmpSlot; } break; case ObjectType.Character: - if( Penumbra.Game.Enums.GameData.SuffixToCustomizationType.TryGetValue( match.Groups[ "Slot" ].Value, out var tmpCustom ) ) + if( GameData.Enums.GameData.SuffixToCustomizationType.TryGetValue( match.Groups[ "Slot" ].Value, out var tmpCustom ) ) { CustomizationType = tmpCustom; } @@ -131,7 +129,7 @@ namespace Penumbra.Importer } if( match.Groups[ "SecondaryType" ].Success - && Penumbra.Game.Enums.GameData.StringToBodySlot.TryGetValue( match.Groups[ "SecondaryType" ].Value, out SecondaryType ) ) + && GameData.Enums.GameData.StringToBodySlot.TryGetValue( match.Groups[ "SecondaryType" ].Value, out SecondaryType ) ) { SecondaryId = ushort.Parse( match.Groups[ "SecondaryId" ].Value ); } diff --git a/Penumbra/Meta/Files/CmpFile.cs b/Penumbra/Meta/Files/CmpFile.cs index 85026b32..266e5e2b 100644 --- a/Penumbra/Meta/Files/CmpFile.cs +++ b/Penumbra/Meta/Files/CmpFile.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Penumbra.Game; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; namespace Penumbra.Meta.Files { diff --git a/Penumbra/Meta/Files/EstFile.cs b/Penumbra/Meta/Files/EstFile.cs index 8a421a5e..fc00fed8 100644 --- a/Penumbra/Meta/Files/EstFile.cs +++ b/Penumbra/Meta/Files/EstFile.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Lumina.Data; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; namespace Penumbra.Meta.Files { diff --git a/Penumbra/Meta/Files/ImcExtensions.cs b/Penumbra/Meta/Files/ImcExtensions.cs index c4c62552..9b5e1c80 100644 --- a/Penumbra/Meta/Files/ImcExtensions.cs +++ b/Penumbra/Meta/Files/ImcExtensions.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.IO; using System.Linq; using Lumina.Data.Files; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; namespace Penumbra.Meta.Files { diff --git a/Penumbra/Meta/Files/MetaDefaults.cs b/Penumbra/Meta/Files/MetaDefaults.cs index 5ff31c34..4cb39e62 100644 --- a/Penumbra/Meta/Files/MetaDefaults.cs +++ b/Penumbra/Meta/Files/MetaDefaults.cs @@ -4,9 +4,8 @@ using Dalamud.Plugin; using Lumina.Data; using Lumina.Data.Files; using Penumbra.Game; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.GameData.Util; -using Penumbra.Util; namespace Penumbra.Meta.Files { diff --git a/Penumbra/Meta/Files/MetaFilenames.cs b/Penumbra/Meta/Files/MetaFilenames.cs index a74fd860..1a974fc1 100644 --- a/Penumbra/Meta/Files/MetaFilenames.cs +++ b/Penumbra/Meta/Files/MetaFilenames.cs @@ -1,7 +1,6 @@ using System; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.GameData.Util; -using Penumbra.Util; namespace Penumbra.Meta.Files { diff --git a/Penumbra/Meta/Identifier.cs b/Penumbra/Meta/Identifier.cs index b9a0d1a9..d491bd1a 100644 --- a/Penumbra/Meta/Identifier.cs +++ b/Penumbra/Meta/Identifier.cs @@ -1,7 +1,5 @@ using System.Runtime.InteropServices; -using Penumbra.Game.Enums; -using Penumbra.Meta.Files; - +using Penumbra.GameData.Enums; // A struct for each type of meta change that contains all relevant information, // to uniquely identify the corresponding file and location for the change. diff --git a/Penumbra/Meta/MetaManipulation.cs b/Penumbra/Meta/MetaManipulation.cs index 6f80c7eb..a43cfe74 100644 --- a/Penumbra/Meta/MetaManipulation.cs +++ b/Penumbra/Meta/MetaManipulation.cs @@ -4,10 +4,9 @@ using System.IO; using System.Runtime.InteropServices; using Newtonsoft.Json; using Penumbra.Game; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.GameData.Util; using Penumbra.Meta.Files; -using Penumbra.Util; using Swan; using ImcFile = Lumina.Data.Files.ImcFile; diff --git a/Penumbra/UI/MenuTabs/TabDebug.cs b/Penumbra/UI/MenuTabs/TabDebug.cs index 2e269132..bff35890 100644 --- a/Penumbra/UI/MenuTabs/TabDebug.cs +++ b/Penumbra/UI/MenuTabs/TabDebug.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; using Dalamud.Game.ClientState.Actors.Types; using ImGuiNET; using Penumbra.Game; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.GameData.Structs; using Penumbra.GameData.Util; using Penumbra.Interop; @@ -289,4 +289,4 @@ namespace Penumbra.UI ImGui.EndTabItem(); } } -} \ No newline at end of file +} diff --git a/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetails.cs b/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetails.cs index 319238b6..e40a4ea8 100644 --- a/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetails.cs +++ b/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetails.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using Dalamud.Interface; using ImGuiNET; using Lumina.Excel.GeneratedSheets; -using Penumbra.Game.Enums; using Penumbra.GameData.Util; using Penumbra.Meta; using Penumbra.Mod; diff --git a/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetailsManipulations.cs b/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetailsManipulations.cs index 5b9ceaa6..60e0a851 100644 --- a/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetailsManipulations.cs +++ b/Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetailsManipulations.cs @@ -7,11 +7,11 @@ using Dalamud.Interface; using ImGuiNET; using Lumina.Data.Files; using Penumbra.Game; -using Penumbra.Game.Enums; +using Penumbra.GameData.Enums; using Penumbra.Meta; using Penumbra.Meta.Files; using Penumbra.Util; -using ObjectType = Penumbra.Game.Enums.ObjectType; +using ObjectType = Penumbra.GameData.Enums.ObjectType; namespace Penumbra.UI { @@ -742,7 +742,7 @@ namespace Penumbra.UI CustomCombo( "Equipment Slot", EqdpEquipSlots, out var equipSlot, ref _newManipEquipSlot ); CustomCombo( "Race", Races, out var race, ref _newManipRace ); CustomCombo( "Gender", Genders, out var gender, ref _newManipGender ); - newManip = MetaManipulation.Eqdp( equipSlot, Penumbra.Game.Enums.GameData.CombinedRace( gender, race ), ( ushort )_newManipSetId, + newManip = MetaManipulation.Eqdp( equipSlot, GameData.Enums.GameData.CombinedRace( gender, race ), ( ushort )_newManipSetId, new EqdpEntry() ); break; } @@ -771,7 +771,7 @@ namespace Penumbra.UI CustomCombo( "Race", Races, out var race, ref _newManipRace ); CustomCombo( "Gender", Genders, out var gender, ref _newManipGender ); - newManip = MetaManipulation.Est( objectType, equipSlot, Penumbra.Game.Enums.GameData.CombinedRace( gender, race ), bodySlot, + newManip = MetaManipulation.Est( objectType, equipSlot, GameData.Enums.GameData.CombinedRace( gender, race ), bodySlot, ( ushort )_newManipSetId, 0 ); break; }