Merge branch 'Language' into Language

SaltWood-Studio · Aug 16, 2024 · 5316e5b · 5316e5b
2 parents 46b38f2 + 464c62b
commit 5316e5b
Show file tree

Hide file tree

Showing 9 changed files with 574 additions and 105 deletions.
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
@@ -842,7 +842,7 @@ Retry:
                                               New ObjectModel.Collection(Of Validate) From {New ValidateNullOrWhiteSpace, New ValidateLength(1, 30), New ValidateExcept({">", "|"})})
         If String.IsNullOrWhiteSpace(NewName) Then Exit Sub
         '解压
-        Hint(GetLang("LangModModpackExtraArchive"))
+        Hint(GetLang("LangModModpackExtractArchive"))
         UnpackFiles(TargetFolder, FileAddress, Nothing)
         '加入文件夹列表
         PageSelectLeft.AddFolder(TargetFolder, NewName, False)

diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb
diff --git a/Plain Craft Launcher 2/Resources/Language/en_GB.xaml b/Plain Craft Launcher 2/Resources/Language/en_GB.xaml
@@ -1667,7 +1667,7 @@ Detailed error information: {0}</s:String>
     <s:String x:Key="LangModModpackSelectInstallFolder">Select installation destination (must be an empty folder)</s:String>
     <s:String x:Key="LangModModpackFolderNoExclamationOrSemicolon">Minecraft folder paths cannot contain exclamation marks (!) or semicolon (;)!</s:String>
     <s:String x:Key="LangModModpackFolderShouldBeEmpty">Please select an empty folder as the installation destination!</s:String>
-    <s:String x:Key="LangModModpackExtraArchive">Extracting archive...</s:String>
+    <s:String x:Key="LangModModpackExtractArchive">Extracting archive...</s:String>
     <s:String x:Key="LangModModpackAddedToGameList">Added to the folder list: {0}</s:String>
 
     <!--ModWatcher-->
@@ -1697,4 +1697,71 @@ Detailed error information: {0}</s:String>
     <s:String x:Key="LangModMyLoadingLoadFail">Failed to Load</s:String>
     <s:String x:Key="LangModMyLoadingUnknownError">Unknown Error</s:String>
     <s:String x:Key="LangModMyLoadingBadNetwork">Poor network, check the internet and retry.</s:String>
