chore: target Minecraft/Paper 26.3

.github/workflows/client.yml

@@ -28,7 +28,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: Set up JDK 25
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Set up JDK 25 (Minecraft toolchain)
+        id: java25
         uses: actions/setup-java@v4
         with:
           java-version: '25'
@@ -37,8 +44,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
       - name: build
         shell: cmd
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
         run: |
-          gradlew :client:fabric_26_2:build --configure-on-demand --parallel --max-workers=4
+          set "JAVA_HOME=%JAVA_HOME_21%"
+          set "PATH=%JAVA_HOME_21%\bin;%PATH%"
+          gradlew.bat -Pallmusic.scope=client-26.2 -Dorg.gradle.java.installations.paths=%JAVA_HOME_25% --no-daemon :client:fabric_26_2:build --configure-on-demand --parallel --max-workers=4
       - name: update
         uses: actions/upload-artifact@v4
         with:

.github/workflows/compatibility.yml

@@ -0,0 +1,188 @@
+name: AllMusic Compatibility
+
+on:
+  push:
+    branches: [chore/minecraft-26.3]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: allmusic-compatibility-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  legacy-client:
+    name: Legacy Fabric 1.20.1 client
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+      - name: Set up JDK 25 (Minecraft 26.3 toolchain)
+        id: java25
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '25'
+      - uses: gradle/actions/setup-gradle@v4
+      - name: Build legacy client
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
+        run: |
+          export JAVA_HOME="$JAVA_HOME_21"
+          export PATH="$JAVA_HOME/bin:$PATH"
+          bash ./gradlew -Pallmusic.scope=legacy-client -Dorg.gradle.java.installations.paths="$JAVA_HOME_25" --no-daemon --stacktrace --configure-on-demand :client:fabric_1_20_1:build
+
+  modern-clients:
+    name: Minecraft 26.3 clients
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - task: :client:fabric_26_3:build
+            launcher: '21'
+          - task: :client:neoforge_26_3:build
+            launcher: '25'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+      - name: Set up JDK 25 (Minecraft 26.3 toolchain)
+        id: java25
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '25'
+      - uses: gradle/actions/setup-gradle@v4
+      - name: Build client
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
+          TASK: ${{ matrix.task }}
+          LAUNCHER: ${{ matrix.launcher }}
+        run: |
+          if [ "$LAUNCHER" = "25" ]; then export JAVA_HOME="$JAVA_HOME_25"; else export JAVA_HOME="$JAVA_HOME_21"; fi
+          export PATH="$JAVA_HOME/bin:$PATH"
+          bash ./gradlew -Pallmusic.scope=modern-client-26.3 -Dorg.gradle.java.installations.paths="$JAVA_HOME_25" --no-daemon --stacktrace --configure-on-demand "$TASK"
+
+  legacy-server:
+    name: Legacy Paper server
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+      - name: Set up JDK 25 (Minecraft 26.3 toolchain)
+        id: java25
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '25'
+      - uses: gradle/actions/setup-gradle@v4
+      - name: Build legacy server
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
+        run: |
+          export JAVA_HOME="$JAVA_HOME_21"
+          export PATH="$JAVA_HOME/bin:$PATH"
+          bash ./gradlew -Pallmusic.scope=legacy-server -Dorg.gradle.java.installations.paths="$JAVA_HOME_25" --no-daemon --stacktrace --configure-on-demand :server:paper:build
+
+  modern-servers:
+    name: Minecraft 26.3 servers
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - task: :server:fabric_26_3:build
+            launcher: '21'
+          - task: :server:neoforge_26_3:build
+            launcher: '25'
+          - task: :server:paper_26_3:build
+            launcher: '21'
+          - task: :server:folia_26_3:build
+            launcher: '21'
+          - task: :server:spigot_26_3:build
+            launcher: '21'
+          - task: :server:velocity_26_3:build
+            launcher: '21'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+      - name: Set up JDK 25 (Minecraft 26.3 toolchain)
+        id: java25
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '25'
+      - uses: gradle/actions/setup-gradle@v4
+      - name: Build server
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
+          TASK: ${{ matrix.task }}
+          LAUNCHER: ${{ matrix.launcher }}
+        run: |
+          if [ "$LAUNCHER" = "25" ]; then export JAVA_HOME="$JAVA_HOME_25"; else export JAVA_HOME="$JAVA_HOME_21"; fi
+          export PATH="$JAVA_HOME/bin:$PATH"
+          bash ./gradlew -Pallmusic.scope=modern-server-26.3 -Dorg.gradle.java.installations.paths="$JAVA_HOME_25" --no-daemon --stacktrace --configure-on-demand "$TASK"
+
+  onejar:
+    name: Minecraft 26.3 one-jars
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - task: :onejar:fabric_26_3:build
+            launcher: '21'
+          - task: :onejar:neoforge_26_3:build
+            launcher: '25'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+      - name: Set up JDK 25 (Minecraft 26.3 toolchain)
+        id: java25
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '25'
+      - uses: gradle/actions/setup-gradle@v4
+      - name: Build one-jar
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
+          TASK: ${{ matrix.task }}
+          LAUNCHER: ${{ matrix.launcher }}
+        run: |
+          if [ "$LAUNCHER" = "25" ]; then export JAVA_HOME="$JAVA_HOME_25"; else export JAVA_HOME="$JAVA_HOME_21"; fi
+          export PATH="$JAVA_HOME/bin:$PATH"
+          bash ./gradlew -Pallmusic.scope=onejar-26.3 -Dorg.gradle.java.installations.paths="$JAVA_HOME_25" --no-daemon --stacktrace --configure-on-demand "$TASK"

