ModSecret.diff 6.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103
  1. --- a/PCL/ModSecret.cs (2.99.0.0)
  2. +++ b/PCL/ModSecret.cs (2.99.0.1)
  3. @@ -172,7 +172,7 @@
  4. }
  5. _0024VB_0024Local_Urls = _0024VB_0024Local_Urls.Select([SpecialName] (string u) => ModMain.ArgumentReplace(u, WebUtility.HtmlEncode)).ToList();
  6. _0024VB_0024Local_Extension = "." + PathUtils.GetExtension(StringExtensions.BeforeLast(_0024VB_0024Local_Urls.First(), "{CDN}", false));
  7. - _0024VB_0024Local_LocalPath = string.Format("{0}{1}.{2}{3}", ModMain.RequestTaskTempFolder(), "2.99.0.0", 50, _0024VB_0024Local_Extension);
  8. + _0024VB_0024Local_LocalPath = string.Format("{0}{1}.{2}{3}", ModMain.RequestTaskTempFolder(), "2.99.0.1", 50, _0024VB_0024Local_Extension);
  9. Logger.Info(string.Format("更新开始,静默:{0},扩展名:{1},下载目标:{2},URL:{3}", _0024STATIC_0024UpdateStart_00240212151280E91E_0024IsSilentUpdate, _0024VB_0024Local_Extension, _0024VB_0024Local_LocalPath, EnumerableExtensions.Join((IEnumerable)_0024VB_0024Local_Urls, ",")), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Modules\\ModSecret.vb");
  10. Task.Output = new ModNet.NetFile[1]
  11. {
  12. @@ -458,16 +458,16 @@
  13. }
  14. else if (SimulateBrowserHeaders)
  15. {
  16. - ((HttpHeaders)Req.Headers).Add("User-Agent", string.Format("PCL2/{0}.{1} Mozilla/5.0 AppleWebKit/537.36 Chrome/63.0.3239.132 Safari/537.36", "2.99.0.0", 50));
  17. + ((HttpHeaders)Req.Headers).Add("User-Agent", string.Format("PCL2/{0}.{1} Mozilla/5.0 AppleWebKit/537.36 Chrome/63.0.3239.132 Safari/537.36", "2.99.0.1", 50));
  18. }
  19. else
  20. {
  21. - ((HttpHeaders)Req.Headers).Add("User-Agent", string.Format("PCL2/{0}.{1}", "2.99.0.0", 50));
  22. + ((HttpHeaders)Req.Headers).Add("User-Agent", string.Format("PCL2/{0}.{1}", "2.99.0.1", 50));
  23. }
  24. }
  25. if (!SimulateBrowserHeaders)
  26. {
  27. - Req.Headers.Referrer = new Uri($"http://{413}.pcl2.server/");
  28. + Req.Headers.Referrer = new Uri($"http://{415}.pcl2.server/");
  29. }
  30. if (Url.Contains("api.curseforge.com") || Url.Contains("forgecdn.net"))
  31. {
  32. @@ -921,7 +921,7 @@
  33. }
  34. else if (flag == true)
  35. {
  36. - ModMain.Hint(string.Format("已经是最新{0} {1},不需要更新啦,可以直接使用!", "正式版", "2.99.0.0"), ModMain.HintType.Green);
  37. + ModMain.Hint(string.Format("已经是最新{0} {1},不需要更新啦,可以直接使用!", "正式版", "2.99.0.1"), ModMain.HintType.Green);
  38. }
  39. else
  40. {
  41. @@ -1034,7 +1034,7 @@
  42. {
  43. CS_0024_003C_003E8__locals28._0024VB_0024Local_Urls = CS_0024_003C_003E8__locals28._0024VB_0024Local_Urls.Select([SpecialName] (string u) => ModMain.ArgumentReplace(u, WebUtility.HtmlEncode)).ToList();
  44. CS_0024_003C_003E8__locals28._0024VB_0024Local_Extension = "." + PathUtils.GetExtension(StringExtensions.BeforeLast(CS_0024_003C_003E8__locals28._0024VB_0024Local_Urls.First(), "{CDN}", false));
  45. - CS_0024_003C_003E8__locals28._0024VB_0024Local_LocalPath = string.Format("{0}{1}.{2}{3}", ModMain.RequestTaskTempFolder(), "2.99.0.0", 50, CS_0024_003C_003E8__locals28._0024VB_0024Local_Extension);
  46. + CS_0024_003C_003E8__locals28._0024VB_0024Local_LocalPath = string.Format("{0}{1}.{2}{3}", ModMain.RequestTaskTempFolder(), "2.99.0.1", 50, CS_0024_003C_003E8__locals28._0024VB_0024Local_Extension);
  47. Logger.Info(string.Format("更新开始,静默:{0},扩展名:{1},下载目标:{2},URL:{3}", _0024STATIC_0024UpdateStart_00240212151280E91E_0024IsSilentUpdate, CS_0024_003C_003E8__locals28._0024VB_0024Local_Extension, CS_0024_003C_003E8__locals28._0024VB_0024Local_LocalPath, EnumerableExtensions.Join((IEnumerable)CS_0024_003C_003E8__locals28._0024VB_0024Local_Urls, ",")), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Modules\\ModSecret.vb");
  48. Task.Output = new ModNet.NetFile[1]
  49. {
  50. @@ -1271,7 +1271,7 @@
  51. //IL_045c: Expected O, but got Unknown
  52. //IL_08b1: Unknown result type (might be due to invalid IL or missing references)
  53. //IL_08b8: Expected O, but got Unknown
  54. - //IL_0903: Unknown result type (might be due to invalid IL or missing references)
  55. + //IL_0996: Unknown result type (might be due to invalid IL or missing references)
  56. //IL_04b5: Unknown result type (might be due to invalid IL or missing references)
  57. //IL_04bc: Expected O, but got Unknown
  58. //IL_05e0: Unknown result type (might be due to invalid IL or missing references)
  59. @@ -1334,10 +1334,10 @@
  60. else
  61. {
  62. Logger.Info($"本地公告编号:{num2},服务器公告:{text3},无需更新", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Modules\\ModSecret.vb");
  63. - if (Settings.Get<int>("SystemHighestSavedBetaVersionReg") < 413 || !FileUtils.Exists(ModBase.PathTemp + "Latest.exe"))
  64. + if (Settings.Get<int>("SystemHighestSavedBetaVersionReg") < 415 || !FileUtils.Exists(ModBase.PathTemp + "Latest.exe"))
  65. {
  66. - Settings.Set("SystemHighestSavedBetaVersionReg", 413);
  67. - Logger.Info($"复制自身为最新正式版:版本号升高到 {413}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Modules\\ModSecret.vb");
  68. + Settings.Set("SystemHighestSavedBetaVersionReg", 415);
  69. + Logger.Info($"复制自身为最新正式版:版本号升高到 {415}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Modules\\ModSecret.vb");
  70. try
  71. {
  72. FileUtils.Copy(ModBase.PathExe, ModBase.PathTemp + "Latest.exe");
  73. @@ -1495,8 +1495,17 @@
  74. case "setup":
  75. {
  76. JObject val5 = (JObject)val4.Value;
  77. + string[] source = new string[12]
  78. + {
  79. + "LaunchAdvanceRun", "LaunchAdvanceJvm", "LaunchAdvanceGame", "UiCustomNet", "HintCustomCommand", "LaunchArgumentJavaAll", "LaunchArgumentJavaSelect", "SystemSystemCache", "LaunchFolderSelect", "LaunchFolders",
  80. + "ToolDownloadCert", "CacheAuthServerServer"
  81. + };
  82. foreach (KeyValuePair<string, JToken> item4 in val5)
  83. {
  84. + if (source.Contains(item4.Key))
  85. + {
  86. + throw new Exception("被禁止的设置项:" + item4.Key);
  87. + }
  88. Settings.Set(item4.Key, item4.Value.ToString());
  89. }
  90. break;
  91. @@ -1571,10 +1580,10 @@
  92. result = (double)Settings.Get<int>("SystemCount") >= ModBase.Val(Value);
  93. break;
  94. case "versioncode <=":
  95. - result = 413.0 <= ModBase.Val(Value);
  96. + result = 415.0 <= ModBase.Val(Value);
  97. break;
  98. case "versioncode >=":
  99. - result = 413.0 >= ModBase.Val(Value);
  100. + result = 415.0 >= ModBase.Val(Value);
  101. break;
  102. case "versionbranch <=":
  103. result = ModBase.Val(50) <= ModBase.Val(Value);