functional (probably) for 7.4

Author: VariableVixen

WoLua/Lua/Api/Game/FateWrapper.cs

@@ -23,7 +23,7 @@ public sealed record class FateWrapper(Fate? WorldFate): IWorldObjectWrapper {
 	internal unsafe FateContext* Struct => this.Valid ? (FateContext*)this.WorldFate!.Address : null;
 
 	[LuaDoc("Whether this FATE is a valid object in the game's memory. If this is false, this wrapper is meaningless.")]
-	public bool Valid => this.WorldFate is Fate fate && Service.ClientState.LocalPlayer?.IsValid() is true;
+	public bool Valid => this.WorldFate is Fate fate && Service.Objects.LocalPlayer?.IsValid() is true;
 
 	[LuaDoc("Whether this FATE still exists in the world. This will be true if the FATE is valid and has not yet ended, even if it is WAITING to end.")]
 	public bool Exists => this.State is not (FateState.Ended or FateState.Failed);

WoLua/Lua/Api/Game/PlayerApi.cs

@@ -30,23 +30,23 @@ internal PlayerApi(ScriptContainer source) : base(source) { }
 		"If you aren't logged in, this will be `false`.",
 		"If this is `false`, then all player properties will be `nil`.")]
 	public bool Loaded => !this.Disposed
-		&& Service.ClientState.LocalPlayer is not null
-		&& Service.ClientState.LocalContentId is not 0;
+		&& Service.Objects.LocalPlayer is not null
+		&& Service.PlayerState.ContentId is not 0;
 	public static implicit operator bool(PlayerApi? player) => player?.Loaded ?? false;
 
 	[LuaDoc("An alternative name for `.Loaded`, to match that used by entity wrappers.")]
 	public bool Exists => this.Loaded;
 
 	[LuaPlayerDoc("This is the _universally unique_ ID of the character currently logged in.")]
 	public ulong? CharacterId => this.Loaded
-		? Service.ClientState.LocalContentId
+		? Service.PlayerState.ContentId
 		: null;
 
 	[LuaDoc("This provides an `EntityWrapper` wrapper object around the currently-logged-in player (or around nothing) _at the time of access_.",
 		"If you cache this, it may become invalid, such as if the player logs out.",
 		"It is recommended that you only cache this in a function-local variable, and not rely on it remaining valid between execution frames, especially if you use the action queue.",
 		"This value itself will _never_ be `nil`, but _will_ represent a nonexistent/invalid game entity if the `Loaded` property is `false`.")]
-	public EntityWrapper Entity => new(this ? Service.ClientState.LocalPlayer : null);
+	public EntityWrapper Entity => new(this ? Service.Objects.LocalPlayer : null);
 
 	[LuaDoc("This provides a `MountData` wrapper object around the currently-logged-in player's mount (or around nothing) _at the time of access_.",
 		"If you cache this, it may become invalid, such as if the player logs out, changes mounts, or dismounts entirely.",
@@ -61,7 +61,7 @@ internal PlayerApi(ScriptContainer source) : base(source) { }
 		"Per FFXIV name formatting, it will contain the first name, a single space, and the last name.",
 		"See also the `Firstname` and `Lastname` properties.")]
 	public string? Name => this.Loaded
