Skip to content

Commit f7e0f16

Browse files
ColoryrColoryr
committed
up
1 parent 8faba76 commit f7e0f16

33 files changed

Lines changed: 303 additions & 305 deletions

‎src/ColorMC.Core/Game/GameArg.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ public static List<string> MakeRunArg(this GameSettingObj obj, GameLaunchArg lar
616616
{
617617
var classpath = new StringBuilder();
618618
var sep = SystemInfo.Os == OsType.Windows ? ';' : ':';
619-
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Launch.Info2"));
619+
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Info28"));
620620

621621
if (arg.UseColorMCASM)
622622
{

‎src/ColorMC.Core/Game/GameAuth.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static async Task<LoginRes> LoginOAuthAsync(ColorMCCore.LoginOAuthCode lo
4242
{
4343
AuthState = AuthState.OAuth,
4444
LoginState = res2.State,
45-
Message = LanguageHelper.Get("Core.Login.Error1")
45+
Message = LanguageHelper.Get("Core.Error62")
4646
};
4747
}
4848
//Xbox登录
@@ -55,7 +55,7 @@ public static async Task<LoginRes> LoginOAuthAsync(ColorMCCore.LoginOAuthCode lo
5555
{
5656
AuthState = AuthState.XBox,
5757
LoginState = res3.State,
58-
Message = LanguageHelper.Get("Core.Login.Error2")
58+
Message = LanguageHelper.Get("Core.Error63")
5959
};
6060
}
6161
//XSTS登录
@@ -68,7 +68,7 @@ public static async Task<LoginRes> LoginOAuthAsync(ColorMCCore.LoginOAuthCode lo
6868
{
6969
AuthState = AuthState.XSTS,
7070
LoginState = res4.State,
71-
Message = LanguageHelper.Get("Core.Login.Error3")
71+
Message = LanguageHelper.Get("Core.Error64")
7272
};
7373
}
7474
//获取mojang token
@@ -81,7 +81,7 @@ public static async Task<LoginRes> LoginOAuthAsync(ColorMCCore.LoginOAuthCode lo
8181
{
8282
AuthState = AuthState.Token,
8383
LoginState = res5.State,
84-
Message = LanguageHelper.Get("Core.Login.Error4")
84+
Message = LanguageHelper.Get("Core.Error65")
8585
};
8686
}
8787
//获取minecraft账户
@@ -93,7 +93,7 @@ public static async Task<LoginRes> LoginOAuthAsync(ColorMCCore.LoginOAuthCode lo
9393
{
9494
AuthState = AuthState.Profile,
9595
LoginState = LoginState.DataError,
96-
Message = LanguageHelper.Get("Core.Login.Error5")
96+
Message = LanguageHelper.Get("Core.Error66")
9797
};
9898
}
9999

@@ -113,7 +113,7 @@ public static async Task<LoginRes> LoginOAuthAsync(ColorMCCore.LoginOAuthCode lo
113113
}
114114
catch (Exception e)
115115
{
116-
var text = LanguageHelper.Get("Core.Login.Error6");
116+
var text = LanguageHelper.Get("Core.Error67");
117117
Logs.Error(text, e);
118118
return new LoginRes
119119
{
@@ -159,7 +159,7 @@ private static async Task<LoginRes> RefreshOAuthAsync(LoginObj obj)
159159
{
160160
AuthState = AuthState.OAuth,
161161
LoginState = res1.State,
162-
Message = LanguageHelper.Get("Core.Login.Error1")
162+
Message = LanguageHelper.Get("Core.Error62")
163163
};
164164
}
165165
var res2 = await OAuthApi.GetXBLAsync(res1.Obj!.AccessToken);
@@ -169,7 +169,7 @@ private static async Task<LoginRes> RefreshOAuthAsync(LoginObj obj)
169169
{
170170
AuthState = AuthState.XBox,
171171
LoginState = res1.State,
172-
Message = LanguageHelper.Get("Core.Login.Error2")
172+
Message = LanguageHelper.Get("Core.Error63")
173173
};
174174
}
175175
var res3 = await OAuthApi.GetXSTSAsync(res2.XBLToken!);
@@ -179,7 +179,7 @@ private static async Task<LoginRes> RefreshOAuthAsync(LoginObj obj)
179179
{
180180
AuthState = AuthState.XSTS,
181181
LoginState = res3.State,
182-
Message = LanguageHelper.Get("Core.Login.Error3")
182+
Message = LanguageHelper.Get("Core.Error64")
183183
};
184184
}
185185
var res4 = await MinecraftAPI.GetMinecraftAsync(res3.XSTSUhs!, res3.XSTSToken!);
@@ -189,7 +189,7 @@ private static async Task<LoginRes> RefreshOAuthAsync(LoginObj obj)
189189
{
190190
AuthState = AuthState.Token,
191191
LoginState = res4.State,
192-
Message = LanguageHelper.Get("Core.Login.Error4")
192+
Message = LanguageHelper.Get("Core.Error65")
193193
};
194194
}
195195

@@ -200,7 +200,7 @@ private static async Task<LoginRes> RefreshOAuthAsync(LoginObj obj)
200200
{
201201
AuthState = AuthState.Profile,
202202
LoginState = LoginState.Error,
203-
Message = LanguageHelper.Get("Core.Login.Error5")
203+
Message = LanguageHelper.Get("Core.Error66")
204204
};
205205
}
206206

