ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-14 20:54:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add fix for unimplemented but listed hairstyle.

Browse source
This commit is contained in:
Ottermandias 2023-01-11 12:36:33 +01:00
parent 9e7c5e9a89
commit 1a4bacf0b7
2 changed files with 75 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Glamourer.GameData/Customization/CustomizationOptions.cs
View file

@ -63,9 +63,14 @@ namespace Glamourer.Customization
continue; continue;
var hairRow = _customizeSheet.GetRow(customizeIdx); var hairRow = _customizeSheet.GetRow(customizeIdx);
hairList.Add(hairRow != null if (hairRow == null)
? new Customization(CustomizationId.Hairstyle, hairRow.FeatureID, hairRow.Icon, (ushort) hairRow.RowId) {
: new Customization(CustomizationId.Hairstyle, (byte) i, customizeIdx, 0)); hairList.Add(new Customization(CustomizationId.Hairstyle, (byte)i, customizeIdx));
}
else if (_icons.IconExists(hairRow.Icon))
{
hairList.Add(new Customization(CustomizationId.Hairstyle, hairRow.FeatureID, hairRow.Icon, (ushort)hairRow.RowId));
}
} }
return hairList.ToArray(); return hairList.ToArray();

36
Glamourer.GameData/Util/IconStorage.cs
View file

@ -1,13 +1,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Logging;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Utility; using Dalamud.Utility;
using ImGuiScene; using ImGuiScene;
using Lumina.Data.Files; using Lumina.Data.Files;
namespace Glamourer.Util namespace Glamourer.Util;
{
public class IconStorage : IDisposable public class IconStorage : IDisposable
{ {
private readonly DalamudPluginInterface _pi; private readonly DalamudPluginInterface _pi;
@ -24,11 +25,17 @@ namespace Glamourer.Util
public TextureWrap this[int id] public TextureWrap this[int id]
=> LoadIcon(id); => LoadIcon(id);
private static string HqPath(uint id)
=> $"ui/icon/{id / 1000 * 1000:000000}/{id:000000}_hr1.tex";
private static string NormalPath(uint id)
=> $"ui/icon/{id / 1000 * 1000:000000}/{id:000000}.tex";
private TexFile? LoadIconHq(uint id) private TexFile? LoadIconHq(uint id)
{ => _gameData.GetFile<TexFile>(HqPath(id));
var path = $"ui/icon/{id / 1000 * 1000:000000}/{id:000000}_hr1.tex";
return _gameData.GetFile<TexFile>(path); public bool IconExists(uint id)
} => _gameData.FileExists(HqPath(id)) || _gameData.FileExists(NormalPath(id));
public TextureWrap LoadIcon(int id) public TextureWrap LoadIcon(int id)
=> LoadIcon((uint)id); => LoadIcon((uint)id);
@ -39,9 +46,23 @@ namespace Glamourer.Util
return ret; return ret;
var icon = LoadIconHq(id) ?? _gameData.GetIcon(id)!; var icon = LoadIconHq(id) ?? _gameData.GetIcon(id)!;
if (icon == null)
{
PluginLog.Warning($"No icon with id {id} could be found.");
ret = _pi.UiBuilder.LoadImageRaw(new byte[]
{
0,
0,
0,
0,
}, 1, 1, 4);
}
else
{
var iconData = icon.GetRgbaImageData(); var iconData = icon.GetRgbaImageData();
ret = _pi.UiBuilder.LoadImageRaw(iconData, icon.Header.Width, icon.Header.Height, 4); ret = _pi.UiBuilder.LoadImageRaw(iconData, icon.Header.Width, icon.Header.Height, 4);
}
_icons[id] = ret; _icons[id] = ret;
return ret; return ret;
} }
@ -56,4 +77,3 @@ namespace Glamourer.Util
~IconStorage() ~IconStorage()
=> Dispose(); => Dispose();
} }
}