+
+    <!--`ModDownloadLib-->
+    <s:String x:Key="LangModDownloadLibTaskMcDownload">Download Minecraft {0}</s:String>
+    <s:String x:Key="LangModDownloadLibHintInstanceDownloading">This version is currently downloading!</s:String>
+    <s:String x:Key="LangModDownloadLibDialogContentRedownloadInstance">Version {0} already exists, do you want to redownload?&#x0a;This will overwrite the version's json and jar files, but will not affect the version isolation files.</s:String>
+    <s:String x:Key="LangModDownloadLibDialogTitleRedownloadInstance">Version Exists</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadJson">Download version json file</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadJarUrl">Analyze core jar file download URL</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadJar">Download core jar file</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadVanillaJsonUrl">Get vanilla json file download URL</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadVanillaAnalysisLibSubLoader">Analyze vanilla support library files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadVanillaDownloadLibSubLoader">Download vanilla support library files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadAnalysisAssestIndexSubLoader">Analyze asset file index URL (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionAnalysisAssestIndexFail">Failed to analyze asset file index URL</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionAddVersionInfoFail">Failed to add client version</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadAssestIndexFail">Download asset file index (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskAnalysisDownloadAssest">Analyze required asset files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadAssest">Download asset files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibSelectTitleSaveAs">Select save location</s:String>
+    <s:String x:Key="LangModDownloadLibTaskOptiFineDownload">Download OptiFine {0}</s:String>
+    <s:String x:Key="LangModDownloadLibOptiFineDownloadJava">Java 8 or higher version</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionOptiFineDownloadCancelJava">Installation canceled due to Java not found.</s:String>
+    <s:String x:Key="LangModDownloadLibCancelJavaDownload">Installation canceled.</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallerException">Installer encountered an error, last line: {0}</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionNoCustomFolder">Cannot specify MC installation folder without specifying vanilla downloader</s:String>
+    <s:String x:Key="LangModDownloadLibTaskOptiFineWaitForVanilla">Waiting for vanilla download</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionOptiFineInstallerRunFail">Failed to run OptiFine installer</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallOptiFineMethodAFail">Failed to install OptiFine (Method A)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskInstallOptiFineMethodB">Install OptiFine (Method B)</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallOptiFineMethodBFail">Failed to install OptiFine (Method B)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskAnalysisOptiFineLib">Analyze OptiFine support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadOptiFineLib">Download OptiFine support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskGetOptiFineDownloadUrl">Get OptiFine download URL</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderDownload">Download LiteLoader {0}</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionNotSupportVersion">Unknown Minecraft version ({0})</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadMainFile">Download main file</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderInstallerDownload">Download LiteLoader {0} installer</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderMcVersionDownload">Start LiteLoader dependency version download</s:String>
+    <s:String x:Key="LangModDownloadLibTaskInstallLiteLoader">Install LiteLoader</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallLiteLoaderFail">Failed to install new LiteLoader version</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderAnalysisLib">Analyze LiteLoader support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderDownloadLib">Download LiteLoader support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeDownload">Download {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeGetDetailInfo">Get {0} detailed information</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeGetDetailInfoFail">Failed to find detailed information for {0}!</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeReadyDownload">Preparing to download {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeGetLibFile">Get {0} support library file</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeRunInstallerFail">Failed to run {0} installer</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeInstallInstanceFail">Failed to install new {0} version</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeInstallMethodB">Install {0} (Method B)</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeInstallFail">Failed to install Forge using non-new version method</s:String>
+    <s:String x:Key="LangModDownloadLibTaskFabricInstallerDownload">Download Fabric {0} installer</s:String>
+    <s:String x:Key="LangModDownloadLibTaskFabricAnalysisLib">Analyze Fabric support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskFabricDownloadLib">Download Fabric support library files</s:String>
+    <s:String x:Key="LangModDownloadLibSuccess">{0} successful!</s:String>
+    <s:String x:Key="LangModDownloadLibFail">{0} failed: {1}</s:String>
+    <s:String x:Key="LangModDownloadLibCancel">{0} canceled!</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcInstall">Install {0}</s:String>
+    <s:String x:Key="LangModDownloadLibHintMcExist">Version {0} already exists!</s:String>
+    <s:String x:Key="LangModDownloadLibTaskAddIgnore">Add ignore flag</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDelIgnore">Delete ignore flag</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadVanilla">Download vanilla {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadOptiFine">Download OptiFine {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadForge">Download Forge {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadNeoForge">Download NeoForge {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadLiteLoader">Download LiteLoader {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadFabric">Download Fabric {0}</s:String>
 </ResourceDictionary>
diff --git a/Plain Craft Launcher 2/Resources/Language/en_US.xaml b/Plain Craft Launcher 2/Resources/Language/en_US.xaml
@@ -1667,7 +1667,7 @@ Detailed error information: {0}</s:String>
     <s:String x:Key="LangModModpackSelectInstallFolder">Select installation destination (must be an empty folder)</s:String>
     <s:String x:Key="LangModModpackFolderNoExclamationOrSemicolon">Minecraft folder paths cannot contain exclamation marks (!) or semicolon (;)!</s:String>
     <s:String x:Key="LangModModpackFolderShouldBeEmpty">Please select an empty folder as the installation destination!</s:String>
-    <s:String x:Key="LangModModpackExtraArchive">Extracting archive...</s:String>
+    <s:String x:Key="LangModModpackExtractArchive">Extracting archive...</s:String>
     <s:String x:Key="LangModModpackAddedToGameList">Added to the folder list: {0}</s:String>
 
     <!--ModWatcher-->
@@ -1697,4 +1697,71 @@ Detailed error information: {0}</s:String>
     <s:String x:Key="LangModMyLoadingLoadFail">Failed to Load</s:String>
     <s:String x:Key="LangModMyLoadingUnknownError">Unknown Error</s:String>
     <s:String x:Key="LangModMyLoadingBadNetwork">Poor network, check the internet and retry.</s:String>
+
+    <!--`ModDownloadLib-->
+    <s:String x:Key="LangModDownloadLibTaskMcDownload">Download Minecraft {0}</s:String>
+    <s:String x:Key="LangModDownloadLibHintInstanceDownloading">This version is currently downloading!</s:String>
+    <s:String x:Key="LangModDownloadLibDialogContentRedownloadInstance">Version {0} already exists, do you want to redownload?&#x0a;This will overwrite the version's json and jar files, but will not affect the version isolation files.</s:String>
+    <s:String x:Key="LangModDownloadLibDialogTitleRedownloadInstance">Version Exists</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadJson">Download version json file</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadJarUrl">Analyze core jar file download URL</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadJar">Download core jar file</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadVanillaJsonUrl">Get vanilla json file download URL</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadVanillaAnalysisLibSubLoader">Analyze vanilla support library files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadVanillaDownloadLibSubLoader">Download vanilla support library files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcDownloadAnalysisAssestIndexSubLoader">Analyze asset file index URL (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionAnalysisAssestIndexFail">Failed to analyze asset file index URL</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionAddVersionInfoFail">Failed to add client version</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadAssestIndexFail">Download asset file index (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskAnalysisDownloadAssest">Analyze required asset files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadAssest">Download asset files (sub loader)</s:String>
+    <s:String x:Key="LangModDownloadLibSelectTitleSaveAs">Select save location</s:String>
+    <s:String x:Key="LangModDownloadLibTaskOptiFineDownload">Download OptiFine {0}</s:String>
+    <s:String x:Key="LangModDownloadLibOptiFineDownloadJava">Java 8 or higher version</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionOptiFineDownloadCancelJava">Installation canceled due to Java not found.</s:String>
+    <s:String x:Key="LangModDownloadLibCancelJavaDownload">Installation canceled.</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallerException">Installer encountered an error, last line: {0}</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionNoCustomFolder">Cannot specify MC installation folder without specifying vanilla downloader</s:String>
+    <s:String x:Key="LangModDownloadLibTaskOptiFineWaitForVanilla">Waiting for vanilla download</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionOptiFineInstallerRunFail">Failed to run OptiFine installer</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallOptiFineMethodAFail">Failed to install OptiFine (Method A)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskInstallOptiFineMethodB">Install OptiFine (Method B)</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallOptiFineMethodBFail">Failed to install OptiFine (Method B)</s:String>
+    <s:String x:Key="LangModDownloadLibTaskAnalysisOptiFineLib">Analyze OptiFine support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadOptiFineLib">Download OptiFine support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskGetOptiFineDownloadUrl">Get OptiFine download URL</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderDownload">Download LiteLoader {0}</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionNotSupportVersion">Unknown Minecraft version ({0})</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadMainFile">Download main file</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderInstallerDownload">Download LiteLoader {0} installer</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderMcVersionDownload">Start LiteLoader dependency version download</s:String>
+    <s:String x:Key="LangModDownloadLibTaskInstallLiteLoader">Install LiteLoader</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionInstallLiteLoaderFail">Failed to install new LiteLoader version</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderAnalysisLib">Analyze LiteLoader support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskLiteLoaderDownloadLib">Download LiteLoader support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeDownload">Download {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeGetDetailInfo">Get {0} detailed information</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeGetDetailInfoFail">Failed to find detailed information for {0}!</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeReadyDownload">Preparing to download {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeGetLibFile">Get {0} support library file</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeRunInstallerFail">Failed to run {0} installer</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeInstallInstanceFail">Failed to install new {0} version</s:String>
+    <s:String x:Key="LangModDownloadLibTaskForgelikeInstallMethodB">Install {0} (Method B)</s:String>
+    <s:String x:Key="LangModDownloadLibExceptionForgelikeInstallFail">Failed to install Forge using non-new version method</s:String>
+    <s:String x:Key="LangModDownloadLibTaskFabricInstallerDownload">Download Fabric {0} installer</s:String>
+    <s:String x:Key="LangModDownloadLibTaskFabricAnalysisLib">Analyze Fabric support library files</s:String>
+    <s:String x:Key="LangModDownloadLibTaskFabricDownloadLib">Download Fabric support library files</s:String>
+    <s:String x:Key="LangModDownloadLibSuccess">{0} successful!</s:String>
+    <s:String x:Key="LangModDownloadLibFail">{0} failed: {1}</s:String>
+    <s:String x:Key="LangModDownloadLibCancel">{0} canceled!</s:String>
+    <s:String x:Key="LangModDownloadLibTaskMcInstall">Install {0}</s:String>
+    <s:String x:Key="LangModDownloadLibHintMcExist">Version {0} already exists!</s:String>
+    <s:String x:Key="LangModDownloadLibTaskAddIgnore">Add ignore flag</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDelIgnore">Delete ignore flag</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadVanilla">Download vanilla {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadOptiFine">Download OptiFine {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadForge">Download Forge {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadNeoForge">Download NeoForge {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadLiteLoader">Download LiteLoader {0}</s:String>
+    <s:String x:Key="LangModDownloadLibTaskDownloadFabric">Download Fabric {0}</s:String>
 </ResourceDictionary>