From 8ee8bd3674df2b5780ab27caaf8221e916c62df5 Mon Sep 17 00:00:00 2001
From: modmuss <modmuss50@gmail.com>
Date: Mon, 16 Dec 2024 11:31:07 +0000
Subject: [PATCH] Rename convention tag mixin package does it doesn't clash
 with the new tag api. (#4300)

* Rename convention tag mixin package does it doesn't clash.

* Better

(cherry picked from commit 08f5ef8bb20e39941e2190781f8c499267b6378b)
---
 .../fabricmc/fabric/mixin/tag/{ => convention}/TagKeyMixin.java | 2 +-
 .../main/resources/fabric-convention-tags-api-v2.mixins.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/tag/{ => convention}/TagKeyMixin.java (94%)

diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/tag/TagKeyMixin.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/tag/convention/TagKeyMixin.java
similarity index 94%
rename from fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/tag/TagKeyMixin.java
rename to fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/tag/convention/TagKeyMixin.java
index 570ba3e406..a667836d17 100644
--- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/tag/TagKeyMixin.java
+++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/mixin/tag/convention/TagKeyMixin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.tag;
+package net.fabricmc.fabric.mixin.tag.convention;
 
 import org.spongepowered.asm.mixin.Mixin;
 
diff --git a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json
index 70b80c518d..41be42a035 100644
--- a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json
+++ b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json
@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.tag",
+  "package": "net.fabricmc.fabric.mixin.tag.convention",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
     "TagKeyMixin"