aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-05-19 02:29:35 +0800
committershedaniel <daniel@shedaniel.me>2020-05-19 02:29:35 +0800
commit3fe17eeb30129cbea59787f03922bd7d8e670b2f (patch)
treebd7b5618fc2ab65d91cd0ba53d228baaf55c887d /src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
parentde1f2d5c16b5dd63b749124f78e7b6aaf276b046 (diff)
downloadRoughlyEnoughItems-3fe17eeb30129cbea59787f03922bd7d8e670b2f.tar.gz
RoughlyEnoughItems-3fe17eeb30129cbea59787f03922bd7d8e670b2f.tar.bz2
RoughlyEnoughItems-3fe17eeb30129cbea59787f03922bd7d8e670b2f.zip
Fix unknown keycode saving
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java')
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java b/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
index b2edf106f..80b9a9378 100644
--- a/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
@@ -85,7 +85,9 @@ public class ConfigManagerImpl implements ConfigManager {
AutoConfig.register(ConfigObjectImpl.class, (definition, configClass) -> new JanksonConfigSerializer<>(definition, configClass, Jankson.builder().registerPrimitiveTypeAdapter(InputUtil.KeyCode.class, it -> {
return it instanceof String ? InputUtil.fromName((String) it) : null;
}).registerSerializer(InputUtil.KeyCode.class, (it, marshaller) -> new JsonPrimitive(it.getName())).registerTypeAdapter(ModifierKeyCode.class, o -> {
- InputUtil.KeyCode keyCode = InputUtil.fromName(((JsonPrimitive) o.get("keyCode")).asString());
+ String code = ((JsonPrimitive) o.get("keyCode")).asString();
+ if (code.endsWith(".unknown")) return ModifierKeyCode.unknown();
+ InputUtil.KeyCode keyCode = InputUtil.fromName(code);
Modifier modifier = Modifier.of(((Number) ((JsonPrimitive) o.get("modifier")).getValue()).shortValue());
return ModifierKeyCode.of(keyCode, modifier);
}).registerSerializer(ModifierKeyCode.class, (keyCode, marshaller) -> {