.github/workflows/onejar.yml

@@ -27,7 +27,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: Set up JDK 25
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Set up JDK 25 (Minecraft toolchain)
+        id: java25
         uses: actions/setup-java@v4
         with:
           java-version: '25'
@@ -36,8 +43,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
       - name: build
         shell: cmd
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
         run: |
-          gradlew :onejar:buildOneJar
+          set "JAVA_HOME=%JAVA_HOME_21%"
+          set "PATH=%JAVA_HOME_21%\bin;%PATH%"
+          gradlew.bat -Dorg.gradle.java.installations.paths=%JAVA_HOME_25% --no-daemon :onejar:buildOneJar
       - name: update
         uses: actions/upload-artifact@v4
         with:

.github/workflows/server.yml

@@ -27,7 +27,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: Set up JDK 25
+      - name: Set up JDK 21 (Gradle launcher)
+        id: java21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Set up JDK 25 (Minecraft toolchain)
+        id: java25
         uses: actions/setup-java@v4
         with:
           java-version: '25'
@@ -36,8 +43,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
       - name: build
         shell: cmd
+        env:
+          JAVA_HOME_21: ${{ steps.java21.outputs.path }}
+          JAVA_HOME_25: ${{ steps.java25.outputs.path }}
         run: |
-          gradlew :server:buildServer
+          set "JAVA_HOME=%JAVA_HOME_21%"
+          set "PATH=%JAVA_HOME_21%\bin;%PATH%"
+          gradlew.bat -Pallmusic.scope=server-all -Dorg.gradle.java.installations.paths=%JAVA_HOME_25% --no-daemon :server:buildServer
       - name: update
         uses: actions/upload-artifact@v4
         with:

README.md