@@ -218,7 +218,7 @@ private static async Task<LoginRes> RefreshOAuthAsync(LoginObj obj)
218218
}
219219
catch (Exception e)
220220
{
221-
var text = LanguageHelper.Get("Core.Login.Error8");
221+
var text = LanguageHelper.Get("Core.Error68");
222222
Logs.Error(text, e);
223223
return new LoginRes
224224
{
@@ -248,7 +248,7 @@ public static async Task<LoginRes> LoginNide8Async(string server, string user, s
248248
{
249249
AuthState = AuthState.Token,
250250
LoginState = res1.State,
251-
Message = string.Format(LanguageHelper.Get("Core.Login.Error9"), res1.Message)
251+
Message = string.Format(LanguageHelper.Get("Core.Error69"), res1.Message)
252252
};
253253
}
254254

@@ -262,7 +262,7 @@ public static async Task<LoginRes> LoginNide8Async(string server, string user, s
262262
}
263263
catch (Exception e)
264264
{
265-
var text = LanguageHelper.Get("Core.Login.Error10");
265+
var text = LanguageHelper.Get("Core.Error70");
266266
Logs.Error(text, e);
267267
return new LoginRes
268268
{
@@ -290,7 +290,7 @@ private static async Task<LoginRes> RefreshNide8Async(LoginObj obj)
290290
{
291291
AuthState = AuthState.Profile,
292292
LoginState = res1.State,
293-
Message = string.Format(LanguageHelper.Get("Core.Login.Error11"), res1.Message)
293+
Message = string.Format(LanguageHelper.Get("Core.Error71"), res1.Message)
294294
};
295295
}
296296
return new LoginRes
@@ -302,7 +302,7 @@ private static async Task<LoginRes> RefreshNide8Async(LoginObj obj)
302302
}
303303
catch (Exception e)
304304
{
305-
var text = LanguageHelper.Get("Core.Login.Error12");
305+
var text = LanguageHelper.Get("Core.Error72");
306306
Logs.Error(text, e);
307307
return new LoginRes
308308
{
@@ -333,7 +333,7 @@ public static async Task<LoginRes> LoginAuthlibInjectorAsync(string server, stri
333333
{
334334
AuthState = AuthState.Token,
335335
LoginState = res1.State,
336-
Message = string.Format(LanguageHelper.Get("Core.Login.Error13"), res1.Message)
336+
Message = string.Format(LanguageHelper.Get("Core.Error73"), res1.Message)
337337
};
338338
}
339339

@@ -347,7 +347,7 @@ public static async Task<LoginRes> LoginAuthlibInjectorAsync(string server, stri
347347
}
348348
catch (Exception e)
349349
{
350-
var text = LanguageHelper.Get("Core.Login.Error14");
350+
var text = LanguageHelper.Get("Core.Error74");
351351
Logs.Error(text, e);
352352
return new LoginRes
353353
{
@@ -375,7 +375,7 @@ private static async Task<LoginRes> RefreshAuthlibInjectorAsync(LoginObj obj)
375375
{
376376
AuthState = AuthState.Token,
377377
LoginState = res1.State,
378-
Message = string.Format(LanguageHelper.Get("Core.Login.Error15"), res1.Message)
378+
Message = string.Format(LanguageHelper.Get("Core.Error75"), res1.Message)
379379
};
380380
}
381381

@@ -388,7 +388,7 @@ private static async Task<LoginRes> RefreshAuthlibInjectorAsync(LoginObj obj)
388388
}
389389
catch (Exception e)
390390
{
391-
var text = LanguageHelper.Get("Core.Login.Error16");
391+
var text = LanguageHelper.Get("Core.Error76");
392392
Logs.Error(text, e);
393393
return new LoginRes
394394
{
@@ -419,7 +419,7 @@ public static async Task<LoginRes> LoginLittleSkinAsync(string user, string pass
419419
{
420420
AuthState = AuthState.Token,
421421
LoginState = res1.State,
422-
Message = string.Format(LanguageHelper.Get("Core.Login.Error17"), res1.Message)
422+
Message = string.Format(LanguageHelper.Get("Core.Error77"), res1.Message)
423423
};
424424
}
425425

@@ -433,7 +433,7 @@ public static async Task<LoginRes> LoginLittleSkinAsync(string user, string pass
433433
}
434434
catch (Exception e)
435435
{
436-
var text = LanguageHelper.Get("Core.Login.Error18");
436+
var text = LanguageHelper.Get("Core.Error78");
437437
Logs.Error(text, e);
438438
return new LoginRes
439439
{
@@ -461,7 +461,7 @@ private static async Task<LoginRes> RefreshLittleSkinAsync(LoginObj obj)
461461
{
462462
AuthState = AuthState.Token,
463463
LoginState = res1.State,
464-
Message = string.Format(LanguageHelper.Get("Core.Login.Error19"), res1.Message)
464+
Message = string.Format(LanguageHelper.Get("Core.Error79"), res1.Message)
465465
};
466466
}
467467

@@ -474,7 +474,7 @@ private static async Task<LoginRes> RefreshLittleSkinAsync(LoginObj obj)
474474
}
475475
catch (Exception e)
476476
{
477-
var text = LanguageHelper.Get("Core.Login.Error20");
477+
var text = LanguageHelper.Get("Core.Error80");
478478
Logs.Error(text, e);
479479
return new LoginRes
480480
{

‎src/ColorMC.Core/Game/GameHandel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public GameHandel(GameRunObj run)
7373
if (ProcessUtils.Launch(Process, run.Admin))
7474
{
7575
IsOutAdmin = true;
76-
ColorMCCore.OnGameLog(_game, LanguageHelper.Get("Core.Game.Info2"));
76+
ColorMCCore.OnGameLog(_game, LanguageHelper.Get("Core.Info21"));
7777
return;
7878
}
7979

‎src/ColorMC.Core/Game/GameLaunch.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private static async Task AuthLoginAsync(GameSettingObj obj, GameLaunchArg larg)
6060
}
6161

6262
stopwatch.Stop();
63-
string temp = string.Format(LanguageHelper.Get("Core.Launch.Info4"),
63+
string temp = string.Format(LanguageHelper.Get("Core.Info30"),
6464
obj.Name, stopwatch.Elapsed.ToString());
6565
ColorMCCore.OnGameLog(obj, temp);
6666
Logs.Info(temp);
@@ -90,7 +90,7 @@ private static async Task PackUpdateAsync(GameSettingObj obj, GameLaunchArg larg
9090
}, token);
9191

9292
stopwatch.Stop();
93-
var temp = string.Format(LanguageHelper.Get("Core.Launch.Info14"),
93+
var temp = string.Format(LanguageHelper.Get("Core.Info39"),
9494
obj.Name, stopwatch.Elapsed.ToString());
9595
ColorMCCore.OnGameLog(obj, temp);
9696
Logs.Info(temp);
@@ -107,7 +107,7 @@ private static async Task PackUpdateAsync(GameSettingObj obj, GameLaunchArg larg
107107
string.Format(LanguageHelper.Get("Core.Launch.Info16"), obj.Name));
108108
}
109109

110-
var res2 = await larg.Request(string.Format(LanguageHelper.Get("Core.Launch.Info15"), obj.Name));
110+
var res2 = await larg.Request(string.Format(LanguageHelper.Get("Core.Info40"), obj.Name));
111111
if (!res2)
112112
{
113113
throw new LaunchException(LaunchState.Cancel, LanguageHelper.Get("Core.Launch.Error8"));
@@ -132,7 +132,7 @@ private static async Task<GameLaunchObj> CheckGameFileAsync(GameSettingObj obj,
132132
var arg1 = await obj.MakeArgAsync(larg, token);
133133
var res = await obj.CheckGameFileAsync(arg1, token);
134134
stopwatch.Stop();
135-
var temp = string.Format(LanguageHelper.Get("Core.Launch.Info5"),
135+
var temp = string.Format(LanguageHelper.Get("Core.Info31"),
136136
obj.Name, stopwatch.Elapsed.ToString());
137137
ColorMCCore.OnGameLog(obj, temp);
138138
Logs.Info(temp);
@@ -151,7 +151,7 @@ private static async Task<GameLaunchObj> CheckGameFileAsync(GameSettingObj obj,
151151
bool download = true;
152152
if (ConfigUtils.Config.Http.AutoDownload == false && larg.Request != null)
153153
{
154-
download = await larg.Request(LanguageHelper.Get("Core.Launch.Info12"));
154+
download = await larg.Request(LanguageHelper.Get("Core.Info38"));
155155
}
156156

157157
if (download)
@@ -169,7 +169,7 @@ private static async Task<GameLaunchObj> CheckGameFileAsync(GameSettingObj obj,
169169
}
170170

171171
stopwatch.Stop();
172-
temp = string.Format(LanguageHelper.Get("Core.Launch.Info7"),
172+
temp = string.Format(LanguageHelper.Get("Core.Info33"),
173173
obj.Name, stopwatch.Elapsed.ToString());
174174
ColorMCCore.OnGameLog(obj, temp);
175175
Logs.Info(temp);
@@ -432,7 +432,7 @@ public static async Task<Dictionary<GameSettingObj, GameLaunchRes>>
432432
}
433433

434434
//打印Jvm参数
435-
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Launch.Info1"));
435+
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Info27"));
436436
bool hidenext = false;
437437
foreach (var item in arg)
438438
{
@@ -453,7 +453,7 @@ public static async Task<Dictionary<GameSettingObj, GameLaunchRes>>
453453
}
454454
}
455455

456-
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Launch.Info3"));
456+
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Info29"));
457457
ColorMCCore.OnGameLog(obj, path);
458458

459459
if (cancel.IsCancellationRequested)
@@ -492,7 +492,7 @@ public static async Task<Dictionary<GameSettingObj, GameLaunchRes>>
492492
stopwatch.Start();
493493
var handel = new GameHandel(item1);
494494
stopwatch.Stop();
495-
var temp = string.Format(LanguageHelper.Get("Core.Launch.Info6"),
495+
var temp = string.Format(LanguageHelper.Get("Core.Info32"),
496496
item1.Obj.Name, stopwatch.Elapsed.ToString());
497497
ColorMCCore.OnGameLog(item1.Obj, temp);
498498
Logs.Info(temp);
@@ -673,7 +673,7 @@ public static async Task<CreateCmdRes> CreateGameCmdAsync(this GameSettingObj ob
673673

674674
var arg = obj.MakeRunArg(larg, arg1, true);
675675

676-
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Launch.Info1"));
676+
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Info27"));
677677
bool hidenext = false;
678678
//打印参数
679679
foreach (var item in arg)
@@ -695,7 +695,7 @@ public static async Task<CreateCmdRes> CreateGameCmdAsync(this GameSettingObj ob
695695
}
696696
}
697697

698-
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Launch.Info3"));
698+
ColorMCCore.OnGameLog(obj, LanguageHelper.Get("Core.Info29"));
699699
ColorMCCore.OnGameLog(obj, path);
700700

701701
if (token.IsCancellationRequested)
@@ -729,14 +729,14 @@ public static async Task<CreateCmdRes> CreateGameCmdAsync(this GameSettingObj ob
729729
start = obj.ReplaceArg(path, arg, start);
730730
obj.CmdRun(start, env, prerun, larg.Admin);
731731
stopwatch.Stop();
732-
string temp1 = string.Format(LanguageHelper.Get("Core.Launch.Info8"),
732+
string temp1 = string.Format(LanguageHelper.Get("Core.Info34"),
733733
obj.Name, stopwatch.Elapsed.ToString());
734734
ColorMCCore.OnGameLog(obj, temp1);
735735
Logs.Info(temp1);
736736
}
737737
else
738738
{
739-
string temp2 = string.Format(LanguageHelper.Get("Core.Launch.Info10"),
739+
string temp2 = string.Format(LanguageHelper.Get("Core.Info36"),
740740
obj.Name);
741741
ColorMCCore.OnGameLog(obj, temp2);
742742
Logs.Info(temp2);
@@ -765,7 +765,7 @@ public static async Task<CreateCmdRes> CreateGameCmdAsync(this GameSettingObj ob
765765
Admin = larg.Admin
766766
});
767767
stopwatch.Stop();
768-
var temp = string.Format(LanguageHelper.Get("Core.Launch.Info6"),
768+
var temp = string.Format(LanguageHelper.Get("Core.Info32"),
769769
obj.Name, stopwatch.Elapsed.ToString());
770770
ColorMCCore.OnGameLog(obj, temp);
771771
Logs.Info(temp);
@@ -791,12 +791,12 @@ public static async Task<CreateCmdRes> CreateGameCmdAsync(this GameSettingObj ob
791791
start1 = obj.ReplaceArg(path, arg, start1);
792792
obj.CmdRun(start1, env, false, larg.Admin);
793793
stopwatch.Stop();
794-
ColorMCCore.OnGameLog(obj, string.Format(LanguageHelper.Get("Core.Launch.Info9"),
794+
ColorMCCore.OnGameLog(obj, string.Format(LanguageHelper.Get("Core.Info35"),
795795
obj.Name, stopwatch.Elapsed.ToString()));
796796
}
797797
else
798798
{
799-
ColorMCCore.OnGameLog(obj, string.Format(LanguageHelper.Get("Core.Launch.Info11"),
799+
ColorMCCore.OnGameLog(obj, string.Format(LanguageHelper.Get("Core.Info37"),
800800
obj.Name));
801801
}
802802

‎src/ColorMC.Core/Game/GameLogs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static List<string> GetLogFiles(this GameSettingObj obj)
132132
}
133133
catch (Exception e)
134134
{
135-
Logs.Error(string.Format(LanguageHelper.Get("Core.Game.Error14"), file), e);
135+
Logs.Error(string.Format(LanguageHelper.Get("Core.Error94"), file), e);
136136
}
137137

138138
return null;

0 commit comments

Comments
 (0)