mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
[1.18.2] Fix tags for custom forge registries. (#8495)
Tag-enabled registries must now be registered to vanilla's root registry. See RegistryBuilder#hasTags. Modded tag-enabled registries have to use the format `data/<namespace>/tags/<registrynamespace>/<registryname>/<tag>.json` This format is to prevent conflicts for registries with the same path but different namespaces EX: Registry name `examplemod:shoe`, tag name `blue_shoes` would be `data/<namespace>/tags/examplemod/shoe/blue_shoes.json` RegistryEvent.NewRegistry has been moved and renamed to NewRegistryEvent. RegistryBuilder#create has been made private. See NewRegistryEvent#create Created new ITagManager system for looking up Forge tags. See IForgeRegistry#tags. Add lookup methods for Holders from forge registries. See IForgeRegistry#getHolder.
This commit is contained in:
1 parent
30f3a7dbba
commit
ad75cb8644
51 files changed
+1621
-531
No files matched your search
@@ -0,0 +1,103 @@
|
||||
/*
|
||||
* Minecraft Forge - Forge Development LLC
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.registries;
|
||||
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.event.IModBusEvent;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.IdentityHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Register new registries when you receive this event through {@link RegistryBuilder} and {@link #create(RegistryBuilder)}.
|
||||
*/
|
||||
public class NewRegistryEvent extends Event implements IModBusEvent
|
||||
{
|
||||
private final List<RegistryData<?>> registries = new ArrayList<>();
|
||||
|
||||
public NewRegistryEvent() {}
|
||||
|
||||
/**
|
||||
* Adds a registry builder to be created.
|
||||
*
|
||||
* @param builder The builder to turn into a {@link IForgeRegistry}
|
||||
* @return A supplier of the {@link IForgeRegistry} created by the builder. Resolving too early will return null.
|
||||
*/
|
||||
public <V extends IForgeRegistryEntry<V>> Supplier<IForgeRegistry<V>> create(RegistryBuilder<V> builder)
|
||||
{
|
||||
return create(builder, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a registry builder to be created.
|
||||
*
|
||||
* @param builder The builder to turn into a {@link IForgeRegistry}
|
||||
* @param onFill Called when the returned supplier is filled with the registry
|
||||
* @return a supplier of the {@link IForgeRegistry} created by the builder. Resolving too early will return null.
|
||||
*/
|
||||
public <V extends IForgeRegistryEntry<V>> Supplier<IForgeRegistry<V>> create(RegistryBuilder<V> builder, @Nullable Consumer<IForgeRegistry<V>> onFill)
|
||||
{
|
||||
RegistryHolder<V> registryHolder = new RegistryHolder<>();
|
||||
|
||||
registries.add(new RegistryData<>(builder, registryHolder, onFill));
|
||||
|
||||
return registryHolder;
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
void fill()
|
||||
{
|
||||
Map<RegistryBuilder<?>, IForgeRegistry<?>> builtRegistries = this.registries
|
||||
.stream()
|
||||
.collect(Collectors.toMap(RegistryData::builder, d -> d.builder().create(), (a, b) -> a, IdentityHashMap::new));
|
||||
|
||||
builtRegistries.forEach((builder, reg) -> {
|
||||
if (builder.getHasWrapper() && !Registry.REGISTRY.containsKey(reg.getRegistryName()))
|
||||
RegistryManager.registerToRootRegistry((ForgeRegistry<?>) reg);
|
||||
});
|
||||
|
||||
for (RegistryData data : this.registries)
|
||||
{
|
||||
IForgeRegistry<?> registry = builtRegistries.get(data.builder);
|
||||
if (registry != null)
|
||||
{
|
||||
data.registryHolder.registry = registry;
|
||||
if (data.onFill != null)
|
||||
data.onFill.accept(registry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private record RegistryData<V extends IForgeRegistryEntry<V>>(
|
||||
RegistryBuilder<V> builder,
|
||||
RegistryHolder<V> registryHolder,
|
||||
Consumer<IForgeRegistry<V>> onFill
|
||||
) {}
|
||||
|
||||
private static class RegistryHolder<V extends IForgeRegistryEntry<V>> implements Supplier<IForgeRegistry<V>>
|
||||
{
|
||||
IForgeRegistry<V> registry = null;
|
||||
|
||||
@Override
|
||||
public IForgeRegistry<V> get()
|
||||
{
|
||||
return this.registry;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return "RegistryEvent.NewRegistry";
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user