From d3dcd0c8cb0b8e89fd92eb4e8c8b1f6f89837eeb Mon Sep 17 00:00:00 2001
From: Wulian233 <71213467+Wulian233@users.noreply.github.com>
Date: Thu, 15 Feb 2024 10:43:20 +0800
Subject: [PATCH] remove forginx

---
 .github/workflows/build.yml                   | 11 ----------
 build.gradle                                  | 22 -------------------
 .../chatimpressiveanimation.mixins.json       |  2 --
 .../ChatImpressiveAnimationClientFabric.java  |  2 +-
 ...chatimpressiveanimation.fabric.mixins.json |  2 --
 .../ChatImpressiveAnimationClientForge.java   |  2 +-
 .../chatimpressiveanimation.forge.mixins.json |  2 --
 ...ChatImpressiveAnimationClientNeoForge.java |  2 +-
 ...atimpressiveanimation.neoforge.mixins.json |  2 --
 9 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29e4d49..185b61a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,11 +27,6 @@ jobs:
           chmod +x gradlew
           ./gradlew build
 
-      - name: Merge Fabric & Forge & NeoForge JARs
-        run: |
-          chmod +x gradlew
-          ./gradlew mergeJars
-
       - name: Upload artifacts (fabric)
         uses: actions/upload-artifact@v3
         with:
@@ -49,9 +44,3 @@ jobs:
         with:
           name: neoforge
           path: ${{ github.workspace }}/neoforge/build/libs
-
-      - name: Upload artifacts (Forgix merged jar)
-        uses: actions/upload-artifact@v3
-        with:
-          name: merged
-          path: ${{ github.workspace }}/build/libs/forgix
diff --git a/build.gradle b/build.gradle
index a1af160..af3d5f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "io.github.pacifistmc.forgix" version "1.2.6"
     id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
 }
 
@@ -43,24 +42,3 @@ allprojects {
         withSourcesJar()
     }
 }
-
-forgix {
-    group = rootProject.maven_group
-    mergedJarName = "${rootProject.archives_base_name}-${rootProject.version}.jar"
-    outputDir = "build/libs/forgix"
-
-    forge {
-        projectName = "forge"
-        jarLocation = "build/libs/${rootProject.archives_base_name}-forge-${rootProject.version}.jar"
-    }
-
-    fabric {
-        projectName = "fabric"
-        jarLocation = "build/libs/${rootProject.archives_base_name}-fabric-${rootProject.version}.jar"
-    }
-
-    custom {
-        projectName = "neoforge"
-        jarLocation = "build/libs/${rootProject.archives_base_name}-neoforge-${rootProject.version}.jar"
-    }
-}
diff --git a/common/src/main/resources/chatimpressiveanimation.mixins.json b/common/src/main/resources/chatimpressiveanimation.mixins.json
index 2927108..3a9d71a 100644
--- a/common/src/main/resources/chatimpressiveanimation.mixins.json
+++ b/common/src/main/resources/chatimpressiveanimation.mixins.json
@@ -2,8 +2,6 @@
 	"required": true,
 	"package": "com.wulian.chatimpressiveanimation.mixin",
 	"compatibilityLevel": "JAVA_17",
-	"mixins": [
-	],
 	"client": [
 		"ChatScreenMixin"
 	],
diff --git a/fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/ChatImpressiveAnimationClientFabric.java b/fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/ChatImpressiveAnimationClientFabric.java
index 761ab9e..7303ce0 100644
--- a/fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/ChatImpressiveAnimationClientFabric.java
+++ b/fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/ChatImpressiveAnimationClientFabric.java
@@ -6,6 +6,6 @@
 public class ChatImpressiveAnimationClientFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-		ChatImpressiveAnimation.LOGGER.info("Chat Animation is loaded!");
+		ChatImpressiveAnimation.LOGGER.info("Chat Impressive Animation is loaded!");
     }
 }
