Mii extra bits

Directory.Build.props

@@ -1,7 +1,54 @@
 <Project>
     <PropertyGroup>
         <CSharpier_Check>false</CSharpier_Check>
+        <Configurations>Debug;Release;Debug-Windows;Debug-Linux;Debug-macOS;Release-Windows;Release-Linux;Release-macOS</Configurations>
+        <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
+
+    <!-- Platform-specific constants for Debug configurations -->
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug-Windows'">
+        <DefineConstants>$(DefineConstants);DEBUG;TRACE;WINDOWS</DefineConstants>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <Optimize>false</Optimize>
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug-Linux'">
+        <DefineConstants>$(DefineConstants);DEBUG;TRACE;LINUX</DefineConstants>
+        <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+        <Optimize>false</Optimize>
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug-macOS'">
+        <DefineConstants>$(DefineConstants);DEBUG;TRACE;MACOS</DefineConstants>
+        <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+        <Optimize>false</Optimize>
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+    </PropertyGroup>
+
+    <!-- Platform-specific constants for Release configurations -->
+    <PropertyGroup Condition="'$(Configuration)' == 'Release-Windows'">
+        <DefineConstants>$(DefineConstants);TRACE;WINDOWS</DefineConstants>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <Optimize>true</Optimize>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release-Linux'">
+        <DefineConstants>$(DefineConstants);TRACE;LINUX</DefineConstants>
+        <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+        <Optimize>true</Optimize>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release-macOS'">
+        <DefineConstants>$(DefineConstants);TRACE;MACOS</DefineConstants>
+        <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+        <Optimize>true</Optimize>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="CSharpier.MsBuild" Version="0.30.6">
             <PrivateAssets>all</PrivateAssets>

Flatpak/io.github.TeamWheelWizard.WheelWizard.metainfo.xml

@@ -31,19 +31,19 @@
   <screenshots>
     <screenshot type="default">
       <caption>Wheel Wizard's home page</caption>
-      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/d8eb58433cea25d438f4d6fb79bfececd5ccbc73/images/screenshots/home_page.png</image>
+      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/261be51961d07ac217d343f4a03231b57e603866/images/screenshots/home_page.png</image>
     </screenshot>
     <screenshot>
       <caption>Wheel Wizard's room details page</caption>
-      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/d8eb58433cea25d438f4d6fb79bfececd5ccbc73/images/screenshots/rooms_page.png</image>
+      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/d1c065020c1a526d80eb08f53423543f0f5c3439/images/screenshots/rooms_page.png</image>
     </screenshot>
     <screenshot>
       <caption>Wheel Wizard's profile page</caption>
-      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/d8eb58433cea25d438f4d6fb79bfececd5ccbc73/images/screenshots/profile_page.png</image>
+      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/d1c065020c1a526d80eb08f53423543f0f5c3439/images/screenshots/profile_page.png</image>
     </screenshot>
     <screenshot>
-      <caption>Wheel Wizard's mod browser</caption>
-      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/d8eb58433cea25d438f4d6fb79bfececd5ccbc73/images/screenshots/mods_browser.png</image>
+      <caption>Wheel Wizard's Mii management page</caption>
+      <image type="source">https://raw.githubusercontent.com/TeamWheelWizard/.github/d1c065020c1a526d80eb08f53423543f0f5c3439/images/screenshots/mii_page.png</image>
     </screenshot>
   </screenshots>
 
@@ -55,6 +55,11 @@
   </provides>
 
   <releases>
+    <release version="2.3.3" date="2025-09-14"/>
+    <release version="2.3.2" date="2025-07-01"/>
+    <release version="2.3.1" date="2025-06-30"/>
+    <release version="2.3.0" date="2025-06-28"/>
+    <release version="2.2.1" date="2025-05-06"/>
     <release version="2.1.3" date="2025-04-13"/>
     <release version="2.1.0" date="2025-04-11"/>
   </releases>

README.md

