From dc1c9736845e49a44db9bfd0b6c25614ecfbbe06 Mon Sep 17 00:00:00 2001
From: Dennis C <xfacthd@gmx.de>
Date: Tue, 28 Jun 2022 06:16:54 +0200
Subject: [PATCH] Fix crash after loading error due to fluid texture gathering
 and config lookup (#8802)

---
 src/main/java/net/minecraftforge/client/ForgeHooksClient.java   | 2 ++
 .../java/net/minecraftforge/client/loading/ClientModLoader.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
index 744bd119ca..7b0a20fa36 100755
--- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
+++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
@@ -472,6 +472,8 @@ public class ForgeHooksClient
 
     public static void gatherFluidTextures(Set<Material> textures)
     {
+        if (!ModLoader.isLoadingStateValid()) return;
+
         ForgeRegistries.FLUIDS.getValues().stream()
                 .flatMap(ForgeHooksClient::getFluidMaterials)
                 .forEach(textures::add);
diff --git a/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java b/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java
index 949a16c58c..c62471b6c6 100644
--- a/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java
+++ b/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java
@@ -147,7 +147,7 @@ public class ClientModLoader
         boolean showWarnings = true;
         try {
             showWarnings = ForgeConfig.CLIENT.showLoadWarnings.get();
-        } catch (NullPointerException e) {
+        } catch (NullPointerException | IllegalStateException e) {
             // We're in an early error state, config is not available. Assume true.
         }
         if (!showWarnings) {