Allow using PackOutputs in Forge-added datagen classes (#9182)

This commit is contained in:
matyrobbrt authored and GitHub committed 2022-12-12 10:22:48 -08:00
1 parent e541201129
commit 2ea16d89ca
13 files changed
+75 -72

No files matched your search

@@ -7,6 +7,7 @@ package net.minecraftforge.debug.item;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.data.loot.BlockLootSubProvider;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.resources.ResourceLocation;
@@ -112,8 +113,9 @@ public class TagBasedToolTypesTest
{
DataGenerator gen = event.getGenerator();
ExistingFileHelper existing = event.getExistingFileHelper();
final PackOutput output = gen.getPackOutput();
gen.addProvider(event.includeServer(), new BlockTagsProvider(gen.getPackOutput(), event.getLookupProvider(), MODID, existing)
gen.addProvider(event.includeServer(), new BlockTagsProvider(output, event.getLookupProvider(), MODID, existing)
{
@Override
protected void addTags(HolderLookup.Provider registry) {
@@ -143,7 +145,7 @@ public class TagBasedToolTypesTest
gen.addProvider(event.includeServer(), new LootTableProvider(event.getGenerator().getPackOutput(), Set.of(), List.of(new LootTableProvider.SubProviderEntry(TestBlockLootProvider::new, LootContextParamSets.BLOCK))));
gen.addProvider(event.includeClient(), new BlockStateProvider(gen, MODID, existing)
gen.addProvider(event.includeClient(), new BlockStateProvider(output, MODID, existing)
{
@Override
protected void registerStatesAndModels()
@@ -151,7 +153,7 @@ public class TagBasedToolTypesTest
simpleBlockWithItem(STONE.get(), models().cubeAll(STONE.getId().getPath(), mcLoc("block/debug")));
}
});
gen.addProvider(event.includeClient(), new ItemModelProvider(gen, MODID, existing)
gen.addProvider(event.includeClient(), new ItemModelProvider(output, MODID, existing)
{
@Override
protected void registerModels()