diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-06-02 16:22:27 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-06-02 16:22:27 +0800 |
| commit | fd4026dd30a2f8ba4c261f344a16b3adee9823a4 (patch) | |
| tree | b2510b5ec19876df2adf54e53f889841ba975c0c | |
| parent | ffb0a6413360b0579e7331d71dd934a7d0050d16 (diff) | |
| download | RoughlyEnoughItems-fd4026dd30a2f8ba4c261f344a16b3adee9823a4.tar.gz RoughlyEnoughItems-fd4026dd30a2f8ba4c261f344a16b3adee9823a4.tar.bz2 RoughlyEnoughItems-fd4026dd30a2f8ba4c261f344a16b3adee9823a4.zip | |
Allow a broader registerFiller
| -rw-r--r-- | api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java | 4 | ||||
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java index 36c726145..1c9ac5d0c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java @@ -183,7 +183,7 @@ public interface DisplayRegistry extends RecipeManagerContext<REIClientPlugin> { * @param <T> the type of object * @param <D> the type of display */ - default <T, D extends Display> void registerFiller(Class<T> typeClass, Function<T, D> filler) { + default <T, D extends Display> void registerFiller(Class<T> typeClass, Function<? extends T, D> filler) { registerFiller(typeClass, Predicates.alwaysTrue(), filler); } @@ -199,7 +199,7 @@ public interface DisplayRegistry extends RecipeManagerContext<REIClientPlugin> { * @param <T> the type of object * @param <D> the type of display */ - <T, D extends Display> void registerFiller(Class<T> typeClass, Predicate<? extends T> predicate, Function<T, D> filler); + <T, D extends Display> void registerFiller(Class<T> typeClass, Predicate<? extends T> predicate, Function<? extends T, D> filler); /** * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}. diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java index 1d6ea4721..98d03acb2 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java @@ -132,8 +132,8 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi } @Override - public <T, D extends Display> void registerFiller(Class<T> typeClass, Predicate<? extends T> predicate, Function<T, D> filler) { - registerFiller(o -> typeClass.isInstance(o) && ((Predicate<T>) predicate).test((T) o), o -> filler.apply((T) o)); + public <T, D extends Display> void registerFiller(Class<T> typeClass, Predicate<? extends T> predicate, Function<? extends T, D> filler) { + registerFiller(o -> typeClass.isInstance(o) && ((Predicate<T>) predicate).test((T) o), o -> ((Function<T, D>) filler).apply((T) o)); } @Override |
