curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-11 22:31:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

control preset to be stored into separate file

Browse Source
This commit is contained in:
minjaesong
2026-02-07 16:19:42 +09:00
parent e838991826
commit 068d0bf1b2
22 changed files with 336 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/net/torvald/terrarum/App.java
View File

@@ -447,6 +447,15 @@ public class App implements ApplicationListener {
createDirs();
initialiseConfig();
readConfigJson();
// Initialise control preset config (separate from main config)
ControlPresetConfig.initialise();
// Migrate control settings on first run with new system
File controlsFile = new File(controlPresetDir);
if (!controlsFile.exists()) {
ControlPresetConfig.migrateFromGenericConfig();
}
setGamepadButtonLabels();
rectifyConfigs();
@@ -1487,6 +1496,8 @@ public class App implements ApplicationListener {
public static String worldsDir;
/** defaultDir + "/config.json" */
public static String configDir;
/** defaultDir + "/controls.json" */
public static String controlPresetDir;
/** defaultDir + "/LoadOrder.txt" */
public static String loadOrderDir;
/** defaultDir + "/Imported" */
@@ -1532,6 +1543,7 @@ public class App implements ApplicationListener {
playersDir = defaultDir + "/Players";
worldsDir = defaultDir + "/Worlds";
configDir = defaultDir + "/config.json";
controlPresetDir = defaultDir + "/controls.json";
loadOrderDir = defaultDir + "/LoadOrder.txt";
recycledPlayersDir = defaultDir + "/Recycled/Players";
recycledWorldsDir = defaultDir + "/Recycled/Worlds";
@@ -1806,6 +1818,15 @@ public class App implements ApplicationListener {
public static Object getConfigMaster(String key1) {
String key = key1.toLowerCase();
// Delegate control_key_*, control_mouse_*, control_preset_keyboard to ControlPresetConfig
if (ControlPresetConfig.isControlKey(key)) {
Object result = ControlPresetConfig.get(key);
if (result != null) {
return result;
}
// Fall through to check defaults if ControlPresetConfig doesn't have it
}
Object config;
try {
config = gameConfig.get(key);