From 609c2238e12ad9835c449cd9f9da842ca747d5dc Mon Sep 17 00:00:00 2001
From: Unknown <shekwancheung0528@gmail.com>
Date: Tue, 18 Jun 2019 20:07:38 +0800
Subject: nah let's break everyone's plugins

---
 .../me/shedaniel/rei/client/DisplayHelperImpl.java   | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java')

diff --git a/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java b/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java
index 4cac6a11f..ac6d581bf 100644
--- a/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java
@@ -19,8 +19,8 @@ import java.util.stream.Collectors;
 
 public class DisplayHelperImpl implements DisplayHelper {
     
-    private static final Comparator<DisplayBoundsHandler> BOUNDS_HANDLER_COMPARATOR;
-    private static final DisplayBoundsHandler EMPTY = new DisplayBoundsHandler() {
+    private static final Comparator<DisplayBoundsHandler<?>> BOUNDS_HANDLER_COMPARATOR;
+    private static final DisplayBoundsHandler<Object> EMPTY = new DisplayBoundsHandler() {
         @Override
         public Class getBaseSupportedClass() {
             return null;
@@ -43,27 +43,27 @@ public class DisplayHelperImpl implements DisplayHelper {
     };
     
     static {
-        Comparator<DisplayBoundsHandler> comparator = Comparator.comparingDouble(DisplayBoundsHandler::getPriority);
+        Comparator<DisplayBoundsHandler<?>> comparator = Comparator.comparingDouble(DisplayBoundsHandler::getPriority);
         BOUNDS_HANDLER_COMPARATOR = comparator.reversed();
     }
     
-    private List<DisplayBoundsHandler> screenDisplayBoundsHandlers = Lists.newArrayList();
-    private Map<Class, DisplayBoundsHandler> handlerCache = Maps.newHashMap();
+    private List<DisplayBoundsHandler<?>> screenDisplayBoundsHandlers = Lists.newArrayList();
+    private Map<Class<?>, DisplayBoundsHandler<?>> handlerCache = Maps.newHashMap();
     private BaseBoundsHandler baseBoundsHandler;
     
     @Override
-    public List<DisplayBoundsHandler> getSortedBoundsHandlers(Class screenClass) {
+    public List<DisplayBoundsHandler<?>> getSortedBoundsHandlers(Class<?> screenClass) {
         return screenDisplayBoundsHandlers.stream().filter(handler -> handler.getBaseSupportedClass().isAssignableFrom(screenClass)).sorted(BOUNDS_HANDLER_COMPARATOR).collect(Collectors.toList());
     }
     
     @Override
-    public List<DisplayBoundsHandler> getAllBoundsHandlers() {
+    public List<DisplayBoundsHandler<?>> getAllBoundsHandlers() {
         return screenDisplayBoundsHandlers;
     }
     
     @Override
-    public DisplayBoundsHandler getResponsibleBoundsHandler(Class screenClass) {
-        Optional<DisplayBoundsHandler> any = handlerCache.entrySet().stream().filter(entry -> entry.getKey().equals(screenClass)).map(Map.Entry::getValue).findAny();
+    public DisplayBoundsHandler<?> getResponsibleBoundsHandler(Class<?> screenClass) {
+        Optional<? extends DisplayBoundsHandler<?>> any = handlerCache.entrySet().stream().filter(entry -> entry.getKey().equals(screenClass)).map(Map.Entry::getValue).findAny();
         if (any.isPresent())
             return any.get();
         handlerCache.put(screenClass, screenDisplayBoundsHandlers.stream().filter(handler -> handler.getBaseSupportedClass().isAssignableFrom(screenClass)).sorted(BOUNDS_HANDLER_COMPARATOR).findAny().orElse(EMPTY));
@@ -71,7 +71,7 @@ public class DisplayHelperImpl implements DisplayHelper {
     }
     
     @Override
-    public void registerBoundsHandler(DisplayBoundsHandler handler) {
+    public void registerBoundsHandler(DisplayBoundsHandler<?> handler) {
         screenDisplayBoundsHandlers.add(handler);
     }
     
-- 
cgit