Update music attribute to use original format

Update README.md

README.md

@@ -12,8 +12,8 @@ This is a server for Taiko no Tatsujin Nijiiro ver 08.18
 
 1. Download the server from release page, extract anywhere
 
-2. From game's Data\x64\datatable folder, find music_attribute.bin, musicinfo.bin, music_order.bin and wordlist.bin, decompress them, add .json prefix to them.
-   The result is music_attribute.json, musicinfo.json, music_order.json and wordlist.json. Put music_attribute.json under wwwroot, the others under wwwroot/data folder in server.
+2. From game's `Data\x64\datatable` folder, find `music_attribute.bin`, `musicinfo.bin`, `music_order.bin` and `wordlist.bin`, decompress them, add `.json` prefix to them.
+   The result is `music_attribute.json`, `musicinfo.json`, `music_order.json` and `wordlist.json`. Put `music_attribute.json` under `wwwroot`, the others under` wwwroot/data` folder in server.
 
 3. Modify hosts, add the following entries:
 
@@ -32,10 +32,19 @@ This is a server for Taiko no Tatsujin Nijiiro ver 08.18
 
    2. Copy the content in Apache folder to Apache root folder (and replace)
 
-   5. Open the certs folder Apache root folder, then click on the localhost.crt file and import it to trusted root store.
-   
+   3. Open `conf/httpd.conf`, find this line, modify it to your Apache install (extracted) full path
+
+      ```htaccess
+      # For example, if your Apache is extracted to C:\users\username\Apache24, then this should be "c:/users/username/Apache24"
+      Define SRVROOT "d:/Projects/Apache24"
+      ```
+
+      
+
+   4. Open the certs folder Apache root folder, then click on the localhost.crt file and import it to trusted root store.
+
       If everything is correct, run bin/httpd.exe, a command prompt will open (and stay open, if it shut down, probably something is not setup correctly)
-   
+
 5. Now run the server, if everything is setup correctly, visit http://localhost:5000, you should be able to see the web ui up and running without errors.
 
 6. Go to game folder, copy the config files (AMConfig.ini and WritableConfig.ini) in the AMCUS folder from server release to AMCUS folder and replace the original ones.
@@ -46,3 +55,7 @@ This is a server for Taiko no Tatsujin Nijiiro ver 08.18
 
 9. Run the game, it should now connect to the server.
 
+### Run the server on another computer
+
+If you want to run the server on another computer, the procedure is identical with an extra step. Before you open browser, in `wwwroot/appsettings.json`, change `BaseUrl` to `https://naominet.jp:10122` then instead of visit localhost, visit the server using domain name to test.
+

TaikoLocalServer/.gitignore

@@ -0,0 +1 @@
+wwwroot/music_attribute.json

TaikoLocalServer/Common/Utils/MusicAttributeManager.cs

@@ -4,7 +4,7 @@ namespace TaikoLocalServer.Common.Utils;
 
 public class MusicAttributeManager
 {
-    public readonly Dictionary<uint,MusicAttribute> MusicAttributes;
+    public readonly Dictionary<uint,MusicAttributeEntry> MusicAttributes;
 
     static MusicAttributeManager()
     {
@@ -16,13 +16,13 @@ public class MusicAttributeManager
         var filePath = Path.Combine(dataPath, Constants.MUSIC_ATTRIBUTE_FILE_NAME);
         var jsonString = File.ReadAllText(filePath);
         
-        var result = JsonSerializer.Deserialize<List<MusicAttribute>>(jsonString);
+        var result = JsonSerializer.Deserialize<MusicAttributes>(jsonString);
         if (result is null)
         {
             throw new ApplicationException("Cannot parse music attribute json!");
         }
         
-        MusicAttributes = result.ToDictionary(attribute => attribute.MusicId);
+        MusicAttributes = result.MusicAttributeEntries.ToDictionary(attribute => attribute.MusicId);
 
         Musics = MusicAttributes.Select(pair => pair.Key)
                                 .ToList();

TaikoLocalServer/Models/MusicAttributeEntry.cs

@@ -2,7 +2,7 @@
 
 namespace TaikoLocalServer.Models;
 
-public class MusicAttribute
+public class MusicAttributeEntry
 {
     [JsonPropertyName("uniqueId")]
     public uint MusicId { get; set; }

TaikoLocalServer/Models/MusicAttributes.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace TaikoLocalServer.Models;
+
+public class MusicAttributes
+{
+    [JsonPropertyName("items")]
+    public List<MusicAttributeEntry> MusicAttributeEntries { get; set; } = new();
+}

TaikoLocalServer/TaikoLocalServer.csproj

@@ -35,10 +35,10 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Update="wwwroot\music_attribute.json">
+      <Content Update="wwwroot\dan_data.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-      <Content Update="wwwroot\dan_data.json">
+      <Content Update="wwwroot\music_attribute.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
     </ItemGroup>