liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update

This commit is contained in:
Tungstend 2023-02-20 23:39:08 +08:00
parent 1cabadcc7c
commit 1d67aacaf8
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FCL/src/main/java/com/tungsten/fcl/fragment/RuntimeFragment.java
View File

@ -246,9 +246,9 @@ public class RuntimeFragment extends FCLFragment implements View.OnClickListener
java17Progress.setVisibility(View.VISIBLE);
new Thread(() -> {
try {
RuntimeUtils.copyAssets(getContext(), "resolv.conf", FCLPath.JAVA_17_PATH + "/resolv.conf");
RuntimeUtils.installJava(getContext(), FCLPath.JAVA_17_PATH, "app_runtime/java/jre17");
java17 = true;
RuntimeUtils.copyAssets(getContext(),"resolv.conf",FCLPath.JAVA_17_PATH+"/resolv.conf");
} catch (IOException e) {
e.printStackTrace();
}

11
FCL/src/main/java/com/tungsten/fcl/game/FCLGameLauncher.java
View File

@ -65,27 +65,26 @@ public final class FCLGameLauncher extends DefaultLauncher {
// TODO: Dirty implementation here
if (!LocaleUtils.getSystemLocale().getDisplayName().equals(Locale.CHINA.getDisplayName())) {
String str="";
StringBuilder str = new StringBuilder();
try (BufferedReader bfr = new BufferedReader(new FileReader(optionsFile))) {
String line;
while ((line = bfr.readLine()) != null) {
if (line.contains("lang:")) {
str+="lang:en_us\n";
str.append("lang:en_us\n");
} else {
str+=line+"\n";
str.append(line).append("\n");
}
}
} catch (Exception e) {
Logging.LOG.log(Level.WARNING, "Unable to read options.txt.", e);
}
if(!"".equals(str)) {
if (!"".equals(str.toString())) {
try (FileWriter fw = new FileWriter(optionsFile)) {
fw.write(str);
fw.write(str.toString());
} catch (IOException e) {
Logging.LOG.log(Level.WARNING, "Unable to write options.txt.", e);
}
}
}
}

6
FCLCore/src/main/java/com/tungsten/fclcore/launch/DefaultLauncher.java
View File

@ -120,6 +120,11 @@ public class DefaultLauncher extends Launcher {
res.addDefault("-Dlog4j.configurationFile=", getLog4jConfigurationFile().getAbsolutePath());
}
JavaVersion javaVersion = options.getJava().getId() == 0 ? JavaVersion.getSuitableJavaVersion(version) : options.getJava();
if (javaVersion.getVersion() == JavaVersion.JAVA_VERSION_17) {
res.addDefault("-Dext.net.resolvPath=", FCLPath.JAVA_17_PATH + "/resolv.conf");
}
res.addDefault("-Djava.io.tmpdir=", FCLPath.CACHE_DIR);
res.addDefault("-Dos.name=", "Linux");
res.addDefault("-Dlwjgl.platform=", "FCL");
@ -208,7 +213,6 @@ public class DefaultLauncher extends Launcher {
res.addDefault("-Dawt.toolkit=", "net.java.openjdk.cacio.ctc.CTCToolkit");
res.addDefault("-Djava.awt.graphicsenv=", "net.java.openjdk.cacio.ctc.CTCGraphicsEnvironment");
} else {
res.addDefault("-Dext.net.resolvPath=",FCLPath.JAVA_17_PATH+"/resolv.conf");
res.addDefault("-Dawt.toolkit=", "com.github.caciocavallosilano.cacio.ctc.CTCToolkit");
res.addDefault("-Djava.awt.graphicsenv=", "com.github.caciocavallosilano.cacio.ctc.CTCGraphicsEnvironment");
res.addDefault("-Djava.system.class.loader=", "com.github.caciocavallosilano.cacio.ctc.CTCPreloadClassLoader");