commit efac47cb3c2508c1a0014055b3645c1bfce1dee0 Author: wzp Date: Mon Aug 7 20:12:39 2023 +0800 First Version diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..ed73010 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [ pull_request, push ] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 17, # Current Java LTS & minimum supported by Minecraft + ] + # and run on both Linux and Windows + os: [ ubuntu-22.04, windows-2022 ] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v3 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS + uses: actions/upload-artifact@v3 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..3d66a6c --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +### DreamRunner Carpet Addition \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..aa1fe4b --- /dev/null +++ b/build.gradle @@ -0,0 +1,100 @@ +plugins { + id 'fabric-loom' version '1.3-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + maven { + url 'https://masa.dy.fi/maven' + } + maven { + name = "CottonMC" + url = "https://server.bbkr.space/artifactory/libs-release" + } +} + +loom { + splitEnvironmentSourceSets() + + mods { + "music" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + +} + +dependencies { + // To change the versions see the gradle.properties file + 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}" + modImplementation "carpet:fabric-carpet:1.20-${project.carpet_core_version}" + modClientImplementation "io.github.cottonmc:LibGui:8.0.2+1.20" + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + // https://mvnrepository.com/artifact/javazoom/jlayer + implementation 'javazoom:jlayer:1.0.1' + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +java { + // 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() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}" } + } +} + +// 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. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..2aa4b88 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.14.21 +carpet_core_version=1.4.112+v230608 +# Mod Properties +mod_version=1.0.0 +maven_group=cn.wzpmc +archives_base_name=der +# Dependencies +fabric_version=0.86.1+1.20.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..033e24c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..62f495d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..fcb6fca --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + 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 + + +# 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"' + +# 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 \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..56266b4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/client/java/cn/wzpmc/DreamRunnerModClient.java b/src/client/java/cn/wzpmc/DreamRunnerModClient.java new file mode 100644 index 0000000..bea0703 --- /dev/null +++ b/src/client/java/cn/wzpmc/DreamRunnerModClient.java @@ -0,0 +1,238 @@ +package cn.wzpmc; + +import cn.wzpmc.entities.MusicObject; +import cn.wzpmc.gui.OnWorldTickStart; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.mojang.brigadier.arguments.IntegerArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.minecraft.client.MinecraftClient; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.util.Identifier; + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.util.*; + +@Environment(EnvType.CLIENT) +public class DreamRunnerModClient implements ClientModInitializer { + + public static final Identifier packageChannelId = Objects.requireNonNull(Identifier.of("der", "music_channel")); + public static OnWorldTickStart worldTickStart = new OnWorldTickStart(); + public static List musics = new ArrayList<>(); + public boolean isLogin = false; + public String cookies = ""; + + @Override + public void onInitializeClient() { + ClientPlayNetworking.registerGlobalReceiver(packageChannelId, (client, handler, buf, responseSender) -> packetHandler(client, buf)); + ClientTickEvents.START_CLIENT_TICK.register(worldTickStart); + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> dispatcher.register(LiteralArgumentBuilder.literal("play").requires((e) -> isLogin).then(CommandManager.argument("id", IntegerArgumentType.integer()).executes((e) -> { + //https://music.163.com/song?id=1369828361&userid=347345537 + Long songId = Long.valueOf(e.getArgument("id", Integer.class)); + ByteBuf buffer = Unpooled.buffer(); + buffer.writeLong(songId); + HttpClient.Builder builder = HttpClient.newBuilder(); + HttpClient build = builder.build(); + HttpRequest request = HttpRequest.newBuilder(URI.create("http://192.168.1.2:1200/song/url/v1?id=" + songId + "&level=exhigh")).setHeader("Cookie", cookies).build(); + try { + HttpResponse send = build.send(request, HttpResponse.BodyHandlers.ofString()); + JsonElement jsonElement = JsonParser.parseString(send.body()); + String url = jsonElement.getAsJsonObject().get("data").getAsJsonArray().get(0).getAsJsonObject().get("url").getAsString(); + System.out.println(url); + HttpResponse music = build.send(HttpRequest.newBuilder(URI.create(url)).build(), HttpResponse.BodyHandlers.ofByteArray()); + HttpRequest.Builder builder1 = HttpRequest.newBuilder(URI.create("http://192.168.1.2:1200/song/detail?ids=" + songId)); + HttpResponse detailResponse = build.send(builder1.build(), HttpResponse.BodyHandlers.ofString()); + JsonObject asJsonObject = JsonParser.parseString(detailResponse.body()).getAsJsonObject().get("songs").getAsJsonArray().get(0).getAsJsonObject(); + String asString = asJsonObject.get("name").getAsString(); + int dt = asJsonObject.get("dt").getAsInt(); + buffer.writeInt(dt); + byte[] bytes1 = asString.getBytes(StandardCharsets.UTF_8); + buffer.writeInt(bytes1.length); + buffer.writeBytes(bytes1); + JsonArray arList = asJsonObject.get("ar").getAsJsonArray(); + int size = arList.size(); + buffer.writeInt(size); + for (JsonElement ar : arList) { + JsonObject jsonObject = ar.getAsJsonObject(); + String arName = jsonObject.get("name").getAsString(); + byte[] bytes = arName.getBytes(StandardCharsets.UTF_8); + buffer.writeInt(bytes.length); + buffer.writeBytes(bytes); + } + JsonObject alObject = asJsonObject.get("al").getAsJsonObject(); + String picURL = alObject.get("picUrl").getAsString(); + HttpRequest.Builder builder3 = HttpRequest.newBuilder(URI.create("http://192.168.1.2:1200/lyric?id=" + songId)).setHeader("Cookie", this.cookies); + String lrc = JsonParser.parseString(build.send(builder3.build(), HttpResponse.BodyHandlers.ofString()).body()).getAsJsonObject().get("lrc").getAsJsonObject().get("lyric").getAsString(); + byte[] bytes = lrc.getBytes(StandardCharsets.UTF_8); + buffer.writeInt(bytes.length); + buffer.writeBytes(bytes); + HttpRequest.Builder builder2 = HttpRequest.newBuilder(URI.create(picURL)); + HttpResponse picResponse = build.send(builder2.build(), HttpResponse.BodyHandlers.ofByteArray()); + byte[] body1 = picResponse.body(); + buffer.writeInt(body1.length); + buffer.writeBytes(body1); + byte[] body = music.body(); + buffer.writeInt(body.length); + buffer.writeBytes(body); + } catch (IOException | InterruptedException ex) { + ex.printStackTrace(); + throw new RuntimeException(ex); + } + try { + packetHandler(MinecraftClient.getInstance(), buffer); + } catch (Throwable ea) { + ea.printStackTrace(); + } + return 0; + })))); + testLogin(); + + } + + private void testLogin() { + HttpClient httpClient = HttpClient.newHttpClient(); + try { + FileInputStream fileInputStream = new FileInputStream("Cookie"); + String cookie = new String(fileInputStream.readAllBytes()); + fileInputStream.close(); + HttpRequest.Builder builder = HttpRequest.newBuilder(URI.create("http://192.168.1.2:1200/login/status?timestamp=" + new Date().getTime())).setHeader("Cookie", cookie); + HttpResponse send = httpClient.send(builder.build(), HttpResponse.BodyHandlers.ofString()); + if (!JsonParser.parseString(send.body()).getAsJsonObject().get("data").getAsJsonObject().get("profile").isJsonNull()) { + this.cookies = cookie; + this.isLogin = true; + return; + } + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + return; + } + HttpRequest.Builder builder = HttpRequest.newBuilder(URI.create("http://192.168.1.2:1200/login/qr/key?timestamp=" + new Date().getTime())); + try { + HttpResponse send = httpClient.send(builder.build(), HttpResponse.BodyHandlers.ofString()); + String body = send.body(); + JsonElement jsonElement = JsonParser.parseString(body); + String unikey = jsonElement.getAsJsonObject().get("data").getAsJsonObject().get("unikey").getAsString(); + HttpRequest.Builder createQr = HttpRequest.newBuilder(URI.create("http://192.168.1.2:1200/login/qr/create?qrimg=1&key=" + unikey)); + HttpResponse send1 = httpClient.send(createQr.build(), HttpResponse.BodyHandlers.ofString()); + String body1 = send1.body(); + JsonElement jsonElement1 = JsonParser.parseString(body1); + String imgB64 = jsonElement1.getAsJsonObject().get("data").getAsJsonObject().get("qrimg").getAsString().replace("data:image/png;base64,", ""); + byte[] decode = Base64.getDecoder().decode(imgB64); + FileOutputStream fileOutputStream = new FileOutputStream("qr.png"); + fileOutputStream.write(decode); + fileOutputStream.close(); + DreamRunnerMod.LOGGER.info(unikey); + new Thread(() -> { + w: + while (true) { + HttpRequest.Builder builder1 = HttpRequest.newBuilder(URI.create("http://192.168.1.2:1200/login/qr/check?key=" + unikey + "×tamp=" + new Date().getTime())); + try { + HttpResponse send2 = httpClient.send(builder1.build(), HttpResponse.BodyHandlers.ofString()); + JsonElement jsonElement2 = JsonParser.parseString(send2.body()); + int code = jsonElement2.getAsJsonObject().get("code").getAsInt(); + switch (code) { + case 801: + break; + case 802: + DreamRunnerMod.LOGGER.info("扫码成功等待确认"); + break; + case 803: + DreamRunnerMod.LOGGER.info("登录成功"); + this.loginSuccess(send2); + break w; + } + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + }).start(); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + } + + private void loginSuccess(HttpResponse send2) { + send2.headers().firstValue("set-cookie").ifPresent((e) -> { + this.isLogin = true; + this.cookies = e; + FileOutputStream fileOutputStream; + try { + fileOutputStream = new FileOutputStream("Cookie"); + fileOutputStream.write(e.getBytes(StandardCharsets.UTF_8)); + fileOutputStream.close(); + } catch (IOException ex) { + ex.printStackTrace(); + } + }); + } + + // Packet Struct: + // SongId + // SongName Length + // SongName + // Artist List Length + // n Artist + // Artist Name Length + // Artist Name + // Pic Length + // Pic Byte Array + // Song Length + // Song Byte Array + public void packetHandler(MinecraftClient client, ByteBuf buf) { + long songId = buf.readLong(); + int duringTime = buf.readInt(); + int songNameLength = buf.readInt(); + byte[] data = new byte[songNameLength]; + buf.readBytes(data); + List artistNames = new ArrayList<>(); + String songName = new String(data, StandardCharsets.UTF_8); + int artistListLength = buf.readInt(); + for (int i = 0; i < artistListLength; i++) { + int artistNameLength = buf.readInt(); + data = new byte[artistNameLength]; + buf.readBytes(data); + String artistName = new String(data, StandardCharsets.UTF_8); + artistNames.add(artistName); + } + int lrcLength = buf.readInt(); + data = new byte[lrcLength]; + buf.readBytes(data); + String lrc = new String(data, StandardCharsets.UTF_8); + int picByteArrayLength = buf.readInt(); + byte[] picByteArray = new byte[picByteArrayLength]; + buf.readBytes(picByteArray); + int songByteArrayLength = buf.readInt(); + byte[] songByteArray = new byte[songByteArrayLength]; + buf.readBytes(songByteArray); + MusicObject musicObject = new MusicObject(songName, songId, artistNames, duringTime, picByteArray, lrc, songByteArray); + if (musics.isEmpty()) { + musicObject.play(); + + } + musics.add(musicObject); + } +} \ No newline at end of file diff --git a/src/client/java/cn/wzpmc/entities/MusicObject.java b/src/client/java/cn/wzpmc/entities/MusicObject.java new file mode 100644 index 0000000..6852951 --- /dev/null +++ b/src/client/java/cn/wzpmc/entities/MusicObject.java @@ -0,0 +1,174 @@ +package cn.wzpmc.entities; + +import cn.wzpmc.DreamRunnerMod; +import cn.wzpmc.DreamRunnerModClient; +import cn.wzpmc.sounds.MusicSoundInstance; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.client.sound.SoundInstance; +import net.minecraft.client.sound.SoundManager; +import net.minecraft.client.texture.NativeImage; +import net.minecraft.client.texture.NativeImageBackedTexture; +import net.minecraft.util.Identifier; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.List; +import java.util.*; + +@Environment(EnvType.CLIENT) +public class MusicObject { + private final String name; + private final long songId; + private final int duringTime; + private final List artists; + private final Map lrc = new HashMap<>(); + private final List lrcTime = new ArrayList<>(); + private final SoundInstance soundInstance; + private byte[] picByteArray; + private NativeImage image; + private NativeImageBackedTexture backedTexture; + private Identifier imageId; + private long startT; + + public MusicObject(String name, long songId, List artists, int duringTime, byte[] picByteArray, String lrc, byte[] songByteArray) { + this.name = name; + this.songId = songId; + this.artists = artists; + this.duringTime = duringTime; + this.picByteArray = picByteArray; + this.startT = new Date().getTime(); + String[] lineSplit = lrc.split("\n"); + for (String fileLine : lineSplit) { + String[] timeLrcSplit = fileLine.split("]"); + String time = timeLrcSplit[0].replace("[", ""); + String[] msSplit = time.split("\\."); + String[] minSecSplit = msSplit[0].split(":"); + long min = Long.parseLong(minSecSplit[0]); + long sec = Long.parseLong(minSecSplit[1]); + long ms = Long.parseLong(msSplit[1]); + StringBuilder line = new StringBuilder(); + for (int i = 1; i < timeLrcSplit.length; i++) { + line.append(timeLrcSplit[i]); + } + long lrcTime = (min * 60 + sec) * 1000 + ms; + this.lrc.put(lrcTime, line.toString()); + this.lrcTime.add(lrcTime); + } + this.lrcTime.sort(Comparator.comparingLong(Long::longValue).reversed()); + // soundInstance + ClientPlayerEntity player = MinecraftClient.getInstance().player; + soundInstance = new MusicSoundInstance(player, new ByteArrayInputStream(songByteArray), this); + } + + public static String getTimeString(long duringTime) { + long secDuringTime = duringTime / 1000; + long sec = secDuringTime % 60; + long min = secDuringTime / 60; + return String.format("%d:%02d", min, sec); + } + + public int getDuringTime() { + return duringTime; + } + + public List getArtists() { + return artists; + } + + public String getDuring() { + return getTimeString(getDuringLong()); + } + + public long getDuringLong() { + long l = new Date().getTime() - startT; + if (l >= this.duringTime) { + DreamRunnerModClient.musics.remove(this); + if (!DreamRunnerModClient.musics.isEmpty()) { + MusicObject next = DreamRunnerModClient.musics.get(0); + next.play(); + } + return this.duringTime; + } + return l; + } + + public void start() { + this.startT = new Date().getTime(); + } + + public void play() { + SoundManager soundManager = MinecraftClient.getInstance().getSoundManager(); + soundManager.play(soundInstance); + } + + public NativeImage getImage() { + if (image == null) { + try { + BufferedImage originalImage = ImageIO.read(new ByteArrayInputStream(this.picByteArray)); + BufferedImage resizedImage = new BufferedImage(64, 64, BufferedImage.TYPE_INT_RGB); + Graphics2D g2d = resizedImage.createGraphics(); + g2d.drawImage(originalImage, 0, 0, 64, 64, null); + g2d.dispose(); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + ImageIO.write(resizedImage, "png", byteArrayOutputStream); + byte[] byteArray = byteArrayOutputStream.toByteArray(); + this.picByteArray = byteArray; + this.image = NativeImage.read(new ByteArrayInputStream(byteArray)); + } catch (IOException e) { + DreamRunnerMod.LOGGER.error("读取图片失败！", e); + return null; + } + } + return image; + } + + public NativeImageBackedTexture getBackedTexture() { + if (backedTexture == null) { + backedTexture = new NativeImageBackedTexture(this.getImage()); + } + return backedTexture; + } + + public Identifier getImageId() { + if (this.imageId == null) { + this.imageId = MinecraftClient.getInstance().getTextureManager().registerDynamicTexture("der", this.getBackedTexture()); + } + return this.imageId; + } + + public String getLrc() { + long dt = this.getDuringLong(); + for (Long time : this.lrcTime) { + if (time <= dt) { + return this.lrc.get(time); + } + } + return ""; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + MusicObject that = (MusicObject) o; + return songId == that.songId && duringTime == that.duringTime && Arrays.equals(picByteArray, that.picByteArray) && Objects.equals(artists, that.artists); + } + + @Override + public int hashCode() { + int result = Objects.hash(songId, duringTime, artists); + result = 31 * result + Arrays.hashCode(picByteArray); + return result; + } + + public String getName() { + return name; + } +} diff --git a/src/client/java/cn/wzpmc/gui/NowSongDetailWeight.java b/src/client/java/cn/wzpmc/gui/NowSongDetailWeight.java new file mode 100644 index 0000000..e28e818 --- /dev/null +++ b/src/client/java/cn/wzpmc/gui/NowSongDetailWeight.java @@ -0,0 +1,58 @@ +package cn.wzpmc.gui; + +import cn.wzpmc.DreamRunnerModClient; +import cn.wzpmc.entities.MusicObject; +import io.github.cottonmc.cotton.gui.client.ScreenDrawing; +import io.github.cottonmc.cotton.gui.widget.WWidget; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; + +@Environment(EnvType.CLIENT) +public class NowSongDetailWeight extends WWidget { + private static int targetWidth = 0; + private static double nowWidth = 0d; + private static double speed = 0d; + private final MinecraftClient client; + + public NowSongDetailWeight() { + this.client = MinecraftClient.getInstance(); + } + + public static void reset() { + targetWidth = 0; + nowWidth = 0d; + speed = 0d; + } + + @Override + public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) { + if (!DreamRunnerModClient.musics.isEmpty()) { + MusicObject musicObject = DreamRunnerModClient.musics.get(0); + if ((int) nowWidth != targetWidth) { + nowWidth += speed; + } + speed = (targetWidth - nowWidth) / 60; + // 总宽度计算：文本最大宽度 + 70 + ScreenDrawing.coloredRect(context, x - 2, y - 2, (int) nowWidth, 68, 0x32_FFFFFF); + context.drawTexture(musicObject.getImageId(), x, y, 0, 0, 0, 64, 64, 64, 64); + String musicName = musicObject.getName(); + String artistsName = String.join(", ", musicObject.getArtists()); + int musicNameWidth = client.textRenderer.getWidth(musicName); + int artistsNameWidth = client.textRenderer.getWidth(artistsName); + context.drawText(client.textRenderer, musicName, 66 + x, y, 0xFFFFFF, false); + context.drawText(client.textRenderer, artistsName, 66 + x, client.textRenderer.fontHeight + y, 0xFFFFFF, false); + // 进度条长度100 + ScreenDrawing.coloredRect(context, 66 + x, client.textRenderer.fontHeight * 2 + y, (int) (((double) musicObject.getDuringLong() / musicObject.getDuringTime()) * 100), client.textRenderer.fontHeight + 4, 0x5F_6754E6); + ScreenDrawing.coloredRect(context, 66 + x, client.textRenderer.fontHeight * 2 + y, 100, client.textRenderer.fontHeight + 4, 0x48_6754E6); + context.drawText(client.textRenderer, musicObject.getDuring() + " / " + MusicObject.getTimeString(musicObject.getDuringTime()), 68 + x, client.textRenderer.fontHeight * 2 + 2 + y, 0xFFFFFF, false); + String lrc = musicObject.getLrc(); + context.drawText(client.textRenderer, lrc, 66 + x, client.textRenderer.fontHeight * 3 + 4 + y, 0xFFFFFF, false); + int lrcWidth = client.textRenderer.getWidth(lrc); + targetWidth = Math.max(Math.max(Math.max(musicNameWidth, artistsNameWidth), lrcWidth), 100) + 70; + } else { + reset(); + } + } +} diff --git a/src/client/java/cn/wzpmc/gui/OnWorldTickStart.java b/src/client/java/cn/wzpmc/gui/OnWorldTickStart.java new file mode 100644 index 0000000..f3d447f --- /dev/null +++ b/src/client/java/cn/wzpmc/gui/OnWorldTickStart.java @@ -0,0 +1,31 @@ +package cn.wzpmc.gui; + +import io.github.cottonmc.cotton.gui.client.CottonHud; +import io.github.cottonmc.cotton.gui.widget.WWidget; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.minecraft.client.MinecraftClient; + +import java.util.ArrayList; +import java.util.List; + +public class OnWorldTickStart implements ClientTickEvents.StartTick { + private final List songList = new ArrayList<>(); + private WWidget nowSongDetail; + + @Override + public void onStartTick(MinecraftClient client) { + if (nowSongDetail != null) { + CottonHud.remove(nowSongDetail); + } + nowSongDetail = new NowSongDetailWeight(); + CottonHud.add(nowSongDetail, 10, 10); + } + + public void remove() { + if (nowSongDetail != null) { + CottonHud.remove(nowSongDetail); + } + nowSongDetail = null; + songList.clear(); + } +} diff --git a/src/client/java/cn/wzpmc/mixin/GameMenuScreenMixin.java b/src/client/java/cn/wzpmc/mixin/GameMenuScreenMixin.java new file mode 100644 index 0000000..265f7fe --- /dev/null +++ b/src/client/java/cn/wzpmc/mixin/GameMenuScreenMixin.java @@ -0,0 +1,17 @@ +package cn.wzpmc.mixin; + +import cn.wzpmc.DreamRunnerModClient; +import net.minecraft.client.gui.screen.GameMenuScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(GameMenuScreen.class) +public class GameMenuScreenMixin { + @Inject(method = "disconnect", at = @At("HEAD")) + private void disconnect(CallbackInfo ci) { + DreamRunnerModClient.worldTickStart.remove(); + DreamRunnerModClient.musics.clear(); + } +} \ No newline at end of file diff --git a/src/client/java/cn/wzpmc/sounds/MusicSoundInstance.java b/src/client/java/cn/wzpmc/sounds/MusicSoundInstance.java new file mode 100644 index 0000000..fa3622e --- /dev/null +++ b/src/client/java/cn/wzpmc/sounds/MusicSoundInstance.java @@ -0,0 +1,60 @@ +package cn.wzpmc.sounds; + +import cn.wzpmc.DreamRunnerMod; +import cn.wzpmc.entities.MusicObject; +import javazoom.jl.decoder.BitstreamException; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.client.sound.AbstractSoundInstance; +import net.minecraft.client.sound.AudioStream; +import net.minecraft.client.sound.SoundInstance; +import net.minecraft.client.sound.SoundLoader; +import net.minecraft.sound.SoundCategory; +import net.minecraft.util.Identifier; + +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.CompletableFuture; + +@Environment(EnvType.CLIENT) +public class MusicSoundInstance extends AbstractSoundInstance { + private final ClientPlayerEntity entity; + private final InputStream inputStream; + private final MusicObject object; + + public MusicSoundInstance(ClientPlayerEntity entity, InputStream inputStream, MusicObject object) { + super(new Identifier("der", "music"), SoundCategory.RECORDS, SoundInstance.createRandom()); + this.entity = entity; + this.inputStream = inputStream; + this.object = object; + } + + @Override + public double getX() { + this.x = this.entity.getX(); + return this.x; + } + + @Override + public double getY() { + this.y = this.entity.getY(); + return this.y; + } + + @Override + public double getZ() { + this.z = this.entity.getZ(); + return this.z; + } + + @Override + public CompletableFuture getAudioStream(SoundLoader loader, Identifier id, boolean repeatInstantly) { + try { + return CompletableFuture.completedFuture(new MyAudioStream(inputStream, this.object)); + } catch (IOException | BitstreamException e) { + DreamRunnerMod.LOGGER.error("读取音频文件出错！", e); + } + return null; + } +} diff --git a/src/client/java/cn/wzpmc/sounds/MyAudioStream.java b/src/client/java/cn/wzpmc/sounds/MyAudioStream.java new file mode 100644 index 0000000..8309a4b --- /dev/null +++ b/src/client/java/cn/wzpmc/sounds/MyAudioStream.java @@ -0,0 +1,84 @@ +package cn.wzpmc.sounds; + +import cn.wzpmc.DreamRunnerMod; +import cn.wzpmc.entities.MusicObject; +import javazoom.jl.decoder.*; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.sound.AudioStream; + +import javax.sound.sampled.AudioFormat; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + +@Environment(EnvType.CLIENT) +public class MyAudioStream implements AudioStream { + private final Bitstream bitstream; + private final Decoder decoder; + private final AudioFormat format; + private final MusicObject object; + private boolean isStart; + + public MyAudioStream(InputStream inputStream, MusicObject object) throws BitstreamException, IOException { + this.bitstream = new Bitstream(inputStream); + this.decoder = new Decoder(); + this.object = object; + this.isStart = false; + Header header = bitstream.readFrame(); + if (header == null) { + throw new IOException("读取MP3文件头失败！"); + } + this.format = new AudioFormat(header.frequency(), 16, header.mode() == Header.SINGLE_CHANNEL ? 1 : 2, true, false); + bitstream.unreadFrame(); + } + + @Override + public void close() { + try { + this.bitstream.close(); + } catch (Exception e) { + DreamRunnerMod.LOGGER.error("关闭资源失败！", e); + } + } + + @Override + public AudioFormat getFormat() { + return this.format; + } + + @Override + public ByteBuffer getBuffer(int size) { + if (!this.isStart) { + this.object.start(); + isStart = true; + } + ByteBuffer buffer = ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder()); + try { + while (buffer.hasRemaining()) { + Header frameHeader = bitstream.readFrame(); + if (frameHeader == null) { + break; + } + + SampleBuffer output = (SampleBuffer) decoder.decodeFrame(frameHeader, bitstream); + + short[] pcm = output.getBuffer(); + for (int i = 0; i < output.getBufferLength(); i++) { + if (!buffer.hasRemaining()) { + break; + } + buffer.putShort(pcm[i]); + } + + bitstream.closeFrame(); + } + } catch (Exception e) { + DreamRunnerMod.LOGGER.error("读取音频文件失败！", e); + return null; + } + buffer.flip(); + return buffer; + } +} diff --git a/src/client/resources/der.client.mixins.json b/src/client/resources/der.client.mixins.json new file mode 100644 index 0000000..6198c86 --- /dev/null +++ b/src/client/resources/der.client.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "package": "cn.wzpmc.mixin", + "compatibilityLevel": "JAVA_17", + "client": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "mixins": [ + "GameMenuScreenMixin" + ] +} \ No newline at end of file diff --git a/src/main/java/cn/wzpmc/CarpetSettings.java b/src/main/java/cn/wzpmc/CarpetSettings.java new file mode 100644 index 0000000..d4bc724 --- /dev/null +++ b/src/main/java/cn/wzpmc/CarpetSettings.java @@ -0,0 +1,14 @@ +package cn.wzpmc; + +import carpet.api.settings.Rule; +import carpet.api.settings.RuleCategory; + +public class CarpetSettings { + /** + * Disable Out of order detect + */ + @Rule(categories = {RuleCategory.BUGFIX}) + public static boolean fuckOutOfOrderChat = false; + @Rule(categories = {RuleCategory.BUGFIX}) + public static boolean clearBotScoreBoard = true; +} diff --git a/src/main/java/cn/wzpmc/DreamRunnerMod.java b/src/main/java/cn/wzpmc/DreamRunnerMod.java new file mode 100644 index 0000000..18b8310 --- /dev/null +++ b/src/main/java/cn/wzpmc/DreamRunnerMod.java @@ -0,0 +1,82 @@ +package cn.wzpmc; + +import carpet.CarpetExtension; +import carpet.CarpetServer; +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import net.fabricmc.api.ModInitializer; +import net.minecraft.scoreboard.ScoreboardObjective; +import net.minecraft.scoreboard.ScoreboardPlayerScore; +import net.minecraft.scoreboard.ServerScoreboard; +import net.minecraft.server.MinecraftServer; +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; + +public class DreamRunnerMod implements ModInitializer, CarpetExtension { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger("DreamRunnerCarpetAddition"); + + static { + System.out.println(); + CarpetServer.manageExtension(new DreamRunnerMod()); + } + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + LOGGER.info("Fuck you out of order chat!!!"); + } + + @Override + public void onGameStarted() { + // let's /carpet handle our few simple settings + CarpetServer.settingsManager.parseSettingsClass(CarpetSettings.class); + } + + public void onTick(MinecraftServer server) { + if (CarpetSettings.clearBotScoreBoard) { + ServerScoreboard scoreboard = server.getScoreboard(); + Collection objectives = scoreboard.getObjectives(); + for (ScoreboardObjective objective : objectives) { + Collection allPlayerScores = scoreboard.getAllPlayerScores(objective); + for (ScoreboardPlayerScore allPlayerScore : allPlayerScores) { + String playerName = allPlayerScore.getPlayerName(); + if (playerName.startsWith("bot_")) { + allPlayerScore.clearScore(); + } + } + } + } + } + + @Override + public Map canHasTranslations(String lang) { + InputStream langFile = DreamRunnerMod.class.getClassLoader().getResourceAsStream("assets/der/lang/%s.json".formatted(lang)); + if (langFile == null) { + // we don't have that language + return Collections.emptyMap(); + } + String jsonData; + try { + jsonData = IOUtils.toString(langFile, StandardCharsets.UTF_8); + } catch (IOException e) { + return Collections.emptyMap(); + } + Gson gson = new GsonBuilder().setLenient().create(); // lenient allows for comments + return gson.fromJson(jsonData, new TypeToken>() { + }.getType()); + } +} \ No newline at end of file diff --git a/src/main/java/cn/wzpmc/mixin/OutOfOrderMixin.java b/src/main/java/cn/wzpmc/mixin/OutOfOrderMixin.java new file mode 100644 index 0000000..d197fc3 --- /dev/null +++ b/src/main/java/cn/wzpmc/mixin/OutOfOrderMixin.java @@ -0,0 +1,21 @@ +package cn.wzpmc.mixin; + +import cn.wzpmc.CarpetSettings; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.time.Instant; + +@Mixin(ServerPlayNetworkHandler.class) +public class OutOfOrderMixin { + @Inject(method = "isInProperOrder", at = @At("HEAD"), cancellable = true) + public void isInProperOrder(Instant timestamp, @NotNull CallbackInfoReturnable cir) { + if (CarpetSettings.fuckOutOfOrderChat) { + cir.setReturnValue(true); + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/der/icon.png b/src/main/resources/assets/der/icon.png new file mode 100644 index 0000000..b1e94bb Binary files /dev/null and b/src/main/resources/assets/der/icon.png differ diff --git a/src/main/resources/assets/der/lang/en_us.json b/src/main/resources/assets/der/lang/en_us.json new file mode 100644 index 0000000..8f223ca --- /dev/null +++ b/src/main/resources/assets/der/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "carpet.rule.fuckOutOfOrderChat.desc": "disable out of order chat check", + "carpet.rule.fuckOutOfOrderChat.name": "Disable out of order chat check", + "carpet.rule.clearBotScoreBoard.desc": "Clear bot's scoreboard score every tick", + "carpet.rule.clearBotScoreBoard.name": "Clear bot's scoreboard" +} \ No newline at end of file diff --git a/src/main/resources/assets/der/lang/zh_cn.json b/src/main/resources/assets/der/lang/zh_cn.json new file mode 100644 index 0000000..868859a --- /dev/null +++ b/src/main/resources/assets/der/lang/zh_cn.json @@ -0,0 +1,6 @@ +{ + "carpet.rule.fuckOutOfOrderChat.desc": "禁用消息乱序检查", + "carpet.rule.fuckOutOfOrderChat.name": "禁用消息乱序检查", + "carpet.rule.clearBotScoreBoard.desc": "每Tick清除bot计分板", + "carpet.rule.clearBotScoreBoard.name": "清除bot计分板" +} \ No newline at end of file diff --git a/src/main/resources/assets/der/sounds.json b/src/main/resources/assets/der/sounds.json new file mode 100644 index 0000000..ae05042 --- /dev/null +++ b/src/main/resources/assets/der/sounds.json @@ -0,0 +1,10 @@ +{ + "music": { + "sounds": [ + { + "name": "fabric-sound-api-v1:empty", + "stream": true + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/der.mixins.json b/src/main/resources/der.mixins.json new file mode 100644 index 0000000..99a6228 --- /dev/null +++ b/src/main/resources/der.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "cn.wzpmc.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "OutOfOrderMixin" + ], + "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..777e305 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,42 @@ +{ + "schemaVersion": 1, + "id": "der", + "version": "${version}", + "name": "DreamRunnerCarpetAddition", + "description": "An Carpet Addition Mod For DreamRunner Server", + "authors": [ + "wzpMC" + ], + "contact": { + "homepage": "https://fabricmc.net/", + "sources": "https://github.com/FabricMC/fabric-example-mod" + }, + "license": "CC0-1.0", + "icon": "assets/der/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "cn.wzpmc.DreamRunnerMod" + ], + "client": [ + "cn.wzpmc.DreamRunnerModClient" + ] + }, + "mixins": [ + "der.mixins.json", + { + "config": "der.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.14.21", + "minecraft": "~1.20.1", + "java": ">=17", + "fabric-api": "*", + "carpet": ">=1.4.45+v210811" + }, + "suggests": { + "another-mod": "*" + } +} \ No newline at end of file