feat: update Minecraft 1.21.7/1.21.8 (#20)

oneachina · web-flow · commit 79dd02b31578 · 2025-08-09T17:27:38.000+08:00
* chore: prepare for Minecraft 1.21.7/1.21.8 update

* fix: SoundEvent and QuitServer mixin repairs

* chore: update fabric.mod.json minecraft version

* chore: update action build

* fix test

* fix fuck fabric loom 11
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -32,6 +32,13 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew clean build --no-daemon
+      # Fabric 1.21.8
+      - name: Upload Artifact (Fabric 1.21.8)
+        uses: actions/upload-artifact@v4
+        with:
+          name: 'ZMusic Fabric 1.21.8'
+          path: |
+            zmusic-fabric/zmusic-fabric-1.21.8/build/libs/**.jar
       # Fabric 1.21
       - name: Upload Artifact (Fabric 1.21)
         uses: actions/upload-artifact@v4
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 //https://github.com/FabricMC/fabric-loom/issues/1036
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT" apply false
+    id("fabric-loom") version "1.11-SNAPSHOT" apply false
 }
 
 def gitCommitHash = {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -18,6 +18,7 @@ rootProject.name = "ZMusic-Mod"
 include("zmusic-core")
 include(
         "zmusic-fabric",
+        "zmusic-fabric:zmusic-fabric-1.21.8",
         "zmusic-fabric:zmusic-fabric-1.21",
         "zmusic-fabric:zmusic-fabric-1.20.5",
         "zmusic-fabric:zmusic-fabric-1.20",
diff --git a/zmusic-fabric/zmusic-fabric-1.14.4/build.gradle b/zmusic-fabric/zmusic-fabric-1.14.4/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.15.2/build.gradle b/zmusic-fabric/zmusic-fabric-1.15.2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.16.5/build.gradle b/zmusic-fabric/zmusic-fabric-1.16.5/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.17.1/build.gradle b/zmusic-fabric/zmusic-fabric-1.17.1/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.18.2/build.gradle b/zmusic-fabric/zmusic-fabric-1.18.2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.19.2/build.gradle b/zmusic-fabric/zmusic-fabric-1.19.2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.19.3/build.gradle b/zmusic-fabric/zmusic-fabric-1.19.3/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.19.4/build.gradle b/zmusic-fabric/zmusic-fabric-1.19.4/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.20.5/build.gradle b/zmusic-fabric/zmusic-fabric-1.20.5/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.20/build.gradle b/zmusic-fabric/zmusic-fabric-1.20/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/build.gradle b/zmusic-fabric/zmusic-fabric-1.21.8/build.gradle
@@ -0,0 +1,21 @@
+plugins {
+    id("fabric-loom") version "1.11-SNAPSHOT"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:1.21.8")
+    mappings("net.fabricmc:yarn:1.21.8+build.1")
+    modImplementation("net.fabricmc:fabric-loader:0.16.14")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.129.0+1.21.8")
+
+    implementation(project(":zmusic-core"))
+}
+
+jar {
+    dependsOn(":zmusic-core:jar")
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/ZMusicMod.java b/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/ZMusicMod.java
@@ -0,0 +1,56 @@
+package me.zhenxin.zmusic;
+
+import me.zhenxin.zmusic.event.ClientEvent;
+import me.zhenxin.zmusic.manager.SoundManagerImpl;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.packet.CustomPayload;
+import net.minecraft.util.Identifier;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Mod 主入口
+ *
+ * @author 真心
+ * @email qgzhenxin@qq.com
+ * @since 2023/1/28 13:01
+ */
+@SuppressWarnings("AlibabaClassNamingShouldBeCamel")
+public class ZMusicMod implements ModInitializer {
+
+    @Override
+    public void onInitialize() {
+        ZMusic.setSoundManager(new SoundManagerImpl());
+
+        record MusicPayload(String str) implements CustomPayload {
+            public static final Id<MusicPayload> ID = new CustomPayload.Id<>(Identifier.of("zmusic", "channel"));
+            public static final PacketCodec<PacketByteBuf, MusicPayload> CODEC = PacketCodec.of((value, buf) -> {
+            }, buf -> {
+                byte[] buffer = new byte[buf.readableBytes()];
+                buf.readBytes(buffer);
+                buffer[0] = 0;
+                String message = new String(buffer, StandardCharsets.UTF_8).substring(1);
+                return new MusicPayload(message);
+            });
+
+
+            @Override
+            public Id<? extends CustomPayload> getId() {
+                return ID;
+            }
+        }
+
+        PayloadTypeRegistry.playS2C().register(MusicPayload.ID, MusicPayload.CODEC);
+        ClientPlayNetworking.registerGlobalReceiver(MusicPayload.ID, (payload, context) -> {
+            ClientEvent.onPacket(payload.str);
+        });
+
+        ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> ClientEvent.onDisconnect());
+        ZMusic.onEnable();
+    }
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/manager/SoundManagerImpl.java b/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/manager/SoundManagerImpl.java
@@ -0,0 +1,25 @@
+package me.zhenxin.zmusic.manager;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.sound.SoundCategory;
+
+/**
+ * 音频管理器实现
+ *
+ * @author 真心
+ * @email qgzhenxin@qq.com
+ * @since 2023/1/29 23:29
+ */
+public class SoundManagerImpl implements SoundManager {
+
+    @Override
+    public float volume() {
+        return MinecraftClient.getInstance().options.getSoundVolume(SoundCategory.RECORDS);
+    }
+
+    @Override
+    public void stop() {
+        MinecraftClient.getInstance().getSoundManager().stopSounds(null, SoundCategory.MUSIC);
+        MinecraftClient.getInstance().getSoundManager().stopSounds(null, SoundCategory.RECORDS);
+    }
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/mixin/QuitServer.java b/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/mixin/QuitServer.java
@@ -0,0 +1,16 @@
+package me.zhenxin.zmusic.mixin;
+
+import me.zhenxin.zmusic.event.ClientEvent;
+import net.minecraft.server.network.ServerQueryNetworkHandler;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ServerQueryNetworkHandler.class)
+public class QuitServer {
+    @Inject(method = "onDisconnected", at = @At("HEAD"))
+    public void onDisconnected(CallbackInfo info) {
+        ClientEvent.onDisconnect();
+    }
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/mixin/SoundEvent.java b/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/mixin/SoundEvent.java
@@ -0,0 +1,29 @@
+package me.zhenxin.zmusic.mixin;
+
+import me.zhenxin.zmusic.ZMusic;
+import net.minecraft.client.sound.SoundInstance;
+import net.minecraft.client.sound.SoundSystem;
+import net.minecraft.sound.SoundCategory;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(SoundSystem.class)
+public class SoundEvent {
+    @Inject(method = "play*", at = @At("HEAD"), cancellable = true)
+    public void play(SoundInstance soundInstance, CallbackInfoReturnable<SoundSystem.PlayResult> info) {
+        if (ZMusic.getPlayer().isPlay()) {
+            SoundCategory data = soundInstance.getCategory();
+            if (data == SoundCategory.RECORDS || data == SoundCategory.MUSIC) {
+                info.setReturnValue(SoundSystem.PlayResult.NOT_STARTED);
+            }
+        }
+    }
+
+    @Inject(method = "reloadSounds", at = @At("RETURN"))
+    public void reload(CallbackInfo info) {
+        ZMusic.getPlayer().setReload();
+    }
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/mixin/Tick.java b/zmusic-fabric/zmusic-fabric-1.21.8/src/main/java/me/zhenxin/zmusic/mixin/Tick.java
@@ -0,0 +1,17 @@
+package me.zhenxin.zmusic.mixin;
+
+import me.zhenxin.zmusic.ZMusic;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftClient.class)
+public class Tick {
+
+    @Inject(method = "tick", at = @At("TAIL"))
+    public void tick(CallbackInfo info) {
+        ZMusic.getPlayer().tick();
+    }
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/src/main/resources/fabric.mod.json b/zmusic-fabric/zmusic-fabric-1.21.8/src/main/resources/fabric.mod.json
@@ -0,0 +1,32 @@
+{
+  "schemaVersion": 1,
+  "id": "zmusic",
+  "version": "${version}",
+  "name": "ZMusic Mod",
+  "description": "Powerful Music System",
+  "authors": [
+    "ZhenXin"
+  ],
+  "contact": {
+    "homepage": "https://m.zplu.cc",
+    "sources": "https://github.com/RealHeart/ZMusic-Mod",
+    "issues": "https://github.com/RealHeart/ZMusic-Mod/issues",
+    "discord": "https://discord.gg/twQgJNufYn"
+  },
+  "license": "GPL-3.0",
+  "environment": "client",
+  "entrypoints": {
+    "main": [
+      "me.zhenxin.zmusic.ZMusicMod"
+    ]
+  },
+  "mixins": [
+    "zmusic.mixins.json"
+  ],
+  "depends": {
+    "fabricloader": ">=0.16.14",
+    "fabric-api": "*",
+    "minecraft": ">=1.21.7",
+    "java": ">=21"
+  }
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21.8/src/main/resources/zmusic.mixins.json b/zmusic-fabric/zmusic-fabric-1.21.8/src/main/resources/zmusic.mixins.json
@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "package": "me.zhenxin.zmusic.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "client": [
+    "QuitServer",
+    "SoundEvent",
+    "Tick"
+  ]
+}
diff --git a/zmusic-fabric/zmusic-fabric-1.21/build.gradle b/zmusic-fabric/zmusic-fabric-1.21/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.6-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
 java {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`//https://github.com/FabricMC/fabric-loom/issues/1036`
`2`	`2`	`plugins {`
`3`		`- id("fabric-loom") version "1.6-SNAPSHOT" apply false`
	`3`	`+ id("fabric-loom") version "1.11-SNAPSHOT" apply false`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`def gitCommitHash = {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("fabric-loom") version "1.6-SNAPSHOT"`
	`2`	`+ id("fabric-loom") version "1.11-SNAPSHOT"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`java {`