@@ -30,6 +30,8 @@ Feel free to join our community on [Discord](https://discord.gg/vZ7T2wJnsq) for
   <img src="https://github.com/TeamWheelWizard/.github/blob/main/images/screenshots/rooms_page.png" alt="Wheel Wizard Logo" width="450"/>
   <img src="https://github.com/TeamWheelWizard/.github/blob/main/images/screenshots/profile_page.png" alt="Wheel Wizard Logo" width="450"/>
   <img src="https://github.com/TeamWheelWizard/.github/blob/main/images/screenshots/mods_browser.png" alt="Wheel Wizard Logo" width="450"/>
+  <img src="https://github.com/TeamWheelWizard/.github/blob/main/images/screenshots/miieditor_page.png" alt="Wheel Wizard Logo" width="450"/>
+  <img src="https://github.com/TeamWheelWizard/.github/blob/main/images/screenshots/mii_page.png" alt="Wheel Wizard Logo" width="450"/>
 </p>
 ---
 

WheelWizard.Test/Features/GameBananaTests.cs

@@ -89,7 +89,7 @@ public async Task GetModSearchResults_WithApiError_ReturnsFailure()
 
             _apiCaller
                 .CallApiAsync(Arg.Any<Expression<Func<IGameBananaApi, Task<GameBananaSearchResults>>>>())
-                .Returns(Fail<GameBananaSearchResults>(expectedError));
+                .Returns(Fail(expectedError));
 
             // Act
             var result = await _service.GetModSearchResults(searchTerm, page);
@@ -128,9 +128,7 @@ public async Task GetModDetails_WithApiError_ReturnsFailure()
             var modId = 123;
             var expectedError = "API Error";
 
-            _apiCaller
-                .CallApiAsync(Arg.Any<Expression<Func<IGameBananaApi, Task<GameBananaModDetails>>>>())
-                .Returns(Fail<GameBananaModDetails>(expectedError));
+            _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IGameBananaApi, Task<GameBananaModDetails>>>>()).Returns(Fail(expectedError));
 
             // Act
             var result = await _service.GetModDetails(modId);

WheelWizard.Test/Features/MiiDbServiceTests.cs

@@ -1,8 +1,8 @@
 using NSubstitute.ExceptionExtensions;
 using Testably.Abstractions;
 using WheelWizard.Shared;
