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

Final fixes for GameData.

Browse source
This commit is contained in:
Ottermandias 2021-07-25 02:45:48 +02:00
parent 702f8e3967
commit ea40d5bc9c
20 changed files with 133 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ namespace Penumbra.GameData.Enums
}
}
public static partial class GameData
public static partial class Names
{
public static readonly Dictionary< string, BodySlot > StringToBodySlot = new()
{

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

@ -38,7 +38,7 @@ namespace Penumbra.GameData.Enums
}
}
public static partial class GameData
public static partial class Names
{
public static readonly Dictionary< string, CustomizationType > SuffixToCustomizationType = new()
{

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

@ -106,7 +106,7 @@ namespace Penumbra.GameData.Enums
}
}
public static partial class GameData
public static partial class Names
{
public static readonly Dictionary< string, EquipSlot > SuffixToEquipSlot = new()
{

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

@ -19,7 +19,7 @@ namespace Penumbra.GameData.Enums
Environment,
}
public static partial class GameData
public static partial class Names
{
public static readonly Dictionary< string, FileType > ExtensionToFileType = new()
{

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

@ -296,7 +296,7 @@ namespace Penumbra.GameData.Enums
}
}
public static partial class GameData
public static partial class Names
{
public static GenderRace GenderRaceFromCode( string code )
{

49
Penumbra.GameData/GameData.cs Normal file
View file

@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using Dalamud.Plugin;
using Lumina.Excel.GeneratedSheets;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.GameData.Util;
namespace Penumbra.GameData
{
public static class GameData
{
internal static ObjectIdentification? Identification;
internal static readonly GamePathParser GamePathParser = new();
public static IObjectIdentifier GetIdentifier( DalamudPluginInterface pi )
{
Identification ??= new ObjectIdentification( pi );
return Identification;
}
public static IObjectIdentifier GetIdentifier( )
{
if( Identification == null )
{
throw new Exception( "Object Identification was not initialized." );
}
return Identification;
}
public static IGamePathParser GetGamePathParser()
=> GamePathParser;
}
public interface IObjectIdentifier
{
public void Identify( IDictionary< string, object? > set, GamePath path );
public Dictionary< string, object? > Identify( GamePath path );
public Item? Identify( SetId setId, WeaponType weaponType, ushort variant, EquipSlot slot );
}
public interface IGamePathParser
{
public ObjectType PathToObjectType( GamePath path );
public GameObjectInfo GetFileInfo( GamePath path );
public string VfxToKey( GamePath path );
}
}

70
Penumbra.GameData/GamePathParser.cs
View file

@ -9,7 +9,7 @@ using Penumbra.GameData.Util;
namespace Penumbra.GameData
{
public static class GamePathParser
internal class GamePathParser : IGamePathParser
{
private const string CharacterFolder = "chara";
private const string EquipmentFolder = "equipment";
@ -31,7 +31,7 @@ namespace Penumbra.GameData
private const string WorldFolder2 = "bg";
// @formatter:off
private static readonly Dictionary<FileType, Dictionary<ObjectType, Regex[]>> Regexes = new()
private readonly Dictionary<FileType, Dictionary<ObjectType, Regex[]>> _regexes = new()
{ { FileType.Font, new Dictionary< ObjectType, Regex[] >(){ { ObjectType.Font, new Regex[]{ new(@"common/font/(?'fontname'.*)_(?'id'\d\d)(_lobby)?\.fdt") } } } }
, { FileType.Texture, new Dictionary< ObjectType, Regex[] >()
{ { ObjectType.Icon, new Regex[]{ new(@"ui/icon/(?'group'\d*)(/(?'lang'[a-z]{2}))?(/(?'hq'hq))?/(?'id'\d*)\.tex") } }
@ -68,7 +68,7 @@ namespace Penumbra.GameData
};
// @formatter:on
public static ObjectType PathToObjectType( GamePath path )
public ObjectType PathToObjectType( GamePath path )
{
if( path.Empty )
{
@ -120,16 +120,16 @@ namespace Penumbra.GameData
};
}
private static (FileType, ObjectType, Match?) ParseGamePath( GamePath path )
private (FileType, ObjectType, Match?) ParseGamePath( GamePath path )
{
if( !GameData.Enums.GameData.ExtensionToFileType.TryGetValue( Extension( path ), out var fileType ) )
if( !Enums.Names.ExtensionToFileType.TryGetValue( Extension( path ), out var fileType ) )
{
fileType = FileType.Unknown;
}
var objectType = PathToObjectType( path );
if( !Regexes.TryGetValue( fileType, out var objectDict ) )
if( !_regexes.TryGetValue( fileType, out var objectDict ) )
{
return ( fileType, objectType, null );
}
@ -157,7 +157,7 @@ namespace Penumbra.GameData
return extIdx < 0 ? "" : filename.Substring( extIdx );
}
private static GameObjectInfo HandleEquipment( FileType fileType, ObjectType objectType, GroupCollection groups )
private static GameObjectInfo HandleEquipment( FileType fileType, GroupCollection groups )
{
var setId = ushort.Parse( groups[ "id" ].Value );
if( fileType == FileType.Imc )
@ -165,8 +165,8 @@ namespace Penumbra.GameData
return GameObjectInfo.Equipment( fileType, setId );
}
var gr = GameData.Enums.GameData.GenderRaceFromCode( groups[ "race" ].Value );
var slot = GameData.Enums.GameData.SuffixToEquipSlot[ groups[ "slot" ].Value ];
var gr = Enums.Names.GenderRaceFromCode( groups[ "race" ].Value );
var slot = Enums.Names.SuffixToEquipSlot[ groups[ "slot" ].Value ];
if( fileType == FileType.Model )
{
return GameObjectInfo.Equipment( fileType, setId, gr, slot );
@ -176,7 +176,7 @@ namespace Penumbra.GameData
return GameObjectInfo.Equipment( fileType, setId, gr, slot, variant );
}
private static GameObjectInfo HandleWeapon( FileType fileType, ObjectType objectType, GroupCollection groups )
private static GameObjectInfo HandleWeapon( FileType fileType, GroupCollection groups )
{
var weaponId = ushort.Parse( groups[ "weapon" ].Value );
var setId = ushort.Parse( groups[ "id" ].Value );
@ -189,7 +189,7 @@ namespace Penumbra.GameData
return GameObjectInfo.Weapon( fileType, setId, weaponId, variant );
}
private static GameObjectInfo HandleMonster( FileType fileType, ObjectType objectType, GroupCollection groups )
private static GameObjectInfo HandleMonster( FileType fileType, GroupCollection groups )
{
var monsterId = ushort.Parse( groups[ "monster" ].Value );
var bodyId = ushort.Parse( groups[ "id" ].Value );
@ -202,7 +202,7 @@ namespace Penumbra.GameData
return GameObjectInfo.Monster( fileType, monsterId, bodyId, variant );
}
private static GameObjectInfo HandleDemiHuman( FileType fileType, ObjectType objectType, GroupCollection groups )
private static GameObjectInfo HandleDemiHuman( FileType fileType, GroupCollection groups )
{
var demiHumanId = ushort.Parse( groups[ "id" ].Value );
var equipId = ushort.Parse( groups[ "equip" ].Value );
@ -211,7 +211,7 @@ namespace Penumbra.GameData
return GameObjectInfo.DemiHuman( fileType, demiHumanId, equipId );
}
var slot = GameData.Enums.GameData.SuffixToEquipSlot[ groups[ "slot" ].Value ];
var slot = Enums.Names.SuffixToEquipSlot[ groups[ "slot" ].Value ];
if( fileType == FileType.Model )
{
return GameObjectInfo.DemiHuman( fileType, demiHumanId, equipId, slot );
@ -221,7 +221,7 @@ namespace Penumbra.GameData
return GameObjectInfo.DemiHuman( fileType, demiHumanId, equipId, slot, variant );
}
private static GameObjectInfo HandleCustomization( FileType fileType, ObjectType objectType, GroupCollection groups )
private static GameObjectInfo HandleCustomization( FileType fileType, GroupCollection groups )
{
if( groups[ "skin" ].Success )
{
@ -236,9 +236,11 @@ namespace Penumbra.GameData
return GameObjectInfo.Customization( fileType, tmpType, id );
}
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;
var gr = Enums.Names.GenderRaceFromCode( groups[ "race" ].Value );
var bodySlot = Enums.Names.StringToBodySlot[ groups[ "type" ].Value ];
var type = groups[ "slot" ].Success
? Enums.Names.SuffixToCustomizationType[ groups[ "slot" ].Value ]
: CustomizationType.Skin;
if( fileType == FileType.Material )
{
var variant = byte.Parse( groups[ "variant" ].Value );
@ -248,7 +250,7 @@ namespace Penumbra.GameData
return GameObjectInfo.Customization( fileType, type, id, gr, bodySlot );
}
private static GameObjectInfo HandleIcon( FileType fileType, ObjectType objectType, GroupCollection groups )
private static GameObjectInfo HandleIcon( FileType fileType, GroupCollection groups )
{
var hq = groups[ "hq" ].Success;
var id = uint.Parse( groups[ "id" ].Value );
@ -268,7 +270,7 @@ namespace Penumbra.GameData
return GameObjectInfo.Icon( fileType, id, hq, language );
}
private static GameObjectInfo HandleMap( FileType fileType, ObjectType objectType, GroupCollection groups )
private static GameObjectInfo HandleMap( FileType fileType, GroupCollection groups )
{
var map = Encoding.ASCII.GetBytes( groups[ "id" ].Value );
var variant = byte.Parse( groups[ "variant" ].Value );
@ -281,7 +283,7 @@ namespace Penumbra.GameData
return GameObjectInfo.Map( fileType, map[ 0 ], map[ 1 ], map[ 2 ], map[ 3 ], variant );
}
public static GameObjectInfo GetFileInfo( GamePath path )
public GameObjectInfo GetFileInfo( GamePath path )
{
var (fileType, objectType, match) = ParseGamePath( path );
if( match == null || !match.Success )
@ -294,14 +296,14 @@ namespace Penumbra.GameData
var groups = match.Groups;
switch( objectType )
{
case ObjectType.Accessory: return HandleEquipment( fileType, objectType, groups );
case ObjectType.Equipment: return HandleEquipment( fileType, objectType, groups );
case ObjectType.Weapon: return HandleWeapon( fileType, objectType, groups );
case ObjectType.Map: return HandleMap( fileType, objectType, groups );
case ObjectType.Monster: return HandleMonster( fileType, objectType, groups );
case ObjectType.DemiHuman: return HandleDemiHuman( fileType, objectType, groups );
case ObjectType.Character: return HandleCustomization( fileType, objectType, groups );
case ObjectType.Icon: return HandleIcon( fileType, objectType, groups );
case ObjectType.Accessory: return HandleEquipment( fileType, groups );
case ObjectType.Equipment: return HandleEquipment( fileType, groups );
case ObjectType.Weapon: return HandleWeapon( fileType, groups );
case ObjectType.Map: return HandleMap( fileType, groups );
case ObjectType.Monster: return HandleMonster( fileType, groups );
case ObjectType.DemiHuman: return HandleDemiHuman( fileType, groups );
case ObjectType.Character: return HandleCustomization( fileType, groups );
case ObjectType.Icon: return HandleIcon( fileType, groups );
}
}
catch( Exception e )
@ -312,19 +314,19 @@ namespace Penumbra.GameData
return new GameObjectInfo { FileType = fileType, ObjectType = objectType };
}
private static readonly Regex VfxRegexTmb = new( @"chara/action/(?'key'[^\s]+?)\.tmb" );
private static readonly Regex VfxRegexPap = new( @"chara/human/c0101/animation/a0001/[^\s]+?/(?'key'[^\s]+?)\.pap" );
private readonly Regex _vfxRegexTmb = new( @"chara/action/(?'key'[^\s]+?)\.tmb" );
private readonly Regex _vfxRegexPap = new( @"chara/human/c0101/animation/a0001/[^\s]+?/(?'key'[^\s]+?)\.pap" );
public static string VfxToKey( GamePath path )
public string VfxToKey( GamePath path )
{
var match = VfxRegexTmb.Match( path );
var match = _vfxRegexTmb.Match( path );
if( match.Success )
{
return match.Groups[ "key" ].Value.ToLowerInvariant();
}
match = VfxRegexPap.Match( path );
match = _vfxRegexPap.Match( path );
return match.Success ? match.Groups[ "key" ].Value.ToLowerInvariant() : string.Empty;
}
}
}
}

15
Penumbra.GameData/ObjectIdentification.cs
View file

@ -11,7 +11,7 @@ using Race = Penumbra.GameData.Enums.Race;
namespace Penumbra.GameData
{
internal class ObjectIdentification
internal class ObjectIdentification : IObjectIdentifier
{
private readonly List< (ulong, HashSet< Item >) > _weapons;
private readonly List< (ulong, HashSet< Item >) > _equipment;
@ -267,7 +267,7 @@ namespace Penumbra.GameData
private void IdentifyVfx( IDictionary< string, object? > set, GamePath path )
{
var key = GamePathParser.VfxToKey( path );
var key = GameData.GamePathParser.VfxToKey( path );
if( key.Length == 0 || !_actions.TryGetValue( key, out var actions ) )
{
return;
@ -287,11 +287,18 @@ namespace Penumbra.GameData
}
else
{
var info = GamePathParser.GetFileInfo( path );
var info = GameData.GamePathParser.GetFileInfo( path );
IdentifyParsed( set, info );
}
}
public Dictionary< string, object? > Identify( GamePath path )
{
Dictionary< string, object? > ret = new();
Identify( ret, path );
return ret;
}
public Item? Identify( SetId setId, WeaponType weaponType, ushort variant, EquipSlot slot )
{
switch( slot )
@ -313,4 +320,4 @@ namespace Penumbra.GameData
}
}
}
}
}

62
Penumbra.GameData/ObjectIdentifier.cs
View file

@ -1,62 +0,0 @@
using System;
using System.Collections.Generic;
using Dalamud.Plugin;
using Lumina.Excel.GeneratedSheets;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.GameData.Util;
namespace Penumbra.GameData
{
public static class ObjectIdentifier
{
private static ObjectIdentification? _identification = null;
public static bool Initialize( DalamudPluginInterface pi )
{
if( _identification != null )
{
return true;
}
try
{
_identification = new ObjectIdentification( pi );
return true;
}
catch( Exception e )
{
_identification = null;
PluginLog.Error( $"Failure while initializing Object Identifier:\n{e}" );
return false;
}
}
private static void Verify()
{
if( _identification == null )
{
throw new Exception( "Object Identifier not initialized." );
}
}
public static void Identify( IDictionary< string, object? > set, GamePath path )
{
Verify();
_identification!.Identify( set, path );
}
public static Dictionary< string, object? > Identify( GamePath path )
{
Dictionary< string, object? > ret = new();
Identify( ret, path );
return ret;
}
public static Item? Identify( SetId setId, WeaponType weaponType, ushort variant, EquipSlot slot )
{
Verify();
return _identification!.Identify( setId, weaponType, variant, slot );
}
}
}

2
Penumbra.GameData/Structs/GameObjectInfo.cs
View file

@ -123,7 +123,7 @@ namespace Penumbra.GameData.Structs
public GenderRace GenderRace
{
get => GameData.Enums.GameData.GenderRaceFromByte( _genderRaceByte );
get => Names.GenderRaceFromByte( _genderRaceByte );
set => _genderRaceByte = value.ToByte();
}

6
Penumbra.GameData/Util/GamePath.cs
View file

@ -69,9 +69,9 @@ namespace Penumbra.GameData.Util
{
return rhs switch
{
string path => string.Compare( _path, path, StringComparison.InvariantCulture ),
string path => string.Compare( _path, path, StringComparison.InvariantCulture ),
GamePath path => string.Compare( _path, path._path, StringComparison.InvariantCulture ),
_ => -1,
_ => -1,
};
}
@ -87,7 +87,7 @@ namespace Penumbra.GameData.Util
public override object ReadJson( JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer )
{
var token = JToken.Load( reader );
return token.ToObject<GamePath>();
return token.ToObject< GamePath >();
}
public override bool CanWrite