@@ -3,14 +3,17 @@
 ![AllMusic](https://socialify.git.ci/Coloryr/AllMusic/image?description=1&font=Inter&forks=1&logo=https%3A%2F%2Fgithub.com%2FColoryr%2FAllMusic%2Fblob%2Fmain%2Fserver%2Fneoforge_26_1%2Fsrc%2Fmain%2Fresources%2Ficon.png%3Fraw%3Dtrue&name=1&owner=1&pattern=Signal&stargazers=1&theme=Auto)
 
 ![](https://img.shields.io/badge/Version-3.1.4-blue?style=for-the-badge)
-![](https://img.shields.io/github/actions/workflow/status/Coloryr/AllMusic/gradle.yml?style=for-the-badge)
+![](https://img.shields.io/github/actions/workflow/status/Coloryr/AllMusic/client.yml?style=for-the-badge)
+![](https://img.shields.io/github/actions/workflow/status/Coloryr/AllMusic/server.yml?style=for-the-badge)
+![](https://img.shields.io/github/actions/workflow/status/Coloryr/AllMusic/onejar.yml?style=for-the-badge)
 ![](https://img.shields.io/github/license/Coloryr/AllMusic?style=for-the-badge)
 
 </div>
 
 ![GIF.gif](img/GIF.gif)
 
-注：需要配合客户端Mod使用  
+**注：需要配合客户端Mod使用**  
+**1.7.10和1.12.2没有技术更新**  
 **不兼容旧版客户端Mod，需要新版客户端Mod**  
 **如果面板服有问题，请自己去问服务器商给不给你用**
 **4.0服务器只能跟4.0客户端用，不兼容3.0的服务器或客户端**
@@ -20,6 +23,10 @@
 - Folia
 - Velocity
 
+本分支新增服务端 26.3 构建模块：`:server:paper_26_3`、`:server:folia_26_3`、`:server:spigot_26_3` 与 `:server:velocity_26_3`。Paper/Folia 模块以 Paper API `26.3.build.157-beta`、Java 25 编译；Spigot 模块以 Spigot API `26.3-R0.1-SNAPSHOT` 编译；Velocity 模块只依赖 Velocity API `4.2.1-SNAPSHOT`，不依赖 Paper API。旧服务端模块保留。
+
+本次服务端升级不宣称 Fabric、Forge 或 NeoForge 客户端已经支持 26.3；客户端/模组模块需另行迁移和实机验证。
+
 模组支持的服务器
 - Forge
 - NeoForge
@@ -29,16 +36,18 @@
 1. 安装AllMusic_Server
 
 Paper服务器  
-复制`[paper]AllMusic_Server-4.0.0-all.jar`到你的`plugins`文件夹  
+复制`[paper]AllMusic_Server-4.0.0.jar`到你的`plugins`文件夹  
 Velocity服务器  
-复制`[velocity]AllMusic_Server-4.0.0-all.jar`到你的`plugins`文件夹  
+复制`[velocity]AllMusic_Server-4.0.0.jar`到你的`plugins`文件夹  
 Forge/Fabric/NeoForge类服务器  
-复制`[xxx-xxx]AllMusic_Server-4.0.0-all.jar`到你的`mods`文件夹  
+复制`[xxx-xxx]AllMusic_Server-4.0.0.jar`到你的`mods`文件夹  
 
 2. 安装客户端mod
-复制`[xxx-xxx]AllMusic_Client-4.0.0-all`到客户端的`mods`文件夹
+复制`[xxx-xxx]AllMusic_Client-4.0.0`到客户端的`mods`文件夹
 重启客户端
 
+如果你是单人游戏使用或者联机使用OneJar版本
+
 ## 音乐API
 AllMusic不会内置音乐api，你想要正常使用需要自己安装
 这里提供一个参考api https://github.com/Coloryr/netapi
@@ -62,12 +71,6 @@ AllMusic不会内置音乐api，你想要正常使用需要自己安装
 > %allmusic_lyric% 歌词  
 > %allmusic_tlyric% 翻译的歌词
 
-## 更新日志
-
-```
-4.0.0：全新字体渲染，拆分音乐API
-```
-
 ## 配置文件说明
 配置文件采用json格式，需要遵守json编写的格式规范  
 - maxPlayList              最大歌曲数  

build.gradle.kts

@@ -12,7 +12,7 @@ allprojects {
     apply(plugin = "com.gradleup.shadow")
 
     group = "com.coloryr"
-    version = "4.1.5"
+    version = "4.2.5"
 
     // 设置项目JDK版本
     java.sourceCompatibility = JavaVersion.VERSION_1_8
@@ -50,8 +50,13 @@ allprojects {
     }
 
     afterEvaluate {
+        // Launch Gradle on Java 21, but compile Minecraft 26.x adapters with Java 25.
+        // Legacy module bytecode targets stay unchanged.
+        java.toolchain.languageVersion.set(JavaLanguageVersion.of(
+            if (java.targetCompatibility == JavaVersion.VERSION_25) 25 else 21
+        ))
         if (plugins.hasPlugin("com.gtnewhorizons.retrofuturagradle")) return@afterEvaluate
-        if (plugins.hasPlugin("fabric-loom")) return@afterEvaluate
+        if (plugins.hasPlugin("fabric-loom") || plugins.hasPlugin("net.fabricmc.fabric-loom")) return@afterEvaluate
 
         val rfgObfAttr = Attribute.of("com.gtnewhorizons.retrofuturagradle.obfuscation", String::class.java)
         val rfgDeobfAttr = Attribute.of("rfgDeobfuscatorTransformed", Boolean::class.javaObjectType)

client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java

@@ -69,7 +69,8 @@ public void sendMessage(String data) {
     }
 
     public float getVolume() {
-        return Minecraft.getInstance().options.getSoundSourceVolume(SoundSource.RECORDS);
+        return Minecraft.getInstance().options.getSoundSourceVolume(SoundSource.RECORDS)
+                * Minecraft.getInstance().options.getSoundSourceVolume(SoundSource.MASTER);
     }
 
     @Override

client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java

@@ -36,9 +36,4 @@ public void play(SoundInstance soundInstance, int v, CallbackInfo info) {
             }
         }
     }
-
-    @Inject(method = "resume", at = @At("RETURN"))
-    public void reload(CallbackInfo info) {
-        AllMusicCore.reload();
-    }
 }