7.4 and API 14 (#91)

RisaDev · web-flow · commit ad7f4dfbea7c · 2025-12-19T21:45:03.000+03:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,13 +9,15 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.x.x'
+          dotnet-version: |
+            10.x.x
+            9.x.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml
@@ -9,18 +9,20 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.x.x'
+          dotnet-version: |
+            10.x.x
+            9.x.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
       - name: Build
         run: |
diff --git a/CustomizePlus.GameData/CustomizePlus.GameData.csproj b/CustomizePlus.GameData/CustomizePlus.GameData.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Dalamud.NET.Sdk/13.1.0">
+﻿<Project Sdk="Dalamud.NET.Sdk/14.0.1">
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/CustomizePlus.GameData/packages.lock.json b/CustomizePlus.GameData/packages.lock.json
@@ -1,12 +1,12 @@
 {
   "version": 1,
   "dependencies": {
-    "net9.0-windows7.0": {
+    "net10.0-windows7.0": {
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
-        "requested": "[1.2.25, )",
-        "resolved": "1.2.25",
-        "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
+        "requested": "[1.2.39, )",
+        "resolved": "1.2.39",
+        "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
       },
       "FlatSharp.Compiler": {
         "type": "Transitive",
@@ -16,10 +16,7 @@
       "FlatSharp.Runtime": {
         "type": "Transitive",
         "resolved": "7.9.0",
-        "contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw==",
-        "dependencies": {
-          "System.Memory": "4.5.5"
-        }
+        "contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw=="
       },
       "JetBrains.Annotations": {
         "type": "Transitive",
@@ -39,11 +36,6 @@
         "resolved": "9.0.2",
         "contentHash": "MNe7GSTBf3jQx5vYrXF0NZvn6l7hUKF6J54ENfAgCO8y6xjN1XUmKKWG464LP2ye6QqDiA1dkaWEZBYnhoZzjg=="
       },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.5",
-        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
-      },
       "ottergui": {
         "type": "Project",
         "dependencies": {
@@ -60,7 +52,7 @@
           "FlatSharp.Compiler": "[7.9.0, )",
           "FlatSharp.Runtime": "[7.9.0, )",
           "OtterGui": "[1.0.0, )",
-          "Penumbra.Api": "[5.10.0, )",
+          "Penumbra.Api": "[5.12.0, )",
           "Penumbra.String": "[1.0.6, )"
         }
       },
diff --git a/CustomizePlus/Core/Services/Dalamud/DalamudServices.cs b/CustomizePlus/Core/Services/Dalamud/DalamudServices.cs
@@ -22,6 +22,7 @@ public static void AddServices(ServiceManager services, IDalamudPluginInterface
             .AddDalamudService<ICommandManager>(pi)
             .AddDalamudService<IChatGui>(pi)
             .AddDalamudService<IClientState>(pi)
+            .AddDalamudService<IPlayerState>(pi)
             .AddDalamudService<IGameGui>(pi)
             .AddDalamudService<IGameInteropProvider>(pi)
             .AddDalamudService<IKeyState>(pi)
diff --git a/CustomizePlus/Core/Services/SupportLogBuilderService.cs b/CustomizePlus/Core/Services/SupportLogBuilderService.cs
@@ -56,6 +56,9 @@ public string BuildSupportLog()
         sb.Append($"> **`Cards:                          `** {_configuration.ProfileApplicationSettings.ApplyInCards}\n");
         sb.Append($"> **`Inspect:                        `** {_configuration.ProfileApplicationSettings.ApplyInInspect}\n");
         sb.Append($"> **`Lobby:                          `** {_configuration.ProfileApplicationSettings.ApplyInLobby}\n");
+        sb.AppendLine("**Dalamud**");
+        sb.Append($"> **`Dalamud Version:                `** {_dalamudPluginInterface.GetDalamudVersion().Version}\n");
+        sb.Append($"> **`Branch:                         `** {_dalamudPluginInterface.GetDalamudVersion().BetaTrack ?? "Release"}\n");
         sb.AppendLine("**Relevant plugins**");
         GatherRelevantPlugins(sb);
         sb.AppendLine("**Integrations**");
diff --git a/CustomizePlus/CustomizePlus.csproj b/CustomizePlus/CustomizePlus.csproj
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 
-<Project Sdk="Dalamud.NET.Sdk/13.1.0">
+<Project Sdk="Dalamud.NET.Sdk/14.0.1">
   <PropertyGroup>
     <AssemblyTitle>CustomizePlus</AssemblyTitle>
     <Version>2.0.0.0</Version>
@@ -51,10 +51,6 @@
     <DefineConstants>INCOGNIFY_STRINGS</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <DefineConstants>CHECK_DALAMUD_BRANCH</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)'=='ReleaseValidate'">
     <DefineConstants>VALIDATE_BUILD</DefineConstants>
   </PropertyGroup>
diff --git a/CustomizePlus/CustomizePlus.json b/CustomizePlus/CustomizePlus.json
@@ -6,8 +6,8 @@
 	"InternalName": "CustomizePlus",
 	"ApplicableVersion": "any",
 	"AssemblyVersion": "2.0.0.0",
-	"DalamudApiLevel": 13,
-	"TestingDalamudApiLevel": 13,
+	"DalamudApiLevel": 14,
+	"TestingDalamudApiLevel": 14,
 	"Tags": [
 		"Anamnesis",
 		"Customization",
diff --git a/CustomizePlus/Game/Services/GPose/ExternalTools/PosingModeDetectService.cs b/CustomizePlus/Game/Services/GPose/ExternalTools/PosingModeDetectService.cs
@@ -1,4 +1,5 @@
 ﻿using Dalamud.Game;
+using Dalamud.Plugin.Services;
 
 namespace CustomizePlus.Game.Services.GPose.ExternalTools;
 
diff --git a/CustomizePlus/UI/Windows/CPlusChangeLog.cs b/CustomizePlus/UI/Windows/CPlusChangeLog.cs
@@ -3,6 +3,12 @@
 
 namespace CustomizePlus.UI.Windows;
 
+//Versioning concept (X.Y.Z.W):
+//X - major version, changes only during major rewrites of the plugin
+//Y - major feature version, changes when new major features are introduced (also can be changed with major game patches)
+//Z - minor feature version, changes when new minor features are introduced
+//W - bugfix version, changes when the update only contains bugfixes.
+
 public class CPlusChangeLog
 {
     public const int LastChangelogVersion = 0;
@@ -35,6 +41,7 @@ public CPlusChangeLog(PluginConfiguration config)
         Add2_0_8_2(Changelog);
         Add2_0_8_4(Changelog);
         Add2_0_9_0(Changelog);
+        Add2_1_0_0(Changelog);
     }
 
     private (int, ChangeLogDisplayType) ConfigData()
@@ -46,6 +53,11 @@ private void Save(int version, ChangeLogDisplayType type)
         _config.ChangelogSettings.ChangeLogDisplayType = type;
         _config.Save();
     }
+
+    private static void Add2_1_0_0(Changelog log)
+        => log.NextVersion("Version 2.1.0.0")
+        .RegisterImportant("Support for 7.4 and Dalamud API 14. (by Risa)");
+
     private static void Add2_0_9_0(Changelog log)
         => log.NextVersion("Version 2.0.9.0")
         .RegisterEntry("Added ability to apply separate scaling to child bones when propagation is enabled on a bone. (by Midona)")
diff --git a/CustomizePlus/packages.lock.json b/CustomizePlus/packages.lock.json
@@ -1,18 +1,18 @@
 {
   "version": 1,
   "dependencies": {
-    "net9.0-windows7.0": {
+    "net10.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[13.1.0, )",
-        "resolved": "13.1.0",
-        "contentHash": "XdoNhJGyFby5M/sdcRhnc5xTop9PHy+H50PTWpzLhJugjB19EDBiHD/AsiDF66RETM+0qKUdJBZrNuebn7qswQ=="
+        "requested": "[14.0.1, )",
+        "resolved": "14.0.1",
+        "contentHash": "y0WWyUE6dhpGdolK3iKgwys05/nZaVf4ZPtIjpLhJBZvHxkkiE23zYRo7K7uqAgoK/QvK5cqF6l3VG5AbgC6KA=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
-        "requested": "[1.2.25, )",
-        "resolved": "1.2.25",
-        "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
+        "requested": "[1.2.39, )",
+        "resolved": "1.2.39",
+        "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
       },
       "GitInfo": {
         "type": "Direct",
@@ -46,44 +46,22 @@
       "FlatSharp.Runtime": {
         "type": "Transitive",
         "resolved": "7.9.0",
-        "contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw==",
-        "dependencies": {
-          "System.Memory": "4.5.5"
-        }
+        "contentHash": "Bm8+WqzEsWNpxqrD5x4x+zQ8dyINlToCreM5FI2oNSfUVc9U9ZB+qztX/jd8rlJb3r0vBSlPwVLpw0xBtPa3Vw=="
       },
       "JetBrains.Annotations": {
         "type": "Transitive",
         "resolved": "2024.3.0",
         "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug=="
       },
-      "Microsoft.CSharp": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
-      },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
         "resolved": "9.0.8",
         "contentHash": "xY3lTjj4+ZYmiKIkyWitddrp1uL5uYiweQjqo4BKBw01ZC4HhcfgLghDpPZcUlppgWAFqFy9SgkiYWOMx365pw=="
       },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.5",
-        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
-      },
-      "System.Threading.Tasks.Extensions": {
-        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
-      },
       "ThisAssembly.Constants": {
         "type": "Transitive",
         "resolved": "1.4.1",
-        "contentHash": "sV0CDYlC6YSIkYbdwd4+jRinLb888Dac71pmNhF2Ll6UXY1J+1oVt3EfmX6euXEKz2RLdfV+4GyZctfEA0NSqA==",
-        "dependencies": {
-          "Microsoft.CSharp": "4.7.0",
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
+        "contentHash": "sV0CDYlC6YSIkYbdwd4+jRinLb888Dac71pmNhF2Ll6UXY1J+1oVt3EfmX6euXEKz2RLdfV+4GyZctfEA0NSqA=="
       },
       "customizeplus.gamedata": {
         "type": "Project",
@@ -110,7 +88,7 @@
           "FlatSharp.Compiler": "[7.9.0, )",
           "FlatSharp.Runtime": "[7.9.0, )",
           "OtterGui": "[1.0.0, )",
-          "Penumbra.Api": "[5.12.0, )",
+          "Penumbra.Api": "[5.13.0, )",
           "Penumbra.String": "[1.0.6, )"
         }
       },
diff --git a/repo.json b/repo.json
@@ -9,8 +9,8 @@
     "TestingAssemblyVersion": "2.0.9.1",
     "RepoUrl": "https://github.com/Aether-Tools/CustomizePlus",
     "ApplicableVersion": "any",
-    "DalamudApiLevel": 13,
-    "TestingDalamudApiLevel": 13,
+    "DalamudApiLevel": 14,
+    "TestingDalamudApiLevel": 14,
     "IsHide": "False",
     "IsTestingExclusive": "False",
     "DownloadCount": 0,
diff --git a/submodules/ECommonsLite b/submodules/ECommonsLite
@@ -1 +1 @@
-Subproject commit 7ad17f0b4abbf820cd50024bac8b0e7c972ceb7f
+Subproject commit 3b9778376b6c3ac3995dd0eef871db41fb7b0d8c
diff --git a/submodules/OtterGui b/submodules/OtterGui
@@ -1 +1 @@
-Subproject commit 18e62ab2d8b9ac7028a33707eb35f8f9c61f245a
+Subproject commit ff1e6543845e3b8c53a5f8b240bc38faffb1b3bf
diff --git a/submodules/Penumbra.Api b/submodules/Penumbra.Api
@@ -1 +1 @@
-Subproject commit 704d62f64f791b8cfd42363beaa464ad6f98ae48
+Subproject commit 1750c41b53e1000c99a7fb9d8a0f082aef639a41
diff --git a/submodules/Penumbra.GameData b/submodules/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 1bb6210d7cba0e3091bbb5a13b901c62e72280e9
+Subproject commit 0e973ed6eace6afd31cd298f8c58f76fa8d5ef60
diff --git a/submodules/Penumbra.String b/submodules/Penumbra.String
@@ -1 +1 @@
-Subproject commit 4aac62e73b89a0c538a7a0a5c22822f15b13c0cc
+Subproject commit 9bd016fbef5fb2de467dd42165267fdd93cd9592

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Dalamud.NET.Sdk/13.1.0">`
	`1`	`+<Project Sdk="Dalamud.NET.Sdk/14.0.1">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<ImplicitUsings>enable</ImplicitUsings>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Dalamud.Game;`
	`2`	`+using Dalamud.Plugin.Services;`
`2`	`3`
`3`	`4`	`namespace CustomizePlus.Game.Services.GPose.ExternalTools;`
`4`	`5`