From 81276b341a6344a341b9d7e45283e156653e2f5f Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 12 Dec 2022 12:00:23 -0800 Subject: [PATCH] Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199 --- .../minecraft/core/MappedRegistry.java.patch | 19 ++++++++++++++++++- .../debug/DataGeneratorTest.java | 8 +++----- .../debug/DeferredRegistryTest.java | 19 +++++++++++-------- .../debug/block/PistonEventTest.java | 10 +++++----- .../debug/block/ScaffoldingTest.java | 7 ++++--- .../loot/GlobalLootModifiersTest.java | 7 ++++--- 6 files changed, 45 insertions(+), 25 deletions(-) diff --git a/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch b/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch index 1bd6309e94..f8a549f893 100644 --- a/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch +++ b/patches/minecraft/net/minecraft/core/MappedRegistry.java.patch @@ -17,7 +17,16 @@ this.m_205921_(p_256594_); Validate.notNull(p_256594_); Validate.notNull(p_256374_); -@@ -300,6 +_,12 @@ +@@ -145,6 +_,8 @@ + reference = this.f_205842_.computeIfAbsent(p_256594_, (p_258168_) -> { + return Holder.Reference.m_254896_(this.m_255331_(), p_258168_); + }); ++ // Forge: Bind the value immediately so it can be queried while the registry is not frozen ++ reference.m_247654_(p_256374_); + } + + this.f_205842_.put(p_256594_, reference); +@@ -300,14 +_,17 @@ return this.f_205842_.containsKey(p_175392_); } @@ -30,6 +39,14 @@ public Registry m_203521_() { if (this.f_205845_) { return this; + } else { + this.f_205845_ = true; +- this.f_205843_.forEach((p_247989_, p_247990_) -> { +- p_247990_.m_247654_(p_247989_); +- }); + List list = this.f_205842_.entrySet().stream().filter((p_211055_) -> { + return !p_211055_.getValue().m_203633_(); + }).map((p_211794_) -> { @@ -321,7 +_,8 @@ throw new IllegalStateException("Some intrusive holders were not registered: " + this.f_244282_.values()); } diff --git a/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java b/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java index 2035f6c286..91df8c8e95 100644 --- a/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java +++ b/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java @@ -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 diff --git a/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java b/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java index e81a59dc2a..9dac398264 100644 --- a/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java @@ -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 DOESNT_EXIST_REG = DeferredRegister.createOptional(new ResourceLocation(MODID, "doesnt_exist"), MODID); private static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(ForgeRegistries.RECIPE_TYPES, MODID); // Vanilla Registry - filled directly after all RegistryEvent.Register events are fired - //private static final DeferredRegister> 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 PLACED_FEATURES = DeferredRegister.create(Registry.PLACED_FEATURE_REGISTRY, MODID); + private static final DeferredRegister> POS_RULE_TEST_TYPES = DeferredRegister.create(Registries.POS_RULE_TEST, MODID); private static final RegistryObject BLOCK = BLOCKS.register("test", () -> new Block(Block.Properties.of(Material.STONE))); private static final RegistryObject 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 DOESNT_EXIST = DOESNT_EXIST_REG.register("test", Object::new); private static final RegistryObject> RECIPE_TYPE = RECIPE_TYPES.register("test", () -> new RecipeType<>() {}); - //private static final RegistryObject> POS_RULE_TEST_TYPE = POS_RULE_TEST_TYPES.register("test", () -> () -> null); - //private static final RegistryObject PLACED_FEATURE = PLACED_FEATURES.register("test", () -> new PlacedFeature(Holder.hackyErase(OreFeatures.ORE_DIORITE), List.of())); + private static final RegistryObject> POS_RULE_TEST_TYPE = POS_RULE_TEST_TYPES.register("test", () -> () -> null); private static final TagKey CUSTOM_TAG_KEY = CUSTOMS.createOptionalTagKey("test_tag", Set.of(CUSTOM)); private static final Supplier> 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"))); diff --git a/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java b/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java index b8759f3555..030dcfa1a7 100644 --- a/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/PistonEventTest.java @@ -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"))); } } diff --git a/src/test/java/net/minecraftforge/debug/block/ScaffoldingTest.java b/src/test/java/net/minecraftforge/debug/block/ScaffoldingTest.java index e44c3d2822..5923f8ba56 100644 --- a/src/test/java/net/minecraftforge/debug/block/ScaffoldingTest.java +++ b/src/test/java/net/minecraftforge/debug/block/ScaffoldingTest.java @@ -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 diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java index 9d0d1ffb0c..6be8c2625a 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java @@ -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