From 50bab68a198f47090655288dcbd586958c6b59b9 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 28 Aug 2021 16:16:56 +0800 Subject: API parity with 1.17 version --- .../me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java | 2 ++ .../main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java index 35817b419..6e83dfac2 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java @@ -109,6 +109,8 @@ public interface CategoryRegistry extends Reloadable, Iterable< CategoryConfiguration get(CategoryIdentifier category); + Optional> tryGet(CategoryIdentifier category); + void configure(CategoryIdentifier category, Consumer> action); int size(); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java index 812ac451c..85113b98f 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java @@ -505,7 +505,7 @@ public class ScreenOverlayImpl extends ScreenOverlay { }; Set> categories = ScreenRegistry.getInstance().handleClickArea((Class) screen.getClass(), context); if (categories != null && !categories.isEmpty()) { - Component collect = CollectionUtils.mapAndJoinToComponent(categories, identifier -> CategoryRegistry.getInstance().get(identifier).getCategory().getTitle(), new ImmutableTextComponent(", ")); + Component collect = CollectionUtils.mapAndJoinToComponent(categories, identifier -> CategoryRegistry.getInstance().tryGet(identifier).map(config -> config.getCategory().getTitle()).orElse(new ImmutableTextComponent(identifier.toString())), new ImmutableTextComponent(", ")); Tooltip.create(new TranslatableComponent("text.rei.view_recipes_for", collect)).queue(); } } -- cgit