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;
}
}