Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add more options that were missing
Browse files Browse the repository at this point in the history
shedaniel committed Nov 2, 2023
1 parent 9f7ae8e commit f3b284c
Showing 4 changed files with 32 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -51,7 +51,8 @@ static OptionCategory make(String key) {
.add(LAYOUT_PANEL);
OptionCategory ACCESSIBILITY = make("accessibility")
.add(ACCESSIBILITY_DISPLAY)
.add(ACCESSIBILITY_WIDGETS);
.add(ACCESSIBILITY_WIDGETS)
.add(ACCESSIBILITY_FEATURES);
OptionCategory FAVORITES = make("favorites")
.add(FAVORITES_FAVORITES)
.add(FAVORITES_ADVANCED);
@@ -66,7 +67,8 @@ static OptionCategory make(String key) {
.add(FILTERING_FILTERING)
.add(FILTERING_ADVANCED);
OptionCategory LIST = make("list")
.add(LIST_ENTRIES);
.add(LIST_ENTRIES)
.add(LIST_COLLAPSIBLE_GROUPS);
OptionCategory DEBUG = make("debug")
.add(DEBUG_PERFORMANCE);
OptionCategory FLAGS = make("flags");
Original file line number Diff line number Diff line change
@@ -64,13 +64,17 @@ static <T> OptionGroup make(String id) {
.add(CRAFTABLE_FILTER);
OptionGroup LAYOUT_PANEL = make("layout.panel")
.add(BOUNDARIES)
.add(LOCATION);
.add(LOCATION)
.add(HIDE_LIST_IF_IDLE);
OptionGroup ACCESSIBILITY_DISPLAY = make("accessibility.display")
.add(LARGER_TABS)
.add(LARGER_ARROW_BUTTONS);
OptionGroup ACCESSIBILITY_WIDGETS = make("accessibility.widgets")
.add(SCROLLBAR_VISIBILITY)
.add(CLICKABLE_RECIPE_ARROWS);
OptionGroup ACCESSIBILITY_FEATURES = make("accessibility.features")
.add(VANILLA_RECIPE_BOOK)
.add(STATUS_EFFECTS_LOCATION);
OptionGroup FAVORITES_FAVORITES = make("favorites.favorites")
.add(FAVORITES_MODE)
.add(NEW_FAVORITES_BUTTON_VISIBILITY);
@@ -94,12 +98,14 @@ static <T> OptionGroup make(String id) {
OptionGroup SEARCH_ADVANCED = make("search.advanced");
OptionGroup FILTERING_FILTERING = make("filtering.filtering");
OptionGroup FILTERING_ADVANCED = make("filtering.advanced")
.add(FILTER_DISPLAYS);
.add(FILTER_DISPLAYS)
.add(MERGE_DISPLAYS);
OptionGroup LIST_ENTRIES = make("list.entries")
.add(DISPLAY_MODE)
.add(ORDERING)
.add(ZOOM)
.add(FOCUS_MODE);
OptionGroup LIST_COLLAPSIBLE_GROUPS = make("list.collapsible_groups");
OptionGroup DEBUG_PERFORMANCE = make("debug.performance")
.add(SEARCH_PERFORMANCE)
.add(ENTRY_LIST_PERFORMANCE);
Original file line number Diff line number Diff line change
@@ -108,6 +108,8 @@ static <T> CompositeOption<T> make(String id, Function<ConfigObjectImpl, T> bind
});
CompositeOption<DisplayPanelLocation> LOCATION = make("layout.location", i -> i.advanced.accessibility.displayPanelLocation, (i, v) -> i.advanced.accessibility.displayPanelLocation = v)
.enumOptions();
CompositeOption<Boolean> HIDE_LIST_IF_IDLE = make("layout.hide_when_idle", i -> i.appearance.hideEntryPanelIfIdle, (i, v) -> i.appearance.hideEntryPanelIfIdle = v)
.enabledDisabled();
CompositeOption<Boolean> LARGER_TABS = make("accessibility.larger_tabs", i -> !i.advanced.accessibility.useCompactTabs, (i, v) -> i.advanced.accessibility.useCompactTabs = !v)
.enabledDisabled();
CompositeOption<Boolean> LARGER_ARROW_BUTTONS = make("accessibility.larger_arrow_buttons", i -> !i.advanced.accessibility.useCompactTabButtons, (i, v) -> i.advanced.accessibility.useCompactTabButtons = !v)
@@ -116,6 +118,10 @@ static <T> CompositeOption<T> make(String id, Function<ConfigObjectImpl, T> bind
.ofBoolean(translatable("config.rei.value.accessibility.scrollbar_visibility.when_scrolling"), translatable("config.rei.value.accessibility.scrollbar_visibility.always"));
CompositeOption<Boolean> CLICKABLE_RECIPE_ARROWS = make("accessibility.clickable_recipe_arrows", i -> i.advanced.miscellaneous.clickableRecipeArrows, (i, v) -> i.advanced.miscellaneous.clickableRecipeArrows = v)
.enabledDisabled();
CompositeOption<Boolean> VANILLA_RECIPE_BOOK = make("accessibility.vanilla_recipe_book", i -> !i.functionality.disableRecipeBook, (i, v) -> i.functionality.disableRecipeBook = !v)
.enabledDisabled();
CompositeOption<Boolean> STATUS_EFFECTS_LOCATION = make("accessibility.status_effects_location", i -> i.functionality.leftSideMobEffects, (i, v) -> i.functionality.leftSideMobEffects = v)
.ofBoolean(translatable("config.rei.value.accessibility.status_effects_location.right"), translatable("config.rei.value.accessibility.status_effects_location.left"));
CompositeOption<Boolean> FAVORITES_MODE = make("favorites.mode", i -> i.basics.favoritesEnabled, (i, v) -> i.basics.favoritesEnabled = v)
.enabledDisabled();
CompositeOption<FavoriteAddWidgetMode> NEW_FAVORITES_BUTTON_VISIBILITY = make("favorites.new_favorites_button_visibility", i -> i.advanced.layout.favoriteAddWidgetMode, (i, v) -> i.advanced.layout.favoriteAddWidgetMode = v)
@@ -145,6 +151,8 @@ static <T> CompositeOption<T> make(String id, Function<ConfigObjectImpl, T> bind
// TODO: CUSTOMIZED_FILTERING
CompositeOption<Boolean> FILTER_DISPLAYS = make("filtering.filter_displays", i -> i.advanced.filtering.shouldFilterDisplays, (i, v) -> i.advanced.filtering.shouldFilterDisplays = v)
.enabledDisabled();
CompositeOption<Boolean> MERGE_DISPLAYS = make("filtering.merge_displays", i -> i.advanced.layout.mergeDisplayUnderOne, (i, v) -> i.advanced.layout.mergeDisplayUnderOne = v)
.enabledDisabled();
CompositeOption<Boolean> DISPLAY_MODE = make("list.display_mode", i -> i.appearance.scrollingEntryListWidget, (i, v) -> i.appearance.scrollingEntryListWidget = v)
.ofBoolean(translatable("config.rei.value.list.display_mode.paginated"), translatable("config.rei.value.list.display_mode.scrolled"));
CompositeOption<EntryPanelOrderingConfig> ORDERING = make("list.ordering", i -> i.advanced.layout.entryPanelOrdering, (i, v) -> i.advanced.layout.entryPanelOrdering = v)
Original file line number Diff line number Diff line change
@@ -316,6 +316,8 @@
"config.rei.options.layout.boundaries.desc": "Declare the boundaries of the panel. Useful to limit the columns / rows displayed on screen.",
"config.rei.options.layout.location": "Location",
"config.rei.options.layout.location.desc": "Change the location of the panel. The entire REI setup may be mirrored horizontally, including the list and all widgets.",
"config.rei.options.layout.hide_when_idle": "Hide When Idle",
"config.rei.options.layout.hide_when_idle.desc": "Hide the panel when search is not active.",
"config.rei.value.layout.location.left": "Left",
"config.rei.value.layout.location.right": "Right",
"config.rei.options.groups.accessibility.display": "Display",
@@ -330,6 +332,13 @@
"config.rei.value.accessibility.scrollbar_visibility.never": "Always Invisible",
"config.rei.options.accessibility.clickable_recipe_arrows": "Clickable Recipe Arrows",
"config.rei.options.accessibility.clickable_recipe_arrows.desc": "Click on recipe arrows to see all recipes in the target category.",
"config.rei.options.groups.accessibility.features": "Features",
"config.rei.options.accessibility.vanilla_recipe_book": "Vanilla Recipe Book",
"config.rei.options.accessibility.vanilla_recipe_book.desc": "Toggle the vanilla recipe book. This option is not designed for Modpack developers, as users should be the one to decide whether to use the vanilla recipe book.",
"config.rei.options.accessibility.status_effects_location": "Status Effects Location",
"config.rei.options.accessibility.status_effects_location.desc": "The location of the status effects. By vanilla, the status effects are placed on the right, but this can be changed to the left.",
"config.rei.value.accessibility.status_effects_location.left": "Left",
"config.rei.value.accessibility.status_effects_location.right": "Right",
"config.rei.options.groups.favorites.favorites": "Favorites",
"config.rei.options.favorites.mode": "Mode",
"config.rei.options.favorites.mode.desc": "Favorite different entries on the opposite side of the entry panel. The favorites are persistent across reloads, and act as a quick access to things you are working on.\nSimply press \"A\", or drag and drop entries to add / remove an entry from favorites.",
@@ -388,6 +397,8 @@
"config.rei.options.groups.filtering.advanced": "Advanced",
"config.rei.options.filtering.filter_displays": "Filter Displays",
"config.rei.options.filtering.filter_displays.desc": "Apply filtering rules to determine the visibility of displays. Displays with all entries filtered will be hidden.",
"config.rei.options.filtering.merge_displays": "Merge Displays",
"config.rei.options.filtering.merge_displays.desc": "Merge displays with the same recipe. This is useful for unifying recipes.",
"config.rei.options.groups.list.entries": "Entries",
"config.rei.options.list.display_mode": "Display Mode",
"config.rei.options.list.display_mode.desc": "The way entries are laid out. Paginated mode displays entries in pages, where there are buttons to traverse the different pages. Scrolled mode displays entries in a vertical list.",
@@ -407,6 +418,7 @@
"config.rei.options.list.focus_mode.desc": "How the focus state of the entries will be presented. By default, REI follows vanilla and highlights the slot.",
"config.rei.value.list.focus_mode.highlighted": "Highlighted",
"config.rei.value.list.focus_mode.zoomed": "Zoomed",
"config.rei.options.groups.list.collapsible_groups": "Collapsible Groups",
"config.rei.options.groups.debug.performance": "Performance",
"config.rei.options.debug.plugins_performance": "Plugins Performance",
"config.rei.options.debug.plugins_performance.desc": "Detailed break-down of plugins' reload times. This is very useful in debugging the performance after loaded into a world.",

0 comments on commit f3b284c

Please sign in to comment.