Wrap click areas, implement createTickTimer

Signed-off-by: shedaniel <daniel@shedaniel.me>

1 files changed, 4 insertions, 4 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java b/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java
index b0b8270e2..7284c01c3 100644
--- a/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java
@@ -95,7 +95,7 @@ public interface ScreenRegistry extends Reloadable {
      * @param categories  The categories of result.
      * @param <T>         The screen type to be registered to.
      */
-    default <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(Rectangle area, Class<T> screenClass, ResourceLocation... categories) {
+    default <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(Rectangle area, Class<? extends T> screenClass, ResourceLocation... categories) {
         registerContainerClickArea(screen -> area, screenClass, categories);
     }
     
@@ -107,7 +107,7 @@ public interface ScreenRegistry extends Reloadable {
      * @param categories  The categories of result.
      * @param <T>         The screen type to be registered to.
      */
-    <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(ScreenClickAreaProvider<T> provider, Class<T> screenClass, ResourceLocation... categories);
+    <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(ScreenClickAreaProvider<T> provider, Class<? extends T> screenClass, ResourceLocation... categories);
     
     /**
      * Registers a click area for a screen.
@@ -117,7 +117,7 @@ public interface ScreenRegistry extends Reloadable {
      * @param categories  The categories of result.
      * @param <T>         The screen type to be registered to.
      */
-    default <T extends Screen> void registerClickArea(ScreenClickAreaProvider<T> provider, Class<T> screenClass, ResourceLocation... categories) {
+    default <T extends Screen> void registerClickArea(ScreenClickAreaProvider<T> provider, Class<? extends T> screenClass, ResourceLocation... categories) {
         registerClickArea(screenClass, provider.toHandler(() -> categories));
     }
     
@@ -129,7 +129,7 @@ public interface ScreenRegistry extends Reloadable {
      * @param <T>         The screen type to be registered to.
      * @see #registerClickArea(ScreenClickAreaProvider, Class, ResourceLocation...) for a simpler way to handle areas without custom categories.
      */
-    <T extends Screen> void registerClickArea(Class<T> screenClass, ClickArea<T> area);
+    <T extends Screen> void registerClickArea(Class<? extends T> screenClass, ClickArea<T> area);
     
     @Nullable <T extends Screen> Set<ResourceLocation> handleClickArea(Class<T> screenClass, ClickArea.ClickAreaContext<T> context);
 }