From c07281fac9bbd1b4af99680efe19ff9e2082cf14 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 16 Mar 2021 22:44:45 +0800
Subject: Wrap click areas, implement createTickTimer

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java   | 4 ++--
 .../java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java     | 2 +-
 runtime/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime/src/main/java')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java
index a2f933723..2c76b3876 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java
@@ -149,7 +149,7 @@ public class ScreenRegistryImpl implements ScreenRegistry {
     }
     
     @Override
-    public <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(ScreenClickAreaProvider<T> provider, Class<T> screenClass, ResourceLocation... categories) {
+    public <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(ScreenClickAreaProvider<T> provider, Class<? extends T> screenClass, ResourceLocation... categories) {
         registerClickArea(screen -> {
             Rectangle rectangle = provider.provide(screen).clone();
             rectangle.translate(screen.leftPos, screen.topPos);
@@ -158,7 +158,7 @@ public class ScreenRegistryImpl implements ScreenRegistry {
     }
     
     @Override
-    public <T extends Screen> void registerClickArea(Class<T> screenClass, ClickArea<T> area) {
+    public <T extends Screen> void registerClickArea(Class<? extends T> screenClass, ClickArea<T> area) {
         clickAreas.put(screenClass, area);
     }
     
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java
index 4766a26b5..9dd07f1eb 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java
@@ -69,7 +69,7 @@ public class CategoryRegistryImpl implements CategoryRegistry, Reloadable {
     
     @Override
     public <T extends Display> CategoryConfiguration<T> get(ResourceLocation category) {
-        return (CategoryConfiguration<T>) this.categories.get(category);
+        return (CategoryConfiguration<T>) Objects.requireNonNull(this.categories.get(category), category.toString());
     }
     
     @Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java
index 10eaf6e58..e08ca7956 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java
@@ -68,7 +68,7 @@ public final class ArrowWidget extends Arrow {
         Minecraft.getInstance().getTextureManager().bind(REIHelper.getInstance().getDefaultDisplayTexture());
         blit(matrices, getX(), getY(), 106, 91, 24, 17);
         if (getAnimationDuration() > 0) {
-            int width = Mth.ceil((System.currentTimeMillis() / (animationDuration / 24) % 24d) / 1f);
+            int width = Mth.ceil((System.currentTimeMillis() / (animationDuration / 24) % 24d));
             blit(matrices, getX(), getY(), 82, 91, width, 17);
         }
     }
-- 
cgit