keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Throw an exception from DeferredRegister when trying to register entries after registry event has fired (#6789)

Browse source
This commit is contained in:
Take Weiland 2020-06-22 09:52:30 +02:00 committed by cpw
parent 2acf2110ef
commit b117722d84
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraftforge/registries/DeferredRegister.java
View file

@ -82,6 +82,7 @@ public class DeferredRegister<T extends IForgeRegistryEntry<T>>
private IForgeRegistry<T> type; private IForgeRegistry<T> type;
private Supplier<RegistryBuilder<T>> registryFactory; private Supplier<RegistryBuilder<T>> registryFactory;
private boolean seenRegisterEvent = false;
private DeferredRegister(Class<T> base, String modid) private DeferredRegister(Class<T> base, String modid)
{ {
@ -106,6 +107,8 @@ public class DeferredRegister<T extends IForgeRegistryEntry<T>>
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <I extends T> RegistryObject<I> register(final String name, final Supplier<? extends I> sup) public <I extends T> RegistryObject<I> register(final String name, final Supplier<? extends I> sup)
{ {
if (seenRegisterEvent)
throw new IllegalStateException("Cannot register new entries to DeferredRegister after RegistryEvent.Register has been fired.");
Objects.requireNonNull(name); Objects.requireNonNull(name);
Objects.requireNonNull(sup); Objects.requireNonNull(sup);
final ResourceLocation key = new ResourceLocation(modid, name); final ResourceLocation key = new ResourceLocation(modid, name);
@ -173,6 +176,7 @@ public class DeferredRegister<T extends IForgeRegistryEntry<T>>
{ {
if (this.type != null && event.getGenericType() == this.type.getRegistrySuperType()) if (this.type != null && event.getGenericType() == this.type.getRegistrySuperType())
{ {
this.seenRegisterEvent = true;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
IForgeRegistry<T> reg = (IForgeRegistry<T>)event.getRegistry(); IForgeRegistry<T> reg = (IForgeRegistry<T>)event.getRegistry();
for (Entry<RegistryObject<T>, Supplier<? extends T>> e : entries.entrySet()) for (Entry<RegistryObject<T>, Supplier<? extends T>> e : entries.entrySet())