Skip to content

Feature/patch7.4 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PassiveModding merged 8 commits into from
Dec 19, 2025
Merged

Feature/patch7.4 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41cd69f
Package bump & net 10 init
PassiveModding Dec 16, 2025
fa44fea
pipeline version bump
PassiveModding Dec 16, 2025
6018509
sdk bump
PassiveModding Dec 17, 2025
6d34b09
Bump langversion and cleanup
PassiveModding Dec 18, 2025
7803c9e
Pipeline version bump
PassiveModding Dec 18, 2025
b59f70c
Bump dalamudpackager
PassiveModding Dec 18, 2025
5d057fd
Update test_release.yml
PassiveModding Dec 18, 2025
8ec38f7
Update release.yml
PassiveModding Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
IsCI: true
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
submodules: true # Grab any submodules that may be required

- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Extract version and custom path
run: |
Expand Down Expand Up @@ -80,13 +80,15 @@ jobs:
-p:AssemblyVersion=${{ env.VERSION }} \
-p:FileVersion=${{ env.VERSION }}

- name: Generate Checksums
- name: Generate Checksums & Export ApiLevel
working-directory: Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin
run: |
sha512sum latest.zip >> checksums.sha512
dalamud_api_level=$(jq -r '.DalamudApiLevel' Meddle.Plugin.json)
echo "DALAMUD_API_LEVEL=$dalamud_api_level" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: |
Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin/latest.zip
Expand All @@ -98,7 +100,7 @@ jobs:
fail_on_unmatched_files: true # If the files arent found, fail the workflow and abort the release.

- name: Upload Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: Release Artifacts
path: |
Expand All @@ -121,7 +123,9 @@ jobs:
.[0].TestingAssemblyVersion = $release_version |
.[0].DownloadLinkInstall = $repo_url |
.[0].DownloadLinkUpdate = $repo_url |
.[0].DownloadLinkTesting = $repo_url' \
.[0].DownloadLinkTesting = $repo_url |
.[0].DalamudApiLevel = '"${{ env.DALAMUD_API_LEVEL }}"' |
.[0].TestingDalamudApiLevel = '"${{ env.DALAMUD_API_LEVEL }}"'' \
repo.json > tmp.json && mv tmp.json repo.json

cat repo.json
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ jobs:
strategy:
fail-fast: false
matrix:
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)
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)
dalamud-version: [ "stg_latest", "latest" ] # Can add multiple Dalamud branches here to test against (For example, testing against Dalamud staging)
env:
DALAMUD_HOME: /tmp/dalamud
IsCI: true
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # We don't need the history for testing builds, so we can save some time by not fetching it
submodules: true # Grab any submodules that may be required

- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ matrix.dotnet-version }}

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

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: Meddle.Plugin-${{ matrix.dalamud-version }}-${{ github.sha }}
path: Meddle/Meddle.Plugin/bin/${{ matrix.dalamud-version }}/Release
17 changes: 10 additions & 7 deletions .github/workflows/test_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ jobs:
DOWNLOAD_PATH: ${{ github.event.inputs.dalamud_branch }}
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
submodules: true # Grab any submodules that may be required

- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Display build information
run: |
Expand Down Expand Up @@ -73,13 +73,15 @@ jobs:
-p:AssemblyVersion=${{ env.VERSION }} \
-p:FileVersion=${{ env.VERSION }}

- name: Generate Checksums
- name: Generate Checksums & Export ApiLevel
working-directory: Meddle/Meddle.Plugin/bin/Release/Meddle.Plugin
run: |
sha512sum latest.zip >> checksums.sha512
dalamud_api_level=$(jq -r '.DalamudApiLevel' Meddle.Plugin.json)
echo "DALAMUD_API_LEVEL=$dalamud_api_level" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
tag_name: testing_v${{ env.VERSION }}${{ env.DOWNLOAD_PATH && format('_{0}', env.DOWNLOAD_PATH) || '' }}
name: Test Release v${{ env.VERSION }}${{ env.DOWNLOAD_PATH && format(' ({0})', env.DOWNLOAD_PATH) || '' }}
Expand All @@ -93,7 +95,7 @@ jobs:
fail_on_unmatched_files: true # If the files arent found, fail the workflow and abort the release.

