update to latest patch

Author: VariableVixen

WoLua/Constants/LogTag.cs

@@ -1,4 +1,4 @@
-namespace PrincessRTFM.WoLua.Constants;
+namespace VariableVixen.WoLua.Constants;
 
 public static class LogTag {
 	public const string

WoLua/Constants/Metamethod.cs

@@ -1,4 +1,4 @@
-namespace PrincessRTFM.WoLua.Constants;
+namespace VariableVixen.WoLua.Constants;
 
 public static class Metamethod {
 	public const string

WoLua/Constants/StatusText.cs

@@ -1,7 +1,7 @@
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 
-namespace PrincessRTFM.WoLua.Constants;
+namespace VariableVixen.WoLua.Constants;
 
 public static class StatusText {
 	public static string IconScripts { get; } = SeIconChar.CrossWorld.ToIconString();

WoLua/ExcelContainer.cs

@@ -4,10 +4,10 @@
 using Lumina.Excel;
 using Lumina.Excel.Sheets;
 
-namespace PrincessRTFM.WoLua;
+namespace VariableVixen.WoLua;
 
 public static class ExcelContainer {
-	private static Lazy<ExcelSheet<T>> init<T>() where T: struct, IExcelRow<T> {
+	private static Lazy<ExcelSheet<T>> init<T>() where T : struct, IExcelRow<T> {
 		return new(() => {
 			if (Service.DataManager is null)
 				throw new InvalidOperationException("Cannot load excel sheet without DataManager instance", new NullReferenceException("Service.DataManager does not exist"));

WoLua/Game/GameFunctionBase.cs

@@ -4,20 +4,20 @@
 
 using Dalamud.Hooking;
 
-using PrincessRTFM.WoLua.Constants;
+using VariableVixen.WoLua.Constants;
 
-namespace PrincessRTFM.WoLua.Game;
+namespace VariableVixen.WoLua.Game;
 
 public abstract class GameFunctionBase<T> where T : Delegate {
-	private readonly IntPtr addr = IntPtr.Zero;
-	public IntPtr Address => this.addr;
+	private readonly nint addr = nint.Zero;
+	public nint Address => this.addr;
 	private T? function;
-	public bool Valid => this.function is not null || this.Address != IntPtr.Zero;
+	public bool Valid => this.function is not null || this.Address != nint.Zero;
 	public T? Delegate {
 		get {
 			if (this.function is not null)
 				return this.function;
-			if (this.Address != IntPtr.Zero) {
+			if (this.Address != nint.Zero) {
 				this.function = Marshal.GetDelegateForFunctionPointer<T>(this.Address);
 				return this.function;
 			}
@@ -36,7 +36,7 @@ internal GameFunctionBase(string sig, int offset = 0) {
 		}
 	}
 	[SuppressMessage("Reliability", "CA2020:Prevent from behavioral change", Justification = "If this explodes, we SHOULD be throwing")]
-	internal GameFunctionBase(IntPtr address, int offset = 0) {
+	internal GameFunctionBase(nint address, int offset = 0) {
 		this.addr = address + offset; // this will throw on overflow
 		ulong totalOffset = (ulong)this.Address.ToInt64() - (ulong)Service.Scanner.Module.BaseAddress.ToInt64();
 		Service.Log.Information($"[{LogTag.PluginCore}] {this.GetType().Name} loaded; address = 0x{this.Address.ToInt64():X16}, base memory offset = 0x{totalOffset:X16}");
@@ -45,5 +45,5 @@ internal GameFunctionBase(IntPtr address, int offset = 0) {
 	public dynamic? Invoke(params dynamic[] parameters)
 		=> this.Delegate?.DynamicInvoke(parameters);
 
-	public Hook<T> Hook(T handler) => Service.Interop.HookFromAddress<T>(this.Address, handler);
+	public Hook<T> Hook(T handler) => Service.Interop.HookFromAddress(this.Address, handler);
 }

WoLua/Game/PlaySound.cs

@@ -1,4 +1,4 @@
-namespace PrincessRTFM.WoLua.Game;
+namespace VariableVixen.WoLua.Game;
 
 public delegate ulong SoundFunc(int soundId, ulong unknown1, ulong unknown2);
 

WoLua/Game/ServerChat.cs

@@ -9,7 +9,7 @@
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
 
-namespace PrincessRTFM.WoLua.Game;
+namespace VariableVixen.WoLua.Game;
 
 internal class ServerChat {
 	private static class Signatures {
@@ -18,8 +18,8 @@ private static class Signatures {
 	}
 
 
-	private delegate void ProcessChatBoxDelegate(IntPtr uiModule, IntPtr message, IntPtr unused, byte a4);
-	private readonly unsafe delegate* unmanaged<Utf8String*, int, IntPtr, void> sanitiseString = null!;
+	private delegate void ProcessChatBoxDelegate(nint uiModule, nint message, nint unused, byte a4);
+	private readonly unsafe delegate* unmanaged<Utf8String*, int, nint, void> sanitiseString = null!;
 
 	private ProcessChatBoxDelegate? processChatBox { get; }
 
@@ -33,7 +33,7 @@ internal unsafe ServerChat(ISigScanner scanner) {
 		}
 
 		if (scanner.TryScanText(Signatures.SanitiseString, out nint sanitisePtr)) {
-			this.sanitiseString = (delegate* unmanaged<Utf8String*, int, IntPtr, void>)sanitisePtr;
+			this.sanitiseString = (delegate* unmanaged<Utf8String*, int, nint, void>)sanitisePtr;
 			Service.Log?.Information("Found signature for chat sanitisation");
 		}
 		else {
@@ -53,7 +53,7 @@ public unsafe void SendMessageUnsafe(byte[] message) {
 		nint mem1 = Marshal.AllocHGlobal(400);
 		Marshal.StructureToPtr(payload, mem1, false);
 
-		this.processChatBox((IntPtr)uiModule, mem1, IntPtr.Zero, 0);
+		this.processChatBox((nint)uiModule, mem1, nint.Zero, 0);
 
 		Marshal.FreeHGlobal(mem1);
 	}
@@ -78,7 +78,7 @@ public unsafe string SanitiseText(string text) {
 
 		Utf8String* uText = Utf8String.FromString(text);
 
-		this.sanitiseString(uText, 0x27F, IntPtr.Zero);
+		this.sanitiseString(uText, 0x27F, nint.Zero);
 		string sanitised = uText->ToString();
 
 		uText->Dtor();
@@ -92,7 +92,7 @@ public unsafe string SanitiseText(string text) {
 	[StructLayout(LayoutKind.Explicit)]
 	private readonly struct ChatPayload: IDisposable {
 		[FieldOffset(0)]
-		private readonly IntPtr textPtr;
+		private readonly nint textPtr;
 
 		[FieldOffset(16)]
 		private readonly ulong textLen;

WoLua/Game/Sound.cs

@@ -1,4 +1,4 @@
-namespace PrincessRTFM.WoLua.Game;
+namespace VariableVixen.WoLua.Game;
 
 public enum Sound: byte {
 	None = 0x00,

WoLua/Hooks.cs

@@ -5,7 +5,7 @@
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 
-namespace PrincessRTFM.WoLua;
+namespace VariableVixen.WoLua;
 
 public class Hooks: IDisposable {
 	private bool disposed;
@@ -16,7 +16,7 @@ public unsafe IGameObject? UITarget {
 			if (pronouns is null)
 				return null;
 			GameObject* actor = pronouns->UiMouseOverTarget;
-			return actor is null ? null : Service.Objects.CreateObjectReference((IntPtr)actor);
+			return actor is null ? null : Service.Objects.CreateObjectReference((nint)actor);
 		}
 	}
 

WoLua/Lua/ActionQueue.cs

@@ -6,10 +6,12 @@
 
 using MoonSharp.Interpreter;
 
-using PrincessRTFM.WoLua.Constants;
-using PrincessRTFM.WoLua.Lua.Actions;
+using VariableVixen.WoLua.Lua;
 
-namespace PrincessRTFM.WoLua.Lua;
+using VariableVixen.WoLua.Constants;
+using VariableVixen.WoLua.Lua.Actions;
+
+namespace VariableVixen.WoLua.Lua;
 
 [SuppressMessage("Naming", "CA1711:Identifiers should not have incorrect suffix", Justification = "It's a queue for script actions")]
 public class ActionQueue: IDisposable {