From 0320403c44554b609bf87876b103e02fd84c7a1b Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 28 May 2022 16:43:53 +0800
Subject: Fix CME in parallel registration for JEI recipes

---
 .../me/shedaniel/rei/RoughlyEnoughItemsCore.java   |  7 +--
 .../registry/display/DisplayRegistryImpl.java      |  2 +-
 .../rei/impl/common/logging/FilteringLogger.java   | 64 ++++++++++++++++++++++
 3 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java

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

diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index d1be18c87..8546ddb3e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -53,10 +53,7 @@ import me.shedaniel.rei.impl.common.entry.comparison.NbtHasherProviderImpl;
 import me.shedaniel.rei.impl.common.entry.settings.EntrySettingsAdapterRegistryImpl;
 import me.shedaniel.rei.impl.common.entry.type.EntryTypeRegistryImpl;
 import me.shedaniel.rei.impl.common.fluid.FluidSupportProviderImpl;
-import me.shedaniel.rei.impl.common.logging.FileLogger;
-import me.shedaniel.rei.impl.common.logging.Log4JLogger;
-import me.shedaniel.rei.impl.common.logging.MultiLogger;
-import me.shedaniel.rei.impl.common.logging.TransformingLogger;
+import me.shedaniel.rei.impl.common.logging.*;
 import me.shedaniel.rei.impl.common.logging.performance.PerformanceLogger;
 import me.shedaniel.rei.impl.common.logging.performance.PerformanceLoggerImpl;
 import me.shedaniel.rei.impl.common.plugins.PluginManagerImpl;
@@ -66,6 +63,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.util.Unit;
 import org.apache.commons.lang3.mutable.MutableLong;
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -77,6 +75,7 @@ public class RoughlyEnoughItemsCore {
     @ApiStatus.Internal
     public static final InternalLogger LOGGER = new TransformingLogger(new MultiLogger(ImmutableList.of(
             new FileLogger(Platform.getGameFolder().resolve("logs/rei.log")),
+            new FilteringLogger(new FileLogger(Platform.getGameFolder().resolve("logs/rei-issues.log")), Level.WARN),
             new Log4JLogger(LogManager.getFormatterLogger("REI"))
     )), message -> "[REI] " + message);
     public static final PerformanceLogger PERFORMANCE_LOGGER = new PerformanceLoggerImpl();
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 3f4c96bc2..73bf3122c 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
@@ -287,7 +287,7 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
                 return filler.mappingFunction.apply(value);
             }
         } catch (Throwable e) {
-            RoughlyEnoughItemsCore.LOGGER.error("Failed to fill displays!", e);
+            throw new RuntimeException("Failed to fill displays!", e);
         }
         
         return null;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java
new file mode 100644
index 000000000..70c440cb4
--- /dev/null
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java
@@ -0,0 +1,64 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.impl.common.logging;
+
+import me.shedaniel.rei.impl.common.InternalLogger;
+import org.apache.commons.io.output.NullOutputStream;
+import org.apache.logging.log4j.Level;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class FilteringLogger implements InternalLogger {
+    private final InternalLogger logger;
+    private final Level minLevel;
+    
+    public FilteringLogger(InternalLogger logger, Level minLevel) {
+        this.logger = logger;
+        this.minLevel = minLevel;
+    }
+    
+    @Override
+    public void throwException(Throwable throwable) {
+        logger.throwException(throwable);
+    }
+    
+    @Override
+    public void log(Level level, String message) {
+        if (level.isLessSpecificThan(minLevel))
+            return;
+        logger.log(level, message);
+    }
+    
+    @Override
+    public void log(Level level, String message, Throwable throwable) {
+        if (level.isLessSpecificThan(minLevel))
+            return;
+        logger.log(level, message, throwable);
+    }
+}
-- 
cgit