Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199

This commit is contained in:
LexManos committed 2022-12-12 12:00:23 -08:00
1 parent f050617b47
commit 81276b341a
6 files changed
+45 -25

No files matched your search

@@ -17,6 +17,7 @@ import net.minecraft.world.level.block.piston.PistonStructureResolver;
import net.minecraft.world.level.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
@@ -25,7 +26,6 @@ import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.event.level.PistonEvent;
@@ -146,20 +146,20 @@ public class PistonEventTest
{
DataGenerator gen = event.getGenerator();
gen.addProvider(event.includeClient(), new BlockStates(gen, event.getExistingFileHelper()));
gen.addProvider(event.includeClient(), new BlockStates(gen.getPackOutput(), event.getExistingFileHelper()));
}
private 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
protected void registerStatesAndModels()
{
simpleBlockWithItem(SHIFT_ON_MOVE.get(), models().cubeAll(shiftOnMove.getId().getPath(), mcLoc("block/furnace_top")));
simpleBlockWithItem(SHIFT_ON_MOVE.get(), models().cubeAll(SHIFT_ON_MOVE.getId().getPath(), mcLoc("block/furnace_top")));
}
}
@@ -13,6 +13,7 @@ import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.tags.BlockTags;
import net.minecraft.resources.ResourceLocation;
@@ -55,14 +56,14 @@ public class ScaffoldingTest
private void gatherData(final GatherDataEvent event)
{
DataGenerator gen = event.getGenerator();
gen.addProvider(event.includeClient(), new ScaffoldingBlockState(gen, MODID, event.getExistingFileHelper()));
gen.addProvider(event.includeClient(), new ScaffoldingBlockState(gen.getPackOutput(), MODID, event.getExistingFileHelper()));
}
static class ScaffoldingBlockState extends BlockStateProvider
{
public ScaffoldingBlockState(DataGenerator gen, String modid, ExistingFileHelper exFileHelper)
public ScaffoldingBlockState(PackOutput output, String modid, ExistingFileHelper exFileHelper)
{
super(gen, modid, exFileHelper);
super(output, modid, exFileHelper);
}
@Override