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

Merge pull request #3 from attickdoor/icon-dev

Browse source 
Merge Icon dev to master
This commit is contained in:
attick 2019-11-07 11:55:42 -05:00 • committed by GitHub
commit aacaf2d38f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 250 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Dalamud.csproj
View file

@ -7,7 +7,7 @@
</PropertyGroup>
<PropertyGroup Label="Build">
<OutputType>Library</OutputType>
<OutputPath>D:\Sapphire\recorder\FFXIV.Recorder\/bin</OutputPath>
<OutputPath></OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<DebugSymbols>true</DebugSymbols>
<DebugType>Portable</DebugType>

249
Dalamud/Game/Internal/Gui/IconReplacer.cs
View file

@ -4,6 +4,7 @@ using Dalamud.Game.ClientState.Structs.JobGauge;
using Dalamud.Hooking;
using Serilog;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.InteropServices;
using XIVLauncher.Dalamud;
@ -25,6 +26,9 @@ namespace Dalamud.Game.Internal.Gui {
private IntPtr byteBase;
private Dalamud dalamud;
private HashSet<uint> CustomIDs;
private HashSet<uint> VanillaIDs;
public unsafe IconReplacer(Dalamud dalamud, SigScanner scanner) {
this.dalamud = dalamud;
this.Address = new IconReplacerAddressResolver();
@ -34,6 +38,11 @@ namespace Dalamud.Game.Internal.Gui {
this.comboTimer = byteBase + 0x1BB5B50;
this.lastComboMove = byteBase + 0x1BB5B54;
CustomIDs = new HashSet<uint>();
VanillaIDs = new HashSet<uint>();
PopulateDict();
Log.Verbose("===== H O T B A R S =====");
Log.Verbose("IsIconReplaceable address {IsIconReplaceable}", Address.IsIconReplaceable);
Log.Verbose("GetIcon address {GetIcon}", Address.GetIcon);
@ -85,6 +94,8 @@ namespace Dalamud.Game.Internal.Gui {
}
}
*/
if (this.VanillaIDs.Contains(actionID)) return this.iconHook.Original(self, actionID);
if (!this.CustomIDs.Contains(actionID)) return actionID;
// TODO: this is currently broken
// As it stands, don't rely on localCharacter.level for anything.
@ -848,5 +859,243 @@ namespace Dalamud.Game.Internal.Gui {
var callback = Marshal.GetDelegateForFunctionPointer<getArray>(step3);
return (IntPtr)callback((long*)num);
}
private void PopulateDict() {
CustomIDs.Add(16477);
CustomIDs.Add(88);
CustomIDs.Add(84);
CustomIDs.Add(3632);
CustomIDs.Add(16468);
CustomIDs.Add(3538);
CustomIDs.Add(3539);
CustomIDs.Add(16457);
CustomIDs.Add(42);
CustomIDs.Add(45);
CustomIDs.Add(16462);
CustomIDs.Add(7480);
CustomIDs.Add(7481);
CustomIDs.Add(7482);
CustomIDs.Add(7484);
CustomIDs.Add(7485);
CustomIDs.Add(3563);
CustomIDs.Add(2255);
CustomIDs.Add(16488);
CustomIDs.Add(16145);
CustomIDs.Add(16146);
CustomIDs.Add(16149);
CustomIDs.Add(7413);
CustomIDs.Add(2870);
CustomIDs.Add(3575);
CustomIDs.Add(149);
CustomIDs.Add(17055);
CustomIDs.Add(3582);
CustomIDs.Add(3581);
CustomIDs.Add(163);
CustomIDs.Add(16508);
CustomIDs.Add(16510);
CustomIDs.Add(16543);
CustomIDs.Add(167);
CustomIDs.Add(15994);
CustomIDs.Add(15993);
CustomIDs.Add(16007);
CustomIDs.Add(16008);
CustomIDs.Add(16531);
CustomIDs.Add(16534);
CustomIDs.Add(3559);
CustomIDs.Add(97);
CustomIDs.Add(16525);
CustomIDs.Add(16524);
CustomIDs.Add(7516);
VanillaIDs.Add(0x3e75);
VanillaIDs.Add(0x3e76);
VanillaIDs.Add(0x3e77);
VanillaIDs.Add(0x3e78);
VanillaIDs.Add(0x3e7d);
VanillaIDs.Add(0x3e7e);
VanillaIDs.Add(0x3e86);
VanillaIDs.Add(0x3f10);
VanillaIDs.Add(0x3f25);
VanillaIDs.Add(0x3f1b);
VanillaIDs.Add(0x3f1c);
VanillaIDs.Add(0x3f1d);
VanillaIDs.Add(0x3f1e);
VanillaIDs.Add(0x451f);
VanillaIDs.Add(0x42ff);
VanillaIDs.Add(0x4300);
VanillaIDs.Add(0x49d4);
VanillaIDs.Add(0x49d5);
VanillaIDs.Add(0x49e9);
VanillaIDs.Add(0x49ea);
VanillaIDs.Add(0x49f4);
VanillaIDs.Add(0x49f7);
VanillaIDs.Add(0x49f9);
VanillaIDs.Add(0x4a06);
VanillaIDs.Add(0x4a31);
VanillaIDs.Add(0x4a32);
VanillaIDs.Add(0x4a35);
VanillaIDs.Add(0x4792);
VanillaIDs.Add(0x452f);
VanillaIDs.Add(0x453f);
VanillaIDs.Add(0x454c);
VanillaIDs.Add(0x455c);
VanillaIDs.Add(0x455d);
VanillaIDs.Add(0x4561);
VanillaIDs.Add(0x4565);
VanillaIDs.Add(0x4566);
VanillaIDs.Add(0x45a0);
VanillaIDs.Add(0x45c8);
VanillaIDs.Add(0x45c9);
VanillaIDs.Add(0x45cd);
VanillaIDs.Add(0x4197);
VanillaIDs.Add(0x4199);
VanillaIDs.Add(0x419b);
VanillaIDs.Add(0x419d);
VanillaIDs.Add(0x419f);
VanillaIDs.Add(0x4198);
VanillaIDs.Add(0x419a);
VanillaIDs.Add(0x419c);
VanillaIDs.Add(0x419e);
VanillaIDs.Add(0x41a0);
VanillaIDs.Add(0x41a1);
VanillaIDs.Add(0x41a2);
VanillaIDs.Add(0x41a3);
VanillaIDs.Add(0x417e);
VanillaIDs.Add(0x404f);
VanillaIDs.Add(0x4051);
VanillaIDs.Add(0x4052);
VanillaIDs.Add(0x4055);
VanillaIDs.Add(0x4053);
VanillaIDs.Add(0x4056);
VanillaIDs.Add(0x405e);
VanillaIDs.Add(0x405f);
VanillaIDs.Add(0x4063);
VanillaIDs.Add(0x406f);
VanillaIDs.Add(0x4074);
VanillaIDs.Add(0x4075);
VanillaIDs.Add(0x4076);
VanillaIDs.Add(0x407d);
VanillaIDs.Add(0x407f);
VanillaIDs.Add(0x4083);
VanillaIDs.Add(0x4080);
VanillaIDs.Add(0x4081);
VanillaIDs.Add(0x4082);
VanillaIDs.Add(0x4084);
VanillaIDs.Add(0x408e);
VanillaIDs.Add(0x4091);
VanillaIDs.Add(0x4092);
VanillaIDs.Add(0x4094);
VanillaIDs.Add(0x4095);
VanillaIDs.Add(0x409c);
VanillaIDs.Add(0x409d);
VanillaIDs.Add(0x40aa);
VanillaIDs.Add(0x40ab);
VanillaIDs.Add(0x40ad);
VanillaIDs.Add(0x40ae);
VanillaIDs.Add(0x272b);
VanillaIDs.Add(0x222a);
VanillaIDs.Add(0x222d);
VanillaIDs.Add(0x222e);
VanillaIDs.Add(0x223b);
VanillaIDs.Add(0x2265);
VanillaIDs.Add(0x2267);
VanillaIDs.Add(0x2268);
VanillaIDs.Add(0x2269);
VanillaIDs.Add(0x2274);
VanillaIDs.Add(0x2290);
VanillaIDs.Add(0x2291);
VanillaIDs.Add(0x2292);
VanillaIDs.Add(0x229c);
VanillaIDs.Add(0x229e);
VanillaIDs.Add(0x22a8);
VanillaIDs.Add(0x22b3);
VanillaIDs.Add(0x22b5);
VanillaIDs.Add(0x22b7);
VanillaIDs.Add(0x22d1);
VanillaIDs.Add(0x4575);
VanillaIDs.Add(0x2335);
VanillaIDs.Add(0x1ebb);
VanillaIDs.Add(0x1cdd);
VanillaIDs.Add(0x1cee);
VanillaIDs.Add(0x1cef);
VanillaIDs.Add(0x1cf1);
VanillaIDs.Add(0x1cf3);
VanillaIDs.Add(0x1cf4);
VanillaIDs.Add(0x1cf7);
VanillaIDs.Add(0x1cfc);
VanillaIDs.Add(0x1d17);
VanillaIDs.Add(0x1d00);
VanillaIDs.Add(0x1d01);
VanillaIDs.Add(0x1d05);
VanillaIDs.Add(0x1d07);
VanillaIDs.Add(0x1d0b);
VanillaIDs.Add(0x1d0d);
VanillaIDs.Add(0x1d0f);
VanillaIDs.Add(0x1d12);
VanillaIDs.Add(0x1d13);
VanillaIDs.Add(0x1d4f);
VanillaIDs.Add(0x1d64);
VanillaIDs.Add(0x1d50);
VanillaIDs.Add(0x1d58);
VanillaIDs.Add(0x1d59);
VanillaIDs.Add(0x1d51);
VanillaIDs.Add(0x1d53);
VanillaIDs.Add(0x1d66);
VanillaIDs.Add(0x1d55);
VanillaIDs.Add(0xdda);
VanillaIDs.Add(0xddd);
VanillaIDs.Add(0xdde);
VanillaIDs.Add(0xde3);
VanillaIDs.Add(0xdf0);
VanillaIDs.Add(0xdfb);
VanillaIDs.Add(0xe00);
VanillaIDs.Add(0xe0b);
VanillaIDs.Add(0xe0c);
VanillaIDs.Add(0xe0e);
VanillaIDs.Add(0xe0f);
VanillaIDs.Add(0xe11);
VanillaIDs.Add(0xfed);
VanillaIDs.Add(0xff7);
VanillaIDs.Add(0xffb);
VanillaIDs.Add(0xfe9);
VanillaIDs.Add(0xb30);
VanillaIDs.Add(0x12e);
VanillaIDs.Add(0x8d3);
VanillaIDs.Add(0x8d4);
VanillaIDs.Add(0x8d5);
VanillaIDs.Add(0x8d7);
VanillaIDs.Add(0xb32);
VanillaIDs.Add(0xb34);
VanillaIDs.Add(0xb38);
VanillaIDs.Add(0xb39);
VanillaIDs.Add(0xb3e);
VanillaIDs.Add(0x12d);
VanillaIDs.Add(0x15);
VanillaIDs.Add(0x26);
VanillaIDs.Add(0x31);
VanillaIDs.Add(0x33);
VanillaIDs.Add(0x4b);
VanillaIDs.Add(0x5c);
VanillaIDs.Add(0x62);
VanillaIDs.Add(0x64);
VanillaIDs.Add(0x71);
VanillaIDs.Add(0x77);
VanillaIDs.Add(0x7f);
VanillaIDs.Add(0x79);
VanillaIDs.Add(0x84);
VanillaIDs.Add(0x90);
VanillaIDs.Add(0x99);
VanillaIDs.Add(0xa4);
VanillaIDs.Add(0xb2);
VanillaIDs.Add(0xa8);
VanillaIDs.Add(0xac);
VanillaIDs.Add(0xb8);
VanillaIDs.Add(0xe2);
VanillaIDs.Add(0x10f);
VanillaIDs.Add(0xf3);
VanillaIDs.Add(0x10e);
VanillaIDs.Add(0x110);
VanillaIDs.Add(0x111);
}
}
}