diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/impl')
| -rw-r--r-- | src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java | 4 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java b/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java index 54185727b..1977427de 100644 --- a/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java @@ -71,7 +71,7 @@ public class ConfigManagerImpl implements ConfigManager { for (FabricKeyBinding binding : ClientHelper.getInstance().getREIKeyBindings()) { entries.add(ConfigEntryBuilder.create().fillKeybindingField(I18n.translate(binding.getId()) + ":", binding).build()); } - KeyCodeEntry entry = ConfigEntryBuilder.create().startKeyCodeField(i13n, getUnsafely(field, config, null)) + KeyCodeEntry entry = ConfigEntryBuilder.create().startKeyCodeField(i13n, getUnsafely(field, config, InputUtil.UNKNOWN_KEYCODE)) .setDefaultValue(() -> getUnsafely(field, defaults)) .setSaveConsumer(newValue -> setUnsafely(field, config, newValue)) .build(); @@ -80,7 +80,7 @@ public class ConfigManagerImpl implements ConfigManager { return entries; }, field -> field.getType() == InputUtil.KeyCode.class, ConfigObject.AddInFrontKeyCode.class); guiRegistry.registerPredicateProvider((i13n, field, config, defaults, guiProvider) -> { - KeyCodeEntry entry = ConfigEntryBuilder.create().startKeyCodeField(i13n, getUnsafely(field, config, null)) + KeyCodeEntry entry = ConfigEntryBuilder.create().startKeyCodeField(i13n, getUnsafely(field, config, InputUtil.UNKNOWN_KEYCODE)) .setDefaultValue(() -> getUnsafely(field, defaults)) .setSaveConsumer(newValue -> setUnsafely(field, config, newValue)) .build(); diff --git a/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java b/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java index 8a4493ba9..52cb791e5 100644 --- a/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java @@ -216,7 +216,7 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData { @Override public InputUtil.KeyCode getFavoriteKeybind() { - return general.favoriteKeybind; + return general.favoriteKeybind == null ? InputUtil.UNKNOWN_KEYCODE : general.favoriteKeybind; } public static class General { |