-using WheelWizard.WiiManagement;
-using WheelWizard.WiiManagement.Domain.Mii;
+using WheelWizard.WiiManagement.MiiManagement;
+using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
 namespace WheelWizard.Test.Features
 {
@@ -30,13 +30,13 @@ private OperationResult<Mii> CreateValidMii(uint id = 1, string name = "TestMii"
             var height = MiiScale.Create(60);
             var weight = MiiScale.Create(50);
             var miiFacial = MiiFacialFeatures.Create(MiiFaceShape.Bread, MiiSkinColor.Brown, MiiFacialFeature.Beard, false, false);
-            var miiHair = MiiHair.Create(1, HairColor.Black, false);
-            var miiEyebrows = MiiEyebrow.Create(3, 3, EyebrowColor.Black, 3, 3, 3);
-            var miiEyes = MiiEye.Create(3, 3, 3, EyeColor.Black, 3, 3);
-            var miiNose = MiiNose.Create(NoseType.Default, 3, 3);
-            var miiLips = MiiLip.Create(3, LipColor.Pink, 3, 3);
-            var miiGlasses = MiiGlasses.Create(GlassesType.None, GlassesColor.Blue, 3, 3);
-            var miiFacialHair = MiiFacialHair.Create(MustacheType.None, BeardType.None, MustacheColor.Black, 3, 3);
+            var miiHair = MiiHair.Create(1, MiiHairColor.Black, false);
+            var miiEyebrows = MiiEyebrow.Create(3, 3, MiiHairColor.Black, 3, 3, 3);
+            var miiEyes = MiiEye.Create(3, 3, 3, MiiEyeColor.Black, 3, 3);
+            var miiNose = MiiNose.Create(MiiNoseType.Default, 3, 3);
+            var miiLips = MiiLip.Create(3, MiiLipColor.Pink, 3, 3);
+            var miiGlasses = MiiGlasses.Create(MiiGlassesType.None, MiiGlassesColor.Blue, 3, 3);
+            var miiFacialHair = MiiFacialHair.Create(MiiMustacheType.None, MiiBeardType.None, MiiHairColor.Black, 3, 3);
             var miiMole = MiiMole.Create(true, 3, 3, 3);
             var creatorName = MiiName.Create("Creator");
             var miiFavoriteColor = MiiFavoriteColor.Red;
@@ -57,9 +57,7 @@ private OperationResult<Mii> CreateValidMii(uint id = 1, string name = "TestMii"
                 creatorName,
             };
             if (EveryResult.Any(r => r.IsFailure))
-            {
-                return Fail<Mii>(EveryResult.First(r => r.IsFailure).Error);
-            }
+                return EveryResult.First(r => r.IsFailure).Error!;
 
             return Ok(
                 new Mii
@@ -68,7 +66,7 @@ private OperationResult<Mii> CreateValidMii(uint id = 1, string name = "TestMii"
                     MiiId = miiId,
                     Height = height.Value,
                     Weight = weight.Value,
-                    MiiFacial = miiFacial.Value,
+                    MiiFacialFeatures = miiFacial.Value,
                     MiiHair = miiHair.Value,
                     MiiEyebrows = miiEyebrows.Value,
                     MiiEyes = miiEyes.Value,
@@ -131,7 +129,6 @@ public void MiiSerializer_Deserialize_ShouldFail_ForInvalidDataLength()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(result.IsFailure, true);
         }
 
         [Fact]
@@ -145,7 +142,6 @@ public void MiiSerializer_Deserialize_ShouldFail_ForNullData()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(result.IsFailure, true);
         }
 
         [Fact]
@@ -280,7 +276,7 @@ public void GetByClientId_ShouldReturnFailure_WhenDeserializationFails()
             // Arrange
             uint targetId = 666;
             var badBytes = new byte[MiiSerializer.MiiBlockSize];
-            for (int i = 0; i < badBytes.Length; i++)
+            for (var i = 0; i < badBytes.Length; i++)
             {
                 badBytes[i] = (byte)(i % 256);
             }
@@ -292,7 +288,6 @@ public void GetByClientId_ShouldReturnFailure_WhenDeserializationFails()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(result.IsFailure, true);
             _repositoryService.Received(1).GetRawBlockByAvatarId(targetId);
         }
 
@@ -350,7 +345,7 @@ public void Update_ShouldReturnFailure_WhenRepositoryUpdateFails()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(repoError.Error, result.Error); // Propagate the exact error
+            Assert.Equal(repoError, result.Error); // Propagate the exact error
             _repositoryService.Received(1).UpdateBlockByClientId(miiToUpdate.MiiId, Arg.Is<byte[]>(b => b.SequenceEqual(expectedBytes)));
         }
 
