From d84e120cca10722aa847f1a2163a215ab60d82e3 Mon Sep 17 00:00:00 2001 From: BRanulf Date: Sat, 19 Apr 2025 16:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=90=AC=E8=BF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 + .gitignore | 118 ++++ LICENSE | 21 + README.md | 1 + build.gradle | 87 +++ gradle.properties | 18 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 ++++++++ gradlew.bat | 89 +++ libs/modmenu-13.0.3.pom | 8 + settings.gradle | 9 + .../semmiedev/disc_jockey/BinaryReader.java | 67 +++ .../java/semmiedev/disc_jockey/Config.java | 43 ++ .../disc_jockey/DiscjockeyCommand.java | 262 +++++++++ src/main/java/semmiedev/disc_jockey/Main.java | 90 +++ .../disc_jockey/ModMenuIntegration.java | 12 + src/main/java/semmiedev/disc_jockey/Note.java | 54 ++ .../java/semmiedev/disc_jockey/Previewer.java | 48 ++ src/main/java/semmiedev/disc_jockey/Song.java | 43 ++ .../semmiedev/disc_jockey/SongLoader.java | 130 +++++ .../semmiedev/disc_jockey/SongPlayer.java | 516 ++++++++++++++++++ .../disc_jockey/gui/SongListWidget.java | 108 ++++ .../disc_jockey/gui/hud/BlocksOverlay.java | 41 ++ .../gui/screen/DiscJockeyScreen.java | 201 +++++++ .../disc_jockey/mixin/ClientWorldMixin.java | 56 ++ .../resources/assets/disc_jockey/icon.png | Bin 0 -> 21044 bytes .../assets/disc_jockey/lang/en_us.json | 55 ++ .../assets/disc_jockey/lang/zh_cn.json | 55 ++ .../assets/disc_jockey/textures/gui/icons.png | Bin 0 -> 359 bytes src/main/resources/disc_jockey.mixins.json | 12 + src/main/resources/fabric.mod.json | 35 ++ 32 files changed, 2420 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 libs/modmenu-13.0.3.pom create mode 100644 settings.gradle create mode 100644 src/main/java/semmiedev/disc_jockey/BinaryReader.java create mode 100644 src/main/java/semmiedev/disc_jockey/Config.java create mode 100644 src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java create mode 100644 src/main/java/semmiedev/disc_jockey/Main.java create mode 100644 src/main/java/semmiedev/disc_jockey/ModMenuIntegration.java create mode 100644 src/main/java/semmiedev/disc_jockey/Note.java create mode 100644 src/main/java/semmiedev/disc_jockey/Previewer.java create mode 100644 src/main/java/semmiedev/disc_jockey/Song.java create mode 100644 src/main/java/semmiedev/disc_jockey/SongLoader.java create mode 100644 src/main/java/semmiedev/disc_jockey/SongPlayer.java create mode 100644 src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java create mode 100644 src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java create mode 100644 src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java create mode 100644 src/main/java/semmiedev/disc_jockey/mixin/ClientWorldMixin.java create mode 100644 src/main/resources/assets/disc_jockey/icon.png create mode 100644 src/main/resources/assets/disc_jockey/lang/en_us.json create mode 100644 src/main/resources/assets/disc_jockey/lang/zh_cn.json create mode 100644 src/main/resources/assets/disc_jockey/textures/gui/icons.png create mode 100644 src/main/resources/disc_jockey.mixins.json create mode 100644 src/main/resources/fabric.mod.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c37caf --- /dev/null +++ b/.gitignore @@ -0,0 +1,118 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a91dff3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2022 Semmieboy_YT + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..9f5b9f1 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +Download the mod at [Modrinth](https://modrinth.com/mod/disc-jockey) or [CurseForge](https://www.curseforge.com/minecraft/mc-mods/disc-jockey) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..078787e --- /dev/null +++ b/build.gradle @@ -0,0 +1,87 @@ +plugins { + id 'fabric-loom' version '1.9.2' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +repositories { + maven { url "https://maven.shedaniel.me/" } + maven {url "https://maven.terraformersmc.com/"} +} + +dependencies { + // To change the versions see the gradle.properties file +// implementation files("libs/modmenu-13.0.3.jar") +// implementation files("libs/modmenu-13.0.3.pom") + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + include modApi("me.shedaniel.cloth:cloth-config-fabric:17.0.142") { + exclude(group: "net.fabricmc.fabric-api") + } + +// modCompileOnly("com.terraformersmc:modmenu:13.0.3")、 + modCompileOnly files("libs/modmenu-13.0.3.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. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..2512360 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# 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 Properties +mod_version=1.14.514.013 +maven_group=semmiedev +archives_base_name=disc_jockey +# Dependencies +# check this on https://modmuss50.me/fabric.html + +fabric_version=0.119.2+1.21.4 +systemProp.http.sslVerify=false +systemProp.https.sslVerify=false +systemProp.javax.net.ssl.trustStoreType=WINDOWS-ROOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d070599 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https://mirrors.aliyun.com/macports/distfiles/gradle/gradle-8.12.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..c53aefa --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions $var, ${var}, ${var:-default}, ${var+SET}, +# ${var#prefix}, ${var%suffix}, and $( cmd ); +# * compound commands having a testable exit status, especially case; +# * various built-in commands including command, set, and ulimit. +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libs/modmenu-13.0.3.pom b/libs/modmenu-13.0.3.pom new file mode 100644 index 0000000..4e0cc7a --- /dev/null +++ b/libs/modmenu-13.0.3.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + com.terraformersmc + modmenu + 13.0.3 + diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/semmiedev/disc_jockey/BinaryReader.java b/src/main/java/semmiedev/disc_jockey/BinaryReader.java new file mode 100644 index 0000000..9b81853 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/BinaryReader.java @@ -0,0 +1,67 @@ +package semmiedev.disc_jockey; + +import java.io.EOFException; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + +public class BinaryReader { + private final InputStream in; + private final ByteBuffer buffer = ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN); + + public BinaryReader(InputStream in) { + this.in = in; + } + + public int readInt() throws IOException { + return buffer.clear().put(readBytes(Integer.BYTES)).rewind().getInt(); + } + + public long readUInt() throws IOException { + return readInt() & 0xFFFFFFFFL; + } + + public int readUShort() throws IOException { + return readShort() & 0xFFFF; + } + + public short readShort() throws IOException { + return buffer.clear().put(readBytes(Short.BYTES)).rewind().getShort(); + } + + public String readString() throws IOException { + return new String(readBytes(readInt())); + } + + public float readFloat() throws IOException { + return buffer.clear().put(readBytes(Float.BYTES)).rewind().getFloat(); + } + + /*private int getStringLength() throws IOException { + int count = 0; + int shift = 0; + boolean more = true; + while (more) { + byte b = (byte) in.read(); + count |= (b & 0x7F) << shift; + shift += 7; + if ((b & 0x80) == 0) { + more = false; + } + } + return count; + }*/ + + public byte readByte() throws IOException { + int b = in.read(); + if (b < 0) throw new EOFException(); + return (byte)(b); + } + + public byte[] readBytes(int length) throws IOException { + byte[] bytes = new byte[length]; + for (int i = 0; i < length; i++) bytes[i] = readByte(); + return bytes; + } +} diff --git a/src/main/java/semmiedev/disc_jockey/Config.java b/src/main/java/semmiedev/disc_jockey/Config.java new file mode 100644 index 0000000..b8c8124 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/Config.java @@ -0,0 +1,43 @@ +package semmiedev.disc_jockey; + +import me.shedaniel.autoconfig.ConfigData; +import me.shedaniel.autoconfig.annotation.ConfigEntry; + +import java.util.ArrayList; + +@me.shedaniel.autoconfig.annotation.Config(name = Main.MOD_ID) +@me.shedaniel.autoconfig.annotation.Config.Gui.Background("textures/block/note_block.png") +public class Config implements ConfigData { + public boolean hideWarning; + @ConfigEntry.Gui.Tooltip(count = 2) public boolean disableAsyncPlayback; + @ConfigEntry.Gui.Tooltip(count = 2) public boolean omnidirectionalNoteBlockSounds = true; + + public enum ExpectedServerVersion { + All, + v1_20_4_Or_Earlier, + v1_20_5_Or_Later; + + @Override + public String toString() { + if(this == All) { + return "All (universal)"; + }else if(this == v1_20_4_Or_Earlier) { + return "≤1.20.4"; + }else if (this == v1_20_5_Or_Later) { + return "≥1.20.5"; + }else { + return super.toString(); + } + } + } + + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + @ConfigEntry.Gui.Tooltip(count = 4) + public ExpectedServerVersion expectedServerVersion = ExpectedServerVersion.All; + + @ConfigEntry.Gui.Tooltip(count = 1) + public float delayPlaybackStartBySecs = 0.0f; + + @ConfigEntry.Gui.Excluded + public ArrayList favorites = new ArrayList<>(); +} diff --git a/src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java b/src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java new file mode 100644 index 0000000..9c23dbb --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java @@ -0,0 +1,262 @@ +package semmiedev.disc_jockey; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.FloatArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.minecraft.block.enums.NoteBlockInstrument; +import net.minecraft.client.MinecraftClient; +import net.minecraft.command.CommandSource; +import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; +import semmiedev.disc_jockey.gui.screen.DiscJockeyScreen; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Map; +import java.util.Optional; + +import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; + +public class DiscjockeyCommand { + + + public static void register(CommandDispatcher commandDispatcher) { + final ArrayList instrumentNames = new ArrayList<>(); + for (NoteBlockInstrument instrument : NoteBlockInstrument.values()) { + instrumentNames.add(instrument.toString().toLowerCase()); + } + final ArrayList instrumentNamesAndAll = new ArrayList<>(instrumentNames); + instrumentNamesAndAll.add("all"); + final ArrayList instrumentNamesAndNothing = new ArrayList<>(instrumentNames); + instrumentNamesAndNothing.add("nothing"); + + commandDispatcher.register( + literal("discjockey") + .executes(context -> { + FabricClientCommandSource source = context.getSource(); + if (!isLoading(context)) { + MinecraftClient client = source.getClient(); + client.send(() -> client.setScreen(new DiscJockeyScreen())); + return 1; + } + return 0; + }) + .then(literal("reload") + .executes(context -> { + if (!isLoading(context)) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID+".reloading")); + SongLoader.loadSongs(); + return 1; + } + return 0; + }) + ) + .then(literal("play") + .then(argument("song", StringArgumentType.greedyString()) + .suggests((context, builder) -> CommandSource.suggestMatching(SongLoader.SONG_SUGGESTIONS, builder)) + .executes(context -> { + if (!isLoading(context)) { + String songName = StringArgumentType.getString(context, "song"); + Optional song = SongLoader.SONGS.stream().filter(input -> input.displayName.equals(songName)).findAny(); + if (song.isPresent()) { + Main.SONG_PLAYER.start(song.get()); + return 1; + } + context.getSource().sendError(Text.translatable(Main.MOD_ID+".song_not_found", songName)); + return 0; + } + return 0; + }) + ) + ) + .then(literal("stop") + .executes(context -> { + if (Main.SONG_PLAYER.running) { + Main.SONG_PLAYER.stop(); + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID+".stopped_playing", Main.SONG_PLAYER.song)); + return 1; + } + context.getSource().sendError(Text.translatable(Main.MOD_ID+".not_playing")); + return 0; + }) + ) + .then(literal("speed") + .then(argument("speed", FloatArgumentType.floatArg(0.0001F, 15.0F)) + .suggests((context, builder) -> CommandSource.suggestMatching(Arrays.asList("0.5", "0.75", "1", "1.25", "1.5", "2"), builder)) + .executes(context -> { + float newSpeed = FloatArgumentType.getFloat(context, "speed"); + Main.SONG_PLAYER.speed = newSpeed; + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".speed_changed", Main.SONG_PLAYER.speed)); + return 0; + }) + ) + ) + .then(literal("info") + .executes(context -> { + + if (!Main.SONG_PLAYER.running) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".info_not_running", Main.SONG_PLAYER.speed)); + return 0; + } + if (!Main.SONG_PLAYER.tuned) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".info_tuning", Main.SONG_PLAYER.song.displayName, Main.SONG_PLAYER.speed)); + return 0; + }else if(!Main.SONG_PLAYER.didSongReachEnd) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".info_playing", formatTimestamp((int) Main.SONG_PLAYER.getSongElapsedSeconds()), formatTimestamp((int) Main.SONG_PLAYER.song.getLengthInSeconds()), Main.SONG_PLAYER.song.displayName, Main.SONG_PLAYER.speed)); + return 0; + }else { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".info_finished", Main.SONG_PLAYER.song != null ? Main.SONG_PLAYER.song.displayName : "???", Main.SONG_PLAYER.speed)); + return 0; + } + }) + ) + .then(literal("remapInstruments") + .executes(context -> { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".instrument_info")); + return 0; + }) + .then(literal("map") + .then(argument("originalInstrument", StringArgumentType.word()) + .suggests((context, builder) -> CommandSource.suggestMatching(instrumentNamesAndAll, builder)) + .then(argument("newInstrument", StringArgumentType.word()) + .suggests((context, builder) -> CommandSource.suggestMatching(instrumentNamesAndNothing, builder)) + .executes(context -> { + String originalInstrumentStr = StringArgumentType.getString(context, "originalInstrument"); + String newInstrumentStr = StringArgumentType.getString(context, "newInstrument"); + @Nullable NoteBlockInstrument originalInstrument = null, newInstrument = null; + for(NoteBlockInstrument maybeInstrument : NoteBlockInstrument.values()) { + if(maybeInstrument.toString().equalsIgnoreCase(originalInstrumentStr)) { + originalInstrument = maybeInstrument; + } + if(maybeInstrument.toString().equalsIgnoreCase(newInstrumentStr)) { + newInstrument = maybeInstrument; + } + } + + if(originalInstrument == null && !originalInstrumentStr.equalsIgnoreCase("all")) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".invalid_instrument", originalInstrumentStr)); + return 0; + } + + if(newInstrument == null && !newInstrumentStr.equalsIgnoreCase("nothing")) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".invalid_instrument", newInstrumentStr)); + return 0; + } + + // (originalInstrument == null) means: all instruments + // (newInstrument == null) means: nothing (represented by null in hashmap, so no special handling below) + + if(originalInstrument == null) { + // All instruments + for(NoteBlockInstrument instrument : NoteBlockInstrument.values()) { + Main.SONG_PLAYER.instrumentMap.put(instrument, newInstrument); + } + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".instrument_mapped_all", newInstrumentStr.toLowerCase())); + }else { + Main.SONG_PLAYER.instrumentMap.put(originalInstrument, newInstrument); + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".instrument_mapped", originalInstrumentStr.toLowerCase(), newInstrumentStr.toLowerCase())); + } + return 1; + }) + ) + ) + ) + .then(literal("unmap") + .then(argument("instrument", StringArgumentType.word()) + .suggests((context, builder) -> CommandSource.suggestMatching(instrumentNames, builder)) + .executes(context -> { + String instrumentStr = StringArgumentType.getString(context, "instrument"); + + NoteBlockInstrument instrument = null; + for(NoteBlockInstrument maybeInstrument : NoteBlockInstrument.values()) { + if(maybeInstrument.toString().equalsIgnoreCase(instrumentStr)) { + instrument = maybeInstrument; + break; + } + } + + if(instrument == null) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".invalid_instrument", instrumentStr)); + return 0; + } + + Main.SONG_PLAYER.instrumentMap.remove(instrument); + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".instrument_unmapped", instrumentStr.toLowerCase())); + return 1; + }) + ) + ) + .then(literal("show") + .executes(context -> { + if(Main.SONG_PLAYER.instrumentMap.isEmpty()) { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".no_mapped_instruments")); + return 1; + } + + StringBuilder maps = new StringBuilder(); + for(Map.Entry entry : Main.SONG_PLAYER.instrumentMap.entrySet()) { + if(maps.length() > 0) { + maps.append(", "); + } + maps + .append(entry.getKey().toString().toLowerCase()) + .append("->") + .append(entry.getValue() == null ? "nothing" : entry.getValue().toString().toLowerCase()); + } + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".mapped_instruments", maps.toString())); + return 1; + }) + ) + .then(literal("clear") + .executes(context -> { + Main.SONG_PLAYER.instrumentMap.clear(); + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".instrument_maps_cleared")); + return 1; + }) + ) + ) + + .then(literal("loop") + .executes(context -> { + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".loop_status", Main.SONG_PLAYER.loopSong ? "yes" : "no")); + return 1; + }) + .then(literal("yes") + .executes(context -> { + Main.SONG_PLAYER.loopSong = true; + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".loop_enabled")); + return 1; + })) + .then(literal("no") + .executes(context -> { + Main.SONG_PLAYER.loopSong = false; + context.getSource().sendFeedback(Text.translatable(Main.MOD_ID + ".loop_disabled")); + return 1; + })) + ) + ); + } + + private static boolean isLoading(CommandContext context) { + if (SongLoader.loadingSongs) { + context.getSource().sendError(Text.translatable(Main.MOD_ID + ".still_loading")); + SongLoader.showToast = true; + return true; + } + return false; + } + + private static String padZeroes(int number, int length) { + StringBuilder builder = new StringBuilder("" + number); + while(builder.length() < length) + builder.insert(0, '0'); + return builder.toString(); + } + + private static String formatTimestamp(int seconds) { + return padZeroes(seconds / 60, 2) + ":" + padZeroes(seconds % 60, 2); + } +} diff --git a/src/main/java/semmiedev/disc_jockey/Main.java b/src/main/java/semmiedev/disc_jockey/Main.java new file mode 100644 index 0000000..19086dd --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/Main.java @@ -0,0 +1,90 @@ +package semmiedev.disc_jockey; + +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.ConfigHolder; +import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents; +import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; +import net.fabricmc.loader.api.FabricLoader; +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.text.MutableText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.lwjgl.glfw.GLFW; +import semmiedev.disc_jockey.gui.hud.BlocksOverlay; +import semmiedev.disc_jockey.gui.screen.DiscJockeyScreen; + +import java.io.File; +import java.util.ArrayList; + +public class Main implements ClientModInitializer { + public static final String MOD_ID = "disc_jockey"; + public static final MutableText NAME = Text.literal("Disc Jockey"); + public static final Logger LOGGER = LogManager.getLogger("Disc Jockey"); + public static final ArrayList TICK_LISTENERS = new ArrayList<>(); + public static final Previewer PREVIEWER = new Previewer(); + public static final SongPlayer SONG_PLAYER = new SongPlayer(); + + public static File songsFolder; + public static Config config; + public static ConfigHolder configHolder; + + @Override + public void onInitializeClient() { + configHolder = AutoConfig.register(Config.class, JanksonConfigSerializer::new); + config = configHolder.getConfig(); + + songsFolder = new File(FabricLoader.getInstance().getConfigDir()+File.separator+MOD_ID+File.separator+"songs"); + if (!songsFolder.isDirectory()) songsFolder.mkdirs(); + + SongLoader.loadSongs(); + + KeyBinding openScreenKeyBind = KeyBindingHelper.registerKeyBinding(new KeyBinding(MOD_ID+".key_bind.open_screen", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_J, "key.category."+MOD_ID)); + + ClientTickEvents.START_CLIENT_TICK.register(new ClientTickEvents.StartTick() { + private ClientWorld prevWorld; + + @Override + public void onStartTick(MinecraftClient client) { + if (prevWorld != client.world) { + PREVIEWER.stop(); + SONG_PLAYER.stop(); + } + prevWorld = client.world; + + if (openScreenKeyBind.wasPressed()) { + if (SongLoader.loadingSongs) { + client.inGameHud.getChatHud().addMessage(Text.translatable(Main.MOD_ID+".still_loading").formatted(Formatting.RED)); + SongLoader.showToast = true; + } else { + client.setScreen(new DiscJockeyScreen()); + } + } + } + }); + + ClientTickEvents.START_WORLD_TICK.register(world -> { + for (ClientTickEvents.StartWorldTick listener : TICK_LISTENERS) listener.onStartTick(world); + }); + + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> { + DiscjockeyCommand.register(dispatcher); + }); + + ClientLoginConnectionEvents.DISCONNECT.register((handler, client) -> { + PREVIEWER.stop(); + SONG_PLAYER.stop(); + }); + + HudRenderCallback.EVENT.register(BlocksOverlay::render); + } +} diff --git a/src/main/java/semmiedev/disc_jockey/ModMenuIntegration.java b/src/main/java/semmiedev/disc_jockey/ModMenuIntegration.java new file mode 100644 index 0000000..5b003fe --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/ModMenuIntegration.java @@ -0,0 +1,12 @@ +package semmiedev.disc_jockey; + +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; +import me.shedaniel.autoconfig.AutoConfig; + +public class ModMenuIntegration implements ModMenuApi { + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return parent -> AutoConfig.getConfigScreen(Config.class, parent).get(); + } +} diff --git a/src/main/java/semmiedev/disc_jockey/Note.java b/src/main/java/semmiedev/disc_jockey/Note.java new file mode 100644 index 0000000..1653780 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/Note.java @@ -0,0 +1,54 @@ +package semmiedev.disc_jockey; + +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.enums.NoteBlockInstrument; + +import java.util.HashMap; + +public record Note(NoteBlockInstrument instrument, byte note) { + public static final HashMap INSTRUMENT_BLOCKS = new HashMap<>(); + + public static final byte LAYER_SHIFT = Short.SIZE; + public static final byte INSTRUMENT_SHIFT = Short.SIZE * 2; + public static final byte NOTE_SHIFT = Short.SIZE * 2 + Byte.SIZE; + + public static final NoteBlockInstrument[] INSTRUMENTS = new NoteBlockInstrument[]{ + NoteBlockInstrument.HARP, + NoteBlockInstrument.BASS, + NoteBlockInstrument.BASEDRUM, + NoteBlockInstrument.SNARE, + NoteBlockInstrument.HAT, + NoteBlockInstrument.GUITAR, + NoteBlockInstrument.FLUTE, + NoteBlockInstrument.BELL, + NoteBlockInstrument.CHIME, + NoteBlockInstrument.XYLOPHONE, + NoteBlockInstrument.IRON_XYLOPHONE, + NoteBlockInstrument.COW_BELL, + NoteBlockInstrument.DIDGERIDOO, + NoteBlockInstrument.BIT, + NoteBlockInstrument.BANJO, + NoteBlockInstrument.PLING + + }; + + static { + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.HARP, Blocks.AIR); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BASEDRUM, Blocks.STONE); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.SNARE, Blocks.SAND); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.HAT, Blocks.GLASS); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BASS, Blocks.OAK_PLANKS); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.FLUTE, Blocks.CLAY); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BELL, Blocks.GOLD_BLOCK); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.GUITAR, Blocks.WHITE_WOOL); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.CHIME, Blocks.PACKED_ICE); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.XYLOPHONE, Blocks.BONE_BLOCK); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.IRON_XYLOPHONE, Blocks.IRON_BLOCK); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.COW_BELL, Blocks.SOUL_SAND); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.DIDGERIDOO, Blocks.PUMPKIN); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BIT, Blocks.EMERALD_BLOCK); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BANJO, Blocks.HAY_BLOCK); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.PLING, Blocks.GLOWSTONE); + } +} diff --git a/src/main/java/semmiedev/disc_jockey/Previewer.java b/src/main/java/semmiedev/disc_jockey/Previewer.java new file mode 100644 index 0000000..572e716 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/Previewer.java @@ -0,0 +1,48 @@ +package semmiedev.disc_jockey; + +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.util.math.Vec3d; + +public class Previewer implements ClientTickEvents.StartWorldTick { + public boolean running; + + private int i; + private float tick; + private Song song; + + public void start(Song song) { + this.song = song; + Main.TICK_LISTENERS.add(this); + running = true; + } + + public void stop() { + MinecraftClient.getInstance().send(() -> Main.TICK_LISTENERS.remove(this)); + running = false; + i = 0; + tick = 0; + } + + @Override + public void onStartTick(ClientWorld world) { + while (running) { + long note = song.notes[i]; + if ((short)note == Math.round(tick)) { + Vec3d pos = MinecraftClient.getInstance().gameRenderer.getCamera().getPos(); + world.playSound(pos.x, pos.y, pos.z, Note.INSTRUMENTS[(byte)(note >> Note.INSTRUMENT_SHIFT)].getSound().value(), SoundCategory.RECORDS, 3, (float)Math.pow(2.0, ((byte)(note >> Note.NOTE_SHIFT) - 12) / 12.0), false); + i++; + if (i >= song.notes.length) { + stop(); + break; + } + } else { + break; + } + } + + tick += song.tempo / 100f / 20f; + } +} diff --git a/src/main/java/semmiedev/disc_jockey/Song.java b/src/main/java/semmiedev/disc_jockey/Song.java new file mode 100644 index 0000000..fae4373 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/Song.java @@ -0,0 +1,43 @@ +package semmiedev.disc_jockey; + +import semmiedev.disc_jockey.gui.SongListWidget; + +import java.util.ArrayList; + +public class Song { + public final ArrayList uniqueNotes = new ArrayList<>(); + + public long[] notes = new long[0]; + + public short length, height, tempo, loopStartTick; + public String fileName, name, author, originalAuthor, description, displayName; + public byte autoSaving, autoSavingDuration, timeSignature, vanillaInstrumentCount, formatVersion, loop, maxLoopCount; + public int minutesSpent, leftClicks, rightClicks, blocksAdded, blocksRemoved; + public String importFileName; + + public SongListWidget.SongEntry entry; + public String searchableFileName, searchableName; + + @Override + public String toString() { + return displayName; + } + + public double millisecondsToTicks(long milliseconds) { + // From NBS Format: The tempo of the song multiplied by 100 (for example, 1225 instead of 12.25). Measured in ticks per second. + double songSpeed = (tempo / 100.0) / 20.0; // 20 Ticks per second (temp / 100 = 20) would be 1x speed + double oneMsTo20TickFraction = 1.0 / 50.0; + return milliseconds * oneMsTo20TickFraction * songSpeed; + } + + public double ticksToMilliseconds(double ticks) { + double songSpeed = (tempo / 100.0) / 20.0; + double oneMsTo20TickFraction = 1.0 / 50.0; + return ticks / oneMsTo20TickFraction / songSpeed; + } + + public double getLengthInSeconds() { + return ticksToMilliseconds(length) / 1000.0; + } + +} diff --git a/src/main/java/semmiedev/disc_jockey/SongLoader.java b/src/main/java/semmiedev/disc_jockey/SongLoader.java new file mode 100644 index 0000000..5e0e44b --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/SongLoader.java @@ -0,0 +1,130 @@ +package semmiedev.disc_jockey; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.toast.SystemToast; +import net.minecraft.text.Text; +import semmiedev.disc_jockey.gui.SongListWidget; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; + +public class SongLoader { + public static final ArrayList SONGS = new ArrayList<>(); + public static final ArrayList SONG_SUGGESTIONS = new ArrayList<>(); + public static volatile boolean loadingSongs; + public static volatile boolean showToast; + + public static void loadSongs() { + if (loadingSongs) return; + new Thread(() -> { + loadingSongs = true; + SONGS.clear(); + SONG_SUGGESTIONS.clear(); + SONG_SUGGESTIONS.add("Songs are loading, please wait"); + for (File file : Main.songsFolder.listFiles()) { + Song song = null; + try { + song = loadSong(file); + } catch (Exception exception) { + Main.LOGGER.error("Unable to read or parse song {}", file.getName(), exception); + } + if (song != null) SONGS.add(song); + } + for (Song song : SONGS) SONG_SUGGESTIONS.add(song.displayName); + Main.config.favorites.removeIf(favorite -> SongLoader.SONGS.stream().map(song -> song.fileName).noneMatch(favorite::equals)); + + if (showToast && MinecraftClient.getInstance().textRenderer != null) SystemToast.add(MinecraftClient.getInstance().getToastManager(), SystemToast.Type.PACK_LOAD_FAILURE, Main.NAME, Text.translatable(Main.MOD_ID+".loading_done")); + showToast = true; + loadingSongs = false; + }).start(); + } + + public static Song loadSong(File file) throws IOException { + if (file.isFile()) { + BinaryReader reader = new BinaryReader(Files.newInputStream(file.toPath())); + Song song = new Song(); + + song.fileName = file.getName().replaceAll("[\\n\\r]", ""); + + song.length = reader.readShort(); + + boolean newFormat = song.length == 0; + if (newFormat) { + song.formatVersion = reader.readByte(); + song.vanillaInstrumentCount = reader.readByte(); + song.length = reader.readShort(); + } + + song.height = reader.readShort(); + song.name = reader.readString().replaceAll("[\\n\\r]", ""); + song.author = reader.readString().replaceAll("[\\n\\r]", ""); + song.originalAuthor = reader.readString().replaceAll("[\\n\\r]", ""); + song.description = reader.readString().replaceAll("[\\n\\r]", ""); + song.tempo = reader.readShort(); + song.autoSaving = reader.readByte(); + song.autoSavingDuration = reader.readByte(); + song.timeSignature = reader.readByte(); + song.minutesSpent = reader.readInt(); + song.leftClicks = reader.readInt(); + song.rightClicks = reader.readInt(); + song.blocksAdded = reader.readInt(); + song.blocksRemoved = reader.readInt(); + song.importFileName = reader.readString().replaceAll("[\\n\\r]", ""); + + if (newFormat) { + song.loop = reader.readByte(); + song.maxLoopCount = reader.readByte(); + song.loopStartTick = reader.readShort(); + } + + song.displayName = song.name.replaceAll("\\s", "").isEmpty() ? song.fileName : song.name+" ("+song.fileName+")"; + song.entry = new SongListWidget.SongEntry(song, SONGS.size()); + song.entry.favorite = Main.config.favorites.contains(song.fileName); + song.searchableFileName = song.fileName.toLowerCase().replaceAll("\\s", ""); + song.searchableName = song.name.toLowerCase().replaceAll("\\s", ""); + + short tick = -1; + short jumps; + while ((jumps = reader.readShort()) != 0) { + tick += jumps; + short layer = -1; + while ((jumps = reader.readShort()) != 0) { + layer += jumps; + + byte instrumentId = reader.readByte(); + byte noteId = (byte)(reader.readByte() - 33); + + if (newFormat) { + // Data that is not needed as it only works with commands + reader.readByte(); // Velocity + reader.readByte(); // Panning + reader.readShort(); // Pitch + } + + if (noteId < 0) { + noteId = 0; + } else if (noteId > 24) { + noteId = 24; + } + + Note note = new Note(Note.INSTRUMENTS[instrumentId], noteId); + if (!song.uniqueNotes.contains(note)) song.uniqueNotes.add(note); + + song.notes = Arrays.copyOf(song.notes, song.notes.length + 1); + song.notes[song.notes.length - 1] = tick | layer << Note.LAYER_SHIFT | (long)instrumentId << Note.INSTRUMENT_SHIFT | (long)noteId << Note.NOTE_SHIFT; + } + } + + return song; + } + return null; + } + + public static void sort() { + SONGS.sort(Comparator.comparing(song -> song.displayName)); + } +} diff --git a/src/main/java/semmiedev/disc_jockey/SongPlayer.java b/src/main/java/semmiedev/disc_jockey/SongPlayer.java new file mode 100644 index 0000000..de45916 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/SongPlayer.java @@ -0,0 +1,516 @@ +package semmiedev.disc_jockey; + +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.enums.NoteBlockInstrument; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.ChatHud; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.client.network.PlayerListEntry; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; +import net.minecraft.state.property.Properties; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Hand; +import net.minecraft.util.Pair; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.*; +import net.minecraft.world.GameMode; +import org.apache.commons.lang3.NotImplementedException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +public class SongPlayer implements ClientTickEvents.StartWorldTick { + private static boolean warned; + public boolean running; + public Song song; + + private int index; + private double tick; // Aka song position + private HashMap> noteBlocks = null; + public boolean tuned; + private long lastPlaybackTickAt = -1L; + + // Used to check and enforce packet rate limits to not get kicked + private long last100MsSpanAt = -1L; + private int last100MsSpanEstimatedPackets = 0; + // At how many packets/100ms should the player just reduce / stop sending packets for a while + final private int last100MsReducePacketsAfter = 300 / 10, last100MsStopPacketsAfter = 450 / 10; + // If higher than current millis, don't send any packets of this kind (temp disable) + private long reducePacketsUntil = -1L, stopPacketsUntil = -1L; + + // Use to limit swings and look to only each tick. More will not be visually visible anyway due to interpolation + private long lastLookSentAt = -1L, lastSwingSentAt = -1L; + + // The thread executing the tickPlayback method + private Thread playbackThread = null; + public long playbackLoopDelay = 5; + // Just for external debugging purposes + public HashMap missingInstrumentBlocks = new HashMap<>(); + public float speed = 1.0f; // Toy + + private long lastInteractAt = -1; + private float availableInteracts = 8; + private int tuneInitialUntunedBlocks = -1; + private HashMap> notePredictions = new HashMap<>(); + public boolean didSongReachEnd = false; + public boolean loopSong = false; + private long pausePlaybackUntil = -1L; // Set after tuning, if configured + + public SongPlayer() { + Main.TICK_LISTENERS.add(this); + } + + public @NotNull HashMap instrumentMap = new HashMap<>(); // Toy + public synchronized void startPlaybackThread() { + if(Main.config.disableAsyncPlayback) { + playbackThread = null; + return; + } + + this.playbackThread = new Thread(() -> { + Thread ownThread = this.playbackThread; + while(ownThread == this.playbackThread) { + try { + // Accuracy doesn't really matter at this precision imo + Thread.sleep(playbackLoopDelay); + }catch (Exception ex) { + ex.printStackTrace(); + } + tickPlayback(); + } + }); + this.playbackThread.start(); + } + + public synchronized void stopPlaybackThread() { + this.playbackThread = null; // Should stop on its own then + } + + public synchronized void start(Song song) { + if (!Main.config.hideWarning && !warned) { + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.translatable("disc_jockey.warning").formatted(Formatting.BOLD, Formatting.RED)); + warned = true; + return; + } + if (running) stop(); + this.song = song; + //Main.LOGGER.info("Song length: " + song.length + " and tempo " + song.tempo); + //Main.TICK_LISTENERS.add(this); + if(this.playbackThread == null) startPlaybackThread(); + running = true; + lastPlaybackTickAt = System.currentTimeMillis(); + last100MsSpanAt = System.currentTimeMillis(); + last100MsSpanEstimatedPackets = 0; + reducePacketsUntil = -1L; + stopPacketsUntil = -1L; + lastLookSentAt = -1L; + lastSwingSentAt = -1L; + missingInstrumentBlocks.clear(); + didSongReachEnd = false; + } + + public synchronized void stop() { + //MinecraftClient.getInstance().send(() -> Main.TICK_LISTENERS.remove(this)); + stopPlaybackThread(); + running = false; + index = 0; + tick = 0; + noteBlocks = null; + notePredictions.clear(); + tuned = false; + tuneInitialUntunedBlocks = -1; + lastPlaybackTickAt = -1L; + last100MsSpanAt = -1L; + last100MsSpanEstimatedPackets = 0; + reducePacketsUntil = -1L; + stopPacketsUntil = -1L; + lastLookSentAt = -1L; + lastSwingSentAt = -1L; + didSongReachEnd = false; // Change after running stop() if actually ended cleanly + } + + public synchronized void tickPlayback() { + if (!running) { + lastPlaybackTickAt = -1L; + last100MsSpanAt = -1L; + return; + } + long previousPlaybackTickAt = lastPlaybackTickAt; + lastPlaybackTickAt = System.currentTimeMillis(); + if(last100MsSpanAt != -1L && System.currentTimeMillis() - last100MsSpanAt >= 100) { + last100MsSpanEstimatedPackets = 0; + last100MsSpanAt = System.currentTimeMillis(); + }else if (last100MsSpanAt == -1L) { + last100MsSpanAt = System.currentTimeMillis(); + last100MsSpanEstimatedPackets = 0; + } + if(noteBlocks != null && tuned) { + if(pausePlaybackUntil != -1L && System.currentTimeMillis() <= pausePlaybackUntil) return; + while (running) { + MinecraftClient client = MinecraftClient.getInstance(); + GameMode gameMode = client.interactionManager == null ? null : client.interactionManager.getCurrentGameMode(); + // In the best case, gameMode would only be queried in sync Ticks, no here + if (gameMode == null || !gameMode.isSurvivalLike()) { + client.inGameHud.getChatHud().addMessage(Text.translatable(Main.MOD_ID+".player.invalid_game_mode", gameMode == null ? "unknown" : gameMode.getTranslatableName()).formatted(Formatting.RED)); + stop(); + return; + } + + long note = song.notes[index]; + final long now = System.currentTimeMillis(); + if ((short)note <= Math.round(tick)) { + @Nullable BlockPos blockPos = noteBlocks.get(Note.INSTRUMENTS[(byte)(note >> Note.INSTRUMENT_SHIFT)]).get((byte)(note >> Note.NOTE_SHIFT)); + if(blockPos == null) { + // Instrument got likely mapped to "nothing". Skip it + index++; + continue; + } + if (!canInteractWith(client.player, blockPos)) { + stop(); + client.inGameHud.getChatHud().addMessage(Text.translatable(Main.MOD_ID+".player.to_far").formatted(Formatting.RED)); + return; + } + Vec3d unit = Vec3d.ofCenter(blockPos, 0.5).subtract(client.player.getEyePos()).normalize(); + if((lastLookSentAt == -1L || now - lastLookSentAt >= 50) && last100MsSpanEstimatedPackets < last100MsReducePacketsAfter && (reducePacketsUntil == -1L || reducePacketsUntil < now)) { + client.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(MathHelper.wrapDegrees((float) (MathHelper.atan2(unit.z, unit.x) * 57.2957763671875) - 90.0f), MathHelper.wrapDegrees((float) (-(MathHelper.atan2(unit.y, Math.sqrt(unit.x * unit.x + unit.z * unit.z)) * 57.2957763671875))), true, false)); + last100MsSpanEstimatedPackets++; + lastLookSentAt = now; + }else if(last100MsSpanEstimatedPackets >= last100MsReducePacketsAfter){ + reducePacketsUntil = Math.max(reducePacketsUntil, now + 500); + } + if(last100MsSpanEstimatedPackets < last100MsStopPacketsAfter && (stopPacketsUntil == -1L || stopPacketsUntil < now)) { + // TODO: 5/30/2022 Check if the block needs tuning + //client.interactionManager.attackBlock(blockPos, Direction.UP); + client.player.networkHandler.sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, blockPos, Direction.UP, 0)); + last100MsSpanEstimatedPackets++; + }else if(last100MsSpanEstimatedPackets >= last100MsStopPacketsAfter) { + Main.LOGGER.info("Stopping all packets for a bit!"); + stopPacketsUntil = Math.max(stopPacketsUntil, now + 250); + reducePacketsUntil = Math.max(reducePacketsUntil, now + 10000); + } + if(last100MsSpanEstimatedPackets < last100MsReducePacketsAfter && (reducePacketsUntil == -1L || reducePacketsUntil < now)) { + client.player.networkHandler.sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, blockPos, Direction.UP, 0)); + last100MsSpanEstimatedPackets++; + }else if(last100MsSpanEstimatedPackets >= last100MsReducePacketsAfter){ + reducePacketsUntil = Math.max(reducePacketsUntil, now + 500); + } + if((lastSwingSentAt == -1L || now - lastSwingSentAt >= 50) &&last100MsSpanEstimatedPackets < last100MsReducePacketsAfter && (reducePacketsUntil == -1L || reducePacketsUntil < now)) { + client.executeSync(() -> client.player.swingHand(Hand.MAIN_HAND)); + lastSwingSentAt = now; + last100MsSpanEstimatedPackets++; + }else if(last100MsSpanEstimatedPackets >= last100MsReducePacketsAfter){ + reducePacketsUntil = Math.max(reducePacketsUntil, now + 500); + } + + index++; + if (index >= song.notes.length) { + stop(); + didSongReachEnd = true; + if(loopSong) { + start(song); + } + break; + } + } else { + break; + } + } + + if(running) { // Might not be running anymore (prevent small offset on song, even if that is not played anymore) + long elapsedMs = previousPlaybackTickAt != -1L && lastPlaybackTickAt != -1L ? lastPlaybackTickAt - previousPlaybackTickAt : (16); // Assume 16ms if unknown + tick += song.millisecondsToTicks(elapsedMs) * speed; + } + } + } + + // TODO: 6/2/2022 Play note blocks every song tick, instead of every tick. That way the song will sound better + // 11/1/2023 Playback now done in separate thread. Not ideal but better especially when FPS are low. + @Override + public void onStartTick(ClientWorld world) { + MinecraftClient client = MinecraftClient.getInstance(); + if(world == null || client.world == null || client.player == null) return; + if(song == null || !running) return; + + // Clear outdated note predictions + ArrayList outdatedPredictions = new ArrayList<>(); + for(Map.Entry> entry : notePredictions.entrySet()) { + if(entry.getValue().getRight() < System.currentTimeMillis()) + outdatedPredictions.add(entry.getKey()); + } + for(BlockPos outdatedPrediction : outdatedPredictions) notePredictions.remove(outdatedPrediction); + + if (noteBlocks == null) { + noteBlocks = new HashMap<>(); + + ClientPlayerEntity player = client.player; + + // Create list of available noteblock positions per used instrument + HashMap> noteblocksForInstrument = new HashMap<>(); + for(NoteBlockInstrument instrument : NoteBlockInstrument.values()) + noteblocksForInstrument.put(instrument, new ArrayList<>()); + final Vec3d playerEyePos = player.getEyePos(); + + final int maxOffset; // Rough estimates, of which blocks could be in reach + if(Main.config.expectedServerVersion == Config.ExpectedServerVersion.v1_20_4_Or_Earlier) { + maxOffset = 7; + }else if(Main.config.expectedServerVersion == Config.ExpectedServerVersion.v1_20_5_Or_Later) { + maxOffset = (int) Math.ceil(player.getBlockInteractionRange() + 1.0 + 1.0); + }else if(Main.config.expectedServerVersion == Config.ExpectedServerVersion.All) { + maxOffset = Math.min(7, (int) Math.ceil(player.getBlockInteractionRange() + 1.0 + 1.0)); + }else { + throw new NotImplementedException("ExpectedServerVersion Value not implemented: " + Main.config.expectedServerVersion.name()); + } + final ArrayList orderedOffsets = new ArrayList<>(); + for(int offset = 0; offset <= maxOffset; offset++) { + orderedOffsets.add(offset); + if(offset != 0) orderedOffsets.add(offset * -1); + } + + for(NoteBlockInstrument instrument : noteblocksForInstrument.keySet().toArray(new NoteBlockInstrument[0])) { + for (int y : orderedOffsets) { + for (int x : orderedOffsets) { + for (int z : orderedOffsets) { + Vec3d vec3d = playerEyePos.add(x, y, z); + BlockPos blockPos = new BlockPos(MathHelper.floor(vec3d.x), MathHelper.floor(vec3d.y), MathHelper.floor(vec3d.z)); + if (!canInteractWith(player, blockPos)) + continue; + BlockState blockState = world.getBlockState(blockPos); + if (!blockState.isOf(Blocks.NOTE_BLOCK) || !world.isAir(blockPos.up())) + continue; + + if (blockState.get(Properties.INSTRUMENT) == instrument) + noteblocksForInstrument.get(instrument).add(blockPos); + } + } + } + } + + // Remap instruments for funzies + if(!instrumentMap.isEmpty()) { + HashMap> newNoteblocksForInstrument = new HashMap<>(); + for(NoteBlockInstrument orig : noteblocksForInstrument.keySet()) { + NoteBlockInstrument mappedInstrument = instrumentMap.getOrDefault(orig, orig); + if(mappedInstrument == null) { + // Instrument got likely mapped to "nothing" + newNoteblocksForInstrument.put(orig, null); + continue; + } + + newNoteblocksForInstrument.put(orig, noteblocksForInstrument.getOrDefault(instrumentMap.getOrDefault(orig, orig), new ArrayList<>())); + } + noteblocksForInstrument = newNoteblocksForInstrument; + } + + // Find fitting noteblocks with the least amount of adjustments required (to reduce tuning time) + ArrayList capturedNotes = new ArrayList<>(); + for(Note note : song.uniqueNotes) { + ArrayList availableBlocks = noteblocksForInstrument.get(note.instrument()); + if(availableBlocks == null) { + // Note was mapped to "nothing". Pretend it got captured, but just ignore it + capturedNotes.add(note); + getNotes(note.instrument()).put(note.note(), null); + continue; + } + BlockPos bestBlockPos = null; + int bestBlockTuningSteps = Integer.MAX_VALUE; + for(BlockPos blockPos : availableBlocks) { + int wantedNote = note.note(); + int currentNote = client.world.getBlockState(blockPos).get(Properties.NOTE); + int tuningSteps = wantedNote >= currentNote ? wantedNote - currentNote : (25 - currentNote) + wantedNote; + + if(tuningSteps < bestBlockTuningSteps) { + bestBlockPos = blockPos; + bestBlockTuningSteps = tuningSteps; + } + } + + if(bestBlockPos != null) { + capturedNotes.add(note); + availableBlocks.remove(bestBlockPos); + getNotes(note.instrument()).put(note.note(), bestBlockPos); + } // else will be a missing note + } + + ArrayList missingNotes = new ArrayList<>(song.uniqueNotes); + missingNotes.removeAll(capturedNotes); + if (!missingNotes.isEmpty()) { + ChatHud chatHud = MinecraftClient.getInstance().inGameHud.getChatHud(); + chatHud.addMessage(Text.translatable(Main.MOD_ID+".player.invalid_note_blocks").formatted(Formatting.RED)); + + HashMap missing = new HashMap<>(); + for (Note note : missingNotes) { + NoteBlockInstrument mappedInstrument = instrumentMap.getOrDefault(note.instrument(), note.instrument()); + if(mappedInstrument == null) continue; // Ignore if mapped to nothing + Block block = Note.INSTRUMENT_BLOCKS.get(mappedInstrument); + Integer got = missing.get(block); + if (got == null) got = 0; + missing.put(block, got + 1); + } + + missingInstrumentBlocks = missing; + missing.forEach((block, integer) -> chatHud.addMessage(Text.literal(block.getName().getString()+" × "+integer).formatted(Formatting.RED))); + stop(); + } + } else if (!tuned) { + //tuned = true; + + int ping = 0; + { + PlayerListEntry playerListEntry; + if (client.getNetworkHandler() != null && (playerListEntry = client.getNetworkHandler().getPlayerListEntry(client.player.getGameProfile().getId())) != null) + ping = playerListEntry.getLatency(); + } + + if(lastInteractAt != -1L) { + // Paper allows 8 interacts per 300 ms (actually 9 it turns out, but lets keep it a bit lower anyway) + availableInteracts += ((System.currentTimeMillis() - lastInteractAt) / (310.0f / 8.0f)); + availableInteracts = Math.min(8f, Math.max(0f, availableInteracts)); + }else { + availableInteracts = 8f; + lastInteractAt = System.currentTimeMillis(); + } + + int fullyTunedBlocks = 0; + HashMap untunedNotes = new HashMap<>(); + for (Note note : song.uniqueNotes) { + if(noteBlocks == null || noteBlocks.get(note.instrument()) == null) + continue; + BlockPos blockPos = noteBlocks.get(note.instrument()).get(note.note()); + if(blockPos == null) continue; + BlockState blockState = world.getBlockState(blockPos); + int assumedNote = notePredictions.containsKey(blockPos) ? notePredictions.get(blockPos).getLeft() : blockState.get(Properties.NOTE); + + if (blockState.contains(Properties.NOTE)) { + if(assumedNote == note.note() && blockState.get(Properties.NOTE) == note.note()) + fullyTunedBlocks++; + if (assumedNote != note.note()) { + if (!canInteractWith(client.player, blockPos)) { + stop(); + client.inGameHud.getChatHud().addMessage(Text.translatable(Main.MOD_ID+".player.to_far").formatted(Formatting.RED)); + return; + } + untunedNotes.put(blockPos, blockState.get(Properties.NOTE)); + } + } else { + noteBlocks = null; + break; + } + } + + if(tuneInitialUntunedBlocks == -1 || tuneInitialUntunedBlocks < untunedNotes.size()) + tuneInitialUntunedBlocks = untunedNotes.size(); + + int existingUniqueNotesCount = 0; + for(Note n : song.uniqueNotes) { + if(noteBlocks.get(n.instrument()).get(n.note()) != null) + existingUniqueNotesCount++; + } + + if(untunedNotes.isEmpty() && fullyTunedBlocks == existingUniqueNotesCount) { + // Wait roundrip + 100ms before considering tuned after changing notes (in case the server rejects an interact) + if(lastInteractAt == -1 || System.currentTimeMillis() - lastInteractAt >= ping * 2 + 100) { + tuned = true; + pausePlaybackUntil = System.currentTimeMillis() + (long) (Math.abs(Main.config.delayPlaybackStartBySecs) * 1000); + tuneInitialUntunedBlocks = -1; + // Tuning finished + } + } + + BlockPos lastBlockPos = null; + int lastTunedNote = Integer.MIN_VALUE; + float roughTuneProgress = 1 - (untunedNotes.size() / Math.max(tuneInitialUntunedBlocks + 0f, 1f)); + while(availableInteracts >= 1f && untunedNotes.size() > 0) { + BlockPos blockPos = null; + int searches = 0; + while(blockPos == null) { + searches++; + // Find higher note + for (Map.Entry entry : untunedNotes.entrySet()) { + if (entry.getValue() > lastTunedNote) { + blockPos = entry.getKey(); + break; + } + } + // Find higher note or equal + if (blockPos == null) { + for (Map.Entry entry : untunedNotes.entrySet()) { + if (entry.getValue() >= lastTunedNote) { + blockPos = entry.getKey(); + break; + } + } + } + // Not found. Reset last note + if(blockPos == null) + lastTunedNote = Integer.MIN_VALUE; + if(blockPos == null && searches > 1) { + // Something went wrong. Take any note (one should at least exist here) + blockPos = untunedNotes.keySet().toArray(new BlockPos[0])[0]; + break; + } + } + if(blockPos == null) return; // Something went very, very wrong! + + lastTunedNote = untunedNotes.get(blockPos); + untunedNotes.remove(blockPos); + int assumedNote = notePredictions.containsKey(blockPos) ? notePredictions.get(blockPos).getLeft() : client.world.getBlockState(blockPos).get(Properties.NOTE); + notePredictions.put(blockPos, new Pair<>((assumedNote + 1) % 25, System.currentTimeMillis() + ping * 2 + 100)); + client.interactionManager.interactBlock(client.player, Hand.MAIN_HAND, new BlockHitResult(Vec3d.of(blockPos), Direction.UP, blockPos, false)); + lastInteractAt = System.currentTimeMillis(); + availableInteracts -= 1f; + lastBlockPos = blockPos; + } + if(lastBlockPos != null) { + // Turn head into spinning with time and lookup up further the further tuning is progressed + //client.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(((float) (System.currentTimeMillis() % 2000)) * (360f/2000f), (1 - roughTuneProgress) * 180 - 90, true)); + client.player.swingHand(Hand.MAIN_HAND); + } + }else if((playbackThread == null || !playbackThread.isAlive()) && running && Main.config.disableAsyncPlayback) { + // Sync playback (off by default). Replacement for playback thread + try { + tickPlayback(); + }catch (Exception ex) { + ex.printStackTrace(); + stop(); + } + } + } + + private HashMap getNotes(NoteBlockInstrument instrument) { + return noteBlocks.computeIfAbsent(instrument, k -> new HashMap<>()); + } + + // Before 1.20.5, the server limits interacts to 6 Blocks from Player Eye to Block Center + // With 1.20.5 and later, the server does a more complex check, to the closest point of a full block hitbox + // (max distance is BlockInteractRange + 1.0). + private boolean canInteractWith(ClientPlayerEntity player, BlockPos blockPos) { + final Vec3d eyePos = player.getEyePos(); + if(Main.config.expectedServerVersion == Config.ExpectedServerVersion.v1_20_4_Or_Earlier) { + return eyePos.squaredDistanceTo(blockPos.toCenterPos()) <= 6.0 * 6.0; + }else if(Main.config.expectedServerVersion == Config.ExpectedServerVersion.v1_20_5_Or_Later) { + double blockInteractRange = player.getBlockInteractionRange() + 1.0; + return new Box(blockPos).squaredMagnitude(eyePos) < blockInteractRange * blockInteractRange; + }else if(Main.config.expectedServerVersion == Config.ExpectedServerVersion.All) { + // Require both checks to succeed (aka use worst distance) + double blockInteractRange = player.getBlockInteractionRange() + 1.0; + return eyePos.squaredDistanceTo(blockPos.toCenterPos()) <= 6.0 * 6.0 + && new Box(blockPos).squaredMagnitude(eyePos) < blockInteractRange * blockInteractRange; + }else { + throw new NotImplementedException("ExpectedServerVersion Value not implemented: " + Main.config.expectedServerVersion.name()); + } + } + + public double getSongElapsedSeconds() { + if(song == null) return 0; + return song.ticksToMilliseconds(tick) / 1000; + } +} diff --git a/src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java b/src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java new file mode 100644 index 0000000..0b2f055 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java @@ -0,0 +1,108 @@ +package semmiedev.disc_jockey.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.widget.EntryListWidget; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; +import semmiedev.disc_jockey.Main; +import semmiedev.disc_jockey.Song; + +public class SongListWidget extends EntryListWidget { + private static final String FAVORITE_EMOJI = "收藏★"; + private static final String NOT_FAVORITE_EMOJI = "收藏☆"; + + public SongListWidget(MinecraftClient client, int width, int height, int top, int itemHeight) { + super(client, width, height, top, itemHeight); + } + + @Override + public int getRowWidth() { + return width - 40; + } + + @Override + protected int getScrollbarX() { + return width - 12; + } + + @Override + public void setSelected(@Nullable SongListWidget.SongEntry entry) { + SongListWidget.SongEntry selectedEntry = getSelectedOrNull(); + if (selectedEntry != null) selectedEntry.selected = false; + if (entry != null) entry.selected = true; + super.setSelected(entry); + } + + @Override + protected void appendClickableNarrations(NarrationMessageBuilder builder) { + // Who cares + } + + // TODO: 6/2/2022 Add a delete icon + public static class SongEntry extends Entry { + private static final Identifier ICONS = Identifier.of(Main.MOD_ID, "textures/gui/icons.png"); + + public final int index; + public final Song song; + + public boolean selected, favorite; + public SongListWidget songListWidget; + + private final MinecraftClient client = MinecraftClient.getInstance(); + + private int x, y, entryWidth, entryHeight; + + public SongEntry(Song song, int index) { + this.song = song; + this.index = index; + } + + @Override + public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { + this.x = x; this.y = y; this.entryWidth = entryWidth; this.entryHeight = entryHeight; + + if (selected) { + context.fill(x, y, x + entryWidth, y + entryHeight, 0xFFFFFF); + context.fill(x + 1, y + 1, x + entryWidth - 1, y + entryHeight - 1, 0x000000); + } + + context.drawCenteredTextWithShadow(client.textRenderer, song.displayName, x + entryWidth / 2, y + 5, selected ? 0xFFFFFF : 0x808080); + + String emoji = String.valueOf(favorite ? FAVORITE_EMOJI : NOT_FAVORITE_EMOJI); + context.drawTextWithShadow( + client.textRenderer, + emoji, + x + 2, y + 2, + favorite ? 0xFFD700 : 0x808080 + ); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (isOverFavoriteButton(mouseX, mouseY)) { + favorite = !favorite; + if (favorite) { + Main.config.favorites.add(song.fileName); + } else { + Main.config.favorites.remove(song.fileName); + } + return true; + } + songListWidget.setSelected(this); + return true; + } + + private boolean isOverFavoriteButton(double mouseX, double mouseY) { + int textWidth = client.textRenderer.getWidth(favorite ? FAVORITE_EMOJI : NOT_FAVORITE_EMOJI); + int textHeight = 8; + return mouseX > x + 2 && + mouseX < x + 2 + textWidth && + mouseY > y + 2 && + mouseY < y + 2 + textHeight; + } + } +} diff --git a/src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java b/src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java new file mode 100644 index 0000000..1e98d1e --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java @@ -0,0 +1,41 @@ +package semmiedev.disc_jockey.gui.hud; + +import net.minecraft.block.Blocks; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderTickCounter; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.ColorHelper; + +public class BlocksOverlay { + public static ItemStack[] itemStacks; + public static int[] amounts; + public static int amountOfNoteBlocks; + + private static final ItemStack NOTE_BLOCK = Blocks.NOTE_BLOCK.asItem().getDefaultStack(); + + public static void render(DrawContext context, RenderTickCounter tickCounter) { + if (itemStacks != null) { + context.fill(2, 2, 62, (itemStacks.length + 1) * 20 + 7, ColorHelper.getArgb(255, 22, 22, 27)); + context.fill(4, 4, 60, (itemStacks.length + 1) * 20 + 5, ColorHelper.getArgb(255, 42, 42, 47)); + + MinecraftClient client = MinecraftClient.getInstance(); + TextRenderer textRenderer = client.textRenderer; + ItemRenderer itemRenderer = client.getItemRenderer(); + + //textRenderer.draw(matrices, " × "+amountOfNoteBlocks, 26, 13, 0xFFFFFF); + context.drawText(textRenderer, " × "+amountOfNoteBlocks, 26, 13, 0xFFFFFF, true); + //itemRenderer.renderInGui(matrices, NOTE_BLOCK, 6, 6); + context.drawItem(NOTE_BLOCK, 6, 6); + + for (int i = 0; i < itemStacks.length; i++) { + //textRenderer.draw(matrices, " × "+amounts[i], 26, 13 + 20 * (i + 1), 0xFFFFFF); + context.drawText(textRenderer, " × "+amounts[i], 26, 13 + 20 * (i + 1), 0xFFFFFF, true); + //itemRenderer.renderInGui(matrices, itemStacks[i], 6, 6 + 20 * (i + 1)); + context.drawItem(itemStacks[i], 6, 6 + 20 * (i + 1)); + } + } + } +} diff --git a/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java b/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java new file mode 100644 index 0000000..83f7fe8 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java @@ -0,0 +1,201 @@ +package semmiedev.disc_jockey.gui.screen; + +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ConfirmScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.item.ItemStack; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import semmiedev.disc_jockey.Main; +import semmiedev.disc_jockey.Note; +import semmiedev.disc_jockey.Song; +import semmiedev.disc_jockey.SongLoader; +import semmiedev.disc_jockey.gui.SongListWidget; +import semmiedev.disc_jockey.gui.hud.BlocksOverlay; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +public class DiscJockeyScreen extends Screen { + private 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"), + PREVIEW = Text.translatable(Main.MOD_ID+".screen.preview"), + PREVIEW_STOP = Text.translatable(Main.MOD_ID+".screen.preview.stop"), + DROP_HINT = Text.translatable(Main.MOD_ID+".screen.drop_hint").formatted(Formatting.GRAY) + ; + + private SongListWidget songListWidget; + private ButtonWidget playButton, previewButton; + private boolean shouldFilter; + private String query = ""; + + public DiscJockeyScreen() { + super(Main.NAME); + } + + @Override + protected void init() { + shouldFilter = true; + songListWidget = new SongListWidget(client, width, height - 64 - 32, 32, 20); + addDrawableChild(songListWidget); + for (int i = 0; i < SongLoader.SONGS.size(); i++) { + Song song = SongLoader.SONGS.get(i); + song.entry.songListWidget = songListWidget; + if (song.entry.selected) songListWidget.setSelected(song.entry); + } + + playButton = ButtonWidget.builder(PLAY, button -> { + if (Main.SONG_PLAYER.running) { + Main.SONG_PLAYER.stop(); + } else { + SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull(); + if (entry != null) { + Main.SONG_PLAYER.start(entry.song); + client.setScreen(null); + } + } + }).dimensions(width / 2 - 160, height - 61, 100, 20).build(); + addDrawableChild(playButton); + + previewButton = ButtonWidget.builder(PREVIEW, button -> { + if (Main.PREVIEWER.running) { + Main.PREVIEWER.stop(); + } else { + SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull(); + if (entry != null) Main.PREVIEWER.start(entry.song); + } + }).dimensions(width / 2 - 50, height - 61, 100, 20).build(); + addDrawableChild(previewButton); + + addDrawableChild(ButtonWidget.builder(Text.translatable(Main.MOD_ID+".screen.blocks"), button -> { + // TODO: 6/2/2022 Add an auto build mode + if (BlocksOverlay.itemStacks == null) { + SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull(); + if (entry != null) { + client.setScreen(null); + + BlocksOverlay.itemStacks = new ItemStack[0]; + BlocksOverlay.amounts = new int[0]; + BlocksOverlay.amountOfNoteBlocks = entry.song.uniqueNotes.size(); + + for (Note note : entry.song.uniqueNotes) { + ItemStack itemStack = Note.INSTRUMENT_BLOCKS.get(note.instrument()).asItem().getDefaultStack(); + int index = -1; + + for (int i = 0; i < BlocksOverlay.itemStacks.length; i++) { + if (BlocksOverlay.itemStacks[i].getItem() == itemStack.getItem()) { + index = i; + break; + } + } + + if (index == -1) { + BlocksOverlay.itemStacks = Arrays.copyOf(BlocksOverlay.itemStacks, BlocksOverlay.itemStacks.length + 1); + BlocksOverlay.amounts = Arrays.copyOf(BlocksOverlay.amounts, BlocksOverlay.amounts.length + 1); + + BlocksOverlay.itemStacks[BlocksOverlay.itemStacks.length - 1] = itemStack; + BlocksOverlay.amounts[BlocksOverlay.amounts.length - 1] = 1; + } else { + BlocksOverlay.amounts[index] = BlocksOverlay.amounts[index] + 1; + } + } + } + } else { + BlocksOverlay.itemStacks = null; + client.setScreen(null); + } + }).dimensions(width / 2 + 60, height - 61, 100, 20).build()); + + TextFieldWidget searchBar = new TextFieldWidget(textRenderer, width / 2 - 75, height - 31, 150, 20, Text.translatable(Main.MOD_ID+".screen.search")); + searchBar.setChangedListener(query -> { + query = query.toLowerCase().replaceAll("\\s", ""); + if (this.query.equals(query)) return; + this.query = query; + shouldFilter = true; + }); + addDrawableChild(searchBar); + + // TODO: 6/2/2022 Add a reload button + } + + @Override + 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, SELECT_SONG, width / 2, 20, 0xFFFFFF); + } + + @Override + public void tick() { + previewButton.setMessage(Main.PREVIEWER.running ? PREVIEW_STOP : PREVIEW); + playButton.setMessage(Main.SONG_PLAYER.running ? PLAY_STOP : PLAY); + + if (shouldFilter) { + shouldFilter = false; +// songListWidget.setScrollAmount(0); + songListWidget.children().clear(); + boolean empty = query.isEmpty(); + int favoriteIndex = 0; + for (Song song : SongLoader.SONGS) { + if (empty || song.searchableFileName.contains(query) || song.searchableName.contains(query)) { + if (song.entry.favorite) { + songListWidget.children().add(favoriteIndex++, song.entry); + } else { + songListWidget.children().add(song.entry); + } + } + } + } + } + + @Override + public void onFilesDropped(List paths) { + String string = paths.stream().map(Path::getFileName).map(Path::toString).collect(Collectors.joining(", ")); + if (string.length() > 300) string = string.substring(0, 300)+"..."; + + client.setScreen(new ConfirmScreen(confirmed -> { + if (confirmed) { + paths.forEach(path -> { + try { + File file = path.toFile(); + + if (SongLoader.SONGS.stream().anyMatch(input -> input.fileName.equalsIgnoreCase(file.getName()))) return; + + Song song = SongLoader.loadSong(file); + if (song != null) { + Files.copy(path, Main.songsFolder.toPath().resolve(file.getName())); + SongLoader.SONGS.add(song); + } + } catch (IOException exception) { + Main.LOGGER.warn("Failed to copy song file from {} to {}", path, Main.songsFolder.toPath(), exception); + } + }); + + SongLoader.sort(); + } + client.setScreen(this); + }, Text.translatable(Main.MOD_ID+".screen.drop_confirm"), Text.literal(string))); + } + + @Override + public boolean shouldPause() { + return false; + } + + @Override + public void close() { + super.close(); + new Thread(() -> Main.configHolder.save()).start(); + } +} diff --git a/src/main/java/semmiedev/disc_jockey/mixin/ClientWorldMixin.java b/src/main/java/semmiedev/disc_jockey/mixin/ClientWorldMixin.java new file mode 100644 index 0000000..2df4843 --- /dev/null +++ b/src/main/java/semmiedev/disc_jockey/mixin/ClientWorldMixin.java @@ -0,0 +1,56 @@ +package semmiedev.disc_jockey.mixin; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.client.sound.SoundInstance; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.math.random.Random; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import semmiedev.disc_jockey.Main; + +@Mixin(ClientWorld.class) +public class ClientWorldMixin { + @Shadow @Final private MinecraftClient client; + + @Inject( + method = "playSound(DDDLnet/minecraft/sound/SoundEvent;Lnet/minecraft/sound/SoundCategory;FFZJ)V", + at = @At("HEAD"), + cancellable = true + ) + private void makeNoteBlockSoundsOmnidirectional( + double x, double y, double z, + SoundEvent event, + SoundCategory category, + float volume, float pitch, + boolean useDistance, long seed, + CallbackInfo ci + ) { + if ( + ((Main.config.omnidirectionalNoteBlockSounds && Main.SONG_PLAYER.running) || Main.PREVIEWER.running) && + event.id().getPath().startsWith("block.note_block") + ) { + ci.cancel(); + client.getSoundManager().play( + new PositionedSoundInstance( + event.id(), + category, + volume, + pitch, + Random.create(seed), + false, + 0, + SoundInstance.AttenuationType.NONE, + 0, 0, 0, + true + ) + ); + } + } +} diff --git a/src/main/resources/assets/disc_jockey/icon.png b/src/main/resources/assets/disc_jockey/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f52d1d0ea62da3d849558d444fa5cc6d69d038 GIT binary patch literal 21044 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/disc_jockey/lang/en_us.json b/src/main/resources/assets/disc_jockey/lang/en_us.json new file mode 100644 index 0000000..e4e0f1c --- /dev/null +++ b/src/main/resources/assets/disc_jockey/lang/en_us.json @@ -0,0 +1,55 @@ +{ + "disc_jockey.screen.select_song": "Select A Song", + "disc_jockey.screen.play": "Play", + "disc_jockey.screen.play.stop": "Stop Playing", + "disc_jockey.screen.preview": "Preview", + "disc_jockey.screen.preview.stop": "Stop Previewing", + "disc_jockey.screen.blocks.title": "Blocks", + "disc_jockey.screen.blocks": "Blocks", + "disc_jockey.screen.search": "Search For Songs", + "disc_jockey.screen.drop_hint": "Drag and drop song files into this window to add them", + "disc_jockey.screen.drop_confirm": "Do you want to add the following songs to Disc Jockey?", + "disc_jockey.player.invalid_note_blocks": "The Note Blocks near you are not in the correct configuration. Missing:", + "disc_jockey.player.invalid_game_mode": "You can't play in %s", + "disc_jockey.player.to_far": "You went to far away", + "disc_jockey.still_loading": "The songs are still loading", + "disc_jockey.reloading": "Reloading all songs", + "disc_jockey.loading_done": "All songs are loaded", + "disc_jockey.song_not_found": " Song '%s' does not exist", + "disc_jockey.not_playing": "Not playing any song", + "disc_jockey.speed_changed": "Changed playback speed to %s", + "disc_jockey.stopped_playing": "Stopped playing '%s'", + "disc_jockey.info_not_running": "No song is playing (Speed: %s)", + "disc_jockey.info_tuning": "Tuning: (Speed: %s)", + "disc_jockey.info_playing": "Playing: [%s/%s] %s (Speed: %s)", + "disc_jockey.info_finished": "Finished: %s (Speed: %s)", + "disc_jockey.instrument_info": "This maps instruments to be played by noteblocks for a different instrument instead.", + "disc_jockey.invalid_instrument": "Invalid instrument: %s", + "disc_jockey.instrument_mapped": "Mapped %s to %s", + "disc_jockey.instrument_mapped_all": "Mapped all instruments to %s", + "disc_jockey.instrument_unmapped": "Unmapped %s", + "disc_jockey.mapped_instruments": "Mapped instruments: %s", + "disc_jockey.no_mapped_instruments": "No instruments mapped, yet.", + "disc_jockey.instrument_maps_cleared": "Instrument mappings cleared.", + "disc_jockey.loop_status": "Loop song: %s", + "disc_jockey.loop_enabled": "Enabled looping of current song.", + "disc_jockey.loop_disabled": "Disabled looping of current song.", + "disc_jockey.warning": "WARNING!!! This mod is very likely to get false flagged as hacks, please contact a server administrator before using this mod! (You can disable this warning in the mod settings)", + "key.category.disc_jockey": "Disc Jockey", + "disc_jockey.key_bind.open_screen": "Open song selection screen", + "text.autoconfig.disc_jockey.title": "Disc Jockey", + "text.autoconfig.disc_jockey.option.hideWarning": "Hide Warning", + "text.autoconfig.disc_jockey.option.disableAsyncPlayback": "Disable Async Playback", + "text.autoconfig.disc_jockey.option.disableAsyncPlayback.@Tooltip[0]": "Will force notes to play synchronously with client ticks instead of in a separate thread.", + "text.autoconfig.disc_jockey.option.disableAsyncPlayback.@Tooltip[1]": "This can lead to performance loss, especially when you client has low or inconsistent fps but can fix issues when playback does not happen at all.", + "text.autoconfig.disc_jockey.option.omnidirectionalNoteBlockSounds": "Omnidirectional Note Block Sounds (clientside)", + "text.autoconfig.disc_jockey.option.omnidirectionalNoteBlockSounds.@Tooltip[0]": "Makes all note block sounds when playing a song omnidirectional, creating a more pleasing listening experience", + "text.autoconfig.disc_jockey.option.omnidirectionalNoteBlockSounds.@Tooltip[1]": "If you don't know what that means, I recommend you just try it and hear the difference", + "text.autoconfig.disc_jockey.option.expectedServerVersion": "Expected Server Version", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[0]": "Select the server version, you expect this mod to be used on.", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[1]": "This affects how reachable NoteBlocks are determined.", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[2]": "Selecting the wrong version could cause you not to be able to play some distant note blocks which could break/worsen playback", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[3]": "If you're unsure, or play on many different server versions and don't mind not reaching every possible note block, select \"All\"", + "text.autoconfig.disc_jockey.option.delayPlaybackStartBySecs": "Delay playback by (seconds)", + "text.autoconfig.disc_jockey.option.delayPlaybackStartBySecs.@Tooltip": "Delays playback for specified seconds, after tuning finished, if any (e.g. 0.5 for half a second delay)." +} \ No newline at end of file diff --git a/src/main/resources/assets/disc_jockey/lang/zh_cn.json b/src/main/resources/assets/disc_jockey/lang/zh_cn.json new file mode 100644 index 0000000..8a69068 --- /dev/null +++ b/src/main/resources/assets/disc_jockey/lang/zh_cn.json @@ -0,0 +1,55 @@ +{ + "disc_jockey.screen.select_song": "选择歌曲", + "disc_jockey.screen.play": "播放", + "disc_jockey.screen.play.stop": "停止播放", + "disc_jockey.screen.preview": "试听", + "disc_jockey.screen.preview.stop": "停止试听", + "disc_jockey.screen.blocks.title": "音符盒", + "disc_jockey.screen.blocks": "音符盒", + "disc_jockey.screen.search": "搜索歌曲", + "disc_jockey.screen.drop_hint": "将歌曲文件拖入此窗口以添加", + "disc_jockey.screen.drop_confirm": "是否将以下歌曲添加到 Disc Jockey？", + "disc_jockey.player.invalid_note_blocks": "附近的音符盒配置不正确。缺失：", + "disc_jockey.player.invalid_game_mode": "无法在 %s 模式下播放", + "disc_jockey.player.to_far": "你距离太远了", + "disc_jockey.still_loading": "歌曲仍在加载中", + "disc_jockey.reloading": "正在重新加载所有歌曲", + "disc_jockey.loading_done": "所有歌曲已加载完成", + "disc_jockey.song_not_found": "歌曲“%s”不存在", + "disc_jockey.not_playing": "未播放任何歌曲", + "disc_jockey.speed_changed": "播放速度已调整为 %s", + "disc_jockey.stopped_playing": "已停止播放“%s”", + "disc_jockey.info_not_running": "未播放歌曲（速度：%s）", + "disc_jockey.info_tuning": "调音中（速度：%s）", + "disc_jockey.info_playing": "播放中：[%s/%s] %s（速度：%s）", + "disc_jockey.info_finished": "已播放：%s（速度：%s）", + "disc_jockey.instrument_info": "此功能可将音符盒的乐器映射为其他乐器音色。", + "disc_jockey.invalid_instrument": "无效乐器：%s", + "disc_jockey.instrument_mapped": "已将 %s 映射为 %s", + "disc_jockey.instrument_mapped_all": "已将全部乐器映射为 %s", + "disc_jockey.instrument_unmapped": "已取消 %s 的映射", + "disc_jockey.mapped_instruments": "已映射乐器：%s", + "disc_jockey.no_mapped_instruments": "当前未映射任何乐器", + "disc_jockey.instrument_maps_cleared": "已清除所有乐器映射", + "disc_jockey.loop_status": "循环播放：%s", + "disc_jockey.loop_enabled": "已启用当前歌曲循环播放", + "disc_jockey.loop_disabled": "已禁用当前歌曲循环播放", + "disc_jockey.warning": "警告！此模组极易被误判为作弊工具，使用前请联系服务器管理员！（可在模组设置中关闭此警告）\n当前版本：1.14.514（1.21.4）为非官方版本，由BRanulf改版，翻译也是这家伙提供的。\n仅供学习参考，请支持官方，别找我XD", + "key.category.disc_jockey": "Disc Jockey", + "disc_jockey.key_bind.open_screen": "打开歌曲选择界面", + "text.autoconfig.disc_jockey.title": "Disc Jockey", + "text.autoconfig.disc_jockey.option.hideWarning": "隐藏警告", + "text.autoconfig.disc_jockey.option.disableAsyncPlayback": "禁用异步播放", + "text.autoconfig.disc_jockey.option.disableAsyncPlayback.@Tooltip[0]": "强制音符与客户端刻同步播放，而非使用独立线程。", + "text.autoconfig.disc_jockey.option.disableAsyncPlayback.@Tooltip[1]": "可能导致性能下降（尤其在低帧率时），但可解决某些情况下无法播放的问题。", + "text.autoconfig.disc_jockey.option.omnidirectionalNoteBlockSounds": "全向音符盒音效（客户端）", + "text.autoconfig.disc_jockey.option.omnidirectionalNoteBlockSounds.@Tooltip[0]": "使音符盒音效全向传播，提升听觉体验", + "text.autoconfig.disc_jockey.option.omnidirectionalNoteBlockSounds.@Tooltip[1]": "若不确定效果，建议直接试听对比", + "text.autoconfig.disc_jockey.option.expectedServerVersion": "预期服务器版本", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[0]": "选择你预计使用此模组的服务器版本。", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[1]": "此设置影响音符盒可触达范围的判定逻辑。", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[2]": "版本选择错误可能导致无法触发部分音符盒，影响播放效果", + "text.autoconfig.disc_jockey.option.expectedServerVersion.@Tooltip[3]": "若不确认版本，或需兼容多版本服务器，请选择“全部”", + "text.autoconfig.disc_jockey.option.delayPlaybackStartBySecs": "播放延迟（秒）", + "text.autoconfig.disc_jockey.option.delayPlaybackStartBySecs.@Tooltip": "调音完成后延迟指定秒数再开始播放（如 0.5 表示延迟半秒）。" +} \ No newline at end of file diff --git a/src/main/resources/assets/disc_jockey/textures/gui/icons.png b/src/main/resources/assets/disc_jockey/textures/gui/icons.png new file mode 100644 index 0000000000000000000000000000000000000000..6442038fdf3d8a2e1c9c9a210a37ce72fc14e7f0 GIT binary patch literal 359 zcmV-t0hs=YP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Q^ZrK~zXf-IQGp zgD?z(VdsL=!@U^poXVt0S02X0J_(VZ)+VjQl(B8w!El)4gyArc_?XEZGc&nk27P;2 z`U><7mM*;b{u^e#D>$unU2EOv5jd^+glUsUM7J{H!?5CgN}}SCXw+Bn=;Nb)G(<+^ z^9}gSBR8O6{jx0K5E=NWeczdl1E0HGPOdkYUt=fN8_chHHXGcn%+8cX%9>OTG;>q002ovPDHLk FV1n(kpU40J literal 0 HcmV?d00001 diff --git a/src/main/resources/disc_jockey.mixins.json b/src/main/resources/disc_jockey.mixins.json new file mode 100644 index 0000000..f907fc6 --- /dev/null +++ b/src/main/resources/disc_jockey.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "semmiedev.disc_jockey.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "ClientWorldMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..1cc0f82 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "disc_jockey", + "version": "${version}", + "name": "Disc Jockey", + "description": "在游戏中播放音符盒（打碟机）", + "authors": [ + "SemmieDev", + "EnderKill98", + "BRanulf(仅限该版本，请支持上面两个原作者)" + ], + "contact": { + "repo": "http://git.branulf.top/BRanulf/DJ_BR" + }, + "license": "MIT", + "icon": "assets/disc_jockey/icon.png", + "environment": "client", + "entrypoints": { + "client": [ + "semmiedev.disc_jockey.Main" + ], + "modmenu": [ + "semmiedev.disc_jockey.ModMenuIntegration" + ] + }, + "mixins": [ + "disc_jockey.mixins.json" + ], + "depends": { + "fabric": "*", + "minecraft": "~1.21.4", + "java": ">=21", + "cloth-config": "*" + } +}