Simply NeoForge registrar eventbus

architectury · Jan 9, 2024 · 907389b · 907389b
1 parent 4041bcd
commit 907389b
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/neoforge/src/main/java/dev/architectury/registry/registries/forge/RegistrarManagerImpl.java b/neoforge/src/main/java/dev/architectury/registry/registries/forge/RegistrarManagerImpl.java
@@ -37,7 +37,6 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.EventPriority;
-import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.registries.NewRegistryEvent;
 import net.neoforged.neoforge.registries.RegisterEvent;
@@ -101,7 +100,6 @@ public String toString() {
     public static class RegistryProviderImpl implements RegistrarManager.RegistryProvider {
         private static final Map<ResourceKey<Registry<?>>, Registrar<?>> CUSTOM_REGS = new HashMap<>();
         private final String modId;
-        private final Supplier<IEventBus> eventBus;
         private final Map<ResourceKey<? extends Registry<?>>, Data<?>> registry = new HashMap<>();
         private final Multimap<ResourceKey<Registry<?>>, Consumer<Registrar<?>>> listeners = HashMultimap.create();
 
@@ -110,23 +108,11 @@ public static class RegistryProviderImpl implements RegistrarManager.RegistryPro
 
         public RegistryProviderImpl(String modId) {
             this.modId = modId;
-            this.eventBus = Suppliers.memoize(() -> {
-                IEventBus eventBus = EventBusesHooksImpl.getModEventBus(modId).orElseThrow(() -> new IllegalStateException("Can't get event bus for mod '" + modId + "' because it was not registered!"));
-                eventBus.register(new EventListener());
-                return eventBus;
-            });
-        }
-
-        private void updateEventBus() {
-            synchronized (eventBus) {
-                // Make sure that the eventbus is setup
-                this.eventBus.get();
-            }
+            EventBusesHooksImpl.getModEventBus(modId).get().register(new EventListener());
         }
 
         @Override
         public <T> Registrar<T> get(ResourceKey<Registry<T>> registryKey) {
-            updateEventBus();
             Registry<T> registry = (Registry<T>) BuiltInRegistries.REGISTRY.get(registryKey.location());
             if (registry != null) {
                 return get(registry);
@@ -138,7 +124,6 @@ public <T> Registrar<T> get(ResourceKey<Registry<T>> registryKey) {
 
         @Override
         public <T> Registrar<T> get(Registry<T> registry) {
-            updateEventBus();
             return new RegistrarImpl<>(modId, this.registry, registry);
         }