curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 18:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

custom asset archive loading

Browse Source
This commit is contained in:
minjaesong
2026-02-20 13:23:32 +09:00
parent 2dea82bb9c
commit 97d22913bf
7 changed files with 72 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/net/torvald/terrarum/Principii.java
View File

@@ -17,9 +17,9 @@ import java.util.*;
*/
public class Principii {
private static KVHashMap gameConfig = new KVHashMap();
private static final KVHashMap gameConfig = new KVHashMap();
private static String OSName = System.getProperty("os.name");
private static final String OSName = System.getProperty("os.name");
private static String operationSystem;
/** %appdata%/Terrarum, without trailing slash */
@@ -27,27 +27,29 @@ public class Principii {
/** defaultDir + "/config.json" */
private static String configDir;
private static final String GAME_NAME = TerrarumAppConfiguration.INSTANCE.getGAME_NAME_FOR_FILESYSTEM();
public static void getDefaultDirRoot() {
String OS = OSName.toUpperCase();
if (OS.contains("WIN")) {
operationSystem = "WINDOWS";
defaultDir = System.getenv("APPDATA") + "/Terrarum";
defaultDir = System.getenv("APPDATA") + "/" + GAME_NAME;
}
else if (OS.contains("OS X") || OS.contains("MACOS")) { // OpenJDK for mac will still report "Mac OS X" with version number "10.16", even on Big Sur and beyond
operationSystem = "OSX";
defaultDir = System.getProperty("user.home") + "/Library/Application Support/Terrarum";
defaultDir = System.getProperty("user.home") + "/Library/Application Support/" + GAME_NAME;
}
else if (OS.contains("NUX") || OS.contains("NIX") || OS.contains("BSD")) {
operationSystem = "LINUX";
defaultDir = System.getProperty("user.home") + "/.Terrarum";
defaultDir = System.getProperty("user.home") + "/." + GAME_NAME;
}
else if (OS.contains("SUNOS")) {
operationSystem = "SOLARIS";
defaultDir = System.getProperty("user.home") + "/.Terrarum";
defaultDir = System.getProperty("user.home") + "/." + GAME_NAME;
}
else {
operationSystem = "UNKNOWN";
defaultDir = System.getProperty("user.home") + "/.Terrarum";
defaultDir = System.getProperty("user.home") + "/." + GAME_NAME;
}
}
@@ -135,8 +137,9 @@ public class Principii {
cmd0.add("-Xms1G");
cmd0.add("-Xmx"+xmx+"G");
cmd0.add("-cp");
cmd0.add("./out/TerrarumBuild.jar");
cmd0.add("./out/" + TerrarumAppConfiguration.JAR_NAME);
cmd0.add(cp);
cmd0.addAll(List.of(args));
var cmd = cmd0.stream().filter((it) -> !it.isBlank()).toList();
System.out.println(cmd);