Skip to content

Commit fefcf10

Browse files
PassiveModdingPassiveModding
authored
Merge pull request #50 from PassiveModding/feature/patch7.4
Feature/patch7.4
2 parents a55e8f6 + 8ec38f7 commit fefcf10

21 files changed

+594
-531
lines changed

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
IsCI: true
2828
steps:
2929
- name: Checkout Repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
submodules: true # Grab any submodules that may be required
3333

3434
- name: Setup .NET
35-
uses: actions/setup-dotnet@v4
35+
uses: actions/setup-dotnet@v5
3636
with:
37-
dotnet-version: 9.0.x
37+
dotnet-version: 10.0.x
3838

3939
- name: Extract version and custom path
4040
run: |
@@ -80,13 +80,15 @@ jobs:
8080
-p:AssemblyVersion=${{ env.VERSION }} \
8181
-p:FileVersion=${{ env.VERSION }}
8282
83-
- name: Generate Checksums
83+
- name: Generate Checksums & Export ApiLevel
8484
working-directory: Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin
8585
run: |
8686
sha512sum latest.zip >> checksums.sha512
87+
dalamud_api_level=$(jq -r '.DalamudApiLevel' Meddle.Plugin.json)
88+
echo "DALAMUD_API_LEVEL=$dalamud_api_level" >> $GITHUB_ENV
8789
8890
- name: Create GitHub Release
89-
uses: softprops/action-gh-release@v1
91+
uses: softprops/action-gh-release@v2
9092
with:
9193
files: |
9294
Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin/latest.zip
@@ -98,7 +100,7 @@ jobs:
98100
fail_on_unmatched_files: true # If the files arent found, fail the workflow and abort the release.
99101

100102
- name: Upload Artifacts
101-
uses: actions/upload-artifact@v4
103+
uses: actions/upload-artifact@v6
102104
with:
103105
name: Release Artifacts
104106
path: |
@@ -121,7 +123,9 @@ jobs:
121123
.[0].TestingAssemblyVersion = $release_version |
122124
.[0].DownloadLinkInstall = $repo_url |
123125
.[0].DownloadLinkUpdate = $repo_url |
124-
.[0].DownloadLinkTesting = $repo_url' \
126+
.[0].DownloadLinkTesting = $repo_url |
127+
.[0].DalamudApiLevel = '"${{ env.DALAMUD_API_LEVEL }}"' |
128+
.[0].TestingDalamudApiLevel = '"${{ env.DALAMUD_API_LEVEL }}"'' \
125129
repo.json > tmp.json && mv tmp.json repo.json
126130
127131
cat repo.json

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
dotnet-version: [ 9.0.x ] # Can add multiple .NET versions here to test against (For example, testing a new version of .NET before it's released)
28+
dotnet-version: [ 10.0.x ] # Can add multiple .NET versions here to test against (For example, testing a new version of .NET before it's released)
2929
dalamud-version: [ "stg_latest", "latest" ] # Can add multiple Dalamud branches here to test against (For example, testing against Dalamud staging)
3030
env:
3131
DALAMUD_HOME: /tmp/dalamud
3232
IsCI: true
3333
steps:
3434
- name: Checkout Repository
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636
with:
3737
fetch-depth: 0 # We don't need the history for testing builds, so we can save some time by not fetching it
3838
submodules: true # Grab any submodules that may be required
3939

4040
- name: Setup .NET
41-
uses: actions/setup-dotnet@v4
41+
uses: actions/setup-dotnet@v5
4242
with:
4343
dotnet-version: ${{ matrix.dotnet-version }}
4444

@@ -60,7 +60,7 @@ jobs:
6060
run: dotnet build -c Release --no-restore --nologo -o ./bin/${{ matrix.dalamud-version }}/Release
6161

6262
- name: Upload Artifact
63-
uses: actions/upload-artifact@v4
63+
uses: actions/upload-artifact@v6
6464
with:
6565
name: Meddle.Plugin-${{ matrix.dalamud-version }}-${{ github.sha }}
6666
path: Meddle/Meddle.Plugin/bin/${{ matrix.dalamud-version }}/Release

‎.github/workflows/test_release.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
DOWNLOAD_PATH: ${{ github.event.inputs.dalamud_branch }}
3737
steps:
3838
- name: Checkout Repository
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v6
4040
with:
4141
submodules: true # Grab any submodules that may be required
4242

4343
- name: Setup .NET
44-
uses: actions/setup-dotnet@v4
44+
uses: actions/setup-dotnet@v5
4545
with:
46-
dotnet-version: 9.0.x
46+
dotnet-version: 10.0.x
4747

4848
- name: Display build information
4949
run: |
@@ -73,13 +73,15 @@ jobs:
7373
-p:AssemblyVersion=${{ env.VERSION }} \
7474
-p:FileVersion=${{ env.VERSION }}
7575
76-
- name: Generate Checksums
76+
- name: Generate Checksums & Export ApiLevel
7777
working-directory: Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin
7878
run: |
7979
sha512sum latest.zip >> checksums.sha512
80+
dalamud_api_level=$(jq -r '.DalamudApiLevel' Meddle.Plugin.json)
81+
echo "DALAMUD_API_LEVEL=$dalamud_api_level" >> $GITHUB_ENV
8082
8183
- name: Create GitHub Release
82-
uses: softprops/action-gh-release@v1
84+
uses: softprops/action-gh-release@v2
8385
with:
8486
tag_name: testing_v${{ env.VERSION }}${{ env.DOWNLOAD_PATH && format('_{0}', env.DOWNLOAD_PATH) || '' }}
8587
name: Test Release v${{ env.VERSION }}${{ env.DOWNLOAD_PATH && format(' ({0})', env.DOWNLOAD_PATH) || '' }}
@@ -93,7 +95,7 @@ jobs:
9395
fail_on_unmatched_files: true # If the files arent found, fail the workflow and abort the release.
9496

