Update for 7.1 compatability (#115)

Update for patch 7.1 / Dalamud API11, no functional changes
PrincessRTFM · Nov 20, 2024 · fac2f70 · fac2f70
1 parent 0bdacde
commit fac2f70
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/XIVComboVX/Combos/DOL.cs b/XIVComboVX/Combos/DOL.cs
@@ -154,7 +154,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 		}
 
 		if (IsEnabled(CustomComboPreset.GatherJobCorrectionFeature)) {
-			switch (LocalPlayer.ClassJob.Id) {
+			switch (LocalPlayer.ClassJob.RowId) {
 				case DOL.BtnID:
 					return actionID switch {
 						MIN.Prospect => IsEnabled(CustomComboPreset.GatherJobCorrectionIgnoreDetectionsFeature) ? actionID : BTN.Triangulate,

diff --git a/XIVComboVX/Config/ConfigWindow.cs b/XIVComboVX/Config/ConfigWindow.cs
@@ -284,7 +284,7 @@ public override void Draw() {
 					ImGui.MenuItem("Not logged in", false);
 				}
 				else {
-					ImGui.MenuItem($"{player.Name}: {player.ClassJob.GameData!.Abbreviation.ToString().ToUpper()} ({player.ClassJob.Id})", false);
+					ImGui.MenuItem($"{player.Name}: {player.ClassJob.Value.Abbreviation.ExtractText()} ({player.ClassJob.RowId})", false);
 				}
 
 				bool clickDebug = ImGui.MenuItem("Snapshot debug messages");

diff --git a/XIVComboVX/CustomCombo.cs b/XIVComboVX/CustomCombo.cs
@@ -162,7 +162,7 @@ protected static bool IsJob(params uint[] jobs) {
 		IPlayerCharacter? p = LocalPlayer;
 		if (p is null)
 			return false;
-		uint current = p.ClassJob.Id;
+		uint current = p.ClassJob.RowId;
 		foreach (uint job in jobs) {
 			if (current == job)
 				return true;

diff --git a/XIVComboVX/GameData/ComboDataCache.cs b/XIVComboVX/GameData/ComboDataCache.cs
@@ -112,7 +112,7 @@ public unsafe (ushort Current, ushort Max) GetMaxCharges(uint actionID) {
 		if (player == null)
 			return (0, 0);
 
-		uint job = player.ClassJob.Id;
+		uint job = player.ClassJob.RowId;
 		byte level = player.Level;
 		if (job == 0 || level == 0)
 			return (0, 0);
@@ -130,8 +130,8 @@ private byte getCooldownGroup(uint actionID) {
 		if (this.cooldownGroupCache.TryGetValue(actionID, out byte cooldownGroup))
 			return cooldownGroup;
 
-		Lumina.Excel.ExcelSheet<Lumina.Excel.GeneratedSheets.Action> sheet = Service.GameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.Action>()!;
-		Lumina.Excel.GeneratedSheets.Action row = sheet.GetRow(actionID)!;
+		Lumina.Excel.ExcelSheet<Lumina.Excel.Sheets.Action> sheet = Service.GameData.GetExcelSheet<Lumina.Excel.Sheets.Action>()!;
+		Lumina.Excel.Sheets.Action row = sheet.GetRow(actionID)!;
 
 		return this.cooldownGroupCache[actionID] = row.CooldownGroup;
 	}

diff --git a/XIVComboVX/GameData/GameState.cs b/XIVComboVX/GameData/GameState.cs
@@ -30,7 +30,7 @@ internal bool IsChatVisible {
 
 	internal GameState() => Service.Client.Logout += this.clearCacheOnLogout;
 
-	private void clearCacheOnLogout() => this.chatLogPointer = null;
+	private void clearCacheOnLogout(int type, int code) => this.chatLogPointer = null;
 
 	public void Dispose() {
 		if (this.disposed)

diff --git a/XIVComboVX/GameData/IconReplacer.cs b/XIVComboVX/GameData/IconReplacer.cs
@@ -71,7 +71,7 @@ private unsafe uint getIconDetour(IntPtr actionManager, uint actionID) {
 			uint lastComboActionId = *(uint*)Service.Address.LastComboMove;
 			float comboTime = *(float*)Service.Address.ComboTimer;
 			byte level = player.Level;
-			uint classJobID = player.ClassJob.Id;
+			uint classJobID = player.ClassJob.RowId;
 
 			foreach (CustomCombo combo in this.customCombos) {
 				if (combo.TryInvoke(actionID, lastComboActionId, comboTime, level, classJobID, out uint newActionID))

diff --git a/XIVComboVX/GameData/PluginAddressResolver.cs b/XIVComboVX/GameData/PluginAddressResolver.cs
@@ -27,7 +27,7 @@ internal unsafe void Setup() {
 			this.ComboTimer = new IntPtr(&ActionManager.Instance()->Combo.Timer);
 
 			Service.Log.Information("Scanning for IsActionIdReplaceable signature");
-			this.IsActionIdReplaceable = Service.SigScanner.ScanText("E8 ?? ?? ?? ?? 84 C0 0F 84 ?? ?? ?? ?? C6 83 ?? ?? ?? ?? ?? 48 8B 5C 24");
+			this.IsActionIdReplaceable = Service.SigScanner.ScanText("40 53 48 83 EC 20 8B D9 48 8B 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 85 C0 74 1B");
 		}
 		catch (Exception ex) {
 			this.LoadFailReason = ex;

diff --git a/XIVComboVX/XIVComboVX.csproj b/XIVComboVX/XIVComboVX.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Product>XIVComboVX</Product>
 		<Authors>VariableVixen, FrigidWalrus, attick, daemitus</Authors>
-		<Version>9.30.0</Version>
+		<Version>9.31.0</Version>
 		<Description>This plugin condenses various abilities onto single buttons.</Description>
 		<PackageProjectUrl>https://github.com/PrincessRTFM/XIVComboPlugin</PackageProjectUrl>
 		<Copyright>Copyleft attick 2020 baybeeee</Copyright>

diff --git a/XIVComboVX/dalamud.props b/XIVComboVX/dalamud.props
@@ -15,7 +15,7 @@
 	<Import Project="framework.props" />
 
 	<ItemGroup>
-		<PackageReference Include="DalamudPackager" Version="2.1.13" />
+		<PackageReference Include="DalamudPackager" Version="11.0.0" />
 		<Reference Include="Newtonsoft.Json">
 			<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
 			<Private>False</Private>

diff --git a/XIVComboVX/packages.lock.json b/XIVComboVX/packages.lock.json
@@ -4,9 +4,9 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.13, )",
-        "resolved": "2.1.13",
-        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
       }
     }
   }