Skip to content

v4.1.8: Various bug fixes #22

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
ALLMarvelous merged 11 commits into from
May 5, 2025
Merged

v4.1.8: Various bug fixes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
00c81f7
Re-format and properly sort Directory.Build.props
ALLMarvelous May 4, 2025
2224a35
CustomAlbums.csproj cleanup and get rid of weird Output directory
ALLMarvelous May 4, 2025
5ba424e
Remove unnecessary log
ALLMarvelous May 4, 2025
b0a5d81
Move ILRepack to a .targets file
ALLMarvelous May 4, 2025
80ebb4b
Update README.md
ALLMarvelous May 4, 2025
0118490
New IData extensions
ALLMarvelous May 4, 2025
fcbfc5f
Merge branch 'development' of https://github.com/MDMods/CustomAlbums …
ALLMarvelous May 4, 2025
e23c41c
CAM-71 Fixed vanilla bug where the difficulty grade icon does not wor…
SB15-MD May 4, 2025
2df0f5d
CAM-72 Disallow duplicates in History of CustomAlbums.json
ALLMarvelous May 5, 2025
713cc27
CAM-70 Remove custom level configs from save file
ALLMarvelous May 5, 2025
8e19ff1
Bump version for release
ALLMarvelous May 5, 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
86 changes: 38 additions & 48 deletions CustomAlbums.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,44 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>AnyCPU;x64</Platforms>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

<ItemGroup>
<None Remove="Directory.Build.props" />
<None Remove="SetPath.cmd" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.40">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
<PackageReference Include="NLayer" Version="1.16.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

<Target Name="ILRepacker" AfterTargets="Build">
<PropertyGroup>
<WorkingDirectory>$(OutputPath)</WorkingDirectory>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>x64</Platforms>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

<ItemGroup>
<None Remove="Directory.Build.props" />
<None Remove="SetPath.cmd" />
<None Remove=".gitattributes" />
<None Remove=".gitignore" />
<None Remove="LICENSE" />
<None Remove="README.md" />
<None Remove="ILRepack.targets" />
</ItemGroup>

<ItemGroup>
<InputAssemblies Include="$(OutputPath)\$(AssemblyName).dll" />
<InputAssemblies Include="$(OutputPath)\NAudio.Core.dll" />
<InputAssemblies Include="$(OutputPath)\NAudio.Vorbis.dll" />
<InputAssemblies Include="$(OutputPath)\NLayer.dll" />
<InputAssemblies Include="$(OutputPath)\NVorbis.dll" />
<InputAssemblies Include="$(OutputPath)\SixLabors.ImageSharp.dll" />
<IlRepackLibs Include="$(OutputPath)" />
<IlRepackLibs Include="$(MelonNET6)" />
<PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.40">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NAudio.Vorbis" Version="1.5.0">
<ExcludeAssets>contentFiles</ExcludeAssets>
</PackageReference>
<PackageReference Include="NLayer" Version="1.16.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>
<ILRepack LibraryPath="@(IlRepackLibs)" OutputFile="$(OutputPath)\$(AssemblyName).dll" InputAssemblies="@(InputAssemblies)" Parallel="true" />
</Target>

<Target Name="ILRepackCopy" AfterTargets="ILRepacker" Condition="'$(WORKER)' != 'GitHub'">
<Copy SourceFiles="$(OutputPath)\$(AssemblyName).dll" DestinationFolder="$(GameFolder)\Mods" />
<Message Text="Copied DLL -&gt; $(GameFolder)\Mods\$(ProjectName).dll" Importance="High" />
</Target>

<Target Name="WarnDeprecatedPath" AfterTargets="Build" Condition="!Exists('$(MD_DIRECTORY)')">
<Message Text="Warning: MD_NET6_DIRECTORY is no longer in use. Please remove the environment variable and run SetPath.cmd again." Importance="High" />
</Target>
</Project>
<Target Name="CopyMod" AfterTargets="Repack" Condition="'$(WORKER)' != 'GitHub'">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(GameFolder)\Mods" />
<Message Text="Copied assembly to '$(GameFolder)\Mods\$(ProjectName).dll'" Importance="High" />
</Target>

<Target Name="WarnDeprecatedPath" AfterTargets="Build" Condition="!Exists('$(MD_DIRECTORY)')">
<Message Text="Warning: MD_NET6_DIRECTORY is no longer in use. Please remove the environment variable and run SetPath.cmd again." Importance="High" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Data/CustomChartSave.cs → Data/ChartSave.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace CustomAlbums.Data
{
public class CustomChartSave
public class ChartSave
{
public int Evaluate { get; set; } = 0;
public int Score { get; set; } = 0;
Expand Down
4 changes: 2 additions & 2 deletions Data/CustomAlbumsSave.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ public class CustomAlbumsSave
public HashSet<string> UnlockedMasters { get; set; } = new();
public HashSet<string> Collections { get; set; } = new();
public HashSet<string> Hides { get; set; } = new();
public Queue<string> History { get; set; } = new();
public Dictionary<string, Dictionary<int, CustomChartSave>> Highest { get; set; } = new();
public List<string> History { get; set; } = new();
public Dictionary<string, Dictionary<int, ChartSave>> Highest { get; set; } = new();
public Dictionary<string, List<int>> FullCombo { get; set; } = new();

internal bool IsEmpty()
Expand Down
Loading
Loading