From 12d411ea7f58ca62b4667194993e25cae2508672 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 12 Nov 2022 13:26:56 +0800
Subject: Fix #1207

---
 .../client/registry/display/DisplayCategory.java   |  2 +-
 .../rei/api/common/util/CollectionUtils.java       | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'api/src/main')

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java
index c01d1a9f3..0f82e6705 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java
@@ -104,7 +104,7 @@ public interface DisplayCategory<T extends Display> extends DisplayCategoryView<
      * @return the display width
      */
     default int getDisplayWidth(T display) {
-        return 150;
+        return getCategoryIdentifier().getPath().equals("plugins/campfire") ? 190 : 150;
     }
     
     /**
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java b/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java
index 67894fb27..3b625d888 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java
@@ -241,6 +241,33 @@ public class CollectionUtils {
         return Stream.of(list).max(comparator);
     }
     
+    public static <T, R> Optional<R> mapAndMin(Collection<T> list, Function<T, R> function, Comparator<R> comparator) {
+        if (list.isEmpty()) {
+            return Optional.empty();
+        }
+        return list.stream().min(Comparator.comparing(function, comparator)).map(function);
+    }
+    
+    public static <T, R> Optional<R> mapAndMin(T[] list, Function<T, R> function, Comparator<R> comparator) {
+        if (list.length <= 0)
+            return Optional.empty();
+        return Stream.of(list).min(Comparator.comparing(function, comparator)).map(function);
+    }
+    
+    public static <T> Optional<T> min(Collection<T> list, Comparator<T> comparator) {
+        if (list.isEmpty()) {
+            return Optional.empty();
+        }
+        return list.stream().min(comparator);
+    }
+    
+    public static <T> Optional<T> min(T[] list, Comparator<T> comparator) {
+        if (list.length <= 0) {
+            return Optional.empty();
+        }
+        return Stream.of(list).min(comparator);
+    }
+    
     public static String joinToString(Iterable<CharSequence> list, CharSequence separator) {
         return String.join(separator, list);
     }
-- 
cgit