other-modules.diff 25 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477
  1. ===== PCL/Application.cs =====
  2. --- a/PCL/Application.cs (2.99.0.0)
  3. +++ b/PCL/Application.cs (2.99.0.1)
  4. @@ -220,7 +220,7 @@
  5. ModMain.FrmStart = new SplashScreen("Images\\icon.ico");
  6. ModMain.FrmStart.Show(false, true);
  7. }
  8. - Logger.Info(string.Format("程序版本:{0} ({1}{2})", "正式版 2.99.0.0", 413, ""), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb");
  9. + Logger.Info(string.Format("程序版本:{0} ({1}{2})", "正式版 2.99.0.1", 415, ""), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb");
  10. Logger.Info($"识别码:{ModBase.Identify}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb");
  11. Logger.Info($"程序路径:{ModBase.PathExe}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb");
  12. Logger.Info($"系统编码:{Encoding.Default.HeaderName} ({Encoding.Default.CodePage}, GBK={ModBase.IsGBKEncoding})", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Application.xaml.vb");
  13. ===== PCL/FormMain.cs =====
  14. --- a/PCL/FormMain.cs (2.99.0.0)
  15. +++ b/PCL/FormMain.cs (2.99.0.1)
  16. @@ -143,7 +143,7 @@
  17. [SpecialName]
  18. internal void _Lambda_0024__1()
  19. {
  20. - if (ModMain.MyMsgBox(_0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.0", "确定", "完整更新日志") == 2)
  21. + if (ModMain.MyMsgBox(_0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.1", "确定", "完整更新日志") == 2)
  22. {
  23. ModBase.OpenWebsite("https://meloong.com/afd/a/LTCat?tab=feed");
  24. }
  25. @@ -258,7 +258,7 @@
  26. {
  27. ProjectData.SetProjectError(ex);
  28. Exception ex2 = ex;
  29. - if (Operators.CompareString(ex2.Message, "为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……", false) == 0)
  30. + if (Operators.CompareString(ex2.Message, "为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……", false) == 0)
  31. {
  32. ModMain.Hint(ex2.Message, ModMain.HintType.Red);
  33. ProjectData.ClearProjectError();
  34. @@ -1264,9 +1264,14 @@
  35. int num = 0;
  36. int num2 = 0;
  37. List<KeyValuePair<int, string>> list = new List<KeyValuePair<int, string>>();
  38. + if (LastVersion < 415)
  39. + {
  40. + list.Add(new KeyValuePair<int, string>(4, "删除:MC 下载功能相关入口"));
  41. + list.Add(new KeyValuePair<int, string>(1, "优化:为设置更新添加部分黑名单"));
  42. + }
  43. if (LastVersion < 413)
  44. {
  45. - list.Add(new KeyValuePair<int, string>(5, "删除:为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……"));
  46. + list.Add(new KeyValuePair<int, string>(5, "删除:为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……"));
  47. }
  48. checked
  49. {
  50. @@ -1391,7 +1396,7 @@
  51. CS_0024_003C_003E8__locals2._0024VB_0024Local_Content = "· " + EnumerableExtensions.Join((IEnumerable)list2, "\r\n· ");
  52. ModBase.RunInNewThread([SpecialName] () =>
  53. {
  54. - if (ModMain.MyMsgBox(CS_0024_003C_003E8__locals2._0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.0", "确定", "完整更新日志") == 2)
  55. + if (ModMain.MyMsgBox(CS_0024_003C_003E8__locals2._0024VB_0024Local_Content, "PCL 已更新至正式版 2.99.0.1", "确定", "完整更新日志") == 2)
  56. {
  57. ModBase.OpenWebsite("https://meloong.com/afd/a/LTCat?tab=feed");
  58. }
  59. @@ -1454,11 +1459,11 @@
  60. ModMain.FrmLaunchLeft = new PageLaunchLeft();
  61. ModMain.FrmLaunchRight = new PageLaunchRight();
  62. int num = Settings.Get<int>("SystemLastVersionReg");
  63. - if (num < 413)
  64. + if (num < 415)
  65. {
  66. UpgradeSub(num);
  67. }
  68. - else if (num > 413)
  69. + else if (num > 415)
  70. {
  71. DowngradeSub(num);
  72. }
  73. @@ -1692,13 +1697,13 @@
  74. private void UpgradeSub(int LastVersionCode)
  75. {
  76. - Logger.Info($"版本号从 {LastVersionCode} 升高到 {413}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb");
  77. - Settings.Set("SystemLastVersionReg", 413);
  78. + Logger.Info($"版本号从 {LastVersionCode} 升高到 {415}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb");
  79. + Settings.Set("SystemLastVersionReg", 415);
  80. int num = Settings.Get<int>("SystemHighestBetaVersionReg");
  81. - if (num < 413)
  82. + if (num < 415)
  83. {
  84. - Settings.Set("SystemHighestBetaVersionReg", 413);
  85. - Logger.Info($"最高版本号从 {num} 升高到 {413}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb");
  86. + Settings.Set("SystemHighestBetaVersionReg", 415);
  87. + Logger.Info($"最高版本号从 {num} 升高到 {415}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb");
  88. }
  89. if (Settings.Get<int>("LaunchArgumentWindowType") == 5)
  90. {
  91. @@ -1762,7 +1767,7 @@
  92. Settings.Reset("LaunchAdvanceJvm");
  93. Logger.Info("已重置 JVM 参数设置", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb");
  94. }
  95. - if (LastVersionCode > 0 && num < 413)
  96. + if (LastVersionCode > 0 && num < 415)
  97. {
  98. ShowUpdateLog(num);
  99. }
  100. @@ -1770,8 +1775,8 @@
  101. private void DowngradeSub(int LastVersionCode)
  102. {
  103. - Logger.Info($"版本号从 {LastVersionCode} 降低到 {413}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb");
  104. - Settings.Set("SystemLastVersionReg", 413);
  105. + Logger.Info($"版本号从 {LastVersionCode} 降低到 {415}", (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\FormMain.xaml.vb");
  106. + Settings.Set("SystemLastVersionReg", 415);
  107. }
  108. private void FormMain_Closing(object sender, CancelEventArgs e)
  109. @@ -2692,7 +2697,7 @@
  110. {
  111. ProjectData.SetProjectError(ex);
  112. Exception ex2 = ex;
  113. - if (Operators.CompareString(ex2.Message, "为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……", false) == 0)
  114. + if (Operators.CompareString(ex2.Message, "为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……", false) == 0)
  115. {
  116. ModMain.Hint(ex2.Message, ModMain.HintType.Red);
  117. ProjectData.ClearProjectError();
  118. ===== PCL/ModBase.cs =====
  119. --- a/PCL/ModBase.cs (2.99.0.0)
  120. +++ b/PCL/ModBase.cs (2.99.0.1)
  121. @@ -645,13 +645,13 @@
  122. }
  123. }
  124. - public const string VersionBaseName = "2.99.0.0";
  125. + public const string VersionBaseName = "2.99.0.1";
  126. public const string CommitHash = "";
  127. - public const int VersionCode = 413;
  128. + public const int VersionCode = 415;
  129. - public const string VersionDisplay = "正式版 2.99.0.0";
  130. + public const string VersionDisplay = "正式版 2.99.0.1";
  131. public const string BuildTypeDisplay = "正式版";
  132. ===== PCL/ModLaunch.cs =====
  133. --- a/PCL/ModLaunch.cs (2.99.0.0)
  134. +++ b/PCL/ModLaunch.cs (2.99.0.1)
  135. @@ -2238,7 +2238,7 @@
  136. yield return (Key: "${libraries_directory}", Value: PathUtils.ToShortPath(ModMinecraft.McFolderSelected + "libraries"));
  137. yield return (Key: "${pure_directory}", Value: PathUtils.RemoveSlashSuffix(ModBase.PathPure.Value));
  138. yield return (Key: "${launcher_name}", Value: "PCL");
  139. - yield return (Key: "${launcher_version}", Value: Conversions.ToString(413));
  140. + yield return (Key: "${launcher_version}", Value: Conversions.ToString(415));
  141. yield return (Key: "${version_name}", Value: ModMinecraft.McInstanceSelected.Name);
  142. checked
  143. {
  144. @@ -3033,7 +3033,7 @@
  145. {
  146. McLaunchLog("", (LogLevel)1);
  147. McLaunchLog("~ 基础参数 ~", (LogLevel)1);
  148. - McLaunchLog("PCL 版本:正式版 2.99.0.0 (" + Conversions.ToString(413) + ")", (LogLevel)1);
  149. + McLaunchLog("PCL 版本:正式版 2.99.0.1 (" + Conversions.ToString(415) + ")", (LogLevel)1);
  150. McLaunchLog(string.Format("游戏版本:{0}({1},Drop {2}{3})", ModMinecraft.McInstanceSelected.VersionDisplayName(), ModMinecraft.McInstanceSelected.Version.Vanilla, ModMinecraft.McInstanceSelected.Version.Drop, ModMinecraft.McInstanceSelected.Version.Reliable ? "" : ",无法完全确定"), (LogLevel)1);
  151. McLaunchLog("资源版本:" + ModMinecraft.McAssetsGetIndexName(ModMinecraft.McInstanceSelected), (LogLevel)1);
  152. McLaunchLog("版本继承:" + ((Operators.CompareString(ModMinecraft.McInstanceSelected.InheritName, "", false) == 0) ? "无" : ModMinecraft.McInstanceSelected.InheritName), (LogLevel)1);
  153. ===== PCL/ModMain.cs =====
  154. --- a/PCL/ModMain.cs (2.99.0.0)
  155. +++ b/PCL/ModMain.cs (2.99.0.1)
  156. @@ -1091,12 +1091,12 @@
  157. public static void HelpTryExtract()
  158. {
  159. - if (Settings.Get<int>("SystemHelpVersion") != 413 || !FileUtils.Exists(ModBase.PathTemp + "Help\\启动器\\备份设置.xaml"))
  160. + if (Settings.Get<int>("SystemHelpVersion") != 415 || !FileUtils.Exists(ModBase.PathTemp + "Help\\启动器\\备份设置.xaml"))
  161. {
  162. DirectoryUtils.Delete(ModBase.PathTemp + "Help", false);
  163. ModBase.ExtractResources(ModBase.PathTemp + "Cache\\Help.zip", "Help");
  164. FileUtils.ExtractToDirectory(ModBase.PathTemp + "Cache\\Help.zip", ModBase.PathTemp + "Help", default(CancellationToken), (ProgressProvider)null);
  165. - Settings.Set("SystemHelpVersion", 413);
  166. + Settings.Set("SystemHelpVersion", 415);
  167. Logger.Info(string.Format("已解压内置帮助文件,目前状态:{0}", FileUtils.Exists(ModBase.PathTemp + "Help\\启动器\\备份设置.xaml")), (LogBehavior)0, "E:\\Projects\\PCL\\本体代码\\Plain Craft Launcher 2\\Modules\\ModMain.vb");
  168. }
  169. }
  170. @@ -1506,8 +1506,8 @@
  171. Monitor.Exit(_0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer_0024Init);
  172. }
  173. }
  174. - Text = Text.Replace("{pcl_version}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("2.99.0.0"));
  175. - Text = Text.Replace("{pcl_version_code}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer(Conversions.ToString(413)));
  176. + Text = Text.Replace("{pcl_version}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("2.99.0.1"));
  177. + Text = Text.Replace("{pcl_version_code}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer(Conversions.ToString(415)));
  178. Text = Text.Replace("{pcl_version_branch}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("正式版"));
  179. Text = Text.Replace("{pcl_build_type}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer(ModBase.BuildTypes.Release.ToString()));
  180. Text = Text.Replace("{pcl_branch}", _0024STATIC_0024ArgumentReplace_002403EE151280F92EE2_0024Replacer("Official"));
  181. ===== PCL/ModMinecraft.cs =====
  182. --- a/PCL/ModMinecraft.cs (2.99.0.0)
  183. +++ b/PCL/ModMinecraft.cs (2.99.0.1)
  184. @@ -2915,7 +2915,7 @@
  185. return;
  186. }
  187. DateTime dateTime = (DateTime)CS_0024_003C_003E8__locals10._0024VB_0024Local_Version[(object)"releaseTime"];
  188. - if (ModMain.MyMsgBox(string.Format("新版本:{0}{1}", CS_0024_003C_003E8__locals11._0024VB_0024Local_VersionName, "\r\n") + (((DateTime.Now - dateTime).TotalDays > 1.0) ? ("更新时间:" + dateTime) : ("更新于:" + StringUtils.FormatTimeSpan(dateTime - DateTime.Now, false))), "Minecraft 更新提示", "确定", "下载", ((DateTime.Now - dateTime).TotalHours > 3.0) ? "更新日志" : "", IsWarn: false, HighLight: true, ForceWait: false, null, null, [SpecialName] () =>
  189. + if (ModMain.MyMsgBox(string.Format("新版本:{0}{1}", CS_0024_003C_003E8__locals11._0024VB_0024Local_VersionName, "\r\n") + (((DateTime.Now - dateTime).TotalDays > 1.0) ? ("更新时间:" + dateTime) : ("更新于:" + StringUtils.FormatTimeSpan(dateTime - DateTime.Now, false))), "Minecraft 更新提示", "确定", "", ((DateTime.Now - dateTime).TotalHours > 3.0) ? "更新日志" : "", IsWarn: false, HighLight: true, ForceWait: false, null, null, [SpecialName] () =>
  190. {
  191. ModDownloadLib.McUpdateLogShow(CS_0024_003C_003E8__locals10._0024VB_0024Local_Version);
  192. }) == 2)
  193. ===== PCL/ModModpack.cs =====
  194. --- a/PCL/ModModpack.cs (2.99.0.0)
  195. +++ b/PCL/ModModpack.cs (2.99.0.1)
  196. @@ -713,7 +713,7 @@
  197. public static void ModpackInstall()
  198. {
  199. _Closure_0024__0_002D0 closure_0024__0_002D = new _Closure_0024__0_002D0();
  200. - ModMain.Hint("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……", ModMain.HintType.Red);
  201. + ModMain.Hint("为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……", ModMain.HintType.Red);
  202. }
  203. public static ModLoader.LoaderCombo<string> ModpackInstall(string File, string InstanceName = null, string Logo = null)
  204. @@ -829,7 +829,7 @@
  205. }
  206. throw new Exception("打开整合包文件失败,文件可能损坏或为不支持的压缩包格式", ex2);
  207. }
  208. - throw new Exception("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……");
  209. + throw new Exception("为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……");
  210. }
  211. finally
  212. {
  213. ===== PCL/PageDownloadInstall.cs =====
  214. --- a/PCL/PageDownloadInstall.cs (2.99.0.0)
  215. +++ b/PCL/PageDownloadInstall.cs (2.99.0.1)
  216. @@ -56,14 +56,14 @@
  217. {
  218. ((VB_0024AnonymousDelegate_10)([SpecialName] () =>
  219. {
  220. - throw new Exception("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……");
  221. + throw new Exception("为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……");
  222. }))();
  223. }
  224. [SpecialName]
  225. internal void _Lambda_0024__3_002D0()
  226. {
  227. - throw new Exception("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……");
  228. + throw new Exception("为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……");
  229. }
  230. [SpecialName]
  231. @@ -1561,7 +1561,7 @@
  232. {
  233. ((VB_0024AnonymousDelegate_10)([SpecialName] () =>
  234. {
  235. - throw new Exception("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……");
  236. + throw new Exception("为遵守相关法律法规,PCL 不再提供 MC 下载功能,非常抱歉 qwq……");
  237. }))();
  238. }), [SpecialName] (ModLoader.LoaderTask<string, ModDownload.DlClientListResult> a0) =>
  239. {
  240. ===== PCL/PageDownloadLeft.cs =====
  241. --- a/PCL/PageDownloadLeft.cs (2.99.0.0)
  242. +++ b/PCL/PageDownloadLeft.cs (2.99.0.1)
  243. @@ -84,6 +84,13 @@
  244. }
  245. }
  246. + [field: AccessedThroughProperty("LabResource")]
  247. + internal virtual TextBlock LabResource
  248. + {
  249. + get; [MethodImpl(MethodImplOptions.Synchronized)]
  250. + set;
  251. + }
  252. +
  253. internal virtual MyListItem ItemMod
  254. {
  255. [CompilerGenerated]
  256. @@ -243,6 +250,10 @@
  257. {
  258. PageID = FormMain.PageSubType.Default;
  259. InitializeComponent();
  260. + ((UIElement)ItemInstall).Visibility = (Visibility)2;
  261. + ((UIElement)LabResource).Visibility = (Visibility)2;
  262. + PageID = FormMain.PageSubType.DownloadMod;
  263. + ItemMod.Checked = true;
  264. }
  265. private void PageCheck(FrameworkElement sender, ModBase.RouteEventArgs e)
  266. @@ -471,6 +482,8 @@
  267. {
  268. //IL_0006: Unknown result type (might be due to invalid IL or missing references)
  269. //IL_0010: Expected O, but got Unknown
  270. + //IL_0028: Unknown result type (might be due to invalid IL or missing references)
  271. + //IL_0032: Expected O, but got Unknown
  272. switch (connectionId)
  273. {
  274. case 1:
  275. @@ -480,18 +493,21 @@
  276. ItemInstall = (MyListItem)target;
  277. break;
  278. case 3:
  279. - ItemMod = (MyListItem)target;
  280. + LabResource = (TextBlock)target;
  281. break;
  282. case 4:
  283. - ItemPack = (MyListItem)target;
  284. + ItemMod = (MyListItem)target;
  285. break;
  286. case 5:
  287. - ItemDataPack = (MyListItem)target;
  288. + ItemPack = (MyListItem)target;
  289. break;
  290. case 6:
  291. - ItemResourcePack = (MyListItem)target;
  292. + ItemDataPack = (MyListItem)target;
  293. break;
  294. case 7:
  295. + ItemResourcePack = (MyListItem)target;
  296. + break;
  297. + case 8:
  298. ItemShader = (MyListItem)target;
  299. break;
  300. default:
  301. ===== PCL/PageInstanceModDisabled.cs =====
  302. --- a/PCL/PageInstanceModDisabled.cs (2.99.0.0)
  303. +++ b/PCL/PageInstanceModDisabled.cs (2.99.0.1)
  304. @@ -107,11 +107,11 @@
  305. public void BtnDownload_Loaded()
  306. {
  307. - //IL_002e: Unknown result type (might be due to invalid IL or missing references)
  308. - //IL_0035: Unknown result type (might be due to invalid IL or missing references)
  309. - //IL_003a: Unknown result type (might be due to invalid IL or missing references)
  310. - //IL_0043: Unknown result type (might be due to invalid IL or missing references)
  311. - Visibility val = (Visibility)(((Settings.Get<bool>("UiHiddenPageDownload") && !PageSetupUI.HiddenForceShow) || (ModMain.FrmSelectRight != null && ModMain.FrmSelectRight.ShowHidden)) ? 2 : 0);
  312. + //IL_0001: Unknown result type (might be due to invalid IL or missing references)
  313. + //IL_0008: Unknown result type (might be due to invalid IL or missing references)
  314. + //IL_000d: Unknown result type (might be due to invalid IL or missing references)
  315. + //IL_0016: Unknown result type (might be due to invalid IL or missing references)
  316. + Visibility val = (Visibility)2;
  317. if (((UIElement)BtnDownload).Visibility != val)
  318. {
  319. ((UIElement)BtnDownload).Visibility = val;
  320. ===== PCL/PageLaunchLeft.cs =====
  321. --- a/PCL/PageLaunchLeft.cs (2.99.0.0)
  322. +++ b/PCL/PageLaunchLeft.cs (2.99.0.1)
  323. @@ -1377,12 +1377,12 @@
  324. public void RefreshButtonsUI()
  325. {
  326. - //IL_02bd: Unknown result type (might be due to invalid IL or missing references)
  327. + //IL_02a5: Unknown result type (might be due to invalid IL or missing references)
  328. if (!((FrameworkElement)BtnLaunch).IsLoaded)
  329. {
  330. return;
  331. }
  332. - int num = ((IsLoadFinished && ModMinecraft.McInstanceListLoader.State != ModBase.LoadState.Loading && ModMinecraft.McFolderListLoader.State != ModBase.LoadState.Loading) ? (((object)ModMinecraft.McInstanceSelected != null) ? 3 : ((Settings.Get<bool>("UiHiddenPageDownload") && !PageSetupUI.HiddenForceShow) ? 1 : 2)) : 0);
  333. + int num = ((IsLoadFinished && ModMinecraft.McInstanceListLoader.State != ModBase.LoadState.Loading && ModMinecraft.McFolderListLoader.State != ModBase.LoadState.Loading) ? (((object)ModMinecraft.McInstanceSelected == null) ? 1 : 3) : 0);
  334. if (num != BtnLaunchState || Operators.CompareString(((object)ModMinecraft.McInstanceSelected == null) ? "" : ModMinecraft.McInstanceSelected.PathVersion, ((object)BtnLaunchInstance == null) ? "" : BtnLaunchInstance.PathVersion, false) != 0)
  335. {
  336. BtnLaunchInstance = ModMinecraft.McInstanceSelected;
  337. ===== PCL/PageLinkMain.cs =====
  338. --- a/PCL/PageLinkMain.cs (2.99.0.0)
  339. +++ b/PCL/PageLinkMain.cs (2.99.0.1)
  340. @@ -1284,7 +1284,7 @@
  341. {
  342. throw new Exception("$" + text);
  343. }
  344. - if (((JObject)ModSecret.ServerConfig["Link"]).ContainsKey("MinVersionCode") && 413 < ModSecret.ServerConfig["Link"][(object)"MinVersionCode"].ToObject<int>())
  345. + if (((JObject)ModSecret.ServerConfig["Link"]).ContainsKey("MinVersionCode") && 415 < ModSecret.ServerConfig["Link"][(object)"MinVersionCode"].ToObject<int>())
  346. {
  347. throw new Exception("$你的 PCL 版本太老了,请在更新 PCL 之后再联机!");
  348. }
  349. ===== PCL/PageOtherAbout.cs =====
  350. --- a/PCL/PageOtherAbout.cs (2.99.0.0)
  351. +++ b/PCL/PageOtherAbout.cs (2.99.0.1)
  352. @@ -187,7 +187,7 @@
  353. if (!IsLoaded)
  354. {
  355. IsLoaded = true;
  356. - ItemAboutPcl.Info = ItemAboutPcl.Info.Replace("%VERSION%", "正式版 2.99.0.0").Replace("%VERSIONCODE%", Conversions.ToString(413)).Replace("%BRANCH%", Conversions.ToString(50));
  357. + ItemAboutPcl.Info = ItemAboutPcl.Info.Replace("%VERSION%", "正式版 2.99.0.1").Replace("%VERSIONCODE%", Conversions.ToString(415)).Replace("%BRANCH%", Conversions.ToString(50));
  358. }
  359. }
  360. ===== PCL/PageResource.cs =====
  361. --- a/PCL/PageResource.cs (2.99.0.0)
  362. +++ b/PCL/PageResource.cs (2.99.0.1)
  363. @@ -132,11 +132,12 @@
  364. //IL_000a: Unknown result type (might be due to invalid IL or missing references)
  365. //IL_000b: Unknown result type (might be due to invalid IL or missing references)
  366. //IL_0016: Unknown result type (might be due to invalid IL or missing references)
  367. - //IL_0018: Invalid comparison between Unknown and I4
  368. if (_Type != value)
  369. {
  370. _Type = value;
  371. - ((UIElement)BtnSearchInstallModPack).Visibility = (Visibility)(((int)value != 2) ? 2 : 0);
  372. + MyButton btnSearchInstallModPack = BtnSearchInstallModPack;
  373. + _ = 2;
  374. + ((UIElement)btnSearchInstallModPack).Visibility = (Visibility)2;
  375. }
  376. }
  377. }
  378. ===== PCL/PageSelectLeft.cs =====
  379. --- a/PCL/PageSelectLeft.cs (2.99.0.0)
  380. +++ b/PCL/PageSelectLeft.cs (2.99.0.1)
  381. @@ -518,10 +518,10 @@
  382. //IL_0a06: Expected O, but got Unknown
  383. //IL_0a06: Unknown result type (might be due to invalid IL or missing references)
  384. //IL_0a10: Expected O, but got Unknown
  385. - //IL_0ec3: Unknown result type (might be due to invalid IL or missing references)
  386. - //IL_0ec8: Unknown result type (might be due to invalid IL or missing references)
  387. - //IL_0ed7: Unknown result type (might be due to invalid IL or missing references)
  388. - //IL_0ee3: Expected O, but got Unknown
  389. + //IL_0ead: Unknown result type (might be due to invalid IL or missing references)
  390. + //IL_0eb2: Unknown result type (might be due to invalid IL or missing references)
  391. + //IL_0ec1: Unknown result type (might be due to invalid IL or missing references)
  392. + //IL_0ecd: Expected O, but got Unknown
  393. //IL_0acb: Unknown result type (might be due to invalid IL or missing references)
  394. //IL_0ad5: Expected O, but got Unknown
  395. //IL_0afb: Unknown result type (might be due to invalid IL or missing references)
  396. @@ -774,7 +774,6 @@
  397. ((FrameworkElement)obj4).ToolTip = "在当前选择的 Minecraft 文件夹下安装整合包";
  398. obj4.Logo = "M512 40.96C249.344 40.96 35.84 252.416 35.84 512s213.504 471.04 476.16 471.04c103.424 0 202.752-33.28 286.72-96.256l1.536-1.536c5.12-5.632 7.68-12.8 7.68-19.968 0-16.896-13.824-30.208-30.72-30.208-7.68 0-15.36 2.56-20.992 7.68h-0.512c-71.68 52.224-155.648 79.36-243.712 79.36-227.328 0-412.16-182.784-412.16-407.552 0-224.768 184.832-407.552 412.16-407.552s412.16 182.784 412.16 407.552c0 68.608-15.872 132.608-46.592 190.464-0.512 1.024-1.024 2.048-1.024 3.072-0.512 2.048-1.536 4.608-1.536 8.192 0 16.896 13.824 30.208 30.72 30.208 12.288 0 23.04-7.168 28.16-18.432 35.84-68.608 53.76-141.312 53.76-216.064 0.512-259.584-212.992-471.04-475.648-471.04z M812.032 483.328c-31.744-20.992-71.68 1.536-78.848 6.144-1.024 0.512-104.448 61.44-128 74.752-8.192 4.608-22.528-0.512-27.136-4.096-31.232-36.352-54.272-70.656-68.608-102.4-13.312-29.184 0.512-41.472 3.072-43.52 7.168-4.608 114.688-68.608 143.36-83.456 24.064-12.288 40.96-25.088 46.08-45.056 3.072-13.312 0-27.136-9.216-39.936-22.016-31.744-172.544-84.992-311.296-3.584-157.184 91.648-152.064 242.688-150.528 292.352v9.216c0 18.944-12.8 37.376-14.848 40.448l-20.992 21.504c-6.144 6.144-9.216 13.824-9.216 22.528 0 8.704 3.584 16.384 9.728 22.528 12.8 12.288 32.768 11.776 45.056-0.512l22.528-23.552 0.512-0.512c3.072-3.584 30.208-38.4 30.208-81.92l-0.512-11.264c-1.536-44.544-5.632-162.816 119.296-235.52 88.064-51.2 173.056-32.256 208.896-19.968-36.864 19.456-143.36 83.456-144.896 84.48-22.016 14.336-55.808 58.88-26.112 122.88 17.408 37.376 43.52 76.8 80.896 120.32 14.336 17.408 62.976 37.376 103.424 15.36 24.576-13.312 125.44-73.216 130.048-75.776 2.048-1.024 4.608-2.56 7.68-3.584 0 2.56-0.512 6.144-1.024 10.752-5.632 35.84-35.328 155.136-191.488 181.76-49.664 8.704-89.6 3.584-121.856-0.512h-0.512c-37.888-4.608-73.216-9.216-101.888 14.336-31.232 26.112-40.96 34.304-35.84 54.272 3.584 14.336 16.384 24.064 30.72 24.064 2.56 0 5.12-0.512 7.68-1.024 6.656-1.536 12.8-5.632 16.896-10.752 2.048-2.048 7.68-6.656 20.992-18.432 6.656-5.632 25.088-3.584 52.736 0 34.816 4.608 81.92 10.24 141.312 0.512 157.184-26.624 228.864-138.752 243.2-234.496 7.68-38.912 0-64.512-21.504-78.336z";
  399. MyListItem myListItem4 = obj4;
  400. - ((Panel)ModMain.FrmSelectLeft.PanList).Children.Add((UIElement)(object)myListItem4);
  401. myListItem4.Click += [SpecialName] (object a0, MouseButtonEventArgs a1) =>
  402. {
  403. ModModpack.ModpackInstall();
  404. ===== PCL/PageSelectRight.cs =====
  405. --- a/PCL/PageSelectRight.cs (2.99.0.0)
  406. +++ b/PCL/PageSelectRight.cs (2.99.0.1)
  407. @@ -387,7 +387,7 @@
  408. {
  409. LabEmptyTitle.Text = "无可用版本";
  410. LabEmptyContent.Text = "未找到任何版本的游戏,请先下载任意版本的游戏。\r\n若有已存在的游戏,请在左边的列表中选择添加文件夹,选择 .minecraft 文件夹将其导入。";
  411. - ((UIElement)BtnEmptyDownload).Visibility = (Visibility)((Settings.Get<bool>("UiHiddenPageDownload") && !PageSetupUI.HiddenForceShow) ? 2 : 0);
  412. + ((UIElement)BtnEmptyDownload).Visibility = (Visibility)2;
  413. }
  414. }
  415. else
  416. ===== PCL/PageSetupSystem.cs =====
  417. --- a/PCL/PageSetupSystem.cs (2.99.0.0)
  418. +++ b/PCL/PageSetupSystem.cs (2.99.0.1)
  419. @@ -596,7 +596,7 @@
  420. string text = FileUtils.TryReadAsString(ModBase.PathTemp + "Cache\\Notice.cfg", (Encoding)null, (Type)null) ?? "";
  421. if (StringExtensions.Split(text, "|", false).Count() >= 3)
  422. {
  423. - return Conversions.ToDouble(StringExtensions.Split(text, "|", false)[2]) <= 413.0;
  424. + return Conversions.ToDouble(StringExtensions.Split(text, "|", false)[2]) <= 415.0;
  425. }
  426. result = null;
  427. }
  428. ===== Properties/AssemblyInfo.cs =====
  429. --- a/Properties/AssemblyInfo.cs (2.99.0.0)
  430. +++ b/Properties/AssemblyInfo.cs (2.99.0.1)
  431. @@ -17,8 +17,8 @@
  432. [assembly: ComVisible(false)]
  433. [assembly: ThemeInfo(/*Could not decode attribute arguments.*/)]
  434. [assembly: Guid("fc6bb5fb-fe5c-4b25-84d7-2effb821c4bd")]
  435. -[assembly: AssemblyFileVersion("2.99.0.0")]
  436. +[assembly: AssemblyFileVersion("2.99.0.1")]
  437. [assembly: NeutralResourcesLanguage("")]
  438. [assembly: AssemblyAssociatedContentFile("maskfiles/plain%20craft%20launcher%202.sln")]
  439. [assembly: RootNamespace("PCL")]
  440. -[assembly: AssemblyVersion("2.99.0.0")]
  441. +[assembly: AssemblyVersion("2.99.0.1")]