1.2 update

.github/workflows/build.yml

@@ -27,11 +27,6 @@ jobs:
           chmod +x gradlew
           ./gradlew build
 
-      - name: Merge Fabric & NeoForge JARs
-        run: |
-          chmod +x gradlew
-          ./gradlew fusejars
-
       - name: Upload fabric artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -43,9 +38,3 @@ jobs:
         with:
           name: neoforge-artifacts
           path: ${{ github.workspace }}/neoforge/build/libs
-
-      - name: Upload merged artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: merged-artifacts
-          path: ${{ github.workspace }}/build/merged/*

build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
-	id "com.hypherionmc.modutils.modfusioner" version "1.0.+"
     id "com.github.johnrengelman.shadow" version "8.+" apply false
 }
 
@@ -42,21 +41,4 @@ allprojects {
 	java {
         withSourcesJar()
     }
-
-	fusioner {
-		packageGroup = rootProject.maven_group
-		mergedJarName = "${rootProject.archives_base_name}"
-		outputDirectory = "build/merged"
-		jarVersion = rootProject.version
-
-		neoforge {
-			projectName = "neoforge"
-			inputTaskName = "remapJar"
-		}
-
-		fabric {
-			projectName = "fabric"
-			inputTaskName = "remapJar"
-		}
-	}
 }

fabric/build.gradle

@@ -20,22 +20,16 @@ configurations {
 }
 
 repositories {
-	maven { url "https://maven.terraformersmc.com/releases/" }
-	maven { url "https://maven.nucleoid.xyz/" }
 }
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
+	modApi "me.shedaniel.cloth:cloth-config-fabric:${rootProject.clothconfig_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
 	shadowBundle(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-
-	modApi "me.shedaniel.cloth:cloth-config-fabric:${rootProject.clothconfig_version}"
-	modApi "com.terraformersmc:modmenu:${rootProject.modmenu_version}"
-	modApi "eu.pb4:placeholder-api:${rootProject.placeholder_api_version}"
 }
 
 processResources {

fabric/src/main/java/com/wulian/chatimpressiveanimation/fabric/mixin/ChatHudMixin.java

@@ -80,8 +80,8 @@ private float applyYOffset(float y) {
 		return y + chatDisplacementY;
 	}
 
-	@Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;ILnet/minecraft/client/gui/hud/MessageIndicator;Z)V", at = @At("TAIL"))
-	private void addMessage(Text message, MessageSignatureData signature, int ticks, MessageIndicator indicator, boolean refresh, CallbackInfo ci) {
+	@Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V", at = @At("TAIL"))
+	private void addMessage(Text message, MessageSignatureData signatureData, MessageIndicator indicator, CallbackInfo ci) {
 		messageTimestamps.addFirst(System.currentTimeMillis());
 		while (this.messageTimestamps.size() > this.visibleMessages.size()) {
 			this.messageTimestamps.removeLast();

fabric/src/main/resources/fabric.mod.json

@@ -18,9 +18,6 @@
 	"entrypoints": {
 		"client": [
 				"com.wulian.chatimpressiveanimation.fabric.ChatImpressiveAnimationClientFabric"
-		],
-		"modmenu": [
-			"com.wulian.chatimpressiveanimation.fabric.ModMenuCompat"
 		]
 	},
 	"mixins": [
@@ -30,7 +27,6 @@
 	"depends": {
 		"fabricloader": ">=0.15.0",
 		"minecraft": ">=1.20.5",
-		"architectury": "*",
 		"cloth-config": "*"
 	}
 }

gradle.properties

@@ -6,12 +6,10 @@ yarn_mappings=1.20.6+build.3
 yarn_patch=1.20.5+build.3
 
 archives_base_name=ChatImpressiveAnimation
-mod_version=1.1.0
+mod_version=1.2.0
 maven_group=com.wulian.chatimpressiveanimation
 
 architectury_version=12.1.4
-modmenu_version=10.0.0
-placeholder_api_version=2.4.0-pre.1+1.20.5
 clothconfig_version=14.0.139
 
 fabric_loader_version=0.16.7

neoforge/src/main/java/com/wulian/chatimpressiveanimation/neoforge/mixin/ChatHudMixin.java

@@ -80,8 +80,8 @@ private float applyYOffset(float y) {
 		return y + chatDisplacementY;
 	}
 
-	@Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;ILnet/minecraft/client/gui/hud/MessageIndicator;Z)V", at = @At("TAIL"))
-	private void addMessage(Text message, MessageSignatureData signature, int ticks, MessageIndicator indicator, boolean refresh, CallbackInfo ci) {
+	@Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V", at = @At("TAIL"))
+	private void addMessage(Text message, MessageSignatureData signatureData, MessageIndicator indicator, CallbackInfo ci) {
 		messageTimestamps.addFirst(System.currentTimeMillis());
 		while (this.messageTimestamps.size() > this.visibleMessages.size()) {
 			this.messageTimestamps.removeLast();

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -30,17 +30,10 @@ side = "BOTH"
 [[dependencies.chatimpressiveanimation]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.20.5,1.21)"
+versionRange = "[1.20.5,)"
 ordering = "NONE"
 side = "BOTH"
 
-[[dependencies.chatimpressiveanimation]]
-modId = "architectury"
-type = "required"
-versionRange = "*"
-ordering = "AFTER"
-side = "BOTH"
-
 [[dependencies.chatimpressiveanimation]]
 modId = "cloth_config"
 type = "required"

neoforge/src/main/resources/pack.mcmeta

@@ -1,6 +1,7 @@
 {
   "pack": {
     "description": "Chat Impressive Animation",
-    "pack_format": 32
+    "pack_format": 32,
+		"supported_formats": [24, 32]
   }
 }