From 34a3e0e2cb0d0767d0e16781d557da2548e01c2f Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Thu, 7 Sep 2023 23:09:08 +0900
Subject: [PATCH] Include namespace in modded registry tag path (#3303)

* Include namespace in modded registry tag path

* Document tag namespace change
---
 .../fabric/api/event/registry/DynamicRegistries.java      | 4 ++++
 .../fabric/api/event/registry/FabricRegistryBuilder.java  | 4 ++++
 .../fabric/mixin/registry/sync/TagManagerLoaderMixin.java | 8 +-------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java
index 1c52338ca7..628d6adada 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java
@@ -37,6 +37,10 @@
  * <p>The list of all dynamic registries, whether from vanilla or mods, can be accessed using
  * {@link #getDynamicRegistries()}.
  *
+ * <p>Tags for the entries of a custom registry must be placed in
+ * {@code /tags/<registry namespace>/<registry path>/}. For example, the tags for the example
+ * registry below would be placed in {@code /tags/my_mod/my_data/}.
+ *
  * <h2 id="sync">Synchronization</h2>
  * Dynamic registries are not synchronized to the client by default.
  * To register a <em>synced dynamic registry</em>, you can replace the {@link #register} call
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java
index 7bc31c316b..0a35a321a7 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java
@@ -44,6 +44,10 @@
  * 	}
  * </pre>
  *
+ * <p>Tags for the entries of a custom registry must be placed in
+ * {@code /tags/<registry namespace>/<registry path>/}. For example, the tags for the example
+ * registry above would be placed in {@code /tags/modid/registry_name/}.
+ *
  * @param <T> The type stored in the Registry
  * @param <R> The registry type
  */
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/TagManagerLoaderMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/TagManagerLoaderMixin.java
index 2e1b78fdd0..312976553e 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/TagManagerLoaderMixin.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/TagManagerLoaderMixin.java
@@ -26,22 +26,16 @@
 import net.minecraft.registry.tag.TagManagerLoader;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.fabric.impl.registry.sync.DynamicRegistriesImpl;
-
 // Adds namespaces to tag directories for registries added by mods.
 @Mixin(TagManagerLoader.class)
 abstract class TagManagerLoaderMixin {
 	@Inject(method = "getPath", at = @At("HEAD"), cancellable = true)
 	private static void onGetPath(RegistryKey<? extends Registry<?>> registry, CallbackInfoReturnable<String> info) {
-		// TODO: Expand this change to static registries in the future.
-		if (!DynamicRegistriesImpl.DYNAMIC_REGISTRY_KEYS.contains(registry)) {
-			return;
-		}
-
 		Identifier id = registry.getValue();
 
 		// Vanilla doesn't mark namespaces in the directories of tags at all,
 		// so we prepend the directories with the namespace if it's a modded registry id.
+		// No need to check DIRECTORIES, since this is only used by vanilla registries.
 		if (!id.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) {
 			info.setReturnValue("tags/" + id.getNamespace() + "/" + id.getPath());
 		}