9597
- name: Upload Artifacts
96-
uses: actions/upload-artifact@v4
98+
uses: actions/upload-artifact@v6
9799
with:
98100
name: Release Artifacts
99101
path: |
@@ -124,7 +126,8 @@ jobs:
124126
jq --arg version "${{ env.VERSION }}" \
125127
--arg repo_url "$repo_url/releases/download/$tag_name/latest.zip" \
126128
'.[0].TestingAssemblyVersion = $version |
127-
.[0].DownloadLinkTesting = $repo_url' \
129+
.[0].DownloadLinkTesting = $repo_url |
130+
.[0].TestingDalamudApiLevel = '"${{ env.DALAMUD_API_LEVEL }}"'' \
128131
repo.json > tmp.json && mv tmp.json repo.json
129132
130133
cat repo.json

‎Meddle/Meddle.Plugin/Meddle.Plugin.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<Project Sdk="Dalamud.NET.Sdk/13.1.0">
1+
<Project Sdk="Dalamud.NET.Sdk/14.0.1">
22
<PropertyGroup>
33
<Version>0.0.1</Version>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<RootNamespace>Meddle.Plugin</RootNamespace>
7-
<LangVersion>13</LangVersion>
8-
<TargetFramework>net9.0-windows</TargetFramework>
7+
<LangVersion>14</LangVersion>
8+
<TargetFramework>net10.0-windows</TargetFramework>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
13-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
14-
<PackageReference Include="Vortice.Direct3D11" Version="3.6.2" />
12+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
14+
<PackageReference Include="Vortice.Direct3D11" Version="3.8.1" />
1515
<Reference Include="OtterTex">
1616
<HintPath>..\Meddle.Utils\Lib\OtterTex.dll</HintPath>
1717
</Reference>

‎Meddle/Meddle.Plugin/Models/Layout/ParsedInstance.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,22 +219,16 @@ public ParsedStain(Stain stain)
219219
Color = ImGui.ColorConvertU32ToFloat4(UiUtil.SeColorToRgba(SeColor));
220220
RowId = stain.RowId;
221221
Name = stain.Name.ExtractText();
222-
Name2 = stain.Name2.ExtractText();
223222
Shade = stain.Shade;
224223
SubOrder = stain.SubOrder;
225-
Unknown1 = stain.Unknown1;
226-
Unknown2 = stain.Unknown2;
227224
}
228225

229226
public uint SeColor { get; }
230227
public Vector4 Color { get; }
231228
public uint RowId { get; }
232229
public string Name { get; }
233-
public string Name2 { get; }
234230
public uint Shade { get; }
235231
public uint SubOrder { get; }
236-
public bool Unknown1 { get; }
237-
public bool Unknown2 { get; }
238232

239233
public static implicit operator ParsedStain(Stain stain) => new(stain);
240234
public static implicit operator ParsedStain?(Stain? stain) => stain == null ? null : new ParsedStain(stain.Value);

‎Meddle/Meddle.Plugin/Services/ParseService.cs‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎Meddle/Meddle.Plugin/Services/ResourceHooks.cs‎

Lines changed: 0 additions & 112 deletions
This file was deleted.

‎Meddle/Meddle.Plugin/UI/AnimationTab.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Dalamud.Bindings.ImGui;
1010
using Meddle.Plugin.Models;
1111
using Meddle.Plugin.Services;
12-
using Meddle.Plugin.Services.UI;
1312
using Meddle.Plugin.Utils;
1413
using Microsoft.Extensions.Logging;
1514
using SharpGLTF.Transforms;
@@ -25,6 +24,7 @@ public class AnimationTab : ITab
2524
{
2625
private readonly AnimationExportService animationExportService;
2726
private readonly CommonUi commonUi;
27+
private readonly IObjectTable objectTable;
2828
private readonly Configuration config;
2929
private readonly List<(DateTime Time, AttachSet[])> frames = [];
3030
private readonly IFramework framework;
@@ -45,12 +45,14 @@ public AnimationTab(
4545
IFramework framework, ILogger<AnimationTab> logger,
4646
AnimationExportService animationExportService,
4747
CommonUi commonUi,
48+
IObjectTable objectTable,
4849
Configuration config)
4950
{
5051
this.framework = framework;
5152
this.logger = logger;
5253
this.animationExportService = animationExportService;
5354
this.commonUi = commonUi;
55+
this.objectTable = objectTable;
5456
this.config = config;
5557
this.framework.Update += OnFrameworkUpdate;
5658
}
@@ -182,7 +184,7 @@ private unsafe void Capture()
182184
return;
183185
}
184186

185-
var characters = commonUi.GetCharacters()
187+
var characters = objectTable.GetCharacters()
186188
.Where(x => selectedCharacters.Any(s => s.Address == x.Address)).ToArray();
187189
if (characters.Length == 0)
188190
{

0 commit comments

Comments
 (0)