Update for DT

This commit is contained in:
Jade Macho 2024-07-15 23:53:09 +02:00
parent 51adb846e4
commit f34ddba234
Signed by: 0x0ade
GPG Key ID: E1960710FE4FBEEF
8 changed files with 23 additions and 22 deletions

View File

@ -16,7 +16,7 @@ public class Configuration : IPluginConfiguration
private static readonly JsonSerializer _jsonSerializer = JsonSerializer.CreateDefault(); private static readonly JsonSerializer _jsonSerializer = JsonSerializer.CreateDefault();
[NonSerialized] [NonSerialized]
private DalamudPluginInterface? _pluginInterface; private IDalamudPluginInterface? _pluginInterface;
[JsonProperty] [JsonProperty]
private Guid _loginGuid; private Guid _loginGuid;
@ -56,7 +56,7 @@ public class Configuration : IPluginConfiguration
} }
} }
internal void Initialize(DalamudPluginInterface pluginInterface) internal void Initialize(IDalamudPluginInterface pluginInterface)
{ {
_pluginInterface = pluginInterface; _pluginInterface = pluginInterface;

View File

@ -1,4 +1,5 @@
using FFXIVClientStructs.FFXIV.Client.System.Framework; using FFXIVClientStructs.FFXIV.Client.System.Framework;
using System.Text;
namespace Ktisis; namespace Ktisis;
@ -7,6 +8,6 @@ public static class GameVersion {
public unsafe static string GetCurrent() { public unsafe static string GetCurrent() {
var framework = Framework.Instance(); var framework = Framework.Instance();
return framework != null ? framework->GameVersion.Base : string.Empty; return framework != null ? Encoding.UTF8.GetString(framework->GameVersion) : string.Empty;
} }
} }

View File

@ -14,7 +14,7 @@ public sealed unsafe class Plugin : IDalamudPlugin
{ {
private readonly List<Cmd> _cmds; private readonly List<Cmd> _cmds;
public Plugin([RequiredVersion("1.0")] DalamudPluginInterface pluginInterface) public Plugin(IDalamudPluginInterface pluginInterface)
{ {
pluginInterface.Create<Service>(); pluginInterface.Create<Service>();
@ -154,7 +154,7 @@ public sealed unsafe class Plugin : IDalamudPlugin
private unsafe delegate nint EnvStateCopyDelegate(EnvState* dest, EnvState* src); private unsafe delegate nint EnvStateCopyDelegate(EnvState* dest, EnvState* src);
[Signature("E8 ?? ?? ?? ?? 49 3B F5", DetourName = nameof(EnvStateCopyDetour))] [Signature("E8 ?? ?? ?? ?? 49 3B F5 75 0D", DetourName = nameof(EnvStateCopyDetour))]
private Hook<EnvStateCopyDelegate> _envStateCopyHook = null!; private Hook<EnvStateCopyDelegate> _envStateCopyHook = null!;
private unsafe nint EnvStateCopyDetour(EnvState* dest, EnvState* src) private unsafe nint EnvStateCopyDetour(EnvState* dest, EnvState* src)
{ {

View File

@ -17,7 +17,7 @@ public sealed class Service
public static EnvCollection Envs { get; internal set; } = null!; public static EnvCollection Envs { get; internal set; } = null!;
[PluginService] [PluginService]
public static DalamudPluginInterface PluginInterface { get; private set; } = null!; public static IDalamudPluginInterface PluginInterface { get; private set; } = null!;
[PluginService] [PluginService]
public static ICommandManager CommandManager { get; private set; } = null!; public static ICommandManager CommandManager { get; private set; } = null!;

View File

@ -6,14 +6,14 @@ namespace Ktisis.Structs.Env;
[StructLayout(LayoutKind.Explicit, Size = 0x258)] [StructLayout(LayoutKind.Explicit, Size = 0x258)]
public struct EnvState { public struct EnvState {
[FieldOffset(0x008)] public uint SkyId; [FieldOffset(0x008)] public uint SkyId;
[FieldOffset(0x020)] public EnvLighting Lighting; [FieldOffset(0x020)] public EnvLighting Lighting;
[FieldOffset(0x094)] public EnvStars Stars; [FieldOffset(0x098)] public EnvStars Stars;
[FieldOffset(0x0BC)] public EnvFog Fog; [FieldOffset(0x0C0)] public EnvFog Fog;
[FieldOffset(0x104)] public EnvClouds Clouds; [FieldOffset(0x148)] public EnvClouds Clouds;
[FieldOffset(0x12C)] public EnvRain Rain; [FieldOffset(0x170)] public EnvRain Rain;
[FieldOffset(0x160)] public EnvDust Dust; [FieldOffset(0x1A4)] public EnvDust Dust;
[FieldOffset(0x194)] public EnvWind Wind; [FieldOffset(0x1D8)] public EnvWind Wind;
} }

View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors>0x0ade</Authors> <Authors>0x0ade</Authors>
<Company></Company> <Company></Company>
<Version>0.1.0.6</Version> <Version>0.1.0.7</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl></PackageProjectUrl> <PackageProjectUrl></PackageProjectUrl>
@ -33,7 +33,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.12" /> <PackageReference Include="DalamudPackager" Version="2.1.13" />
<Reference Include="FFXIVClientStructs"> <Reference Include="FFXIVClientStructs">
<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath> <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
<Private>false</Private> <Private>false</Private>

View File

@ -3,7 +3,7 @@
"InternalName": "VoidBox2782", "InternalName": "VoidBox2782",
"Author": "0x0ade", "Author": "0x0ade",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 9, "DalamudApiLevel": 10,
"Punchline": "Make jump puzzles prettier by adding a skybox to the housing void.", "Punchline": "Make jump puzzles prettier by adding a skybox to the housing void.",
"Description": "Basic plugin to add a skybox to the housing void.", "Description": "Basic plugin to add a skybox to the housing void.",
"Tags": [ "skybox", "housing", "void", "jump puzzles" ], "Tags": [ "skybox", "housing", "void", "jump puzzles" ],

View File

@ -4,9 +4,9 @@
"net8.0-windows7.0": { "net8.0-windows7.0": {
"DalamudPackager": { "DalamudPackager": {
"type": "Direct", "type": "Direct",
"requested": "[2.1.12, )", "requested": "[2.1.13, )",
"resolved": "2.1.12", "resolved": "2.1.13",
"contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg==" "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
} }
} }
} }