From fca707a9c8f89d7a8f3097f84528b39a7330e3f7 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 14 Dec 2024 18:17:53 +0000 Subject: [PATCH 1/2] Rename convention tag mixin package does it doesn't clash. --- .../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..b6a4e1e819 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 @@ -3,7 +3,7 @@ "package": "net.fabricmc.fabric.mixin.tag", "compatibilityLevel": "JAVA_21", "mixins": [ - "TagKeyMixin" + "convention.TagKeyMixin" ], "injectors": { "defaultRequire": 1 From c4b8961b8ab8915f2ecc9d8d0e5837901dbaf1db Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 14 Dec 2024 18:18:33 +0000 Subject: [PATCH 2/2] Better --- .../main/resources/fabric-convention-tags-api-v2.mixins.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b6a4e1e819..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,9 +1,9 @@ { "required": true, - "package": "net.fabricmc.fabric.mixin.tag", + "package": "net.fabricmc.fabric.mixin.tag.convention", "compatibilityLevel": "JAVA_21", "mixins": [ - "convention.TagKeyMixin" + "TagKeyMixin" ], "injectors": { "defaultRequire": 1