Expand registry prefix omitting filter

Fixes #951
Sinytra · Mar 30, 2024 · bcca0ed · bcca0ed
1 parent d76e419
commit bcca0ed
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/DynamicRegistryPrefixes.java b/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/DynamicRegistryPrefixes.java
@@ -0,0 +1,10 @@
+package dev.su5ed.sinytra.connector.mod.compat;
+
+import net.fabricmc.fabric.impl.registry.sync.DynamicRegistriesImpl;
+import net.minecraft.resources.ResourceKey;
+
+public class DynamicRegistryPrefixes {
+    public static boolean isRegisteredFabricDynamicRegistry(ResourceKey<?> key) {
+        return DynamicRegistriesImpl.FABRIC_DYNAMIC_REGISTRY_KEYS.stream().anyMatch(key::equals);
+    }
+}
diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java b/src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java
@@ -1,6 +1,7 @@
 package dev.su5ed.sinytra.connector.mod.mixin.registries;
 
 import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
+import dev.su5ed.sinytra.connector.mod.compat.DynamicRegistryPrefixes;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.FileToIdConverter;
 import net.minecraft.resources.RegistryDataLoader;
@@ -70,9 +71,13 @@ private static String modifyRegistryDirPath(ResourceLocation location, RegistryO
 
     @Unique
     private static boolean connector$shouldOmitPrefix(ResourceLocation location, ResourceKey<? extends Registry<?>> registryKey, ResourceManager manager) {
+        String modid = location.getNamespace();
+        // Fabric mod registries added directly to RegistryDataLoader.WORLDGEN_REGISTRIES should not be prefixed
+        if (ConnectorEarlyLoader.isConnectorMod(modid) && ModList.get().isLoaded("fabric_registry_sync_v0") && !DynamicRegistryPrefixes.isRegisteredFabricDynamicRegistry(registryKey)) {
+            return true;
+        }
         // Check if the registry has been registered
         if (DataPackRegistriesHooks.getDataPackRegistries().stream().noneMatch(data -> registryKey.equals(data.key()))) {
-            String modid = location.getNamespace();
             // If the namespace is one of a fabric mod, omit the prefix
             if (ConnectorEarlyLoader.isConnectorMod(modid)) {
                 return true;