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

@@ -15,6 +15,7 @@ import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.data.models.model.ModelLocationUtils;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.Connection;
@@ -139,17 +140,18 @@ public class CustomTransformTypeTest
public void gatherData(GatherDataEvent event)
{
DataGenerator gen = event.getGenerator();
final PackOutput output = gen.getPackOutput();
gen.addProvider(event.includeClient(), new ItemModels(gen, event.getExistingFileHelper()));
gen.addProvider(event.includeClient(), new BlockStateModels(gen, event.getExistingFileHelper()));
gen.addProvider(event.includeClient(), new ItemModels(output, event.getExistingFileHelper()));
gen.addProvider(event.includeClient(), new BlockStateModels(output, event.getExistingFileHelper()));
}
public static class BlockStateModels extends BlockStateProvider
{
public BlockStateModels(DataGenerator gen, ExistingFileHelper exFileHelper)
public BlockStateModels(PackOutput output, ExistingFileHelper exFileHelper)
{
super(gen, MODID, exFileHelper);
super(output, MODID, exFileHelper);
}
@Override
@@ -164,9 +166,9 @@ public class CustomTransformTypeTest
public static class ItemModels extends ItemModelProvider
{
public ItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper)
public ItemModels(PackOutput output, ExistingFileHelper existingFileHelper)
{
super(generator, MODID, existingFileHelper);
super(output, MODID, existingFileHelper);
}
@Override
@@ -8,6 +8,7 @@ package net.minecraftforge.debug.client.model;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.data.PackOutput;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
@@ -181,18 +182,19 @@ public class NewModelLoaderTest
private void datagen(GatherDataEvent event)
{
DataGenerator gen = event.getGenerator();
final PackOutput output = gen.getPackOutput();
// Let blockstate provider see generated item models by passing its existing file helper
ItemModelProvider itemModels = new ItemModels(gen, event.getExistingFileHelper());
ItemModelProvider itemModels = new ItemModels(output, event.getExistingFileHelper());
gen.addProvider(event.includeClient(), itemModels);
gen.addProvider(event.includeClient(), new BlockStates(gen, itemModels.existingFileHelper));
gen.addProvider(event.includeClient(), new BlockStates(output, itemModels.existingFileHelper));
}
public static class ItemModels extends ItemModelProvider
{
public ItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper)
public ItemModels(PackOutput output, ExistingFileHelper existingFileHelper)
{
super(generator, MODID, existingFileHelper);
super(output, MODID, existingFileHelper);
}
@Override
@@ -215,9 +217,9 @@ public class NewModelLoaderTest
public static class BlockStates extends BlockStateProvider
{
public BlockStates(DataGenerator gen, ExistingFileHelper exFileHelper)
public BlockStates(PackOutput output, ExistingFileHelper exFileHelper)
{
super(gen, MODID, exFileHelper);
super(output, MODID, exFileHelper);
}
@Override