- name: Upload Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: Release Artifacts
path: |
Expand Down Expand Up @@ -124,7 +126,8 @@ jobs:
jq --arg version "${{ env.VERSION }}" \
--arg repo_url "$repo_url/releases/download/$tag_name/latest.zip" \
'.[0].TestingAssemblyVersion = $version |
.[0].DownloadLinkTesting = $repo_url' \
.[0].DownloadLinkTesting = $repo_url |
.[0].TestingDalamudApiLevel = '"${{ env.DALAMUD_API_LEVEL }}"'' \
repo.json > tmp.json && mv tmp.json repo.json

cat repo.json
Expand Down
12 changes: 6 additions & 6 deletions Meddle/Meddle.Plugin/Meddle.Plugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Dalamud.NET.Sdk/13.1.0">
<Project Sdk="Dalamud.NET.Sdk/14.0.1">
<PropertyGroup>
<Version>0.0.1</Version>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Meddle.Plugin</RootNamespace>
<LangVersion>13</LangVersion>
<TargetFramework>net9.0-windows</TargetFramework>
<LangVersion>14</LangVersion>
<TargetFramework>net10.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageReference Include="Vortice.Direct3D11" Version="3.6.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageReference Include="Vortice.Direct3D11" Version="3.8.1" />
<Reference Include="OtterTex">
<HintPath>..\Meddle.Utils\Lib\OtterTex.dll</HintPath>
</Reference>
Expand Down
6 changes: 0 additions & 6 deletions Meddle/Meddle.Plugin/Models/Layout/ParsedInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,22 +219,16 @@ public ParsedStain(Stain stain)
Color = ImGui.ColorConvertU32ToFloat4(UiUtil.SeColorToRgba(SeColor));
RowId = stain.RowId;
Name = stain.Name.ExtractText();
Name2 = stain.Name2.ExtractText();
Shade = stain.Shade;
SubOrder = stain.SubOrder;
Unknown1 = stain.Unknown1;
Unknown2 = stain.Unknown2;
}

public uint SeColor { get; }
public Vector4 Color { get; }
public uint RowId { get; }
public string Name { get; }
public string Name2 { get; }
public uint Shade { get; }
public uint SubOrder { get; }
public bool Unknown1 { get; }
public bool Unknown2 { get; }

public static implicit operator ParsedStain(Stain stain) => new(stain);
public static implicit operator ParsedStain?(Stain? stain) => stain == null ? null : new ParsedStain(stain.Value);
Expand Down
38 changes: 0 additions & 38 deletions Meddle/Meddle.Plugin/Services/ParseService.cs
View file
Open in desktop

This file was deleted.

112 changes: 0 additions & 112 deletions Meddle/Meddle.Plugin/Services/ResourceHooks.cs
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions Meddle/Meddle.Plugin/UI/AnimationTab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Dalamud.Bindings.ImGui;
using Meddle.Plugin.Models;
using Meddle.Plugin.Services;
using Meddle.Plugin.Services.UI;
using Meddle.Plugin.Utils;
using Microsoft.Extensions.Logging;
using SharpGLTF.Transforms;
Expand All @@ -25,6 +24,7 @@ public class AnimationTab : ITab
{
private readonly AnimationExportService animationExportService;
private readonly CommonUi commonUi;
private readonly IObjectTable objectTable;
private readonly Configuration config;
private readonly List<(DateTime Time, AttachSet[])> frames = [];
private readonly IFramework framework;
Expand All @@ -45,12 +45,14 @@ public AnimationTab(
IFramework framework, ILogger<AnimationTab> logger,
AnimationExportService animationExportService,
CommonUi commonUi,
IObjectTable objectTable,
Configuration config)
{
this.framework = framework;
this.logger = logger;
this.animationExportService = animationExportService;
this.commonUi = commonUi;
this.objectTable = objectTable;
this.config = config;
this.framework.Update += OnFrameworkUpdate;
}
Expand Down Expand Up @@ -182,7 +184,7 @@ private unsafe void Capture()
return;
}

var characters = commonUi.GetCharacters()
var characters = objectTable.GetCharacters()
.Where(x => selectedCharacters.Any(s => s.Address == x.Address)).ToArray();
if (characters.Length == 0)
{
Expand Down
Loading
Loading