@@ -385,8 +380,8 @@ public void UpdateName_ShouldReturnSuccess_WhenGetAndUpdateSucceed()
         {
             // Arrange
             uint targetId = 333;
-            string oldName = "OldName";
-            string newName = "NewName";
+            var oldName = "OldName";
+            var newName = "NewName";
             var miiResult = CreateValidMii(targetId, oldName);
             Assert.True(miiResult.IsSuccess, "Setup Failed: Could not create original Mii");
             var originalMii = miiResult.Value;
@@ -420,15 +415,15 @@ public void UpdateName_ShouldReturnFailure_WhenGetByClientIdFails_NotFound()
         {
             // Arrange
             uint targetId = 404;
-            string newName = "NewName";
+            var newName = "NewName";
             _repositoryService.GetRawBlockByAvatarId(targetId).Returns((byte[]?)null);
 
             // Act
             var result = _service.UpdateName(targetId, newName);
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal("Mii block not found or invalid.", result.Error.Message); // Error from GetByClientId
+            Assert.Equal("Mii block not found", result.Error.Message); // Error from GetByClientId
             _repositoryService.Received(1).GetRawBlockByAvatarId(targetId);
             _repositoryService.DidNotReceive().UpdateBlockByClientId(Arg.Any<uint>(), Arg.Any<byte[]>());
         }
@@ -438,7 +433,7 @@ public void UpdateName_ShouldReturnFailure_WhenGetByClientIdFails_Deserializatio
         {
             // Arrange
             uint targetId = 666;
-            string newName = "NewName";
+            var newName = "NewName";
             var badBytes = new byte[MiiSerializer.MiiBlockSize]; // Correct size, bad content
             _repositoryService.GetRawBlockByAvatarId(targetId).Returns(badBytes);
 
@@ -457,8 +452,8 @@ public void UpdateName_ShouldReturnFailure_WhenNewNameIsInvalid()
         {
             // Arrange
             uint targetId = 555;
-            string oldName = "ValidOld";
-            string invalidNewName = "ThisNameIsDefinitelyTooLongForTheMii"; // > 10 chars
+            var oldName = "ValidOld";
+            var invalidNewName = "ThisNameIsDefinitelyTooLongForTheMii"; // > 10 chars
             var miiResult = CreateValidMii(targetId, oldName);
             Assert.True(miiResult.IsSuccess, "Setup Failed: Could not create original Mii");
             var originalBytes = GetSerializedBytes(miiResult.Value);
@@ -470,7 +465,6 @@ public void UpdateName_ShouldReturnFailure_WhenNewNameIsInvalid()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(result.IsFailure, true);
             _repositoryService.Received(1).GetRawBlockByAvatarId(targetId);
             _repositoryService.DidNotReceive().UpdateBlockByClientId(Arg.Any<uint>(), Arg.Any<byte[]>());
         }
@@ -480,8 +474,8 @@ public void UpdateName_ShouldReturnFailure_WhenRepositoryUpdateFails()
         {
             // Arrange
             uint targetId = 777;
-            string oldName = "Old";
-            string newName = "New";
+            var oldName = "Old";
+            var newName = "New";
             var miiResult = CreateValidMii(targetId, oldName);
             Assert.True(miiResult.IsSuccess, "Setup Failed: Could not create original Mii");
             var originalBytes = GetSerializedBytes(miiResult.Value);
@@ -497,7 +491,7 @@ public void UpdateName_ShouldReturnFailure_WhenRepositoryUpdateFails()
 
             // Assert
             Assert.True(result.IsFailure);
-            Assert.Equal(repoError.Error, result.Error); // Error from the repository update propagated
+            Assert.Equal(repoError, result.Error); // Error from the repository update propagated
             _repositoryService.Received(1).GetRawBlockByAvatarId(targetId);
             _repositoryService.Received(1).UpdateBlockByClientId(targetId, Arg.Any<byte[]>());
         }
@@ -507,7 +501,7 @@ public void UpdateName_ShouldHandleExceptionDuringGet()
         {
             // Arrange
             uint targetId = 111;
-            string newName = "New";
+            var newName = "New";
             var expectedException = new TimeoutException("Timeout contacting repository");
             _repositoryService.GetRawBlockByAvatarId(targetId).Throws(expectedException);
 
@@ -523,8 +517,8 @@ public void UpdateName_ShouldHandleExceptionDuringUpdate()
         {
             // Arrange
             uint targetId = 222;
-            string oldName = "Old";
-            string newName = "New";
+            var oldName = "Old";
+            var newName = "New";
             var miiResult = CreateValidMii(targetId, oldName);
             Assert.True(miiResult.IsSuccess, "Setup Failed: Could not create original Mii");
             var originalBytes = GetSerializedBytes(miiResult.Value);

WheelWizard.Test/Features/MiiSerializerTests.cs

@@ -1,4 +1,5 @@
 using WheelWizard.WiiManagement;
+using WheelWizard.WiiManagement.MiiManagement;
 
 namespace WheelWizard.Test.Features;
 
@@ -94,7 +95,7 @@ public void RoundTrip_Serialization_ShouldBeConsistent(string base64Data)
         Assert.Equal(mii.Name.ToString(), miiRoundTrip.Name.ToString());
         Assert.Equal(mii.Height.Value, miiRoundTrip.Height.Value);
         Assert.Equal(mii.Weight.Value, miiRoundTrip.Weight.Value);
-        Assert.Equal(mii.MiiFacial.FaceShape, miiRoundTrip.MiiFacial.FaceShape);
+        Assert.Equal(mii.MiiFacialFeatures.FaceShape, miiRoundTrip.MiiFacialFeatures.FaceShape);
         Assert.Equal(mii.MiiEyes.Type, miiRoundTrip.MiiEyes.Type);
         Assert.Equal(mii.MiiGlasses.Type, miiRoundTrip.MiiGlasses.Type);
         Assert.Equal(mii.CreatorName.ToString(), miiRoundTrip.CreatorName.ToString());

WheelWizard.Test/Features/WhWzDataTests.cs

@@ -41,7 +41,7 @@ public async Task GetStatusAsync_ReturnsFailure_WhenApiCallFails()
         // Arrange
         var expectedError = new OperationError { Message = "API call failed" };
 
-        _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<WhWzStatus>>>>()).Returns(Fail<WhWzStatus>(expectedError));
+        _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<WhWzStatus>>>>()).Returns(expectedError);
 
         // Act
         var result = await _service.GetStatusAsync();
@@ -59,7 +59,7 @@ public async Task LoadBadgesAsync_ReturnsSuccess_WhenApiCallSucceeds()
         {
             { "FC1", [BadgeVariant.WhWzDev, BadgeVariant.Translator] },
             { "FC2", [BadgeVariant.RrDev] },
-            { "FC3", [BadgeVariant.None, BadgeVariant.GoldWinner] },
+            { "FC3", [BadgeVariant.None, BadgeVariant.Firestarter_GoldWinner] },
         };
 
         _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<Dictionary<string, BadgeVariant[]>>>>>()).Returns(Ok(badgeData));
@@ -77,9 +77,7 @@ public async Task LoadBadgesAsync_ReturnsFailure_WhenApiCallFails()
         // Arrange
         var expectedError = new OperationError { Message = "API call failed" };
 
-        _apiCaller
-            .CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<Dictionary<string, BadgeVariant[]>>>>>())
-            .Returns(Fail<Dictionary<string, BadgeVariant[]>>(expectedError));
+        _apiCaller.CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<Dictionary<string, BadgeVariant[]>>>>>()).Returns(expectedError);
 
         // Act
         var result = await _service.LoadBadgesAsync();
