ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix dalamud launch language and add --dalamud-client-language (#826)

Browse source 
* Fix dalamud launch language and add --dalamud-client-language

* Fix help
This commit is contained in:
kizer 2022-04-30 03:12:22 +09:00 • committed by GitHub
parent c052275589
commit fde3f63dc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 74 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

128
Dalamud.Injector/EntryPoint.cs
View file

@ -37,9 +37,9 @@ namespace Dalamud.Injector
/// <param name="argvPtr">byte** string arguments.</param> /// <param name="argvPtr">byte** string arguments.</param>
public static void Main(int argc, IntPtr argvPtr) public static void Main(int argc, IntPtr argvPtr)
{ {
Init();
List<string> args = new(argc); List<string> args = new(argc);
Init(args);
unsafe unsafe
{ {
var argv = (IntPtr*)argvPtr; var argv = (IntPtr*)argvPtr;
@ -96,15 +96,13 @@ namespace Dalamud.Injector
} }
else else
{ {
Console.WriteLine("Invalid command: {0}", mainCommand); throw new CommandLineException($"\"{mainCommand}\" is not a valid command.");
ProcessHelpCommand(args);
Environment.Exit(-1);
} }
} }
private static void Init() private static void Init(List<string> args)
{ {
InitUnhandledException(); InitUnhandledException(args);
InitLogging(); InitLogging();
var cwd = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory; var cwd = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
@ -115,25 +113,31 @@ namespace Dalamud.Injector
} }
} }
private static void InitUnhandledException() private static void InitUnhandledException(List<string> args)
{ {
AppDomain.CurrentDomain.UnhandledException += (sender, eventArgs) => AppDomain.CurrentDomain.UnhandledException += (sender, eventArgs) =>
{ {
if (Log.Logger == null) var exObj = eventArgs.ExceptionObject;
if (exObj is CommandLineException clex)
{
Console.WriteLine();
Console.WriteLine("Command line error: {0}", clex.Message);
Console.WriteLine();
ProcessHelpCommand(args);
Environment.Exit(-1);
}
else if (Log.Logger == null)
{ {
Console.WriteLine($"A fatal error has occurred: {eventArgs.ExceptionObject}"); Console.WriteLine($"A fatal error has occurred: {eventArgs.ExceptionObject}");
} }
else if (exObj is Exception ex)
{
Log.Error(ex, "A fatal error has occurred.");
}
else else
{ {
var exObj = eventArgs.ExceptionObject; Log.Error($"A fatal error has occurred: {eventArgs.ExceptionObject}");
if (exObj is Exception ex)
{
Log.Error(ex, "A fatal error has occurred.");
}
else
{
Log.Error($"A fatal error has occurred: {eventArgs.ExceptionObject}");
}
} }
#if DEBUG #if DEBUG
@ -150,7 +154,7 @@ namespace Dalamud.Injector
#endif #endif
_ = MessageBoxW(IntPtr.Zero, message, caption, MessageBoxType.IconError | MessageBoxType.Ok); _ = MessageBoxW(IntPtr.Zero, message, caption, MessageBoxType.IconError | MessageBoxType.Ok);
Environment.Exit(0); Environment.Exit(-1);
}; };
} }
@ -229,6 +233,9 @@ namespace Dalamud.Injector
private static DalamudStartInfo ExtractAndInitializeStartInfoFromArguments(DalamudStartInfo? startInfo, List<string> args) private static DalamudStartInfo ExtractAndInitializeStartInfoFromArguments(DalamudStartInfo? startInfo, List<string> args)
{ {
int len;
string key;
if (startInfo == null) if (startInfo == null)
startInfo = new(); startInfo = new();
@ -238,10 +245,10 @@ namespace Dalamud.Injector
var defaultPluginDirectory = startInfo.DefaultPluginDirectory; var defaultPluginDirectory = startInfo.DefaultPluginDirectory;
var assetDirectory = startInfo.AssetDirectory; var assetDirectory = startInfo.AssetDirectory;
var delayInitializeMs = startInfo.DelayInitializeMs; var delayInitializeMs = startInfo.DelayInitializeMs;
var languageStr = startInfo.Language.ToString().ToLowerInvariant();
for (var i = 2; i < args.Count; i++) for (var i = 2; i < args.Count; i++)
{ {
string key;
if (args[i].StartsWith(key = "--dalamud-working-directory=")) if (args[i].StartsWith(key = "--dalamud-working-directory="))
workingDirectory = args[i][key.Length..]; workingDirectory = args[i][key.Length..];
else if (args[i].StartsWith(key = "--dalamud-configuration-path=")) else if (args[i].StartsWith(key = "--dalamud-configuration-path="))
@ -254,6 +261,8 @@ namespace Dalamud.Injector
assetDirectory = args[i][key.Length..]; assetDirectory = args[i][key.Length..];
else if (args[i].StartsWith(key = "--dalamud-delay-initialize=")) else if (args[i].StartsWith(key = "--dalamud-delay-initialize="))
delayInitializeMs = int.Parse(args[i][key.Length..]); delayInitializeMs = int.Parse(args[i][key.Length..]);
else if (args[i].StartsWith(key = "--dalamud-client-language="))
languageStr = args[i][key.Length..].ToLowerInvariant();
else else
continue; continue;
@ -270,6 +279,26 @@ namespace Dalamud.Injector
defaultPluginDirectory ??= Path.Combine(xivlauncherDir, "devPlugins"); defaultPluginDirectory ??= Path.Combine(xivlauncherDir, "devPlugins");
assetDirectory ??= Path.Combine(xivlauncherDir, "dalamudAssets", "dev"); assetDirectory ??= Path.Combine(xivlauncherDir, "dalamudAssets", "dev");
ClientLanguage clientLanguage;
if (languageStr[0..(len = Math.Min(languageStr.Length, (key = "english").Length))] == key[0..len])
clientLanguage = ClientLanguage.English;
else if (languageStr[0..(len = Math.Min(languageStr.Length, (key = "japanese").Length))] == key[0..len])
clientLanguage = ClientLanguage.Japanese;
else if (languageStr[0..(len = Math.Min(languageStr.Length, (key = "日本語").Length))] == key[0..len])
clientLanguage = ClientLanguage.Japanese;
else if (languageStr[0..(len = Math.Min(languageStr.Length, (key = "german").Length))] == key[0..len])
clientLanguage = ClientLanguage.German;
else if (languageStr[0..(len = Math.Min(languageStr.Length, (key = "deutsche").Length))] == key[0..len])
clientLanguage = ClientLanguage.German;
else if (languageStr[0..(len = Math.Min(languageStr.Length, (key = "french").Length))] == key[0..len])
clientLanguage = ClientLanguage.French;
else if (languageStr[0..(len = Math.Min(languageStr.Length, (key = "français").Length))] == key[0..len])
clientLanguage = ClientLanguage.French;
else if (int.TryParse(languageStr, out var languageInt) && Enum.IsDefined((ClientLanguage)languageInt))
clientLanguage = (ClientLanguage)languageInt;
else
throw new CommandLineException($"\"{languageStr}\" is not a valid supported language.");
return new() return new()
{ {
WorkingDirectory = workingDirectory, WorkingDirectory = workingDirectory,
@ -277,7 +306,7 @@ namespace Dalamud.Injector
PluginDirectory = pluginDirectory, PluginDirectory = pluginDirectory,
DefaultPluginDirectory = defaultPluginDirectory, DefaultPluginDirectory = defaultPluginDirectory,
AssetDirectory = assetDirectory, AssetDirectory = assetDirectory,
Language = ClientLanguage.English, Language = clientLanguage,
GameVersion = null, GameVersion = null,
DelayInitializeMs = delayInitializeMs, DelayInitializeMs = delayInitializeMs,
}; };
@ -303,12 +332,14 @@ namespace Dalamud.Injector
Console.WriteLine("{0} [-g path/to/ffxiv_dx11.exe] [--game=path/to/ffxiv_dx11.exe]", exeSpaces); Console.WriteLine("{0} [-g path/to/ffxiv_dx11.exe] [--game=path/to/ffxiv_dx11.exe]", exeSpaces);
Console.WriteLine("{0} [-m entrypoint|inject] [--mode=entrypoint|inject]", exeSpaces); Console.WriteLine("{0} [-m entrypoint|inject] [--mode=entrypoint|inject]", exeSpaces);
Console.WriteLine("{0} [--handle-owner=inherited-handle-value]", exeSpaces); Console.WriteLine("{0} [--handle-owner=inherited-handle-value]", exeSpaces);
Console.WriteLine("{0} [--without-dalamud]", exeSpaces);
Console.WriteLine("{0} [-- game_arg1=value1 game_arg2=value2 ...]", exeSpaces); Console.WriteLine("{0} [-- game_arg1=value1 game_arg2=value2 ...]", exeSpaces);
} }
Console.WriteLine("Specifying dalamud start info: [--dalamud-working-directory path] [--dalamud-configuration-path path]"); Console.WriteLine("Specifying dalamud start info: [--dalamud-working-directory=path] [--dalamud-configuration-path=path]");
Console.WriteLine(" [--dalamud-plugin-directory path] [--dalamud-dev-plugin-directory path]"); Console.WriteLine(" [--dalamud-plugin-directory=path] [--dalamud-dev-plugin-directory=path]");
Console.WriteLine(" [--dalamud-asset-directory path] [--dalamud-delay-initialize 0(ms)]"); Console.WriteLine(" [--dalamud-asset-directory=path] [--dalamud-delay-initialize=0(ms)]");
Console.WriteLine(" [--dalamud-client-language=0-3|j(apanese)|e(nglish)|d|g(erman)|f(rench)]");
return 0; return 0;
} }
@ -353,8 +384,7 @@ namespace Dalamud.Injector
} }
else else
{ {
Log.Error("\"{0}\" is not a valid argument.", args[i]); throw new CommandLineException($"\"{args[i]}\" is not a command line argument.");
return -1;
} }
} }
@ -366,8 +396,7 @@ namespace Dalamud.Injector
if (!targetProcessSpecified) if (!targetProcessSpecified)
{ {
Log.Error("No target process has been specified."); throw new CommandLineException("No target process has been specified. Use -a(--all) option to inject to all ffxiv_dx11.exe processes.");
return -1;
} }
else if (!processes.Any()) else if (!processes.Any())
{ {
@ -401,6 +430,7 @@ namespace Dalamud.Injector
var useFakeArguments = false; var useFakeArguments = false;
var showHelp = args.Count <= 2; var showHelp = args.Count <= 2;
var handleOwner = IntPtr.Zero; var handleOwner = IntPtr.Zero;
var withoutDalamud = false;
var parsingGameArgument = false; var parsingGameArgument = false;
for (var i = 2; i < args.Count; i++) for (var i = 2; i < args.Count; i++)
@ -412,42 +442,25 @@ namespace Dalamud.Injector
} }
if (args[i] == "-h" || args[i] == "--help") if (args[i] == "-h" || args[i] == "--help")
{
showHelp = true; showHelp = true;
}
else if (args[i] == "-f" || args[i] == "--fake-arguments") else if (args[i] == "-f" || args[i] == "--fake-arguments")
{
useFakeArguments = true; useFakeArguments = true;
} else if (args[i] == "--without-dalamud")
withoutDalamud = true;
else if (args[i] == "-g") else if (args[i] == "-g")
{
gamePath = args[++i]; gamePath = args[++i];
}
else if (args[i].StartsWith("--game=")) else if (args[i].StartsWith("--game="))
{
gamePath = args[i].Split('=', 2)[1]; gamePath = args[i].Split('=', 2)[1];
}
else if (args[i] == "-m") else if (args[i] == "-m")
{
mode = args[++i]; mode = args[++i];
}
else if (args[i].StartsWith("--mode=")) else if (args[i].StartsWith("--mode="))
{
gamePath = args[i].Split('=', 2)[1]; gamePath = args[i].Split('=', 2)[1];
}
else if (args[i].StartsWith("--handle-owner=")) else if (args[i].StartsWith("--handle-owner="))
{
handleOwner = IntPtr.Parse(args[i].Split('=', 2)[1]); handleOwner = IntPtr.Parse(args[i].Split('=', 2)[1]);
}
else if (args[i] == "--") else if (args[i] == "--")
{
parsingGameArgument = true; parsingGameArgument = true;
}
else else
{ throw new CommandLineException($"\"{args[i]}\" is not a command line argument.");
Log.Error("No such command found: {0}", args[i]);
return -1;
}
} }
if (showHelp) if (showHelp)
@ -467,8 +480,7 @@ namespace Dalamud.Injector
} }
else else
{ {
Log.Error("Invalid mode: {0}", mode); throw new CommandLineException($"\"{mode}\" is not a valid Dalamud load mode.");
return -1;
} }
if (gamePath == null) if (gamePath == null)
@ -526,7 +538,7 @@ namespace Dalamud.Injector
"DEV.LobbyHost09=127.0.0.9", "DEV.LobbyHost09=127.0.0.9",
"DEV.LobbyPort09=54994", "DEV.LobbyPort09=54994",
"SYS.Region=0", "SYS.Region=0",
"language=1", $"language={(int)dalamudStartInfo.Language}",
$"ver={gameVersion}", $"ver={gameVersion}",
$"DEV.MaxEntitledExpansionID={maxEntitledExpansionId}", $"DEV.MaxEntitledExpansionID={maxEntitledExpansionId}",
"DEV.GMServerHost=127.0.0.100", "DEV.GMServerHost=127.0.0.100",
@ -537,7 +549,7 @@ namespace Dalamud.Injector
var gameArgumentString = string.Join(" ", gameArguments.Select(x => EncodeParameterArgument(x))); var gameArgumentString = string.Join(" ", gameArguments.Select(x => EncodeParameterArgument(x)));
var process = NativeAclFix.LaunchGame(Path.GetDirectoryName(gamePath), gamePath, gameArgumentString, (Process p) => var process = NativeAclFix.LaunchGame(Path.GetDirectoryName(gamePath), gamePath, gameArgumentString, (Process p) =>
{ {
if (mode == "entrypoint") if (!withoutDalamud && mode == "entrypoint")
{ {
var startInfo = AdjustStartInfo(dalamudStartInfo, gamePath); var startInfo = AdjustStartInfo(dalamudStartInfo, gamePath);
Log.Information("Using start info: {0}", JsonConvert.SerializeObject(startInfo)); Log.Information("Using start info: {0}", JsonConvert.SerializeObject(startInfo));
@ -549,7 +561,7 @@ namespace Dalamud.Injector
} }
}); });
if (mode == "inject") if (!withoutDalamud && mode == "inject")
{ {
var startInfo = AdjustStartInfo(dalamudStartInfo, gamePath); var startInfo = AdjustStartInfo(dalamudStartInfo, gamePath);
Log.Information("Using start info: {0}", JsonConvert.SerializeObject(startInfo)); Log.Information("Using start info: {0}", JsonConvert.SerializeObject(startInfo));
@ -629,7 +641,7 @@ namespace Dalamud.Injector
PluginDirectory = startInfo.PluginDirectory, PluginDirectory = startInfo.PluginDirectory,
DefaultPluginDirectory = startInfo.DefaultPluginDirectory, DefaultPluginDirectory = startInfo.DefaultPluginDirectory,
AssetDirectory = startInfo.AssetDirectory, AssetDirectory = startInfo.AssetDirectory,
Language = ClientLanguage.English, Language = startInfo.Language,
GameVersion = gameVer, GameVersion = gameVer,
DelayInitializeMs = startInfo.DelayInitializeMs, DelayInitializeMs = startInfo.DelayInitializeMs,
}; };
@ -738,5 +750,13 @@ namespace Dalamud.Injector
return quoted.ToString(); return quoted.ToString();
} }
private class CommandLineException : Exception
{
public CommandLineException(string cause)
: base(cause)
{
}
}
} }
} }