aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-08-28 16:16:56 +0800
committershedaniel <daniel@shedaniel.me>2021-08-28 16:16:56 +0800
commit50bab68a198f47090655288dcbd586958c6b59b9 (patch)
tree82ec67696cf8a5fbd900b48da60e6bd2beb895d7
parent903b302447e67c92c11dd3bc14b69f88362891b8 (diff)
downloadRoughlyEnoughItems-50bab68a198f47090655288dcbd586958c6b59b9.tar.gz
RoughlyEnoughItems-50bab68a198f47090655288dcbd586958c6b59b9.tar.bz2
RoughlyEnoughItems-50bab68a198f47090655288dcbd586958c6b59b9.zip
API parity with 1.17 version
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java2
2 files changed, 3 insertions, 1 deletions
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<REIClientPlugin>, Iterable<
<T extends Display> CategoryConfiguration<T> get(CategoryIdentifier<T> category);
+ <T extends Display> Optional<CategoryConfiguration<T>> tryGet(CategoryIdentifier<T> category);
+
<T extends Display> void configure(CategoryIdentifier<T> category, Consumer<CategoryConfiguration<T>> 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<CategoryIdentifier<?>> categories = ScreenRegistry.getInstance().handleClickArea((Class<Screen>) 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();
}
}