Log error when Sheets is class-loaded before registration is completed (#9475)

fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java

@@ -82,6 +82,7 @@ public class ModLoader
     private boolean loadingStateValid;
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private final Optional<Consumer<String>> statusConsumer = StartupMessageManager.modLoaderConsumer();
+    private final Set<IModLoadingState> completedStates = new HashSet<>();
     private ModList modList;
 
     private ModLoader()
@@ -200,6 +201,7 @@ public class ModLoader
         statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
         state.inlineRunnable().ifPresent(a->a.accept(this.modList));
         state.buildTransition(syncExecutor, parallelExecutor).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+        completedStates.add(state);
     }
 
     private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
@@ -210,6 +212,7 @@ public class ModLoader
         statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
         state.inlineRunnable().ifPresent(a->a.accept(this.modList));
         state.buildTransition(syncExecutor, parallelExecutor, preSyncTask, postSyncTask).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
+        completedStates.add(state);
     }
 
     private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
@@ -296,6 +299,11 @@ public class ModLoader
         return get().loadingStateValid;
     }
 
+    public boolean hasCompletedState(final String stateName) {
+        IModLoadingState state = stateManager.findState(stateName);
+        return completedStates.contains(state);
+    }
+
     public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
         if (!loadingStateValid) {
             LOGGER.error("Cowardly refusing to send event generator to a broken mod state");

fmlcore/src/main/java/net/minecraftforge/fml/ModStateManager.java

@@ -39,4 +39,13 @@ public class ModStateManager {
         nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
         return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
     }
+
+    public IModLoadingState findState(final String stateName) {
+        return stateMap.values()
+                .stream()
+                .flatMap(Collection::stream)
+                .filter(mls -> mls.name().equals(stateName))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
+    }
 }

patches/minecraft/net/minecraft/client/renderer/Sheets.java.patch

@@ -16,10 +16,11 @@
     }
  
     public static Material m_173381_(WoodType p_173382_) {
-@@ -209,5 +_,13 @@
+@@ -208,6 +_,23 @@
+          case SINGLE:
           default:
              return p_110773_;
-       }
++      }
 +   }
 +
 +   /**
@@ -28,5 +29,14 @@
 +   public static void addWoodType(WoodType woodType) {
 +      f_110743_.put(woodType, m_173385_(woodType));
 +      f_244291_.put(woodType, m_245275_(woodType));
++   }
++
++   static {
++      if (net.minecraftforge.fml.ModLoader.isLoadingStateValid() && !net.minecraftforge.fml.ModLoader.get().hasCompletedState("LOAD_REGISTRIES")) {
++         com.mojang.logging.LogUtils.getLogger().error(
++                 "net.minecraft.client.renderer.Sheets loaded too early, modded registry-based materials may not work correctly",
++                 new IllegalStateException("net.minecraft.client.renderer.Sheets loaded too early")
++         );
+       }
     }
  }