diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-11-09 17:52:09 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 00:38:18 +0900 |
| commit | ea27fb3a913bc64e96901dbf727514a9e1037831 (patch) | |
| tree | cebc40c56972b4a150c2c63dc0522b48c43d1819 /runtime/src | |
| parent | 669e46400de12dfc93d846b0e99cdc06da6a89c9 (diff) | |
| download | RoughlyEnoughItems-ea27fb3a913bc64e96901dbf727514a9e1037831.tar.gz RoughlyEnoughItems-ea27fb3a913bc64e96901dbf727514a9e1037831.tar.bz2 RoughlyEnoughItems-ea27fb3a913bc64e96901dbf727514a9e1037831.zip | |
Add back previews to config groups
Diffstat (limited to 'runtime/src')
2 files changed, 5 insertions, 5 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigEntriesListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigEntriesListWidget.java index 906148b75..eebf1b9d4 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigEntriesListWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigEntriesListWidget.java @@ -37,7 +37,7 @@ import java.util.List; public class ConfigEntriesListWidget { public static Widget create(ConfigAccess access, Rectangle bounds, List<OptionGroup> groups) { WidgetWithBounds list = ListWidget.builderOf(RectangleUtils.inset(bounds, 6, 6), groups, - (index, entry) -> ConfigGroupWidget.create(access, entry, bounds.width - 12 - 6, false)) + (index, entry) -> ConfigGroupWidget.create(access, entry, bounds.width - 12 - 6, true)) .gap(7) .calculateTotalHeightDynamically(true) .build(); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java index e41c233b2..59546ec9e 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java @@ -48,7 +48,7 @@ import java.util.function.IntSupplier; import java.util.function.Supplier; public class ConfigGroupWidget { - private static final Map<OptionGroup, Pair<PreviewLocation, SpecialGroupConstructor>> SPECIAL_GROUPS = new HashMap<>(); + private static final Map<String, Pair<PreviewLocation, SpecialGroupConstructor>> SPECIAL_GROUPS = new HashMap<>(); static { addPreview(AllREIConfigGroups.APPEARANCE_INTERFACE, PreviewLocation.RIGHT, (access, entry, width, height) -> InterfacePreviewer.create(access, width, height)); @@ -57,7 +57,7 @@ public class ConfigGroupWidget { } public static void addPreview(OptionGroup group, PreviewLocation location, SpecialGroupConstructor constructor) { - SPECIAL_GROUPS.put(group, Pair.of(location, constructor)); + SPECIAL_GROUPS.put(group.getId(), Pair.of(location, constructor)); } public static WidgetWithBounds create(ConfigAccess access, OptionGroup entry, int width, boolean applyPreview) { @@ -66,8 +66,8 @@ public class ConfigGroupWidget { .withPadding(0, 0, 0, 6); WidgetWithBounds contents; - if (applyPreview && SPECIAL_GROUPS.containsKey(entry)) { - Pair<PreviewLocation, SpecialGroupConstructor> pair = SPECIAL_GROUPS.get(entry); + if (applyPreview && SPECIAL_GROUPS.containsKey(entry.getId())) { + Pair<PreviewLocation, SpecialGroupConstructor> pair = SPECIAL_GROUPS.get(entry.getId()); PreviewLocation location = pair.getLeft(); int halfWidth = width * 6 / 10 - 2; if (halfWidth <= 200 && location == PreviewLocation.RIGHT) location = PreviewLocation.TOP; |