-		? Service.ClientState.LocalPlayer!.Name!.TextValue
+		? Service.Objects.LocalPlayer!.Name!.TextValue
 		: null;
 
 	[LuaPlayerDoc("This is the first name (and only the first name) of the current character.",
@@ -269,7 +269,7 @@ internal PlayerApi(ScriptContainer source) : base(source) { }
 	[LuaPlayerDoc("Whether the current character is engaged in combat, which restricts certain actions.")]
 	public bool? InCombat => this.Loaded
 		? Service.Condition[ConditionFlag.InCombat]
-		|| Service.ClientState.LocalPlayer!.StatusFlags.HasFlag(StatusFlags.InCombat)
+		|| Service.Objects.LocalPlayer!.StatusFlags.HasFlag(StatusFlags.InCombat)
 		: null;
 
 	[LuaPlayerDoc("Whether the currect character is presently mounted. It may not be their own mount.")]
@@ -302,7 +302,7 @@ internal PlayerApi(ScriptContainer source) : base(source) { }
 	public bool? Casting => this.Loaded
 		? Service.Condition[ConditionFlag.Casting]
 		|| Service.Condition[ConditionFlag.Casting87]
-		|| Service.ClientState.LocalPlayer!.StatusFlags.HasFlag(StatusFlags.IsCasting)
+		|| Service.Objects.LocalPlayer!.StatusFlags.HasFlag(StatusFlags.IsCasting)
 		: null;
 
 	[LuaPlayerDoc("Whether the current character is watching a cutscene. Some commands are not available during cutscenes.")]
@@ -359,7 +359,7 @@ internal PlayerApi(ScriptContainer source) : base(source) { }
 
 	[LuaPlayerDoc("Whether the current character has their weapon drawn.")]
 	public bool? WeaponDrawn => this.Loaded
-		? Service.ClientState.LocalPlayer!.StatusFlags.HasFlag(StatusFlags.WeaponOut)
+		? Service.Objects.LocalPlayer!.StatusFlags.HasFlag(StatusFlags.WeaponOut)
 		: null;
 
 	[LuaPlayerDoc("Whether the game considers the current character to be in motion.")]

WoLua/Lua/Api/Game/WorldPosition.cs

@@ -33,12 +33,12 @@ public sealed record class WorldPosition(float? PosX, float? PosY, float? PosZ):
 	public float? FlatDistanceFrom([AsLuaType("EntityWrapper|FateWrapper|PlayerApi|WorldPosition")] IWorldObjectWrapper? other) => this && other?.Exists is true
 		? Vector2.Distance(this, other.Position)
 		: null;
-	public float? FlatDistance => this.FlatDistanceFrom(FromGameObject(Service.ClientState.LocalPlayer));
+	public float? FlatDistance => this.FlatDistanceFrom(FromGameObject(Service.Objects.LocalPlayer));
 
 	public float? DistanceFrom([AsLuaType("EntityWrapper|FateWrapper|PlayerApi|WorldPosition")] IWorldObjectWrapper? other) => this && other?.Exists is true
 		? Vector3.Distance(this.GameEnginePosition, other!.Position.GameEnginePosition)
 		: null;
-	public float? Distance => this.DistanceFrom(FromGameObject(Service.ClientState.LocalPlayer));
+	public float? Distance => this.DistanceFrom(FromGameObject(Service.Objects.LocalPlayer));
 
 	internal Vector3? UiCoords {
 		get {

WoLua/Plugin.cs

@@ -210,27 +210,27 @@ public void OnCommand(string command, string argline) {
 				Service.DocumentationGenerator.Run();
 				break;
 			case "query":
-				if (Service.ClientState.LocalContentId == 0 || Service.ClientState.LocalPlayer is null) {
+				if (Service.PlayerState.ContentId == 0 || Service.Objects.LocalPlayer is null) {
 					this.Error("No character is loaded. You are probably not logged in.");
 					break;
 				}
 				if (args.Length >= 2) {
 					switch (args[1].ToLower()) {
 						case "id":
-							this.Print($"Your current character ID is {Service.ClientState.LocalContentId}.");
+							this.Print($"Your current character ID is {Service.PlayerState.ContentId}.");
 							break;
 						case "class":
 						case "job":
-							if (Service.ClientState.LocalPlayer.ClassJob.Value is ClassJob job) {
-								this.Print($"You current job is {job.RowId} ({job.Abbreviation}, {job.Name}) at level {Service.ClientState.LocalPlayer.Level}.");
+							if (Service.Objects.LocalPlayer.ClassJob.Value is ClassJob job) {
+								this.Print($"You current job is {job.RowId} ({job.Abbreviation}, {job.Name}) at level {Service.Objects.LocalPlayer.Level}.");
 							}
 							else {
 								this.Error("Cannot determine class/job details.");
 							}
 							break;
 						case "mount":
 							unsafe {
-								Character* player = (Character*)Service.ClientState.LocalPlayer.Address;
+								Character* player = (Character*)Service.Objects.LocalPlayer.Address;
 								if (!player->IsMounted()) {
 									this.Print("You are not mounted.");
 								}

WoLua/Service.cs

@@ -39,6 +39,7 @@ internal class Service {
 	[PluginService] public static ITargetManager Targets { get; private set; } = null!;
 	[PluginService] public static IToastGui Toast { get; private set; } = null!;
 	[PluginService] public static INotificationManager Notifications { get; private set; } = null!;
+	[PluginService] public static IPlayerState PlayerState { get; private set; } = null!;
 
 	public static Hooks Hooks { get; internal set; } = null!;
 	public static IDtrBarEntry StatusLine { get; private set; } = null!;

WoLua/WoLua.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Dalamud.NET.Sdk/13.1.0">
 	<PropertyGroup>
 		<Product>WoLua</Product>
-		<Version>4.2.0</Version>
+		<Version>4.3.0</Version>
 		<Description>Warrior of... Lua? Write your own chat commands in lua for FFXIV/Dalamud!</Description>
 		<Copyright>Copyleft VariableVixen 2022</Copyright>
 	</PropertyGroup>

WoLua/dalamud.props

@@ -4,7 +4,7 @@
 	<PropertyGroup>
 		<Platforms>x64</Platforms>
 		<PlatformTarget>x64</PlatformTarget>
-		<TargetFramework>net9-windows</TargetFramework>
+		<TargetFramework>net10.0-windows7.0</TargetFramework>
 		<OutputType>Library</OutputType>
 		<Deterministic>false</Deterministic>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

WoLua/packages.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net9.0-windows7.0": {
+    "net10.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
         "requested": "[13.1.0, )",
@@ -16,9 +16,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[9.0.10, )",
-        "resolved": "9.0.10",
-        "contentHash": "sseaSJcBxKEpkc59hnB00b3NmJdGvJLfj74HK+nucHxERxbZSUREuWKjC9ywc+HdzJvJyiP2eiyEOROaGSfcPw=="
+        "requested": "[10.0.1, )",
+        "resolved": "10.0.1",
+        "contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ=="
       },
       "MoonSharp": {
         "type": "Direct",