Merge pull request #4 from pikepikeid/Fix4

Author: pikepikeid

VRCFTPicoModule/Assets/Locales/ja-JP.json

@@ -0,0 +1,22 @@
+{
+  "start-init": "初期化を開始しています...",
+  "config-path": "設定ファイルの場所: {0}",
+  "force-disable-eye": "アイトラッキングは強制的に無効化されています",
+  "force-disable-expression": "フェイストラッキングは強制的に無効化されています",
+  "initializing-udp-clients": "UDPクライアントのポートを {0} で初期化しています",
+  "using-port": "使用ポート: {0}",
+  "eye-tracking-disabled": "アイトラッキングは無効です",
+  "expression-tracking-disabled": "フェイストラッキングは無効です",
+  "legacy-protocol": "レガシープロトコル",
+  "full-face-tracking": "フルフェイストラッキング",
+  "eye-tracking": "アイトラッキング",
+  "expression-tracking": "フェイストラッキング",
+  "init-failed": "初期化に失敗しました。例外: {0}",
+  "update-timeout": "データ受信がタイムアウトしました",
+  "update-failed": "アップデートに失敗しました: {0}",
+  "eye-gain-loaded": "視線ゲインを読み込みました: X={0}, Y={1}",
+  "eye-gain-invalid": "eye_gain.txt の形式が無効です: \"{0}\"",
+  "eye-gain-not-found": "eye_gain.txt が見つからないため、デフォルト値（1.0）を使用します",
+  "eye-gain-disabled": "視線ゲインは無効です",
+  "eye-gain-failed": "eye_gain.txt の読み込みに失敗しました"
+}

VRCFTPicoModule/VRCFTPicoModule.cs

@@ -11,7 +11,7 @@ namespace VRCFTPicoModule;
 public class VRCFTPicoModule : ExtTrackingModule
 {
     private static readonly int[] Ports = [29765, 29763];
-    private static readonly UdpClient[] Clients = Ports.Select(port => new UdpClient(port) { Client = { ReceiveTimeout = 100 } }).ToArray();
+    private UdpClient[] _clients = [];
     private static UdpClient _udpClient = new();
     private static int _port;
     private Updater? _updater;
@@ -108,7 +108,7 @@ private void UpdateModuleInfo((bool, bool) initializationResult)
             { Item1: false, Item2: true } => T("expression-tracking"),
             _ => ""
         };
-        ModuleInformation.Name = "PICO / " + moduleTrackingStatus + moduleProtocol;
+        ModuleInformation.Name = "VRCFTPicoModule (modified) / " + moduleTrackingStatus + moduleProtocol;
         var stream = GetType().Assembly.GetManifestResourceStream("VRCFTPicoModule.Assets.pico.png");
         ModuleInformation.StaticImages = stream != null ? [stream] : ModuleInformation.StaticImages;
     }
@@ -117,7 +117,12 @@ private async Task<int> ListenOnPorts()
     {
         try
         {
-            var tasks = Clients.Select(client => client.ReceiveAsync()).ToArray();
+            _clients = Ports.Select(port => new UdpClient(port)
+            {
+                Client = { ReceiveTimeout = 100 }
+            }).ToArray();
+
+            var tasks = _clients.Select(client => client.ReceiveAsync()).ToArray();
 
             if (tasks.Length == 0)
             {
@@ -126,7 +131,7 @@ private async Task<int> ListenOnPorts()
 
             var completedTask = await Task.WhenAny(tasks);
 
-            foreach (var client in Clients) client.Dispose();
+            foreach (var client in _clients) client.Dispose();
 
             return Array.IndexOf(tasks, completedTask);
         }
@@ -143,7 +148,7 @@ public override void Update()
         if (_shuttingDown) return;
 
         try
-        {
+        {
             _updater?.Update(Status);
         }
         catch (AggregateException ex) when (ex.InnerException is ObjectDisposedException) { }
@@ -154,7 +159,7 @@ public override void Teardown()
     {
         _shuttingDown = true;
 
-        foreach (var client in Clients)
+        foreach (var client in _clients)
             client.Dispose();
         _udpClient.Dispose();
     }
@@ -164,7 +169,7 @@ private void LoadEyeGain()
         {
             if (!File.Exists(GainFilePath))
             {
-                Logger.LogDebug("eye_gain.txt not found, using default values");
+                Logger.LogInformation(T("eye-gain-not-found"));
                 return;
             }
 
@@ -178,16 +183,16 @@ private void LoadEyeGain()
                 _eyeGainX = x;
                 _eyeGainY = y;
 
-                Logger.LogInformation($"Eye gain loaded: X={_eyeGainX}, Y={_eyeGainY}");
+                Logger.LogInformation(T("eye-gain-loaded"),_eyeGainX,_eyeGainY);
             }
             else
             {
-                Logger.LogWarning($"Invalid eye_gain.txt format: \"{text}\"");
+                Logger.LogWarning(T("eye-gain-invalid"),text);
             }
         }
         catch (Exception ex)
         {
-            Logger.LogError(ex, "Failed to read eye_gain.txt");
+            Logger.LogError(ex, T("eye-gain-failed"));
         }
     }
 }

VRCFTPicoModule/VRCFTPicoModule.csproj

@@ -4,7 +4,7 @@
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>0.1.11</AssemblyVersion>
+    <AssemblyVersion>0.1.10.4</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
     <Version>$(AssemblyVersion)</Version>
   </PropertyGroup>
@@ -26,6 +26,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Assets\Locales\ja-JP.json" />
+    <EmbeddedResource Include="Assets\Locales\ja-JP.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
   <Target Name="PostBuild" AfterTargets="Build" Condition="'$(ContinuousIntegrationBuild)' != 'true'">
     <Copy SourceFiles="$(TargetPath)" DestinationFiles="$(APPDATA)\VRCFaceTracking\CustomLibs\$(TargetFileName)" OverwriteReadOnlyFiles="True" SkipUnchangedFiles="True" />
   </Target>