切换语言后提示用户重启软件 #4380
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Hello Minecraft! Launcher | ||
| * Copyright (C) 2020 huangyuhui <[email protected]> and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.jackhuang.hmcl.util; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import org.jackhuang.hmcl.EntryPoint; | ||
| import org.jackhuang.hmcl.java.JavaRuntime; | ||
| import org.jackhuang.hmcl.util.io.JarUtils; | ||
|
|
||
| /** | ||
| * <p>A common restart tool class, used for:</p> | ||
| * <ul> | ||
| * <li>Restart after update</li> | ||
| * <li>Restart after switching interface language</li> | ||
| * <li>Any scenario that requires a restart to take effect</li> | ||
| * </ul> | ||
| */ | ||
| public final class Restarter { | ||
|
|
||
| private final List<String> jvmOptions = new ArrayList<>(); | ||
| private final List<String> programArgs = new ArrayList<>(); | ||
| private Path jarPath; | ||
|
|
||
| private Restarter() { } | ||
|
|
||
| public static Restarter builder() { | ||
| return new Restarter(); | ||
| } | ||
|
|
||
| public Restarter addSystemProperty(String key, String value) { | ||
| jvmOptions.add("-D" + key + "=" + value); | ||
| return this; | ||
| } | ||
|
|
||
| public Restarter addProgramArguments(List<String> args) { | ||
| programArgs.addAll(args); | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * <p> | ||
| * Set the JAR path to start | ||
| * If not, the current running JAR will be used by default | ||
| * </p> | ||
| */ | ||
| public Restarter setJarPath(Path jarPath) { | ||
| this.jarPath = jarPath; | ||
| return this; | ||
| } | ||
|
|
||
| public void restart() throws IOException { | ||
| Path jar = this.jarPath; | ||
| if (jar == null) { | ||
| jar = JarUtils.thisJarPath(); | ||
| } | ||
| if (jar == null) { | ||
| throw new IOException("Cannot locate JAR file"); | ||
| } | ||
|
|
||
| List<String> command = new ArrayList<>(); | ||
| command.add(JavaRuntime.getDefault().getBinary().toString()); | ||
|
|
||
| for (Map.Entry<Object, Object> e : System.getProperties().entrySet()) { | ||
| Object k = e.getKey(); | ||
| if (k instanceof String && ((String) k).startsWith("hmcl.")) { | ||
| command.add("-D" + k + "=" + e.getValue()); | ||
| } | ||
| } | ||
|
|
||
| command.addAll(jvmOptions); | ||
|
|
||
| command.add("-jar"); | ||
| command.add(jar.toAbsolutePath().toString()); | ||
|
|
||
| command.addAll(programArgs); | ||
|
|
||
| new ProcessBuilder(command) | ||
| .directory(new File(System.getProperty("user.dir"))) | ||
| .inheritIO() | ||
| .start(); | ||
|
|
||
| EntryPoint.exit(0); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -205,6 +205,7 @@ button.save_as=另存 | |
| button.select_all=悉擇之 | ||
| button.view=覽 | ||
| button.yes=然 | ||
| button.restart=復啟 | ||
|
|
||
| chat=會集 | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
重启失败的时候为什么要跳回去？我觉得应该提示用户手动重启完成切换。