registry: Pass specific catalog type from event (#3152)

This allows registering implementations of types, not just instances of concrete types
SpongePowered · Sep 3, 2020 · 5eb67a9 · 5eb67a9
1 parent 0a60c31
commit 5eb67a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/spongepowered/common/event/lifecycle/RegisterCatalogEventImpl.java b/src/main/java/org/spongepowered/common/event/lifecycle/RegisterCatalogEventImpl.java
@@ -52,7 +52,7 @@ public TypeToken<C> getGenericType() {
     public C register(C catalog) throws DuplicateRegistrationException {
         Preconditions.checkNotNull(catalog);
 
-        return ((SpongeCatalogRegistry) Sponge.getRegistry().getCatalogRegistry()).registerCatalog(catalog);
+        return ((SpongeCatalogRegistry) Sponge.getRegistry().getCatalogRegistry()).registerCatalog(this.token, catalog);
     }
 
     @Override

diff --git a/src/main/java/org/spongepowered/common/registry/SpongeCatalogRegistry.java b/src/main/java/org/spongepowered/common/registry/SpongeCatalogRegistry.java
@@ -457,10 +457,10 @@ private <T extends CatalogType, U> SpongeCatalogRegistry registerMappedRegistry(
         return registry;
     }
 
-    public <C extends CatalogType> C registerCatalog(final C catalogType) {
+    public <C extends CatalogType> C registerCatalog(final TypeToken<C> catalog, final C catalogType) {
         Objects.requireNonNull(catalogType);
 
-        final Registry<C> registry = (Registry<C>) this.registriesByType.get(catalogType.getClass());
+        final Registry<C> registry = (Registry<C>) this.registriesByType.get(catalog.getRawType());
         if (registry == null) {
             throw new UnknownTypeException(String.format("Catalog '%s' with id '%s' has no registry registered!", catalogType.getClass(), catalogType.getKey()));
         }