Merge pull request #142 from ktisis-tools/main-dt

Dawntrail

Ktisis/Camera/CameraService.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-using Dalamud.Logging;
 using Dalamud.Game.ClientState.Objects.Types;
 
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
@@ -29,7 +28,7 @@ internal static class CameraService {
 
 			var camera = GetCameraByAddress((nint)active);
 			if (camera == null && Override != null) {
-				PluginLog.Warning("Lost track of active camera! Attempting to reset.");
+				Ktisis.Log.Warning("Lost track of active camera! Attempting to reset.");
 				Reset();
 				camera = GetCameraByAddress((nint)Services.Camera->Camera);
 			}
@@ -83,7 +82,7 @@ internal unsafe static void RemoveCamera(KtisisCamera cam) {
 			return pos;
 		}
 
-		internal static GameObject? GetTargetLock(nint addr) {
+		internal static IGameObject? GetTargetLock(nint addr) {
 			if (!Ktisis.IsInGPose || GetCameraByAddress(addr) is not KtisisCamera camera)
 				return null;
 
@@ -141,7 +140,7 @@ internal unsafe static void Reset() {
 		private unsafe static void SetCamera(GameCamera* camera) {
 			if (camera == null) return;
 			var mgr = CameraManager.Instance();
-			mgr->CameraArraySpan[0] = &camera->CameraBase.SceneCamera;
+			mgr->Cameras[0] = &camera->CameraBase.SceneCamera;
 		}
 
 		// Overrides
@@ -217,7 +216,7 @@ private unsafe static void PrepareCameraList() {
 		}
 
 		private unsafe static void DisposeCameras() {
-			PluginLog.Debug("Disposing cameras...");
+			Ktisis.Log.Debug("Disposing cameras...");
 			if (Override != null)
 				Reset();
 			foreach (var cam in Cameras)

Ktisis/Camera/KtisisCamera.cs

@@ -72,7 +72,7 @@ public unsafe static KtisisCamera Spawn(GameCamera* clone = null) {
 		public void SetPositionLock(Vector3? pos) => CameraEdit.Position = pos;
 		public void SetOffset(Vector3? off) => CameraEdit.Offset = off;
 
-		internal GameObject? GetOrbitTarget() {
+		internal IGameObject? GetOrbitTarget() {
 			if (!Ktisis.IsInGPose) return null;
 			return CameraEdit.Orbit != null ? Services.ObjectTable.FirstOrDefault(
 				actor => actor.ObjectIndex == CameraEdit.Orbit

Ktisis/Configuration.cs

@@ -8,6 +8,7 @@
 
 using Dalamud;
 using Dalamud.Configuration;
+using Dalamud.Game;
 using Dalamud.Game.ClientState.Keys;
 
 using Ktisis.Interface;

Ktisis/Data/Excel/Glasses.cs

@@ -0,0 +1,18 @@
+using Dalamud.Utility;
+
+using Lumina.Data;
+using Lumina.Excel;
+
+namespace Ktisis.Data.Excel {
+	[Sheet("Glasses")]
+	public class Glasses : ExcelRow {
+		public string Name { get; set; } = string.Empty;
+
+		public override void PopulateData(RowParser parser, Lumina.GameData gameData, Language language) {
+			base.PopulateData(parser, gameData, language);
+
+			var name = parser.ReadColumn<string>(13);
+			this.Name = !name.IsNullOrEmpty() ? name : "None";
+		}
+	}
+}

Ktisis/Data/Excel/Item.cs

@@ -37,7 +37,7 @@ public ItemModel(ulong var, bool isWep = false) {
 	[Sheet("Item")]
 	public class Item : ExcelRow {
 		public string Name { get; set; } = "";
-		public ushort Icon { get; set; }
+		public int Icon { get; set; }
 
 		public LazyRow<EquipSlotCategory> EquipSlotCategory { get; set; } = null!;
 

Ktisis/Data/Files/AnamCharaFile.cs

@@ -86,6 +86,8 @@ public enum SaveModes {
 		public ItemSave? Wrists { get; set; }
 		public ItemSave? LeftRing { get; set; }
 		public ItemSave? RightRing { get; set; }
+
+		public ushort? Glasses { get; set; }
 
 		// extended appearance
 		// NOTE: extended weapon values are stored in the WeaponSave
@@ -128,6 +130,7 @@ public void WriteToFile(Actor actor, SaveModes mode) {
 				Hands = GetItemSave(actor, EquipIndex.Hands);
 				Legs = GetItemSave(actor, EquipIndex.Legs);
 				Feet = GetItemSave(actor, EquipIndex.Feet);
+				Glasses = actor.DrawData.Glasses;
 			}
 
 			if (IncludeSection(SaveModes.EquipmentAccessories, mode)) {
@@ -215,6 +218,7 @@ public unsafe void Apply(Actor* actor, SaveModes mode) {
 				Hands?.Write(actor, EquipIndex.Hands);
 				Legs?.Write(actor, EquipIndex.Legs);
 				Feet?.Write(actor, EquipIndex.Feet);
+				if (Glasses != null) actor->SetGlasses(Glasses.Value);
 			}
 
 			if (IncludeSection(SaveModes.EquipmentAccessories, mode)) {
@@ -361,14 +365,16 @@ public WeaponSave(WeaponEquip from) {
 				ModelBase = from.Base;
 				ModelVariant = from.Variant;
 				DyeId = from.Dye;
+				DyeId2 = from.Dye2;
 			}
 
 			public Vector3 Color { get; set; }
 			public Vector3 Scale { get; set; }
 			public ushort ModelSet { get; set; }
 			public ushort ModelBase { get; set; }
 			public ushort ModelVariant { get; set; }
-			public ushort DyeId { get; set; }
+			public byte DyeId { get; set; }
+			public byte DyeId2 { get; set; }
 
 			public unsafe void Write(Actor* actor, bool isMainHand) {
 				var wep = new WeaponEquip() {
@@ -379,6 +385,7 @@ public unsafe void Write(Actor* actor, bool isMainHand) {
 					wep.Base = ModelBase;
 					wep.Variant = ModelVariant;
 					wep.Dye = DyeId;
+					wep.Dye2 = DyeId2;
 				}
 
 				actor->Equip(isMainHand ? 0 : 1, wep);
@@ -394,17 +401,20 @@ public ItemSave(ItemEquip from) {
 				ModelBase = from.Id;
 				ModelVariant = from.Variant;
 				DyeId = from.Dye;
+				DyeId2 = from.Dye2;
 			}
 
 			public ushort ModelBase { get; set; }
 			public byte ModelVariant { get; set; }
 			public byte DyeId { get; set; }
+			public byte DyeId2 { get; set; }
 
 			public unsafe void Write(Actor* actor, EquipIndex index) {
 				var item = new ItemEquip() {
 					Id = ModelBase,
 					Variant = ModelVariant,
-					Dye = DyeId
+					Dye = DyeId,
+					Dye2 = DyeId2
 				};
 				actor->Equip(index, item);
 			}

Ktisis/Data/Files/FfxivCharaDat.cs

@@ -43,10 +43,5 @@ public unsafe string Note() {
 			fixed (byte* ptr = NoteChars)
 				return Marshal.PtrToStringAnsi((IntPtr)ptr) ?? "";
 		}
-
-		public unsafe static FfxivCharaDat GetFromSlot(int slot) {
-			var addr = Interop.StaticOffsets.CharaDatData + 8 + 0x140*slot;
-			return *(FfxivCharaDat*)addr;
-		}
 	}
 }

Ktisis/Data/Serialization/Converters/JsonFileConverter.cs

@@ -3,8 +3,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-using Dalamud.Logging;
-
 using Ktisis.Data.Files;
 
 namespace Ktisis.Data.Serialization.Converters {
@@ -27,7 +25,7 @@ public class JsonFileConverter : JsonConverter<JsonFile> {
 					var value = jsonValue.Deserialize(prop.PropertyType, options);
 					if (value != null) prop.SetValue(result, value);
 				} catch {
-					PluginLog.Warning($"Failed to parse {prop.PropertyType.Name} value '{prop.Name}' (received {jsonValue.ValueKind} instead)");
+					Ktisis.Log.Warning($"Failed to parse {prop.PropertyType.Name} value '{prop.Name}' (received {jsonValue.ValueKind} instead)");
 				}
 			}
 

Ktisis/Env/EnvService.cs

@@ -3,8 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using Dalamud.Interface.Internal;
-using Dalamud.Logging;
+using Dalamud.Interface.Textures;
 
 using FFXIVClientStructs.FFXIV.Client.Graphics.Environment;
 
@@ -48,29 +47,28 @@ private static void OnGPoseChange(bool state) {
 		private static uint CurSky = uint.MaxValue;
 
 		public static readonly object SkyLock = new();
-		public static IDalamudTextureWrap? SkyTex;
+		public static ISharedImmediateTexture? SkyTex;
 
 		public static void GetSkyImage(uint sky) {
 			if (sky == CurSky) return;
 
 			CurSky = sky;
 			GetSkyboxTex(CurSky).ContinueWith(result => {
 				if (result.Exception != null) {
-					PluginLog.Error(result.Exception.ToString());
+					Ktisis.Log.Error(result.Exception.ToString());
 					return;
 				}
 
 				lock (SkyLock) {
-					SkyTex?.Dispose();
 					SkyTex = result.Result;
 				}
 			});
 		}
 
-		private static async Task<IDalamudTextureWrap?> GetSkyboxTex(uint skyId) {
+		private static async Task<ISharedImmediateTexture> GetSkyboxTex(uint skyId) {
 			await Task.Yield();
-			PluginLog.Verbose($"Retrieving skybox texture: {skyId:000}");
-			return Services.Textures.GetTextureFromGame($"bgcommon/nature/sky/texture/sky_{skyId:000}.tex");
+			Ktisis.Log.Verbose($"Retrieving skybox texture: {skyId:000}");
+			return Services.Textures.GetFromGame($"bgcommon/nature/sky/texture/sky_{skyId:000}.tex");
 		}
 
 		public unsafe static byte[] GetEnvWeatherIds() {
@@ -92,11 +90,13 @@ public static async Task<IEnumerable<WeatherInfo>> GetWeatherIcons(IEnumerable<b
 
 			foreach (var id in weathers) {
 				if (token.IsCancellationRequested) break;
+
+				if (id == 0) continue;
 
 				var weather = weatherSheet.GetRow(id);
 				if (weather == null) continue;
 
-				var icon = Services.Textures.GetIcon((uint)weather.Icon);
+				var icon = Services.Textures.GetFromGameIcon((uint)weather.Icon);
 				var info = new WeatherInfo(weather, icon);
 				result.Add(info);
 			}

Ktisis/Env/WeatherInfo.cs

@@ -1,4 +1,4 @@
-using Dalamud.Interface.Internal;
+using Dalamud.Interface.Textures;
 using Dalamud.Utility;
 
 using Lumina.Excel.GeneratedSheets;
@@ -7,14 +7,13 @@ namespace Ktisis.Env {
 	public class WeatherInfo {
 		public readonly string Name;
 		public readonly uint RowId;
-		public readonly IDalamudTextureWrap? Icon;
+		public readonly ISharedImmediateTexture? Icon;
 
 		public WeatherInfo(string name) {
 			this.Name = name;
-			this.Icon = new NullTexture();
 		}
 
-		public WeatherInfo(Weather weather, IDalamudTextureWrap? icon) {
+		public WeatherInfo(Weather weather, ISharedImmediateTexture? icon) {
 			var name = weather.Name?.RawString;
 			if (name.IsNullOrEmpty())
 				name = $"Weather #{weather.RowId}";
@@ -25,13 +24,5 @@ public WeatherInfo(Weather weather, IDalamudTextureWrap? icon) {
 		}
 
 		public static WeatherInfo Default => new("None");
-
-		private class NullTexture : IDalamudTextureWrap {
-			public nint ImGuiHandle { get; } = nint.Zero;
-			public int Width { get; } = 0;
-			public int Height { get; } = 0;
-
-			public void Dispose() { }
-		}
 	}
 }

Ktisis/Events/EventManager.cs

@@ -1,11 +1,10 @@
 using Dalamud.Game.ClientState.Keys;
 
-using FFXIVClientStructs.Havok;
-using static FFXIVClientStructs.Havok.hkaPose;
+using FFXIVClientStructs.Havok.Animation.Rig;
+using FFXIVClientStructs.Havok.Common.Base.Math.QsTransform;
 
 using Ktisis.Overlay;
 using Ktisis.Structs.Actor;
-using Ktisis.Structs.Actor.State;
 using Ktisis.Structs.Input;
 
 namespace Ktisis.Events {
@@ -34,7 +33,7 @@ public static unsafe void FireOnTransformationMatrixChangeEvent(bool state) {
 			if (OnTransformationMatrixChange == null) return;
 			var bone = Skeleton.GetSelectedBone();
 			var actor = (Actor*)Ktisis.GPoseTarget!.Address;
-			hkQsTransformf* boneTransform = bone is null ? &actor->Model->Transform : bone.AccessModelSpace(PropagateOrNot.DontPropagate);
+			hkQsTransformf* boneTransform = bone is null ? &actor->Model->Transform : bone.AccessModelSpace(hkaPose.PropagateOrNot.DontPropagate);
 			OnTransformationMatrixChange(state);
 		}
 

Ktisis/Helpers/PoseHelpers.cs

@@ -3,7 +3,6 @@
 
 using Ktisis.Data.Files;
 using Ktisis.Data.Serialization;
-using Ktisis.Data.Serialization.Converters;
 using Ktisis.Structs.Actor;
 using Ktisis.Structs.Poses;
 using Ktisis.Interop.Hooks;

Ktisis/History/ActorBone.cs

@@ -1,11 +1,11 @@
 using System.Numerics;
 
+using FFXIVClientStructs.Havok.Animation.Rig;
+
 using Ktisis.Structs;
 using Ktisis.Structs.Actor;
 using Ktisis.Structs.Bones;
 
-using static FFXIVClientStructs.Havok.hkaPose;
-
 namespace Ktisis.History {
 	public class ActorBone : HistoryItem {
 		private Bone? Bone { get; set; } // This should never have been introduced here.
@@ -58,7 +58,7 @@ public unsafe override void Update(bool undo) {
 
 			var bone = model->Skeleton->GetBone(historyBone.Partial, historyBone.Index);
 			var boneName = bone.HkaBone.Name.String ?? "";
-			var boneTransform = bone.AccessModelSpace(PropagateOrNot.DontPropagate);
+			var boneTransform = bone.AccessModelSpace(hkaPose.PropagateOrNot.DontPropagate);
 
 			// Write our updated matrix to memory.
 			var initialRot = boneTransform->Rotation.ToQuat();
@@ -78,7 +78,7 @@ public unsafe bool SetMatrix(bool start = true) {
 			var bone = GetBone();
 			if (bone == null) return false;
 
-			var boneTransform = bone.AccessModelSpace(PropagateOrNot.DontPropagate);
+			var boneTransform = bone.AccessModelSpace(hkaPose.PropagateOrNot.DontPropagate);
 			var matrix = Interop.Alloc.GetMatrix(boneTransform);
 
 			if (start)

Ktisis/Interface/Components/ActorsList.cs

@@ -6,7 +6,7 @@
 using ImGuiNET;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using Dalamud.Interface;
-using DalamudGameObject = Dalamud.Game.ClientState.Objects.Types.GameObject;
+using DalamudGameObject = Dalamud.Game.ClientState.Objects.Types.IGameObject;
 using ObjectKind = Dalamud.Game.ClientState.Objects.Enums.ObjectKind;
 
 using Ktisis.Structs.Actor;
@@ -163,7 +163,7 @@ private unsafe static bool IsValidActor(long target) {
 		private static bool IsValidActor(DalamudGameObject gameObject) =>
 			IsValidActor((long)gameObject.Address);
 		private static bool IsNonNetworkObject(DalamudGameObject gameObject) =>
-			gameObject.ObjectId == DalamudGameObject.InvalidGameObjectId;
+			gameObject.EntityId == 0xE0000000;
 		private static string ExtraInfo(DalamudGameObject gameObject) {
 			List<string> info = new();
 			if (IsGposeActor(gameObject))

Ktisis/Interface/Components/AnimationControls.cs

@@ -1,7 +1,7 @@
 using ImGuiNET;
 
 using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.Havok;
+using FFXIVClientStructs.Havok.Animation.Playback.Control.Default;
 
 using Ktisis.Interop.Hooks;
 using Ktisis.Util;
@@ -10,7 +10,7 @@ namespace Ktisis.Interface.Components {
 	public static class AnimationControls {
 
 
-		public static unsafe void Draw(GameObject? target) {
+		public static unsafe void Draw(IGameObject? target) {
 			// Animation control
 			if (ImGui.CollapsingHeader("Animation Control")) {
 				var control = PoseHooks.GetAnimationControl(target);