diff --git a/BveEx/BveEx.csproj b/BveEx/BveEx.csproj index d6890694..27bc7470 100644 --- a/BveEx/BveEx.csproj +++ b/BveEx/BveEx.csproj @@ -262,8 +262,6 @@ - - diff --git a/BveEx/Launching/LaunchModeManager.cs b/BveEx/Launching/LaunchModeManager.cs index 23fd28ed..de126b5c 100644 --- a/BveEx/Launching/LaunchModeManager.cs +++ b/BveEx/Launching/LaunchModeManager.cs @@ -6,50 +6,19 @@ using System.Text; using System.Threading.Tasks; -using UnembeddedResources; - using BveEx.PluginHost; namespace BveEx.Launching { internal static class LaunchModeManager { - private class ResourceSet - { - private readonly ResourceLocalizer Localizer = ResourceLocalizer.FromResXOfType(typeof(LaunchModeManager), "Core"); - - [ResourceStringHolder(nameof(Localizer))] public Resource ConflictedMessage { get; private set; } - [ResourceStringHolder(nameof(Localizer))] public Resource ConflictedApproach { get; private set; } - - public ResourceSet() - { - ResourceLoader.LoadAndSetAll(this); - } - } - - private static readonly Lazy Resources = new Lazy(); - - static LaunchModeManager() - { -#if DEBUG - _ = Resources.Value; -#endif - } - public static void RestartAsLegacyMode(string scenarioPath) { - string[] commandLineArgs = Environment.GetCommandLineArgs(); - if (commandLineArgs.Contains("/bveex-modechanged", StringComparer.OrdinalIgnoreCase)) - { - ErrorDialog.Show(5, Resources.Value.ConflictedMessage.Value, Resources.Value.ConflictedApproach.Value); - throw new InvalidOperationException(Resources.Value.ConflictedMessage.Value); - } - string legacyFilePath = Path.Combine(Path.GetDirectoryName(App.Instance.BveExLauncherAssembly.Location), ".LEGACY"); File.Create(legacyFilePath).Close(); File.SetAttributes(legacyFilePath, FileAttributes.Hidden); - Process.Start(App.Instance.BveAssembly.Location, scenarioPath is null ? string.Empty : $"\"{scenarioPath}\" /bveex-modechanged"); + Process.Start(App.Instance.BveAssembly.Location, scenarioPath is null ? string.Empty : $"\"{scenarioPath}\""); Environment.Exit(0); } } diff --git a/BveEx/Resources/LaunchModeManager.ja.resx b/BveEx/Resources/LaunchModeManager.ja.resx deleted file mode 100644 index fc671533..00000000 --- a/BveEx/Resources/LaunchModeManager.ja.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 旧・AtsEX 向けのマップ構文や AtsEX プラグインの使用を取り止め、BveEX 向けのものに統一してください。 - - - 旧・AtsEX 用の構文と BveEX 用の構文の両方が検出されました。これらを同一シナリオで併用することはできません。 - - \ No newline at end of file diff --git a/BveEx/Resources/LaunchModeManager.resx b/BveEx/Resources/LaunchModeManager.resx deleted file mode 100644 index 05e24701..00000000 --- a/BveEx/Resources/LaunchModeManager.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Replace map statements for AtsEX or AtsEX plugins by those for BveEX. - - - Both code for AtsEX and that for BveEX detected. They cannot be used in the same scenario. - - \ No newline at end of file