Skip to content

Commit

Permalink
Merge pull request #5 from PassiveModding/feature/dawntrail
Browse files Browse the repository at this point in the history
Feature/dawntrail
  • Loading branch information
PassiveModding authored Jul 8, 2024
2 parents 53928e3 + b4dd9f5 commit 437cbc9
Show file tree
Hide file tree
Showing 163 changed files with 13,823 additions and 4,705 deletions.
2 changes: 1 addition & 1 deletion FFXIVClientStructs
40 changes: 35 additions & 5 deletions Meddle.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meddle.Plugin", "Meddle\Med
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs", "FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj", "{13C16D26-657B-4EC2-90F2-365125403E2D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFXIVClientStructs.InteropSourceGenerators", "FFXIVClientStructs\FFXIVClientStructs.InteropSourceGenerators\FFXIVClientStructs.InteropSourceGenerators.csproj", "{768B4B01-444D-42FB-9C08-49BEB30EB5B8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meddle.Utils", "Meddle\Meddle.Utils\Meddle.Utils.csproj", "{AF561495-196F-4076-AA2B-0415E7F85B8E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meddle.UI.InteropPlugin", "Meddle\Meddle.UI.InteropPlugin\Meddle.UI.InteropPlugin.csproj", "{F056F9E7-B1D1-4220-8B51-D180855D1EDA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meddle.UI", "Meddle\Meddle.UI\Meddle.UI.csproj", "{853D0E4A-A38F-42DF-A2A1-10A1240773DC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFXIVClientStructs.Generators", "FFXIVClientStructs\FFXIVClientStructs.Generators\FFXIVClientStructs.Generators.csproj", "{F428CB69-6B3C-4C30-AA47-2F69B07FBD5F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropGenerator", "FFXIVClientStructs\InteropGenerator\InteropGenerator.csproj", "{965F3CEF-32C7-41EA-AFC9-7AC55FA4BE21}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropGenerator.Runtime", "FFXIVClientStructs\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj", "{AFB41DF8-3B49-4B35-8704-6810454971A0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -23,10 +33,30 @@ Global
{13C16D26-657B-4EC2-90F2-365125403E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13C16D26-657B-4EC2-90F2-365125403E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{13C16D26-657B-4EC2-90F2-365125403E2D}.Release|Any CPU.Build.0 = Release|Any CPU
{768B4B01-444D-42FB-9C08-49BEB30EB5B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{768B4B01-444D-42FB-9C08-49BEB30EB5B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{768B4B01-444D-42FB-9C08-49BEB30EB5B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{768B4B01-444D-42FB-9C08-49BEB30EB5B8}.Release|Any CPU.Build.0 = Release|Any CPU
{AF561495-196F-4076-AA2B-0415E7F85B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF561495-196F-4076-AA2B-0415E7F85B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF561495-196F-4076-AA2B-0415E7F85B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF561495-196F-4076-AA2B-0415E7F85B8E}.Release|Any CPU.Build.0 = Release|Any CPU
{F056F9E7-B1D1-4220-8B51-D180855D1EDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F056F9E7-B1D1-4220-8B51-D180855D1EDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F056F9E7-B1D1-4220-8B51-D180855D1EDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F056F9E7-B1D1-4220-8B51-D180855D1EDA}.Release|Any CPU.Build.0 = Release|Any CPU
{853D0E4A-A38F-42DF-A2A1-10A1240773DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{853D0E4A-A38F-42DF-A2A1-10A1240773DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{853D0E4A-A38F-42DF-A2A1-10A1240773DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{853D0E4A-A38F-42DF-A2A1-10A1240773DC}.Release|Any CPU.Build.0 = Release|Any CPU
{F428CB69-6B3C-4C30-AA47-2F69B07FBD5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F428CB69-6B3C-4C30-AA47-2F69B07FBD5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F428CB69-6B3C-4C30-AA47-2F69B07FBD5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F428CB69-6B3C-4C30-AA47-2F69B07FBD5F}.Release|Any CPU.Build.0 = Release|Any CPU
{965F3CEF-32C7-41EA-AFC9-7AC55FA4BE21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{965F3CEF-32C7-41EA-AFC9-7AC55FA4BE21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{965F3CEF-32C7-41EA-AFC9-7AC55FA4BE21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{965F3CEF-32C7-41EA-AFC9-7AC55FA4BE21}.Release|Any CPU.Build.0 = Release|Any CPU
{AFB41DF8-3B49-4B35-8704-6810454971A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFB41DF8-3B49-4B35-8704-6810454971A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFB41DF8-3B49-4B35-8704-6810454971A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AFB41DF8-3B49-4B35-8704-6810454971A0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
9 changes: 0 additions & 9 deletions Meddle/Meddle.Plugin/Enums/ExportType.cs

This file was deleted.

41 changes: 41 additions & 0 deletions Meddle/Meddle.Plugin/InteropService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
using Dalamud.Game;
using Dalamud.Hooking;
using Dalamud.Utility.Signatures;
using InteropGenerator.Runtime;

namespace Meddle.Plugin;

public class InteropService(ISigScanner sigScanner) : IDisposable
{
/// <summary>
/// Used to identify if ClientStructs have been resolved.
/// </summary>
public bool IsResolved { get; private set; }

public void Initialize()
{
if (IsResolved)
return;
FFXIVClientStructs.Interop.Generated.Addresses.Register();
//Addresses.Register();
Resolver.GetInstance.Setup(sigScanner.SearchBase);
Resolver.GetInstance.Resolve();
IsResolved = true;
}

// Client::System::Framework::Framework_Tick
[Signature("40 53 48 83 EC 20 FF 81 ?? ?? ?? ?? 48 8B D9 48 8D 4C 24", DetourName = nameof(PostTickDetour))]
private Hook<PostTickDelegate> postTickHook = null!;
private delegate bool PostTickDelegate(nint a1);

private bool PostTickDetour(nint a1)
{
var ret = postTickHook.Original(a1);
return ret;
}

public void Dispose()
{
postTickHook?.Dispose();
}
}
17 changes: 3 additions & 14 deletions Meddle/Meddle.Plugin/Meddle.Plugin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,8 @@
</PropertyGroup>

<ItemGroup>
<None Update="Lib\DirectXTexC.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>DirectXTexC.dll</TargetPath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.12" />
<PackageReference Include="DalamudPackager" Version="2.1.13" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="SharpGLTF.Core" Version="1.0.0-alpha0031" />
<PackageReference Include="SharpGLTF.Toolkit" Version="1.0.0-alpha0031" />
<PackageReference Include="SkiaSharp" Version="2.88.7" />
<PackageReference Include="Vortice.Direct3D11" Version="3.5.0" />
<Reference Include="Dalamud">
<HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
<Private>false</Private>
Expand All @@ -51,11 +40,11 @@
<Private>False</Private>
</Reference>
<Reference Include="OtterTex">
<HintPath>Lib\OtterTex.dll</HintPath>
<HintPath>..\Meddle.Utils\Lib\OtterTex.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj" />
<ProjectReference Include="..\Meddle.Utils\Meddle.Utils.csproj" />
</ItemGroup>
</Project>
31 changes: 0 additions & 31 deletions Meddle/Meddle.Plugin/Models/AttachedChild.cs

This file was deleted.

113 changes: 0 additions & 113 deletions Meddle/Meddle.Plugin/Models/CharacterTree.cs

This file was deleted.

Loading

0 comments on commit 437cbc9

Please sign in to comment.