From 232e2f18bfbf6827eb474dbda7c8a766ed89be80 Mon Sep 17 00:00:00 2001 From: Polymeta <4726322-polymeta@users.noreply.gitlab.com> Date: Fri, 18 Sep 2026 23:19:24 +0100 Subject: [PATCH] MR feedback Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com> --- .../mod/common/data/CobblemonDataProvider.kt | 12 +++++++----- .../com/cobblemon/mod/fabric/CobblemonFabric.kt | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt b/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt index 258d67665a..936d52af44 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt @@ -183,11 +183,13 @@ object CobblemonDataProvider : DataProvider { val reloadAllowed = server()?.isReady != true registries .filter { it.type == PackType.SERVER_DATA && (reloadAllowed || it in reloadableRegistries) } - .filterIsInstance>() - .forEach { it.reload(manager, registryAccess) } - registries - .filter { it.type == PackType.SERVER_DATA && (reloadAllowed || it in reloadableRegistries) } - .forEach { it.reload(manager) } + .forEach { + if (it is ServerJsonDataRegistry<*>) { + it.reload(manager, registryAccess) + } else { + it.reload(manager) + } + } } } } diff --git a/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt b/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt index 9fcc930de9..1d3d9c2fd2 100644 --- a/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt +++ b/fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt @@ -354,7 +354,7 @@ object CobblemonFabric : CobblemonImplementation { reloaderFactory: (HolderLookup.Provider) -> PreparableReloadListener ) { if (type == PackType.SERVER_DATA) { - val resourceLoader = ResourceManagerHelper.get(PackType.CLIENT_RESOURCES) + val resourceLoader = ResourceManagerHelper.get(PackType.SERVER_DATA) resourceLoader.registerReloadListener(identifier, { object : IdentifiableResourceReloadListener { override fun reload( synchronizer: PreparableReloadListener.PreparationBarrier,