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

@@ -33,8 +33,6 @@ import net.minecraft.advancements.critereon.InventoryChangeTrigger;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.PackOutput;
import net.minecraft.data.advancements.AdvancementProvider;
import net.minecraft.data.advancements.AdvancementSubProvider;
import net.minecraft.data.recipes.*;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -140,7 +138,7 @@ public class DataGeneratorTest
// Let blockstate provider see generated item models by passing its existing file helper
ItemModelProvider itemModels = new ItemModels(packOutput, event.getExistingFileHelper());
gen.addProvider(event.includeClient(), itemModels);
gen.addProvider(event.includeClient(), new BlockStates(gen, itemModels.existingFileHelper));
gen.addProvider(event.includeClient(), new BlockStates(gen.getPackOutput(), itemModels.existingFileHelper));
gen.addProvider(event.includeClient(), new SoundDefinitions(packOutput, event.getExistingFileHelper()));
gen.addProvider(event.includeServer(), new Recipes(packOutput));
@@ -681,9 +679,9 @@ public class DataGeneratorTest
{
private static final Logger LOGGER = LogManager.getLogger();
public BlockStates(DataGenerator gen, ExistingFileHelper exFileHelper)
public BlockStates(PackOutput output, ExistingFileHelper exFileHelper)
{
super(gen, MODID, exFileHelper);
super(output, MODID, exFileHelper);
}
@Override
@@ -20,8 +20,15 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType;
import net.minecraft.world.level.material.Material;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.worldgen.features.OreFeatures;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraftforge.client.model.generators.BlockStateProvider;
@@ -48,9 +55,7 @@ public class DeferredRegistryTest {
private static final DeferredRegister<Object> DOESNT_EXIST_REG = DeferredRegister.createOptional(new ResourceLocation(MODID, "doesnt_exist"), MODID);
private static final DeferredRegister<RecipeType<?>> RECIPE_TYPES = DeferredRegister.create(ForgeRegistries.RECIPE_TYPES, MODID);
// Vanilla Registry - filled directly after all RegistryEvent.Register events are fired
//private static final DeferredRegister<PosRuleTestType<?>> POS_RULE_TEST_TYPES = DeferredRegister.create(Registry.POS_RULE_TEST_REGISTRY, MODID);
// Vanilla Builtin Registry - filled directly after all RegistryEvent.Register events are fired
//private static final DeferredRegister<PlacedFeature> PLACED_FEATURES = DeferredRegister.create(Registry.PLACED_FEATURE_REGISTRY, MODID);
private static final DeferredRegister<PosRuleTestType<?>> POS_RULE_TEST_TYPES = DeferredRegister.create(Registries.POS_RULE_TEST, MODID);
private static final RegistryObject<Block> BLOCK = BLOCKS.register("test", () -> new Block(Block.Properties.of(Material.STONE)));
private static final RegistryObject<Item> ITEM = ITEMS .register("test", () -> new BlockItem(BLOCK.get(), new Item.Properties()));
@@ -58,8 +63,7 @@ public class DeferredRegistryTest {
// Should never be created as the registry doesn't exist - this should silently fail and remain empty
private static final RegistryObject<Object> DOESNT_EXIST = DOESNT_EXIST_REG.register("test", Object::new);
private static final RegistryObject<RecipeType<?>> RECIPE_TYPE = RECIPE_TYPES.register("test", () -> new RecipeType<>() {});
//private static final RegistryObject<PosRuleTestType<?>> POS_RULE_TEST_TYPE = POS_RULE_TEST_TYPES.register("test", () -> () -> null);
//private static final RegistryObject<PlacedFeature> PLACED_FEATURE = PLACED_FEATURES.register("test", () -> new PlacedFeature(Holder.hackyErase(OreFeatures.ORE_DIORITE), List.of()));
private static final RegistryObject<PosRuleTestType<?>> POS_RULE_TEST_TYPE = POS_RULE_TEST_TYPES.register("test", () -> () -> null);
private static final TagKey<Custom> CUSTOM_TAG_KEY = CUSTOMS.createOptionalTagKey("test_tag", Set.of(CUSTOM));
private static final Supplier<IForgeRegistry<Custom>> CUSTOM_REG = CUSTOMS.makeRegistry(() ->
@@ -73,8 +77,7 @@ public class DeferredRegistryTest {
ITEMS.register(modBus);
CUSTOMS.register(modBus);
RECIPE_TYPES.register(modBus);
//POS_RULE_TEST_TYPES.register(modBus);
//PLACED_FEATURES.register(modBus);
POS_RULE_TEST_TYPES.register(modBus);
modBus.addListener(this::gatherData);
MinecraftForge.EVENT_BUS.addListener(this::serverStarted);
@@ -103,7 +106,7 @@ public class DeferredRegistryTest {
public void gatherData(GatherDataEvent event) {
DataGenerator gen = event.getGenerator();
gen.addProvider(event.includeClient(), new BlockStateProvider(gen, MODID, event.getExistingFileHelper()) {
gen.addProvider(event.includeClient(), new BlockStateProvider(gen.getPackOutput(), MODID, event.getExistingFileHelper()) {
@Override
protected void registerStatesAndModels() {
simpleBlockWithItem(BLOCK.get(), models().cubeAll(BLOCK.getId().getPath(), mcLoc("block/furnace_top")));
@@ -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
@@ -15,6 +15,7 @@ import net.minecraft.advancements.critereon.MinMaxBounds;
import net.minecraft.util.ExtraCodecs;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.Enchantment.Rarity;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -82,15 +83,15 @@ public class GlobalLootModifiersTest {
public static void runData(GatherDataEvent event)
{
if(ENABLE)
event.getGenerator().addProvider(event.includeServer(), new DataProvider(event.getGenerator(), MODID));
event.getGenerator().addProvider(event.includeServer(), new DataProvider(event.getGenerator().getPackOutput(), MODID));
}
}
private static class DataProvider extends GlobalLootModifierProvider
{
public DataProvider(DataGenerator gen, String modid)
public DataProvider(PackOutput output, String modid)
{
super(gen, modid);
super(output, modid);
}
@Override