FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-03 10:39:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some useful helper methods to FabricDynamicRegistryProvider.Entries ()

Browse source 
* Add some useful helper methods to FabricDynamicRegistryProvider.Entries

* Update fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
This commit is contained in:
modmuss50 2022-11-26 19:58:25 +00:00 • committed by GitHub
parent 12a01b0610
commit 65e415cb4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 15 deletions
fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome
WorldgenProvider.java
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider
FabricDynamicRegistryProvider.java

13
fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/WorldgenProvider.java
View file

@ -19,7 +19,6 @@ package net.fabricmc.fabric.test.biome;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.entry.RegistryEntry;
@ -44,17 +43,7 @@ public class WorldgenProvider extends FabricDynamicRegistryProvider {
protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries) {
final RegistryWrapper.Impl<Biome> biomeRegistry = registries.getWrapperOrThrow(RegistryKeys.BIOME);
List<RegistryKey<Biome>> allBiomes = List.of(
TestBiomes.TEST_CRIMSON_FOREST,
TestBiomes.CUSTOM_PLAINS,
TestBiomes.TEST_END_HIGHLANDS,
TestBiomes.TEST_END_MIDLANDS,
TestBiomes.TEST_END_BARRRENS
);
for (RegistryKey<Biome> biomeRegistryKey : allBiomes) {
entries.add(biomeRegistryKey, biomeRegistry.getOrThrow(biomeRegistryKey).value());
}
entries.addAll(biomeRegistry);
ConfiguredFeature<?, ?> COMMON_DESERT_WELL = new ConfiguredFeature<>(Feature.DESERT_WELL, DefaultFeatureConfig.INSTANCE);

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

@ -74,15 +74,17 @@ public abstract class FabricDynamicRegistryProvider implements DataProvider {
private final RegistryWrapper.WrapperLookup registries;
// Registry ID -> Entries for that registry
private final Map<Identifier, RegistryEntries<?>> queuedEntries;
private final String modId;
@ApiStatus.Internal
Entries(RegistryWrapper.WrapperLookup registries) {
Entries(RegistryWrapper.WrapperLookup registries, String modId) {
this.registries = registries;
this.queuedEntries = RegistryLoader.DYNAMIC_REGISTRIES.stream()
.collect(Collectors.toMap(
e -> e.key().getValue(),
e -> RegistryEntries.create(registries, e)
));
this.modId = modId;
}
/**
@ -122,12 +124,33 @@ public abstract class FabricDynamicRegistryProvider implements DataProvider {
}
/**
* Adds a new object to be data generated and returns a reference to it for use in other objects.
* Adds a new object to be data generated.
*
* @return a reference to it for use in other objects.
*/
public <T> RegistryEntry<T> add(RegistryKey<T> registry, T object) {
return getQueuedEntries(registry).add(registry.getValue(), object);
}
/**
* Adds a new {@link RegistryKey} from a given {@link RegistryWrapper.Impl} to be data generated.
*
* @return a reference to it for use in other objects.
*/
public <T> RegistryEntry<T> add(RegistryWrapper.Impl<T> registry, RegistryKey<T> valueKey) {
return add(valueKey, registry.getOrThrow(valueKey).value());
}
/**
* All the registry entries whose namespace matches the current effective mod ID will be data generated.
*/
public <T> List<RegistryEntry<T>> addAll(RegistryWrapper.Impl<T> registry) {
return registry.streamKeys()
.filter(registryKey -> registryKey.getValue().getNamespace().equals(modId))
.map(key -> add(registry, key))
.toList();
}
@SuppressWarnings("unchecked")
<T> RegistryEntries<T> getQueuedEntries(RegistryKey<T> key) {
RegistryEntries<?> regEntries = queuedEntries.get(key.getRegistry());
@ -177,7 +200,7 @@ public abstract class FabricDynamicRegistryProvider implements DataProvider {
return registriesFuture.thenCompose(registries -> {
return CompletableFuture
.supplyAsync(() -> {
Entries entries = new Entries(registries);
Entries entries = new Entries(registries, output.getModId());
configure(registries, entries);
return entries;
})