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

joystick axis rendering (no textures), improve config error handling and fix joystick deadzones being unordered

Browse Source
This commit is contained in:
isXander
2023-02-17 00:46:40 +00:00
parent fa1a3331e6
commit 8e31472c07
89 changed files with 169 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,8 +105,14 @@ public class ControlifyConfig {
}
private void applyControllerConfig(Controller<?, ?> controller, JsonObject object) {
controller.setConfig(GSON, object.getAsJsonObject("config"));
controller.bindings().fromJson(object.getAsJsonObject("bindings"));
try {
controller.setConfig(GSON, object.getAsJsonObject("config"));
controller.bindings().fromJson(object.getAsJsonObject("bindings"));
} catch (Exception e) {
Controlify.LOGGER.error("Failed to load controller data for " + controller.uid() + ". Resetting to default!", e);
controller.resetConfig();
save();
}
}
public GlobalSettings globalSettings() {

4
src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java
View File

@ -27,6 +27,7 @@ import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@ -190,7 +191,8 @@ public class YACLHelper {
.collect(Collectors.toMap(
i -> joystick.mapping().axis(i).identifier(),
i -> i,
(x, y) -> x
(x, y) -> x,
LinkedHashMap::new
))
.values();
var jsCfg = joystick.config();