ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move Enums to GameData.

Browse source
This commit is contained in:
Ottermandias 2021-07-25 02:30:59 +02:00
parent fce9ec5659
commit 4cfd7f56c0
24 changed files with 40 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Game/Enums/BodySlot.cs → Penumbra.GameData/Enums/BodySlot.cs
View file

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.ComponentModel;
namespace Penumbra.Game.Enums
namespace Penumbra.GameData.Enums
{
public enum BodySlot : byte
{

2
Penumbra/Game/Enums/CustomizationType.cs → Penumbra.GameData/Enums/CustomizationType.cs
View file

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.ComponentModel;
namespace Penumbra.Game.Enums
namespace Penumbra.GameData.Enums
{
public enum CustomizationType : byte
{

2
Penumbra/Game/Enums/EquipSlot.cs → Penumbra.GameData/Enums/EquipSlot.cs
View file

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.ComponentModel;
namespace Penumbra.Game.Enums
namespace Penumbra.GameData.Enums
{
public enum EquipSlot : byte
{

2
Penumbra/Game/Enums/FileType.cs → Penumbra.GameData/Enums/FileType.cs
View file

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Penumbra.Game.Enums
namespace Penumbra.GameData.Enums
{
public enum FileType : byte
{

2
Penumbra/Game/Enums/ObjectType.cs → Penumbra.GameData/Enums/ObjectType.cs
View file

@ -1,4 +1,4 @@
namespace Penumbra.Game.Enums
namespace Penumbra.GameData.Enums
{
public enum ObjectType : byte
{

2
Penumbra/Game/Enums/Race.cs → Penumbra.GameData/Enums/Race.cs
View file

@ -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
{

2
Penumbra/Game/Enums/RspAttribute.cs → Penumbra.GameData/Enums/RspAttribute.cs
View file

@ -1,4 +1,4 @@
namespace Penumbra.Game.Enums
namespace Penumbra.GameData.Enums
{
public enum RspAttribute : byte
{

2
Penumbra/Game/EqdpEntry.cs
View file

@ -1,6 +1,6 @@
using System;
using System.ComponentModel;
using Penumbra.Game.Enums;
using Penumbra.GameData.Enums;
using Penumbra.Meta;
namespace Penumbra.Game

2
Penumbra/Game/EqpEntry.cs
View file

@ -1,6 +1,6 @@
using System;
using System.ComponentModel;
using Penumbra.Game.Enums;
using Penumbra.GameData.Enums;
using Penumbra.Meta;
namespace Penumbra.Game

4
Penumbra/Game/GameObjectInfo.cs
View file

@ -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();
}

16
Penumbra/Game/GamePathParser.cs
View file

@ -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 );

4
Penumbra/Game/ObjectIdentification.cs
View file

@ -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
{

2
Penumbra/Game/RspEntry.cs
View file

@ -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
{

10
Penumbra/Importer/TexToolsMeta.cs
View file

@ -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 );
}

2
Penumbra/Meta/Files/CmpFile.cs
View file

@ -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
{

2
Penumbra/Meta/Files/EstFile.cs
View file

@ -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
{

2
Penumbra/Meta/Files/ImcExtensions.cs
View file

@ -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
{

3
Penumbra/Meta/Files/MetaDefaults.cs
View file

@ -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
{

3
Penumbra/Meta/Files/MetaFilenames.cs
View file

@ -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
{

4
Penumbra/Meta/Identifier.cs
View file

@ -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.

3
Penumbra/Meta/MetaManipulation.cs
View file

@ -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;

2
Penumbra/UI/MenuTabs/TabDebug.cs
View file

@ -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;

2
Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetails.cs
View file

@ -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;

8
Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetailsManipulations.cs
View file

@ -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;
}