Add --flat argument to data generators to not create data in mod specific directores.

Useful For Forge's test mods mainly.
Standardized data gen cache file's folder separators.
Added ItemModelProvider to BlockStateProvider for cleaner datagen code.
Added .gitattributes to fix datagen json's line endings correct on windows.
This commit is contained in:
LexManos committed 2020-06-03 16:57:07 -07:00
1 parent a39f1cbe1a
commit f24991f3bb
16 files changed
+241 -115

No files matched your search

@@ -19,6 +19,8 @@
package net.minecraftforge.client.model.generators;
import javax.annotation.Nonnull;
import net.minecraft.data.DataGenerator;
/**
@@ -30,4 +32,10 @@ public abstract class BlockModelProvider extends ModelProvider<BlockModelBuilder
public BlockModelProvider(DataGenerator generator, String modid, ExistingFileHelper existingFileHelper) {
super(generator, modid, BLOCK_FOLDER, BlockModelBuilder::new, existingFileHelper);
}
@Nonnull
@Override
public String getName() {
return "Block Models: " + modid;
}
}
@@ -80,32 +80,31 @@ public abstract class BlockStateProvider implements IDataProvider {
@VisibleForTesting
protected final Map<Block, IGeneratedBlockstate> registeredBlocks = new LinkedHashMap<>();
private final DataGenerator generator;
private final String modid;
private final BlockModelProvider blockModels;
private final ItemModelProvider itemModels;
public BlockStateProvider(DataGenerator gen, String modid, ExistingFileHelper exFileHelper) {
this.generator = gen;
this.modid = modid;
this.blockModels = new BlockModelProvider(gen, modid, exFileHelper) {
@Override
public String getName() {
return BlockStateProvider.this.getName();
}
@Override
protected void registerModels() {}
@Override protected void registerModels() {}
};
this.itemModels = new ItemModelProvider(gen, modid, exFileHelper) {
@Override protected void registerModels() {}
};
}
@Override
public void act(DirectoryCache cache) throws IOException {
models().clear();
itemModels().clear();
registeredBlocks.clear();
registerStatesAndModels();
models().generateAll(cache);
itemModels().generateAll(cache);
for (Map.Entry<Block, IGeneratedBlockstate> entry : registeredBlocks.entrySet()) {
saveBlockState(cache, entry.getValue().toJson(), entry.getKey());
}
@@ -136,11 +135,15 @@ public abstract class BlockStateProvider implements IDataProvider {
return ret;
}
}
public BlockModelProvider models() {
return blockModels;
}
public ItemModelProvider itemModels() {
return itemModels;
}
public ResourceLocation modLoc(String name) {
return new ResourceLocation(modid, name);
}
@@ -178,6 +181,10 @@ public abstract class BlockStateProvider implements IDataProvider {
simpleBlock(block, new ConfiguredModel(model));
}
public void simpleBlockItem(Block block, ModelFile model) {
itemModels().getBuilder(block.getRegistryName().getPath()).parent(model);
}
public void simpleBlock(Block block, ConfiguredModel... models) {
getVariantBuilder(block)
.partialState().setModels(models);
@@ -538,7 +545,7 @@ public abstract class BlockStateProvider implements IDataProvider {
@Nonnull
@Override
public String getName() {
return "Block States";
return "Block States: " + modid;
}
public static class ConfiguredModelList {
@@ -19,6 +19,8 @@
package net.minecraftforge.client.model.generators;
import javax.annotation.Nonnull;
import net.minecraft.data.DataGenerator;
/**
@@ -30,4 +32,10 @@ public abstract class ItemModelProvider extends ModelProvider<ItemModelBuilder>
public ItemModelProvider(DataGenerator generator, String modid, ExistingFileHelper existingFileHelper) {
super(generator, modid, ITEM_FOLDER, ItemModelBuilder::new, existingFileHelper);
}
@Nonnull
@Override
public String getName() {
return "Item Models: " + modid;
}
}
@@ -234,8 +234,8 @@ public class ModLoader
if (containers.size() != modInfoMap.size()) {
LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
modFile.getFilePath(),
containers.size(), containers.stream().map(c -> c != null ? c.getModId() : "(null)").collect(Collectors.toList()),
modInfoMap.size(), modInfoMap.values().stream().map(IModInfo::getModId).collect(Collectors.toList()));
containers.size(), containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList()),
modInfoMap.size(), modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList()));
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
}
return containers;
@@ -285,11 +285,16 @@ public class ModLoader
this.loadingWarnings.add(warning);
}
@Deprecated //Remove in 1.16
public void runDataGenerator(final Set<String> mods, final Path path, final Collection<Path> inputs, Collection<Path> existingPacks, final boolean serverGenerators, final boolean clientGenerators, final boolean devToolGenerators, final boolean reportsGenerator, final boolean structureValidator) {
runDataGenerator(mods, path, inputs, existingPacks, serverGenerators, clientGenerators, devToolGenerators, reportsGenerator, structureValidator, false);
}
public void runDataGenerator(final Set<String> mods, final Path path, final Collection<Path> inputs, Collection<Path> existingPacks, final boolean serverGenerators, final boolean clientGenerators, final boolean devToolGenerators, final boolean reportsGenerator, final boolean structureValidator, final boolean flat) {
if (mods.contains("minecraft") && mods.size() == 1) return;
LOGGER.info("Initializing Data Gatherer for mods {}", mods);
Bootstrap.register();
dataGeneratorConfig = new GatherDataEvent.DataGeneratorConfig(mods, path, inputs, serverGenerators, clientGenerators, devToolGenerators, reportsGenerator, structureValidator);
dataGeneratorConfig = new GatherDataEvent.DataGeneratorConfig(mods, path, inputs, serverGenerators, clientGenerators, devToolGenerators, reportsGenerator, structureValidator, flat);
existingFileHelper = new ExistingFileHelper(existingPacks, structureValidator);
gatherAndInitializeMods(() -> {});
dispatchAndHandleError(LifecycleEventProvider.GATHERDATA, Runnable::run, () -> {});
@@ -297,6 +302,6 @@ public class ModLoader
}
public Function<ModContainer, ModLifecycleEvent> getDataGeneratorEvent() {
return mc -> new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.getMods().size() == 1 ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper);
return mc -> new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper);
}
}
@@ -28,8 +28,10 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
public class GatherDataEvent extends ModLifecycleEvent
{
@@ -61,9 +63,14 @@ public class GatherDataEvent extends ModLifecycleEvent
private final boolean dev;
private final boolean reports;
private final boolean validate;
private final boolean flat;
private List<DataGenerator> generators = new ArrayList<>();
@Deprecated //Remove in 1.16
public DataGeneratorConfig(final Set<String> mods, final Path path, final Collection<Path> inputs, final boolean server, final boolean client, final boolean dev, final boolean reports, final boolean validate) {
this(mods, path, inputs, server, client, dev, reports, validate, false);
}
public DataGeneratorConfig(final Set<String> mods, final Path path, final Collection<Path> inputs, final boolean server, final boolean client, final boolean dev, final boolean reports, final boolean validate, final boolean flat) {
this.mods = mods;
this.path = path;
this.inputs = inputs;
@@ -72,20 +79,34 @@ public class GatherDataEvent extends ModLifecycleEvent
this.dev = dev;
this.reports = reports;
this.validate = validate;
this.flat = flat;
}
public Set<String> getMods() {
return mods;
}
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), inputs);
if (shouldExecute) generators.add(generator);
if (shouldExecute)
generators.add(generator);
return generator;
}
public void runAll() {
generators.forEach(LamdbaExceptionUtils.rethrowConsumer(DataGenerator::run));
Map<Path, List<DataGenerator>> paths = generators.stream().collect(Collectors.groupingBy(DataGenerator::getOutputFolder));
paths.values().forEach(LamdbaExceptionUtils.rethrowConsumer(lst -> {
DataGenerator parent = lst.get(0);
for (int x = 1; x < lst.size(); x++)
lst.get(x).getProviders().forEach(parent::addProvider);
parent.run();
}));
}
}
}