djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

compound joysticks, button guide in screens, improve API

Browse Source
This commit is contained in:
isXander
2023-03-26 18:13:02 +01:00
parent de210df84f
commit 0d9321e3ba
55 changed files with 1188 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/dev/isxander/controlify/config/ControlifyConfig.java
View File

@ -3,12 +3,17 @@ package dev.isxander.controlify.config;
import com.google.gson.*;
import dev.isxander.controlify.Controlify;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.controlify.controller.joystick.CompoundJoystickInfo;
import net.fabricmc.loader.api.FabricLoader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
public class ControlifyConfig {
public static final Path CONFIG_PATH = FabricLoader.getInstance().getConfigDir().resolve("controlify.json");
@ -24,6 +29,7 @@ public class ControlifyConfig {
private String currentControllerUid;
private JsonObject controllerData = new JsonObject();
private Map<String, CompoundJoystickInfo> compoundJoysticks = Map.of();
private GlobalSettings globalSettings = new GlobalSettings();
private boolean firstLaunch;
@ -69,9 +75,10 @@ public class ControlifyConfig {
}
controllerData = newControllerData;
config.add("controllers", controllerData);
config.add("global", GSON.toJsonTree(globalSettings));
config.addProperty("current_controller", currentControllerUid = controlify.currentController().uid());
config.add("controllers", controllerData);
config.add("compound_joysticks", GSON.toJsonTree(compoundJoysticks.values().toArray(new CompoundJoystickInfo[0])));
config.add("global", GSON.toJsonTree(globalSettings));
return config;
}
@ -97,6 +104,13 @@ public class ControlifyConfig {
}
}
this.compoundJoysticks = object
.getAsJsonArray("compound_joysticks")
.asList()
.stream()
.map(element -> GSON.fromJson(element, CompoundJoystickInfo.class))
.collect(Collectors.toMap(info -> info.type().identifier(), Function.identity()));
if (object.has("current_controller")) {
currentControllerUid = object.get("current_controller").getAsString();
} else {
@ -128,6 +142,14 @@ public class ControlifyConfig {
}
}
public Optional<JsonObject> getLoadedControllerConfig(String uid) {
return Optional.ofNullable(controllerData.getAsJsonObject(uid));
}
public Map<String, CompoundJoystickInfo> getCompoundJoysticks() {
return compoundJoysticks;
}
public GlobalSettings globalSettings() {
return globalSettings;
}