diff --git a/fabric/src/main/resources/chatimpressiveanimation.fabric.mixins.json b/fabric/src/main/resources/chatimpressiveanimation.fabric.mixins.json
index 0792db1..28da5ae 100644
--- a/fabric/src/main/resources/chatimpressiveanimation.fabric.mixins.json
+++ b/fabric/src/main/resources/chatimpressiveanimation.fabric.mixins.json
@@ -2,8 +2,6 @@
 	"required": true,
 	"package": "com.wulian.chatimpressiveanimation.fabric.mixin",
 	"compatibilityLevel": "JAVA_17",
-	"mixins": [
-	],
 	"client": [
       "ChatHudMixin"
 	],
diff --git a/forge/src/main/java/com/wulian/chatimpressiveanimation/forge/ChatImpressiveAnimationClientForge.java b/forge/src/main/java/com/wulian/chatimpressiveanimation/forge/ChatImpressiveAnimationClientForge.java
index 4b7dafb..d5bcaf0 100644
--- a/forge/src/main/java/com/wulian/chatimpressiveanimation/forge/ChatImpressiveAnimationClientForge.java
+++ b/forge/src/main/java/com/wulian/chatimpressiveanimation/forge/ChatImpressiveAnimationClientForge.java
@@ -8,7 +8,7 @@
 public class ChatImpressiveAnimationClientForge {
     public ChatImpressiveAnimationClientForge() {
         if (FMLLoader.getDist().isClient()) {
-			ChatImpressiveAnimation.LOGGER.info("Chat Animation is loaded!");
+			ChatImpressiveAnimation.LOGGER.info("Chat Impressive Animation is loaded!");
         }
     }
 }
diff --git a/forge/src/main/resources/chatimpressiveanimation.forge.mixins.json b/forge/src/main/resources/chatimpressiveanimation.forge.mixins.json
index 1271297..7c45718 100644
--- a/forge/src/main/resources/chatimpressiveanimation.forge.mixins.json
+++ b/forge/src/main/resources/chatimpressiveanimation.forge.mixins.json
@@ -2,8 +2,6 @@
 	"required": true,
 	"package": "com.wulian.chatimpressiveanimation.forge.mixin",
 	"compatibilityLevel": "JAVA_17",
-	"mixins": [
-	],
 	"client": [
 		"ChatHudMixin"
 	],
diff --git a/neoforge/src/main/java/com/wulian/chatimpressiveanimation/neoforge/ChatImpressiveAnimationClientNeoForge.java b/neoforge/src/main/java/com/wulian/chatimpressiveanimation/neoforge/ChatImpressiveAnimationClientNeoForge.java
index 39a5259..72c7fc4 100644
--- a/neoforge/src/main/java/com/wulian/chatimpressiveanimation/neoforge/ChatImpressiveAnimationClientNeoForge.java
+++ b/neoforge/src/main/java/com/wulian/chatimpressiveanimation/neoforge/ChatImpressiveAnimationClientNeoForge.java
@@ -8,7 +8,7 @@
 public class ChatImpressiveAnimationClientNeoForge {
     public ChatImpressiveAnimationClientNeoForge() {
         if (FMLLoader.getDist().isClient()) {
-			ChatImpressiveAnimation.LOGGER.info("Chat Animation is loaded!");
+			ChatImpressiveAnimation.LOGGER.info("Chat Impressive Animation is loaded!");
         }
     }
 }
diff --git a/neoforge/src/main/resources/chatimpressiveanimation.neoforge.mixins.json b/neoforge/src/main/resources/chatimpressiveanimation.neoforge.mixins.json
index 5ab328d..b3a8094 100644
--- a/neoforge/src/main/resources/chatimpressiveanimation.neoforge.mixins.json
+++ b/neoforge/src/main/resources/chatimpressiveanimation.neoforge.mixins.json
@@ -2,8 +2,6 @@
 	"required": true,
 	"package": "com.wulian.chatimpressiveanimation.neoforge.mixin",
 	"compatibilityLevel": "JAVA_17",
-	"mixins": [
-	],
 	"client": [
       "ChatHudMixin"
 	],