From 87bb1a6bf154648919b437d31266899fbc9baaff Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 11 Aug 2022 03:03:00 +0800
Subject: Fix crash without architectury api

---
 .../me/shedaniel/rei/impl/client/ErrorDisplayer.java     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/ErrorDisplayer.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/ErrorDisplayer.java
index 1b4bbdb61..29b7accfe 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/ErrorDisplayer.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/ErrorDisplayer.java
@@ -23,13 +23,12 @@
 
 package me.shedaniel.rei.impl.client;
 
-import dev.architectury.platform.Platform;
 import me.shedaniel.rei.RoughlyEnoughItemsState;
 import me.shedaniel.rei.impl.client.gui.screen.WarningAndErrorScreen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 
-import java.lang.reflect.InvocationTargetException;
+import java.util.ServiceLoader;
 import java.util.function.UnaryOperator;
 
 public class ErrorDisplayer {
@@ -56,12 +55,11 @@ public class ErrorDisplayer {
     }
     
     public static void registerGuiInit(UnaryOperator<Screen> consumer) {
-        try {
-            Class.forName("me.shedaniel.rei.impl.client.%s.ErrorDisplayerImpl".formatted(Platform.isForge() ? "forge" : "fabric"))
-                    .getDeclaredMethod("registerGuiInit", UnaryOperator.class)
-                    .invoke(null, consumer);
-        } catch (IllegalAccessException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
+        ErrorGuiInitializer initializer = ServiceLoader.load(ErrorGuiInitializer.class).findFirst().orElseThrow();
+        initializer.registerGuiInit(consumer);
+    }
+    
+    public interface ErrorGuiInitializer {
+        void registerGuiInit(UnaryOperator<Screen> consumer);
     }
 }
-- 
cgit