mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Cleanup FMLLoader and Launch Handlers.
Cleanup some of the build.gradle Start work on restructuring test mods. They are now treated as their own jars, as well as having their mods.toml auto-generated. No more mods.toml conflicts! Add pattern matching support to Data run modlist.
This commit is contained in:
64 files changed
+883
-1108
No files matched your search
@@ -6,10 +6,10 @@
|
||||
package net.minecraftforge.data.loading;
|
||||
|
||||
import net.minecraft.Util;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.registries.VanillaRegistries;
|
||||
import net.minecraft.server.Bootstrap;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.fml.ModList;
|
||||
import net.minecraftforge.fml.ModLoader;
|
||||
import net.minecraftforge.fml.ModWorkManager;
|
||||
import net.minecraftforge.data.event.GatherDataEvent;
|
||||
@@ -19,12 +19,13 @@ import org.apache.logging.log4j.Logger;
|
||||
import java.io.File;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class DatagenModLoader {
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
private static GatherDataEvent.DataGeneratorConfig dataGeneratorConfig;
|
||||
private static ExistingFileHelper existingFileHelper;
|
||||
private static boolean runningDataGen;
|
||||
|
||||
@@ -32,25 +33,49 @@ public class DatagenModLoader {
|
||||
return runningDataGen;
|
||||
}
|
||||
|
||||
public static void begin(final Set<String> mods, final Path path, final Collection<Path> inputs, Collection<Path> existingPacks,
|
||||
Set<String> existingMods, final boolean serverGenerators, final boolean clientGenerators, final boolean devToolGenerators, final boolean reportsGenerator,
|
||||
final boolean structureValidator, final boolean flat, final String assetIndex, final File assetsDir) {
|
||||
if (mods.contains("minecraft") && mods.size() == 1)
|
||||
public static void begin(
|
||||
Set<String> patterns, Path output, Collection<Path> inputs, Collection<Path> existingPacks, Set<String> existingMods,
|
||||
boolean genServer, boolean genClient, boolean genDev, boolean genReports,
|
||||
boolean validate, boolean flat, String assetIndex, File assetsDir
|
||||
) {
|
||||
if (patterns.contains("minecraft") && patterns.size() == 1)
|
||||
return;
|
||||
LOGGER.info("Initializing Data Gatherer for mods {}", mods);
|
||||
|
||||
runningDataGen = true;
|
||||
Bootstrap.bootStrap();
|
||||
ModLoader.get().gatherAndInitializeMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), ()->{});
|
||||
CompletableFuture<HolderLookup.Provider> lookupProvider = CompletableFuture.supplyAsync(VanillaRegistries::createLookup, Util.backgroundExecutor());
|
||||
dataGeneratorConfig = new GatherDataEvent.DataGeneratorConfig(mods, path, inputs, lookupProvider, serverGenerators,
|
||||
clientGenerators, devToolGenerators, reportsGenerator, structureValidator, flat);
|
||||
var lookupProvider = CompletableFuture.supplyAsync(VanillaRegistries::createLookup, Util.backgroundExecutor());
|
||||
|
||||
var mods = new HashSet<String>();
|
||||
for (var pattern : patterns) {
|
||||
if (pattern.indexOf('.') == -1) // No wildcard!
|
||||
mods.add(pattern);
|
||||
|
||||
var m = Pattern.compile('^' + pattern + '$');
|
||||
ModList.get().forEachModInOrder(mc -> {
|
||||
var id = mc.getModId();
|
||||
if (!"forge".equals(id) && !"minecraft".equals(id) && m.matcher(id).matches())
|
||||
mods.add(id);
|
||||
});
|
||||
}
|
||||
LOGGER.info("Initializing Data Gatherer for mods {}", mods);
|
||||
|
||||
var config = new GatherDataEvent.DataGeneratorConfig(mods, output, inputs, lookupProvider, genServer,
|
||||
genClient, genDev, genReports, validate, flat);
|
||||
|
||||
if (!mods.contains("forge")) {
|
||||
// If we aren't generating data for forge, automatically add forge as an existing so mods can access forge's data
|
||||
existingMods.add("forge");
|
||||
}
|
||||
existingFileHelper = new ExistingFileHelper(existingPacks, existingMods, structureValidator, assetIndex, assetsDir);
|
||||
ModLoader.get().runEventGenerator(mc -> new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p -> dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()),
|
||||
dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));
|
||||
dataGeneratorConfig.runAll();
|
||||
|
||||
existingFileHelper = new ExistingFileHelper(existingPacks, existingMods, validate, assetIndex, assetsDir);
|
||||
ModLoader.get().runEventGenerator(mc -> new GatherDataEvent(
|
||||
mc,
|
||||
config.makeGenerator(
|
||||
p -> config.isFlat() ? p : p.resolve(mc.getModId()),
|
||||
config.getMods().contains(mc.getModId())
|
||||
), config, existingFileHelper)
|
||||
);
|
||||
config.runAll();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user