FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-02-25 16:04:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bad interaction between FabricDynamicRegistryProvider and modded dynamic registries (#3353)

Browse source 
* Add reproduction test

* Fix the issue

(cherry picked from commit d19c412984)
This commit is contained in:
Technici4n 2023-10-01 13:37:41 +02:00 committed by modmuss50
parent 0737cd807b
commit 0889cb781a
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java
View file

@ -82,6 +82,8 @@ public abstract class FabricDynamicRegistryProvider implements DataProvider {
Entries(RegistryWrapper.WrapperLookup registries, String modId) {
this.registries = registries;
this.queuedEntries = DynamicRegistries.getDynamicRegistries().stream()
// Some modded dynamic registries might not be in the wrapper lookup, filter them out
.filter(e -> registries.getOptionalWrapper(e.key()).isPresent())
.collect(Collectors.toMap(
e -> e.key().getValue(),
e -> RegistryEntries.create(registries, e)

4
fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestContent.java
View file

@ -56,6 +56,9 @@ public class DataGeneratorTestContent implements ModInitializer {
TEST_DATAGEN_DYNAMIC_REGISTRY_KEY,
new Identifier(MOD_ID, "tiny_potato")
);
// Empty registry
public static final RegistryKey<Registry<TestDatagenObject>> TEST_DATAGEN_DYNAMIC_EMPTY_REGISTRY_KEY =
RegistryKey.ofRegistry(new Identifier("fabric", "test_datagen_dynamic_empty"));
@Override
public void onInitialize() {
@ -73,6 +76,7 @@ public class DataGeneratorTestContent implements ModInitializer {
.build());
DynamicRegistries.register(TEST_DATAGEN_DYNAMIC_REGISTRY_KEY, TestDatagenObject.CODEC);
DynamicRegistries.register(TEST_DATAGEN_DYNAMIC_EMPTY_REGISTRY_KEY, TestDatagenObject.CODEC);
}
private static Block createBlock(String name, boolean hasItem, AbstractBlock.Settings settings) {

1
fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java
View file

@ -132,6 +132,7 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
TEST_DATAGEN_DYNAMIC_REGISTRY_KEY,
this::bootstrapTestDatagenRegistry
);
// do NOT add TEST_DATAGEN_DYNAMIC_EMPTY_REGISTRY_KEY, should still work without it
}
private void bootstrapTestDatagenRegistry(Registerable<DataGeneratorTestContent.TestDatagenObject> registerable) {