a

README.md

@@ -1,14 +1,75 @@
 # 源README
 Download the mod at [Modrinth](https://modrinth.com/mod/disc-jockey) or [CurseForge](https://www.curseforge.com/minecraft/mc-mods/disc-jockey)
 # 该版本附加
-## 关于此项目  
+___
-此 Mod 是基于 [Disc-Jockey](https://github.com/SemmieDev/Disc-Jockey)（由 [SemmieDev](https://github.com/SemmieDev/) 开发）的修改版本，适配了 Minecraft 1.21.4。  
+# Disc Jockey Revive
-原始代码版权归原作者所有，修改部分版权归 BRanulf 所有。 
 
-同时，该二改版本我本人并没有上传至任何其他网站（包括 Modrinth 、CurseForge 、Github 等），请勿用于商业用途及其他非法用途。
+一个 Minecraft Fabric 模组，旨在为音符盒音乐爱好者提供强大的播放和即兴演奏功能。
 
-目前[Modrinth](https://modrinth.com/mod/disc_jockey_revive)上的这个版本非本人上传，就当允许上传了罢，毕竟我比较懒XD
+<!-- ## 模组特性
 
-[最新版本下载：Release](https://git.branulf.top/Branulf/DIsc_Jockey_revive/releases)
+### 🎵 歌曲播放
+- **播放 `.nbs` 歌曲文件**：支持标准的 Note Block Studio (`.nbs`) 歌曲文件（暂不支持带变速的）。
+- **文件夹管理**：支持歌曲文件夹，方便组织和浏览您的音乐库。
+- **多种播放模式**：
+    - **单曲循环**：重复播放当前歌曲。
+    - **列表循环**：按顺序循环播放当前文件夹或列表中的歌曲。
+    - **随机播放**：随机播放当前文件夹或列表中的歌曲。
+    - **播完停止**：歌曲播放完毕后自动停止。
+- **播放进度条**：在 HUD 上显示歌曲播放进度和时间。
+- **实时调速**：在播放界面通过滑块实时调整歌曲播放速度（0.25x - 4.0x）。
+- **播放失败处理**：当附近音符盒配置不正确时，可选择停止播放或自动播放下一首。
+- **音符盒材料清单**：显示播放当前歌曲所需的所有音符盒材料及数量。
+- **自动调音**：模组会自动识别并调音附近的音符盒以匹配歌曲音高。
+- **全向音符盒音效 (客户端)**：
+    - **常规模式**：在播放歌曲或预览时，使音符盒音效全向传播，提供更沉浸的听觉体验。
+    - **强制模式**：强制所有音符盒音效（包括手动触发的）始终全向传播。
 
-~~这边建议去给原作者点个Star~~
+### 🎹 即兴演奏 (Live DJ)
+- **独立界面**：通过专用快捷键打开一个独立界面，用于即兴演奏。
+- **键盘弹奏**：利用键盘按键直接弹奏音符盒，就像在 FL Studio 中一样。
+- **自定义键位映射**：
+    - 独立的键位映射配置界面，允许您为每个键盘按键设置特定的音符（乐器和音高）。
+    - 默认提供类似于 FL Studio 的键盘布局预设。
+- **即兴演奏调音**：在即兴演奏界面中，可以一键对周围的音符盒进行调音，以确保弹奏的音符准确无误。
+- **独立于歌曲播放**：即兴演奏功能与歌曲播放功能完全独立，互不干扰。
+
+### ⚙️ 配置与调试
+- **Mod Menu 集成**：通过 Mod Menu 轻松访问模组配置。
+- **快捷键**：
+    - 打开歌曲选择界面 (默认 `J`)。
+    - 打开即兴演奏界面 (默认 `UNKNOW（未指定）`)。
+- **调试模式**：可配置的调试模式，开启后会在日志中输出详细的调试信息，方便排查问题。
+
+## 如何使用
+
+1.  **安装**：将 `Disc Jockey Revive` 模组文件和 Fabric API 放入您的 Minecraft `mods` 文件夹。
+2.  **添加歌曲**：
+    *   在游戏中打开歌曲选择界面 (默认 `J` 键)。
+    *   点击“打开文件夹”按钮，将 `.nbs` 歌曲文件放入弹出的 `disc_jockey/songs` 文件夹中。
+    *   您也可以直接将 `.nbs` 文件拖放到歌曲选择界面中。
+    *   点击“重新加载”按钮以加载新添加的歌曲。
+3.  **播放歌曲**：
+    *   在歌曲选择界面中选择一首歌曲。
+    *   点击“播放”按钮。模组将自动寻找并调音附近的音符盒。
+    *   确保您处于生存模式或创造模式，并且附近有足够的音符盒。
+    *   您可以通过滑块调整播放速度，并通过播放模式按钮切换循环方式。
+4.  **即兴演奏**：
+    *   在游戏中打开即兴演奏界面 (默认 `UNKNOW` 键)。
+    *   点击“开始调音”按钮，模组将自动调音附近的音符盒。
+    *   调音完成后，您可以使用键盘按键直接弹奏音符盒。
+    *   点击“编辑键位映射”按钮可以自定义每个按键对应的音符。 -->
+
+## 注意事项
+
+*   **服务器兼容性**：此模组通过发送玩家交互数据包来控制音符盒。在某些服务器上，这可能被反作弊插件误判为作弊行为。**强烈建议在使用前联系服务器管理员。**
+*   **音符盒数量**：为了获得最佳播放效果，请确保您周围有足够数量且种类齐全的音符盒。
+*   **非官方版本**：此版本为非官方修订版，仅供学习和参考。请支持原版模组作者。
+
+## 贡献与支持
+
+如果您有任何问题、建议或发现 Bug，请联系[BRanulf](https://space.bilibili.com/479966868)（仅限于改二改版本，原版本请前往[原作者GitHub](https://github.com/SemmieDev/Disc-Jockey)）。
+
+不回复是正常现象，因为我也只是随便做做，并没有打算正经地维护，真要搞的化我估计会去GitHub创建分支，而不是只在自己仓库中修改。
+
+---

build.gradle

@@ -1,89 +1,51 @@
 plugins {
-    id 'fabric-loom' version '1.9.2'
+    id 'fabric-loom' version '1.10.5' apply false
-    id 'maven-publish'
+//    id 'maven-publish' apply false
+
+    id 'com.replaymod.preprocess' version '9d21b334a7'
+
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 version = project.mod_version
 group = project.maven_group
 
-repositories {
+preprocess {
-    maven { url "https://maven.shedaniel.me/" }
+    strictExtraMappings.set(false)
-    maven {url "https://maven.terraformersmc.com/"}
+
+    def mc12104 = createNode("1.21.4", 1_21_04, "")
+    def mc12105 = createNode("1.21.5", 1_21_05, "")
+    def mc12106 = createNode("1.21.6", 1_21_06, "")
+    def mc12107 = createNode("1.21.7", 1_21_07, "")
+    def mc12108 = createNode("1.21.8", 1_21_08, "")
+
+    mc12108.link(mc12107, file("versions/mapping_12108_12107.txt"))
+    mc12107.link(mc12106, file("versions/mapping_12107_12106.txt"))
+    mc12106.link(mc12105, file("versions/mapping_12106_12105.txt"))
+    mc12105.link(mc12104, file("versions/mapping_12105_12104.txt"))
 }
 
-dependencies {
+tasks.register('buildAndGather') {
-    // To change the versions see the gradle.properties file
+    subprojects {
-//    implementation files("libs/modmenu-13.0.3.jar")
+        dependsOn project.tasks.named('build').get()
-//    implementation files("libs/modmenu-13.0.3.pom")
+    }
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    doFirst {
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+        println 'Gathering builds'
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+        def buildLibs = {
-
+            p -> p.buildDir.toPath().resolve('libs')
-    // Fabric API. This is technically optional, but you probably want it anyway.
+        }
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+        delete fileTree(buildLibs(rootProject)) {
-
+            include '*'
-    include modApi("me.shedaniel.cloth:cloth-config-fabric:17.0.142") {
+        }
-        exclude(group: "net.fabricmc.fabric-api")
+        subprojects {
+            copy {
+                from(buildLibs(project)) {
+                    include '*.jar'
+                    exclude '*-dev.jar', '*-sources.jar', '*-shadow.jar'
+                }
+                into buildLibs(rootProject)
+                duplicatesStrategy DuplicatesStrategy.INCLUDE
+            }
         }
-    modImplementation "me.shedaniel.cloth:cloth-config-fabric:17.0.142"
-
-//    modCompileOnly("com.terraformersmc:modmenu:13.0.3")、
-    modCompileOnly files("libs/modmenu-13.0.3.jar")
-    modImplementation files("libs/LibGui-12.0.1+1.21.2.jar")
-}
-
-processResources {
-    inputs.property "version", project.version
-    filteringCharset "UTF-8"
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-def targetJavaVersion = 21
-tasks.withType(JavaCompile).configureEach {
-    // ensure that the encoding is set to UTF-8, no matter what the system default is
-    // this fixes some edge cases with special characters not displaying correctly
-    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-    // If Javadoc is generated, this must be specified in that task too.
-    it.options.encoding = "UTF-8"
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        it.options.release = targetJavaVersion
-    }
-}
-
-java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
-    archivesBaseName = project.archives_base_name
-    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-    // if it is present.
-    // If you remove this line, sources will not be generated.
-    withSourcesJar()
-}
-
-jar {
-    from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
-    }
-}
-
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-        // Notice: This block does NOT have the same function as the block in the top level.
-        // The repositories here will be used for publishing your artifact, not for
-        // retrieving dependencies.
     }
 }

common.gradle

@@ -0,0 +1,174 @@
+apply plugin: 'maven-publish'
+apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'fabric-loom'
+apply plugin: 'com.replaymod.preprocess'
+
+int mcVersion = project.mcVersion
+
+repositories {
+    maven {
+        url 'https://maven.fabricmc.net/' // loom
+    }
+    maven {
+        url 'https://masa.dy.fi/maven' // masa（随便加的）
+    }
+    maven {
+        url 'https://maven.fallenbreath.me/releases' // preprocessor
+    }
+    maven {
+        url 'https://jitpack.io' // preprocessor
+    }
+    maven {
+        url 'https://www.cursemaven.com' // curseforge（随便加的）
+    }
+    maven {
+        url "https://maven.shedaniel.me/" // cloth config
+    }
+    maven {
+        url "https://maven.terraformersmc.com/" // modmenu
+    }
+}
+
+dependencies {
+    minecraft "com.mojang:minecraft:${project.minecraft_version}" // 从子项目
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" // 从子项目
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}" // 从根项目
+
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+
+    include modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
+    modImplementation "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}"
+
+//    modCompileOnly files("${rootProject.projectDir}/libs/modmenu-13.0.3.jar")
+    modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}")
+//    modImplementation files("${rootProject.projectDir}/libs/LibGui-12.0.1+1.21.2.jar")
+}
+
+String MIXIN_CONFIG_PATH = 'disc_jockey.mixins.json' // mixin
+
+JavaVersion JAVA_COMPATIBILITY // java自动
+if (mcVersion >= 12100) {
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_21
+} else if (mcVersion >= 11800) {
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_17
+} else if (mcVersion >= 11700) {
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_16
+} else {
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_1_8
+}
+JavaVersion MIXIN_COMPATIBILITY_LEVEL = JAVA_COMPATIBILITY
+
+loom {
+    def commonVmArgs = ['-Dmixin.debug.export=true']
+    runConfigs.configureEach {
+        runDir '../../run'
+        vmArgs commonVmArgs
+        ideConfigGenerated true
+    }
+
+    runs {
+        def auditVmArgs = [*commonVmArgs, '-Ddisc_jockey_revive.mixin_audit=true']
+        serverMixinAudit {
+            server()
+            vmArgs auditVmArgs
+            ideConfigGenerated false
+        }
+        clientMixinAudit {
+            client()
+            vmArgs auditVmArgs
+            ideConfigGenerated false
+        }
+    }
+}
+
+// 打包胖子
+shadowJar {
+    configurations = [project.configurations.shadow]
+    exclude("META-INF")
+    archiveClassifier.set('shadow')
+}
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+tasks.withType(ShadowJar).configureEach {
+    enableRelocation true
+    relocationPrefix 'semmiedev.disc_jockey_revive.libs'
+}
+
+remapJar {
+    dependsOn(shadowJar)
+    mustRunAfter(shadowJar)
+    inputFile = shadowJar.archiveFile
+}
+
+String modVersionSuffix = ''
+if (System.getenv("BUILD_RELEASE") != "true") {
+    String buildNumber = System.getenv("BUILD_ID")
+    modVersionSuffix += buildNumber != null ? ('+build.' + buildNumber) : '' // 文件名前
+}
+String fullModVersion = rootProject.mod_version + modVersionSuffix
+
+String fullProjectVersion
+
+group = rootProject.maven_group
+if (System.getenv("JITPACK") == "true") {
+    base.archivesName = rootProject.archives_base_name + '-' + project.minecraft_version
+    fullProjectVersion = 'v' + rootProject.mod_version + modVersionSuffix
+} else {
+    base.archivesName = rootProject.archives_base_name
+    fullProjectVersion = 'v' + rootProject.mod_version + '-' + project.minecraft_version + modVersionSuffix
+}
+version = fullProjectVersion
+
+processResources {
+    inputs.property "id", rootProject.mod_id // 从根项目
+    inputs.property "name", rootProject.mod_name // 从根项目
+    inputs.property "version", fullModVersion
+
+    filesMatching("fabric.mod.json") {
+        def valueMap = [
+                "id"               : rootProject.mod_id,
+                "name"             : rootProject.mod_name,
+                "version"          : fullModVersion,
+                "minecraft_version": project.minecraft_dependency, // 从子项目
+                "loader_version"   : rootProject.loader_version // 从根项目
+        ]
+        expand valueMap
+    }
+
+    filesMatching(MIXIN_CONFIG_PATH) {
+        filter { s -> s.replace('{{COMPATIBILITY_LEVEL}}', "JAVA_${MIXIN_COMPATIBILITY_LEVEL.ordinal() + 1}") }
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
+    if (JAVA_COMPATIBILITY <= JavaVersion.VERSION_1_8) {
+        options.compilerArgs << '-Xlint:-options'
+    }
+}
+
+java {
+    sourceCompatibility = JAVA_COMPATIBILITY
+    targetCompatibility = JAVA_COMPATIBILITY
+    withSourcesJar()
+}
+
+jar {
+    from(rootProject.file('LICENSE')) {
+        rename { "${it}_${rootProject.archives_base_name}" }
+    }
+}
+
+//publishing {
+//    publications {
+//        mavenJava(MavenPublication) {
+//            from components.java
+//        }
+//    }
+//    repositories {
+//    }
+//}

gradle.properties

@@ -1,12 +1,14 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.21.4
 yarn_mappings=1.21.4+build.8
 loader_version=0.16.10
+mod_name=Disc Jockey Revive
+mod_id=disc_jockey_revive
 # Mod Properties
-mod_version=1.14.514.043
+mod_version=1.14.514.050
 maven_group=semmiedev
 archives_base_name=disc_jockey_revive
 # Dependencies

libs/LibGui-12.0.1+1.21.2.pom

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- This module was also published with a richer model, Gradle metadata,  -->
-  <!-- which should be used instead. Do not delete the following line which  -->
-  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
-  <!-- that they should prefer consuming it instead. -->
-  <!-- do_not_remove: published-with-gradle-metadata -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.github.cottonmc</groupId>
-  <artifactId>LibGui</artifactId>
-  <version>12.0.1+1.21.2</version>
-  <name>LibGui</name>
-  <description>Minecraft GUI Library</description>
-  <url>https://github.com/CottonMC/LibGui</url>
-  <licenses>
-    <license>
-      <name>MIT</name>
-      <url>https://github.com/CottonMC/LibGui/blob/HEAD/LICENSE</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>CottonMC</name>
-      <url>https://github.com/CottonMC</url>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>io.github.juuxel</groupId>
-      <artifactId>libninepatch</artifactId>
-      <version>1.2.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.fabricmc.fabric-api</groupId>
-      <artifactId>fabric-api-base</artifactId>
-      <version>0.4.48+c47b9d4373</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.fabricmc.fabric-api</groupId>
-      <artifactId>fabric-networking-api-v1</artifactId>
-      <version>4.3.3+56ec7ac673</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.fabricmc</groupId>
-      <artifactId>fabric-loader</artifactId>
-      <version>0.16.7</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.fabricmc.fabric-api</groupId>
-      <artifactId>fabric-lifecycle-events-v1</artifactId>
-      <version>2.3.22+c47b9d4373</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.fabricmc.fabric-api</groupId>
-      <artifactId>fabric-rendering-v1</artifactId>
-      <version>8.0.5+c47b9d4373</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.fabricmc.fabric-api</groupId>
-      <artifactId>fabric-resource-loader-v0</artifactId>
-      <version>3.0.5+c47b9d4373</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.github.cottonmc</groupId>
-      <artifactId>Jankson-Fabric</artifactId>
-      <version>9.0.0+j1.2.3</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>

libs/modmenu-13.0.3.pom

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.terraformersmc</groupId>
-  <artifactId>modmenu</artifactId>
-  <version>13.0.3</version>
-</project>

settings.gradle

@@ -1,9 +1,35 @@
+import groovy.json.JsonSlurper
+
 pluginManagement {
     repositories {
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven {
+            name = 'Jitpack'
+            url = 'https://jitpack.io' // preprocessor
+        }
+        mavenCentral()
         gradlePluginPortal()
     }
+    resolutionStrategy {
+        eachPlugin {
+            switch (requested.id.id) {
+                case "com.replaymod.preprocess": {
+                    useModule("com.github.Fallen-Breath:preprocessor:${requested.version}")
+                    break
+                }
+            }
+        }
+    }
+}
+
+def settings = new JsonSlurper().parseText(file('settings.json').text)
+for (String version : settings.versions) {
+    include(":$version")
+
+    def proj = project(":$version")
+    proj.projectDir = file("versions/$version")
+    proj.buildFileName = "../../common.gradle"
 }

settings.json

@@ -0,0 +1,9 @@
+{
+  "versions": [
+    "1.21.4",
+    "1.21.5",
+    "1.21.6",
+    "1.21.7",
+    "1.21.8"
+  ]
+}

src/main/java/semmiedev/disc_jockey_revive/DebugLogger.java

@@ -32,8 +32,11 @@ public class DebugLogger {
     }
 
     public static void sendMessage(String message) {
-        if (Main.config != null && Main.config.debugModeEnabled) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client != null && client.inGameHud != null && client.inGameHud.getChatHud() != null) {
             MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.of("[DiscJockeyRevive-调试]"+message.formatted(Formatting.GRAY)));
+        } else {
+//            Main.LOGGER.error("[DiscJockeyRevive-调试] 聊天窗口未初始化，{}",message);
         }
     }
 }

src/main/java/semmiedev/disc_jockey_revive/Main.java

@@ -14,9 +14,13 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;

src/main/java/semmiedev/disc_jockey_revive/ModConfig.java

@@ -12,6 +12,9 @@ public class ModConfig implements ConfigData {
     @ConfigEntry.Gui.Tooltip(count = 2) public boolean disableAsyncPlayback;
     @ConfigEntry.Gui.Tooltip(count = 2) public boolean omnidirectionalNoteBlockSounds = true;
 
+    @ConfigEntry.Gui.Tooltip(count = 1)
+    public boolean forceOmnidirectionalNoteBlockSounds = false;
+
     @ConfigEntry.Gui.Excluded
     public String currentFolderPath = "";
 
@@ -62,4 +65,7 @@ public class ModConfig implements ConfigData {
 
     @ConfigEntry.Gui.Tooltip(count = 1)
     public boolean debugModeEnabled = false;
+
+    @ConfigEntry.Gui.Tooltip(count = 1)
+    public boolean debugModeChatMessages = false;
 }

src/main/java/semmiedev/disc_jockey_revive/Note.java

@@ -31,6 +31,14 @@ public record Note(NoteBlockInstrument instrument, byte note) {
             NoteBlockInstrument.BANJO,
             NoteBlockInstrument.PLING,
 
+            NoteBlockInstrument.ZOMBIE,
+            NoteBlockInstrument.SKELETON,
+            NoteBlockInstrument.CREEPER,
+            NoteBlockInstrument.DRAGON,
+            NoteBlockInstrument.WITHER_SKELETON,
+            NoteBlockInstrument.PIGLIN,
+            NoteBlockInstrument.CUSTOM_HEAD
+
     };
 
     static {
@@ -50,5 +58,13 @@ public record Note(NoteBlockInstrument instrument, byte note) {
         INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BIT, Blocks.EMERALD_BLOCK);
         INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BANJO, Blocks.HAY_BLOCK);
         INSTRUMENT_BLOCKS.put(NoteBlockInstrument.PLING, Blocks.GLOWSTONE);
+
+        INSTRUMENT_BLOCKS.put(NoteBlockInstrument.ZOMBIE, Blocks.ZOMBIE_HEAD);
+        INSTRUMENT_BLOCKS.put(NoteBlockInstrument.SKELETON, Blocks.SKELETON_SKULL);
+        INSTRUMENT_BLOCKS.put(NoteBlockInstrument.CREEPER, Blocks.CREEPER_HEAD);
+        INSTRUMENT_BLOCKS.put(NoteBlockInstrument.DRAGON, Blocks.DRAGON_HEAD);
+        INSTRUMENT_BLOCKS.put(NoteBlockInstrument.WITHER_SKELETON, Blocks.WITHER_SKELETON_SKULL);
+        INSTRUMENT_BLOCKS.put(NoteBlockInstrument.PIGLIN, Blocks.PIGLIN_HEAD);
+        INSTRUMENT_BLOCKS.put(NoteBlockInstrument.CUSTOM_HEAD, Blocks.PLAYER_HEAD);
     }
 }

src/main/java/semmiedev/disc_jockey_revive/gui/KeyMappingListWidget.java

@@ -89,9 +89,9 @@ public class KeyMappingListWidget extends EntryListWidget<KeyMappingListWidget.K
             MinecraftClient client = MinecraftClient.getInstance();
             int textY = y + (entryHeight - client.textRenderer.fontHeight) / 2;
             Text keyText = Text.translatable(key.getTranslationKey());
-            context.drawTextWithShadow(client.textRenderer, keyText, x + 5, textY, 0xFFFFFF);
+            context.drawTextWithShadow(client.textRenderer, keyText, x + 5, textY, 0xFFFFFFFF);
             String noteDisplayName = KeyMappingManager.getNoteDisplayName(note);
-            context.drawTextWithShadow(client.textRenderer, noteDisplayName, x + 100, textY, 0xAAAAAA); 
+            context.drawTextWithShadow(client.textRenderer, noteDisplayName, x + 100, textY, 0xFFAAAAAA);
             int buttonWidth = 50;
             int buttonHeight = 18;
             int buttonY = y + (entryHeight - buttonHeight) / 2;

src/main/java/semmiedev/disc_jockey_revive/gui/ProgressBarRenderer.java

@@ -6,7 +6,7 @@ import net.minecraft.client.gui.DrawContext;
 public class ProgressBarRenderer {
     private static final int BACKGROUND_COLOR = 0x80808080;
 //    private static final int PROGRESS_COLOR = 0x8000FF00;
-    private static final int TEXT_COLOR = 0xFFFFFF;
+    private static final int TEXT_COLOR = 0xEEFFFFFF;
 
     public void renderProgressBar(DrawContext context, int x, int y, int width, int height, float progress, String timeText, int PROGRESS_COLOR) {
         context.fill(x, y, x + width, y + height, BACKGROUND_COLOR);

src/main/java/semmiedev/disc_jockey_revive/gui/SongListWidget.java

@@ -70,7 +70,7 @@ public class SongListWidget extends EntryListWidget<SongListWidget.Entry> {
                     client.textRenderer,
                     emoji,
                     x + 4, y + 6,
-                    favorite ? 0xFFD700 : 0x808080
+                    favorite ? 0xFFFFD700 : 0xFF808080
             );
 
             // 歌曲名称靠左显示，从收藏图标右侧开始
@@ -81,7 +81,7 @@ public class SongListWidget extends EntryListWidget<SongListWidget.Entry> {
                     client.textRenderer,
                     displayText,
                     textX, y + 6,
-                    selected ? 0xFFFFFF : 0x808080
+                    selected ? 0xFFFFFFFF : 0xFF808080
             );
         }
 
@@ -159,7 +159,7 @@ public class SongListWidget extends EntryListWidget<SongListWidget.Entry> {
                     client.textRenderer,
                     displayText,
                     x + 6, y + 6,
-                    selected ? 0xFFFFFF : 0x808080
+                    selected ? 0xFFFFFFFF : 0xFF808080
             );
         }
 

src/main/java/semmiedev/disc_jockey_revive/gui/screen/DiscJockeyScreen.java

@@ -1,5 +1,6 @@
 package semmiedev.disc_jockey_revive.gui.screen;
 
+import me.shedaniel.autoconfig.AutoConfig;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.client.gui.screen.Screen;
@@ -30,7 +31,7 @@ import semmiedev.disc_jockey_revive.SongPlayer.PlayMode;
 import static net.minecraft.client.toast.TutorialToast.PROGRESS_BAR_WIDTH;
 
 public class DiscJockeyScreen extends Screen {
-    private static final MutableText
+    public static final MutableText
             SELECT_SONG = Text.translatable(Main.MOD_ID+".screen.select_song"),
             PLAY = Text.translatable(Main.MOD_ID+".screen.play"),
             PLAY_STOP = Text.translatable(Main.MOD_ID+".screen.play.stop").formatted(Formatting.YELLOW),
@@ -39,12 +40,12 @@ public class DiscJockeyScreen extends Screen {
             DROP_HINT = Text.translatable(Main.MOD_ID+".screen.drop_hint").formatted(Formatting.GRAY)
     ;
 
-    private SongListWidget songListWidget;
+    public SongListWidget songListWidget;
-    private ButtonWidget playButton, previewButton;
+    public ButtonWidget playButton, previewButton;
     public boolean shouldFilter;
-    private String query = "";
+    public String query = "";
 
-    private static final MutableText
+    public static final MutableText
             FOLDER_UP = Text.literal("↑"),
             CURRENT_FOLDER = Text.translatable(Main.MOD_ID+".screen.current_folder"),
             PLAY_MODE = Text.translatable(Main.MOD_ID+".screen.play_mode"),
@@ -53,19 +54,21 @@ public class DiscJockeyScreen extends Screen {
             MODE_RANDOM = Text.translatable(Main.MOD_ID+".screen.mode_random"),
             MODE_STOP = Text.translatable(Main.MOD_ID+".screen.mode_stop");
 
-    private static final MutableText
+    public static final MutableText
             OPEN_FOLDER = Text.translatable(Main.MOD_ID+".screen.open_folder"),
             RELOAD = Text.translatable(Main.MOD_ID+".screen.reload"),
             LIVE_DJ = Text.translatable(Main.MOD_ID+".screen.live_dj").formatted(Formatting.GOLD);
 
-    private ButtonWidget folderUpButton, playModeButton;
+    public ButtonWidget folderUpButton, playModeButton;
     public SongFolder currentFolder;
-    private PlayMode currentPlayMode = PlayMode.STOP_AFTER;
+    public PlayMode currentPlayMode = PlayMode.STOP_AFTER;
 
-    private ProgressBarRenderer progressBarRenderer;
+    public ProgressBarRenderer progressBarRenderer;
 
     public CustomSliderWidget speedSlider;
 
+    public ButtonWidget configButton;
+
     public DiscJockeyScreen() {
         super(Main.NAME);
         this.progressBarRenderer = new ProgressBarRenderer();
@@ -145,8 +148,18 @@ public class DiscJockeyScreen extends Screen {
                 Main.SONG_PLAYER.speed = newSpeed;
                 DebugLogger.log("播放速度设置为: {:.2f}x", newSpeed);
             }
-        };
+        }; if (isLargeScreen) addDrawableChild(speedSlider);
-        addDrawableChild(speedSlider);
+
+        // 配置按钮
+        int configButtonSize = 20;
+        int configButtonX = width - 120 - sliderWidth - configButtonSize - 10 - 10;
+        int configButtonY = 10;
+        if (!isLargeScreen) configButtonX = width - 120 - configButtonSize - 10;
+        configButton = ButtonWidget.builder(Text.literal("⚙"), button -> {
+            Screen configScreen = AutoConfig.getConfigScreen(ModConfig.class, this).get();
+            client.setScreen(configScreen);
+        }).dimensions(configButtonX, configButtonY, configButtonSize, configButtonSize).build();
+        addDrawableChild(configButton);
 
         int buttonY;
         if (isLargeScreen){
@@ -302,17 +315,18 @@ public class DiscJockeyScreen extends Screen {
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
 
-        context.drawCenteredTextWithShadow(textRenderer, DROP_HINT, width / 2, 5, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, DROP_HINT, width / 2, 5, 0xFFFFFFFF);
-        context.drawCenteredTextWithShadow(textRenderer, SELECT_SONG, width / 2, 20, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, SELECT_SONG, width / 2, 20, 0xFFFFFFFF);
 
         // 显示当前文件夹和播放模式
         String folderName = currentFolder == null ? "/" : currentFolder.name;
-        context.drawTextWithShadow(textRenderer, CURRENT_FOLDER.getString() + ": " + folderName, 35, 15, 0xFFFFFF);
+        context.drawTextWithShadow(textRenderer, CURRENT_FOLDER.getString() + ": " + folderName, 35, 15, 0xFFFFFFFF);
 //        context.drawTextWithShadow(textRenderer, PLAY_MODE.getString() + ":", width - 220, 15, 0xFFFFFF);
 
         int screenWidth = context.getScaledWindowWidth();
 
-        // 进度条
+        // 播放进度条
+        // TODO 关于可拖动什么的以后再加，这里放个TODO防止以后忘了
         if (Main.SONG_PLAYER.running && Main.SONG_PLAYER.song != null) {
             int progressBarX = 10;
             int progressBarY = height - 52; // 按钮上方
@@ -330,7 +344,7 @@ public class DiscJockeyScreen extends Screen {
             );
         }
 
-        // 进度条
+        // 预览进度条
         if (Main.PREVIEWER.running && Main.PREVIEWER.song != null) {
             int progressBarX = 10;
             int progressBarY = height - 37; // 比上一个低一点
@@ -348,6 +362,10 @@ public class DiscJockeyScreen extends Screen {
             );
         }
 
+        if (configButton != null && configButton.isMouseOver(mouseX, mouseY)) {
+            context.drawTooltip(textRenderer, Text.translatable(Main.MOD_ID + ".screen.open_config"), mouseX, mouseY);
+        }
+
 
 //        DebugLogger.log("DiscJockeyScreen: 初始化界面完成");
     }

src/main/java/semmiedev/disc_jockey_revive/gui/screen/EditKeyMappingsScreen.java

@@ -135,11 +135,11 @@ public class EditKeyMappingsScreen extends Screen {
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
-        context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFFFF);
         if (waitingForKeyPress) {
             
             context.fill(0, 0, this.width, this.height, 0x80000000); 
-            context.drawCenteredTextWithShadow(textRenderer, PRESS_KEY_INSTRUCTION, this.width / 2, this.height / 2 - 10, 0xFFFFFF);
+            context.drawCenteredTextWithShadow(textRenderer, PRESS_KEY_INSTRUCTION, this.width / 2, this.height / 2 - 10, 0xFFFFFFFF);
         }
         mappingListWidget.render(context, mouseX, mouseY, delta);
     }

src/main/java/semmiedev/disc_jockey_revive/gui/screen/LiveDjScreen.java

@@ -58,8 +58,8 @@ public class LiveDjScreen extends Screen {
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
-        context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFFFF);
-        context.drawCenteredTextWithShadow(textRenderer, INSTRUCTIONS, this.width / 2, 30, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, INSTRUCTIONS, this.width / 2, 30, 0xFFFFFFFF);
 
         Text tuningStatusText;
         if (Main.LIVE_DJ_PLAYER.getNoteBlocks() == null) {
@@ -112,7 +112,7 @@ public class LiveDjScreen extends Screen {
             startTuningButton.active = false;
             startTuningButton.visible = false;
         }
-        context.drawCenteredTextWithShadow(textRenderer, tuningStatusText, this.width / 2, 50, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, tuningStatusText, this.width / 2, 50, 0xFFFFFFFF);
 
         
         if (!Main.LIVE_DJ_PLAYER.missingInstrumentBlocks.isEmpty()) {

src/main/java/semmiedev/disc_jockey_revive/gui/screen/SelectNoteScreen.java

@@ -147,7 +147,7 @@ public class SelectNoteScreen extends Screen {
 
         super.render(context, mouseX, mouseY, delta);
 
-        context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFFFF);
         
         context.drawCenteredTextWithShadow(textRenderer, Text.translatable(Main.MOD_ID + ".screen.select_note.mapping_key", Text.translatable(keyToMap.getTranslationKey())), this.width / 2, 30, 0xFFFFFF);
     }

src/main/java/semmiedev/disc_jockey_revive/mixin/ClientWorldMixin.java

@@ -32,11 +32,28 @@ public class ClientWorldMixin {
             boolean useDistance, long seed,
             CallbackInfo ci
     ) {
-        if (
+        boolean isNoteBlockSound = event.id().getPath().startsWith("block.note_block");
-                ((Main.config.omnidirectionalNoteBlockSounds && Main.SONG_PLAYER.running) || Main.PREVIEWER.running) &&
+
-                        event.id().getPath().startsWith("block.note_block")
+        if (Main.config.forceOmnidirectionalNoteBlockSounds && isNoteBlockSound) {
-        ) {
             ci.cancel();
+            playOmnidirectionalSound(event, category, volume, pitch, seed);
+            return;
+        }
+
+        if (Main.config.omnidirectionalNoteBlockSounds &&
+                (Main.SONG_PLAYER.running || Main.PREVIEWER.running) &&
+                isNoteBlockSound) {
+            ci.cancel();
+            playOmnidirectionalSound(event, category, volume, pitch, seed);
+        }
+    }
+
+    private void playOmnidirectionalSound(
+            SoundEvent event,
+            SoundCategory category,
+            float volume, float pitch,
+            long seed
+    ) {
         client.getSoundManager().play(
                 new PositionedSoundInstance(
                         event.id(),
@@ -52,5 +69,4 @@ public class ClientWorldMixin {
                 )
         );
     }
-    }
 }

src/main/resources/assets/disc_jockey/lang/en_us.json

@@ -96,14 +96,20 @@
   "text.autoconfig.disc_jockey_revive.option.debugModeEnabled.@Tooltip": "Enable detailed logging for debugging.\nKeep it off unless troubleshooting.\nOf course, many debug parts have been removed.\nEnabling this may cause the log file to be too large.\nHonestly, it's not really helpful for you.",
   "disc_jockey_revive.screen.speed": "Speed",
   "disc_jockey_revive.screen.speed_value": "Speed: %.2fx",
-  "disc_jockey_revive.screen.speed.@Tooltip": "Drag to adjust playback speed\n0.25~4",
 
   "text.autoconfig.disc_jockey_revive.option.playbackFailureAction": "On Playback Failure",
-  "text.autoconfig.disc_jockey_revive.option.playbackFailureAction.@Tooltip[0]": "Action when playback fails due to missing note blocks\nOptions: Stop (default) or Play Next Song",
+  "text.autoconfig.disc_jockey_revive.option.playbackFailureAction.@Tooltip": "Action when playback fails due to missing note blocks\nOptions: Stop (default) or Play Next Song",
 
   "disc_jockey_revive.playback_failure.stop": "Stop playback",
   "disc_jockey_revive.playback_failure.next": "Play next song",
   "disc_jockey_revive.playback_failure.next_message": "Playback failure handling: Play next song.",
 
-  "command.failure_action.set": "Playback failure action set to: %s"
+  "command.failure_action.set": "Playback failure action set to: %s",
+
+  "text.autoconfig.disc_jockey_revive.option.forceOmnidirectionalNoteBlockSounds": "Force Omnidirectional Note Blocks",
+  "text.autoconfig.disc_jockey_revive.option.forceOmnidirectionalNoteBlockSounds.@Tooltip": "Forces all note block sounds to be omnidirectional at all times.\nOverrides the regular omnidirectional setting.",
+  "disc_jockey_revive.screen.open_config": "Open Mod Settings",
+
+  "text.autoconfig.disc_jockey_revive.option.debugModeChatMessages": "Debug mode chat messages",
+  "text.autoconfig.disc_jockey_revive.option.debugModeChatMessages.@Tooltip": "Enable detailed logging output to chat\nPlease enable debug mode first"
 }

src/main/resources/assets/disc_jockey/lang/zh_cn.json

@@ -96,14 +96,20 @@
   "text.autoconfig.disc_jockey_revive.option.debugModeEnabled.@Tooltip": "启用详细日志输出以进行调试。\n除非排查问题，否则请保持关闭。\n当然，很多调试用的部分已经移除。\n开启这个可能会导致日志文件占用过大\n老实说，其实这对你并没有什么帮助",
   "disc_jockey_revive.screen.speed": "速度",
   "disc_jockey_revive.screen.speed_value": "速度: %.2fx",
-  "disc_jockey_revive.screen.speed.@Tooltip": "拖动调整播放速度\n0.25~4",
 
   "text.autoconfig.disc_jockey_revive.option.playbackFailureAction": "播放失败处理",
-  "text.autoconfig.disc_jockey_revive.option.playbackFailureAction.@Tooltip[0]": "当因缺少音符盒导致播放失败时的处理方式\n选项: 停止播放(默认) 或 播放下一首",
+  "text.autoconfig.disc_jockey_revive.option.playbackFailureAction.@Tooltip": "当因缺少音符盒导致播放失败时的处理方式\n选项: 停止播放(默认) 或 播放下一首",
 
   "disc_jockey_revive.playback_failure.stop": "停止播放",
   "disc_jockey_revive.playback_failure.next": "播放下一首",
   "disc_jockey_revive.playback_failure.next_message": "播放失败处理：播放下一首",
 
-  "command.failure_action.set": "播放失败处理方式已设置为: %s"
+  "command.failure_action.set": "播放失败处理方式已设置为: %s",
+
+  "text.autoconfig.disc_jockey_revive.option.forceOmnidirectionalNoteBlockSounds": "强制全向音符盒音效",
+  "text.autoconfig.disc_jockey_revive.option.forceOmnidirectionalNoteBlockSounds.@Tooltip": "强制所有音符盒音效始终保持全向传播\n会覆盖常规的全向音符盒设置",
+  "disc_jockey_revive.screen.open_config": "打开模组设置",
+
+  "text.autoconfig.disc_jockey_revive.option.debugModeChatMessages": "调试模式聊天框消息",
+  "text.autoconfig.disc_jockey_revive.option.debugModeChatMessages.@Tooltip": "启用将详细日志输出到聊天框\n请先启用调试模式"
 }

src/main/resources/disc_jockey.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "semmiedev.disc_jockey_revive.mixin",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "{{COMPATIBILITY_LEVEL}}",
   "mixins": [
     "ClientWorldMixin"
   ],

src/main/resources/fabric.mod.json

@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "id": "disc_jockey_revive",
   "version": "${version}",
-  "name": "Disc Jockey Revive",
+  "name": "${name}",
   "description": "在游戏中播放音符盒（打碟机）",
   "authors": [
     "SemmieDev",
@@ -10,7 +10,7 @@
     "BRanulf(仅限该版本，请支持上面两个原作者)"
   ],
   "contact": {
-    "homepage": "https://git.branulf.top/Branulf/DIsc_Jockey_revive",
+    "homepage": "https://git.branulf.top/Branulf",
     "sources": "https://git.branulf.top/Branulf/DIsc_Jockey_revive"
   },
   "license": "MIT",
@@ -28,8 +28,9 @@
     "disc_jockey.mixins.json"
   ],
   "depends": {
+    "fabricloader": ">=${loader_version}",
     "fabric": "*",
-    "minecraft": "~1.21.4",
+    "minecraft": "${minecraft_version}",
     "java": ">=21",
     "cloth-config": "*"
   }

versions/1.21.4/gradle.properties

@@ -0,0 +1,11 @@
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+
+minecraft_dependency=1.21.4
+
+game_versions=1.21.4
+
+fabric_api_version=0.119.2+1.21.4
+
+modmenu_version=13.0.3
+cloth_config_version=17.0.144

versions/1.21.5/gradle.properties

@@ -0,0 +1,11 @@
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+
+minecraft_dependency=1.21.5
+
+game_versions=1.21.5
+
+fabric_api_version=0.119.5+1.21.5
+
+modmenu_version=14.0.0-rc.2
+cloth_config_version=18.0.145

versions/1.21.6/gradle.properties

@@ -0,0 +1,11 @@
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+
+minecraft_dependency=1.21.6
+
+game_versions=1.21.6
+
+fabric_api_version=0.127.0+1.21.6
+
+modmenu_version=15.0.0-beta.3
+cloth_config_version=19.0.147

versions/1.21.7/gradle.properties

@@ -0,0 +1,11 @@
+minecraft_version=1.21.7
+yarn_mappings=1.21.7+build.7
+
+minecraft_dependency=1.21.7
+
+game_versions=1.21.7
+
+fabric_api_version=0.128.1+1.21.7
+
+modmenu_version=15.0.0-beta.3
+cloth_config_version=19.0.147

versions/1.21.8/gradle.properties

@@ -0,0 +1,11 @@
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
+
+minecraft_dependency=1.21.8
+
+game_versions=1.21.8
+
+fabric_api_version=0.129.0+1.21.8
+
+modmenu_version=15.0.0-beta.3
+cloth_config_version=19.0.147

versions/mainProject

@@ -0,0 +1 @@
+1.21.4