Merge branch '1.21.x' into recipe-priority-but-mutable

neoforged · Jan 17, 2025 · 5cb3773 · 5cb3773
2 parents a864521 + e082c32
commit 5cb3773
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/main/java/net/neoforged/neoforge/data/event/GatherDataEvent.java b/src/main/java/net/neoforged/neoforge/data/event/GatherDataEvent.java
@@ -47,6 +47,7 @@
 import net.neoforged.fml.event.IModBusEvent;
 import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.neoforge.resource.ResourcePackLoader;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class GatherDataEvent extends Event implements IModBusEvent {
@@ -107,6 +108,7 @@ public Client(ModContainer mc, DataGenerator dataGenerator, DataGeneratorConfig
         }
     }
 
+    @ApiStatus.Internal
     public static class DataGeneratorConfig {
         private final Set<String> mods;
         private final Path path;
@@ -155,10 +157,9 @@ public boolean isFlat() {
             return flat || getMods().size() == 1;
         }
 
-        public DataGenerator makeGenerator(final Function<Path, Path> pathEnhancer, final boolean shouldExecute) {
-            final DataGenerator generator = new DataGenerator(pathEnhancer.apply(path), DetectedVersion.tryDetectVersion(), shouldExecute);
-            if (shouldExecute)
-                generators.add(generator);
+        public DataGenerator makeGenerator(final Function<Path, Path> pathEnhancer) {
+            final DataGenerator generator = new DataGenerator(pathEnhancer.apply(path), DetectedVersion.tryDetectVersion(), true);
+            generators.add(generator);
             return generator;
         }
 

diff --git a/src/main/java/net/neoforged/neoforge/data/loading/DatagenModLoader.java b/src/main/java/net/neoforged/neoforge/data/loading/DatagenModLoader.java
@@ -15,7 +15,8 @@
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.server.Bootstrap;
-import net.neoforged.fml.ModLoader;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.ModList;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 import net.neoforged.neoforge.internal.CommonModLoader;
 import net.neoforged.neoforge.internal.RegistrationEvents;
@@ -49,8 +50,16 @@ public static void begin(final Set<String> mods, final Path path, final Collecti
         CompletableFuture<HolderLookup.Provider> lookupProvider = CompletableFuture.supplyAsync(VanillaRegistries::createLookup, Util.backgroundExecutor());
         dataGeneratorConfig = new GatherDataEvent.DataGeneratorConfig(mods, path, inputs, lookupProvider, devToolGenerators, reportsGenerator, structureValidator, flat, vanillaGenerator, assetIndex, assetsDir, existingPacks);
         setup.run();
-        ModLoader.runEventGenerator(mc -> eventGenerator.create(mc, dataGeneratorConfig.makeGenerator(p -> dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()),
-                dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig));
+
+        // Only fire the event for mods that have their generators enabled
+        for (ModContainer mod : ModList.get().getSortedMods()) {
+            if (dataGeneratorConfig.getMods().contains(mod.getModId())) {
+                var generator = dataGeneratorConfig.makeGenerator(p -> dataGeneratorConfig.isFlat() ? p : p.resolve(mod.getModId()));
+                var event = eventGenerator.create(mod, generator, dataGeneratorConfig);
+                mod.acceptEvent(event);
+            }
+        }
+
         dataGeneratorConfig.runAll();
     }
 }