@@ -162,7 +160,10 @@ public async Task LoadBadgesAsync_OverwritesExistingBadges_WhenCalledMultipleTim
         Assert.Contains(BadgeVariant.WhWzDev, initialBadges);
 
         // Arrange - Second load with different data
-        var updatedBadgeData = new Dictionary<string, BadgeVariant[]> { { "FC1", [BadgeVariant.Translator, BadgeVariant.GoldWinner] } };
+        var updatedBadgeData = new Dictionary<string, BadgeVariant[]>
+        {
+            { "FC1", [BadgeVariant.Translator, BadgeVariant.Firestarter_GoldWinner] },
+        };
 
         _apiCaller
             .CallApiAsync(Arg.Any<Expression<Func<IWhWzDataApi, Task<Dictionary<string, BadgeVariant[]>>>>>())
@@ -175,7 +176,7 @@ public async Task LoadBadgesAsync_OverwritesExistingBadges_WhenCalledMultipleTim
         var updatedBadges = _service.GetBadges("FC1");
         Assert.Equal(2, updatedBadges.Length);
         Assert.Contains(BadgeVariant.Translator, updatedBadges);
-        Assert.Contains(BadgeVariant.GoldWinner, updatedBadges);
+        Assert.Contains(BadgeVariant.Firestarter_GoldWinner, updatedBadges);
         Assert.DoesNotContain(BadgeVariant.WhWzDev, updatedBadges);
     }
 }

WheelWizard.Test/GlobalUsings.cs

@@ -1,2 +1,3 @@
 global using NSubstitute;
+global using static WheelWizard.Shared.OperationError;
 global using static WheelWizard.Shared.OperationResult;