diff --git a/fabric-1.21.11/.gitattributes b/fabric-1.21.11/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/fabric-1.21.11/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/fabric-1.21.11/.gitignore b/fabric-1.21.11/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/fabric-1.21.11/.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/fabric-1.21.11/LICENSE b/fabric-1.21.11/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/fabric-1.21.11/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/fabric-1.21.11/build.gradle b/fabric-1.21.11/build.gradle new file mode 100644 index 0000000..4ca973c --- /dev/null +++ b/fabric-1.21.11/build.gradle @@ -0,0 +1,91 @@ +plugins { + id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + id 'maven-publish' + id "org.jetbrains.kotlin.jvm" version "2.3.0" +} + +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. +} + +fabricApi { + configureDataGeneration { + client = true + } +} + +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 "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": inputs.properties.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = 21 + } +} + +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_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + inputs.property "archivesName", project.base.archivesName + + from("LICENSE") { + rename { "${it}_${inputs.properties.archivesName}"} + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + 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/fabric-1.21.11/gradle.properties b/fabric-1.21.11/gradle.properties new file mode 100644 index 0000000..0406973 --- /dev/null +++ b/fabric-1.21.11/gradle.properties @@ -0,0 +1,22 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.11 +yarn_mappings=1.21.11+build.3 +loader_version=0.18.3 +loom_version=1.14-SNAPSHOT +fabric_kotlin_version=1.13.8+kotlin.2.3.0 + +# Mod Properties +mod_version=1.0.0 +maven_group=org.suny +archives_base_name=thingy + +# Dependencies +fabric_version=0.140.0+1.21.11 \ No newline at end of file diff --git a/fabric-1.21.11/gradle/wrapper/gradle-wrapper.jar b/fabric-1.21.11/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f8e1ee3 Binary files /dev/null and b/fabric-1.21.11/gradle/wrapper/gradle-wrapper.jar differ diff --git a/fabric-1.21.11/gradle/wrapper/gradle-wrapper.properties b/fabric-1.21.11/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..23449a2 --- /dev/null +++ b/fabric-1.21.11/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/fabric-1.21.11/gradlew b/fabric-1.21.11/gradlew new file mode 100644 index 0000000..adff685 --- /dev/null +++ b/fabric-1.21.11/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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 + + + +# 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=SC2039,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=SC2039,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" ) + + 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 optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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/fabric-1.21.11/gradlew.bat b/fabric-1.21.11/gradlew.bat new file mode 100644 index 0000000..e509b2d --- /dev/null +++ b/fabric-1.21.11/gradlew.bat @@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/fabric-1.21.11/settings.gradle b/fabric-1.21.11/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/fabric-1.21.11/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/fabric-1.21.11/src/main/java/suike/suikefoxfriend/SuiKe.java b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/SuiKe.java new file mode 100644 index 0000000..c54cb77 --- /dev/null +++ b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/SuiKe.java @@ -0,0 +1,63 @@ +package suike.suikefoxfriend; + +import java.util.List; + +import suike.suikefoxfriend.api.IOwnable; + +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.FoxEntity; +import net.minecraft.util.Hand; +import net.minecraft.util.ActionResult; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.Version; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.MappingResolver; +import net.fabricmc.fabric.api.event.player.UseEntityCallback; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.collect.Lists; + +public class SuiKe implements ModInitializer { + public static final String MOD_ID = "suikefoxfriend"; + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + public static List foxCanPickupItemList = Lists.newArrayList( + Items.TOTEM_OF_UNDYING + ); + public static List foxNotPickupItemList = Lists.newArrayList( + Items.ROTTEN_FLESH, Items.SPIDER_EYE, Items.POISONOUS_POTATO, Items.SUSPICIOUS_STEW + ); + + @Override + public void onInitialize() { + UseEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> { + if (hand == Hand.MAIN_HAND && !world.isClient()) { + // 检查是否是右键点击 + if (entity instanceof FoxEntity) { + IOwnable foxIOwnable = ((IOwnable) entity); + Item handItem = player.getMainHandStack().getItem(); + if (foxIOwnable.isTamed() && handItem != Items.SWEET_BERRIES && handItem != Items.NAME_TAG) { + // 设置等待状态 + foxIOwnable.playerSetWaiting(player); + return ActionResult.SUCCESS; + + } else if (!foxIOwnable.isTamed() && handItem == Items.SWEET_BERRIES) { + if (!player.getAbilities().creativeMode) { + player.getMainHandStack().decrement(1); + } + + // 设为驯服 + foxIOwnable.playerTamedFox(player); + return ActionResult.SUCCESS; + } + } + } + return ActionResult.PASS; + }); + } +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/java/suike/suikefoxfriend/api/IOwnable.java b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/api/IOwnable.java new file mode 100644 index 0000000..f1b92f7 --- /dev/null +++ b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/api/IOwnable.java @@ -0,0 +1,26 @@ +package suike.suikefoxfriend.api; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; + +public interface IOwnable { + void playerTamedFox(PlayerEntity player); + + boolean isTamed(); + + boolean isWaiting(); + + void playerSetWaiting(PlayerEntity player); + + void setWaiting(boolean waiting); + + boolean getIsSleeping(); + + LivingEntity getOwner(); + + void mixinStopActions(); + + void mixinSetSleeping(boolean sleeping); + + void mixinSetAggressive(boolean aggressive); +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/java/suike/suikefoxfriend/entity/ai/FoxFollowOwnerGoal.java b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/entity/ai/FoxFollowOwnerGoal.java new file mode 100644 index 0000000..bb11dbe --- /dev/null +++ b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/entity/ai/FoxFollowOwnerGoal.java @@ -0,0 +1,145 @@ +package suike.suikefoxfriend.entity.ai; + +import java.util.Random; +import java.util.EnumSet; + +import suike.suikefoxfriend.api.IOwnable; + +import net.minecraft.block.BlockState; +import net.minecraft.block.LeavesBlock; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.passive.FoxEntity; +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.entity.ai.pathing.PathNodeType; +import net.minecraft.entity.ai.pathing.LandPathNodeMaker; +import net.minecraft.world.World; +import net.minecraft.util.math.BlockPos; + +public class FoxFollowOwnerGoal extends Goal { + private final FoxEntity fox; + private final World world; + private final double speed = 1.0D; + private final float minDistance = 10.0F; + private final float maxDistance = 20.0F; + private LivingEntity owner; + private int updateCountdownTicks; + + public FoxFollowOwnerGoal(FoxEntity fox) { + this.fox = fox; + this.world = fox.getEntityWorld(); + this.setControls(EnumSet.of(Goal.Control.MOVE, Goal.Control.LOOK)); + } + + @Override + public boolean canStart() { + LivingEntity owner = ((IOwnable) this.fox).getOwner(); + if (owner == null || owner.isSpectator() || this.cannotFollow()) { + return false; + } else if (this.fox.squaredDistanceTo(owner) < (double) (this.minDistance * this.minDistance)) { + return false; + } else { + this.owner = owner; + return true; + } + } + + @Override + public boolean shouldContinue() { + if (this.cannotFollow()) { + return false; + } else if (this.fox.squaredDistanceTo(((IOwnable) this.fox).getOwner()) <= (double) (this.maxDistance * this.maxDistance)) { + return false; + } else { + return true; + } + } + + private boolean cannotFollow() { + return ((IOwnable) this.fox).isWaiting(); + } + + @Override + public void start() { + this.updateCountdownTicks = 0; + } + + @Override + public void stop() { + this.owner = null; + this.fox.getNavigation().stop(); + } + + @Override + public void tick() { + if (this.owner == null) { + return; + } + // 看向主人 + this.fox.getLookControl().lookAt(this.owner, 10.0F, (float) this.fox.getMaxLookPitchChange()); + + // 是否传送到主人 + if (--this.updateCountdownTicks <= 0) { + this.updateCountdownTicks = 10; + if (this.fox.squaredDistanceTo(this.owner) >= 144.0D) { + this.tryTeleport(); + } else { + this.fox.getNavigation().startMovingTo(this.owner, this.speed); + } + } + } + + public boolean teleport() { + this.owner = ((IOwnable) this.fox).getOwner();; + if (owner != null && this.fox.squaredDistanceTo(this.owner) >= 144.0D) { + this.tryTeleport(); + this.owner = null; + return true; + } + this.owner = null; + return false; + } + + private void tryTeleport() { + BlockPos ownerPos = this.owner.getBlockPos(); + for (int i = 0; i < 10; ++i) { + int x = ownerPos.getX() + this.getRandomInt(-3, 3); + int y = ownerPos.getY() + this.getRandomInt(-1, 1); + int z = ownerPos.getZ() + this.getRandomInt(-3, 3); + if (this.tryTeleportTo(x, y, z)) { + return; + } + } + } + + private boolean tryTeleportTo(int x, int y, int z) { + if (Math.abs((double) x - this.owner.getX()) < 2.0D && Math.abs((double) z - this.owner.getZ()) < 2.0D) { + return false; + } else if (!this.canTeleportTo(new BlockPos(x, y, z))) { + return false; + } else { + this.fox.refreshPositionAndAngles((double) x + 0.5D, (double) y, (double) z + 0.5D, this.fox.getYaw(), this.fox.getPitch()); + this.fox.getNavigation().stop(); + return true; + } + } + + private boolean canTeleportTo(BlockPos pos) { + PathNodeType pathNodeType = LandPathNodeMaker.getLandNodeType(this.fox, pos.mutableCopy()); + if (pathNodeType != PathNodeType.WALKABLE) { + return false; + } else { + BlockState blockState = this.world.getBlockState(pos.down()); + if (blockState.getBlock() instanceof LeavesBlock) { + return false; + } else { + BlockPos blockPos = pos.subtract(this.fox.getBlockPos()); + return this.world.isSpaceEmpty(this.fox, this.fox.getBoundingBox().offset(blockPos)); + } + } + } + + private static Random random = new Random(); + private int getRandomInt(int min, int max) { + return random.nextInt(max - min + 1) + min; + } +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/java/suike/suikefoxfriend/entity/ai/FoxWaitingGoal.java b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/entity/ai/FoxWaitingGoal.java new file mode 100644 index 0000000..b8118e1 --- /dev/null +++ b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/entity/ai/FoxWaitingGoal.java @@ -0,0 +1,65 @@ +package suike.suikefoxfriend.entity.ai; + +import suike.suikefoxfriend.api.IOwnable; + +import net.minecraft.entity.ai.goal.Goal; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.passive.FoxEntity; +import net.minecraft.util.math.Vec3d; + +public class FoxWaitingGoal extends Goal { + private final FoxEntity fox; + + public FoxWaitingGoal(FoxEntity fox) { + this.fox = fox; + } + + @Override + public boolean canStart() { + if (((IOwnable) this.fox).isWaiting()) { + ((IOwnable) this.fox).mixinStopActions(); + ((IOwnable) this.fox).mixinSetSleeping(true); // 修复进入等待依然移动的BUG + if (!((IOwnable) this.fox).getIsSleeping()) { // + this.fox.setSitting(true); // + } //*/ + return true; + } + return false; + } + + @Override + public boolean shouldContinue() { + return ((IOwnable) this.fox).isWaiting(); + } + + @Override + public void start() {} + + @Override + public void stop() { + this.fox.setSitting(false); + this.fox.setRollingHead(true); + this.fox.setCanPickUpLoot(true); + ((IOwnable) this.fox).mixinSetSleeping(false); + this.fox.getNavigation().stop(); + } + + @Override + public void tick() { + this.fox.setJumping(false); + ((IOwnable) this.fox).mixinSetAggressive(false); + if (((IOwnable) this.fox).getIsSleeping()) { + // 睡觉时 + /*锁定视角*/this.fox.setRollingHead(false); + /*不允许收集*/this.fox.setCanPickUpLoot(false); + /*设为睡觉*/((IOwnable) this.fox).mixinSetSleeping(true); + } else { + // 不睡觉时 + /*坐下*/this.fox.setSitting(true); + LivingEntity owner = ((IOwnable) this.fox).getOwner(); + if (owner != null && this.fox.squaredDistanceTo(owner) < 5.0D) { + /*看向主人*/this.fox.getLookControl().lookAt(owner, 10.0F, (float) this.fox.getMaxLookPitchChange()); + } + } + } +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/FleeEntityGoalMixin.java b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/FleeEntityGoalMixin.java new file mode 100644 index 0000000..5448779 --- /dev/null +++ b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/FleeEntityGoalMixin.java @@ -0,0 +1,34 @@ +package suike.suikefoxfriend.mixin; + +import java.util.function.Predicate; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.passive.FoxEntity; +import net.minecraft.entity.passive.PolarBearEntity; +import net.minecraft.entity.mob.PathAwareEntity; +import net.minecraft.entity.ai.goal.FleeEntityGoal; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(FleeEntityGoal.class) +public abstract class FleeEntityGoalMixin { + @Shadow + @Mutable + private Class classToFleeFrom; + + @Inject( + method = "(Lnet/minecraft/entity/mob/PathAwareEntity;Ljava/lang/Class;FDDLjava/util/function/Predicate;)V", + at = @At("TAIL") + ) + private void onInit(PathAwareEntity fleeingEntity, Class classToFleeFrom, float fleeDistance, double fleeSlowSpeed, double fleeFastSpeed, Predicate inclusionSelector, CallbackInfo ci) { + if (fleeingEntity instanceof FoxEntity && PlayerEntity.class.equals(classToFleeFrom)) { + this.classToFleeFrom = (Class) PolarBearEntity.class; + } + } +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/FoxEntityMixin.java b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/FoxEntityMixin.java new file mode 100644 index 0000000..0e153e6 --- /dev/null +++ b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/FoxEntityMixin.java @@ -0,0 +1,339 @@ +package suike.suikefoxfriend.mixin; + +import java.util.List; +import java.util.UUID; +import java.util.Random; +import java.util.Optional; + +import com.mojang.serialization.Codec; +import net.minecraft.entity.*; +import net.minecraft.storage.NbtReadView; +import net.minecraft.storage.ReadView; +import net.minecraft.storage.WriteView; +import net.minecraft.util.Uuids; +import org.spongepowered.asm.mixin.Final; +import suike.suikefoxfriend.SuiKe; +import suike.suikefoxfriend.api.*; +import suike.suikefoxfriend.entity.ai.FoxWaitingGoal; +import suike.suikefoxfriend.entity.ai.FoxFollowOwnerGoal; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.entity.mob.MobEntity; +import net.minecraft.entity.data.DataTracker; +import net.minecraft.entity.data.TrackedData; +import net.minecraft.entity.data.TrackedDataHandlerRegistry; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.passive.FoxEntity; +import net.minecraft.entity.ai.goal.GoalSelector; +import net.minecraft.entity.ai.pathing.EntityNavigation; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.FoodComponent; +import net.minecraft.world.World; +import net.minecraft.util.math.BlockPos; +import net.minecraft.text.Text; +import net.minecraft.nbt.NbtString; +import net.minecraft.nbt.NbtElement; +import net.minecraft.nbt.NbtIntArray; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.fluid.FluidState; +import net.minecraft.advancement.criterion.Criteria; +import net.minecraft.server.network.ServerPlayerEntity; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(FoxEntity.class) +public abstract class FoxEntityMixin implements IOwnable {//, Tameable { + + private int foxCooldownTicks = 0; + private int foxNameWaitingTicks = 0; + private static Random random = new Random(); + private FoxFollowOwnerGoal foxFollowOwnerGoal; + private boolean isSleeping = false; + public boolean getIsSleeping() {return this.isSleeping;} + + @Shadow abstract void stopActions(); + @Shadow abstract void setSleeping(boolean sleeping); + @Shadow abstract void setAggressive(boolean aggressive); + + @Shadow + @Final + private static Codec>> TRUSTED_ENTITIES_CODEC; + + public void mixinStopActions() {this.stopActions();} + public void mixinSetSleeping(boolean sleeping) {this.setSleeping(sleeping);} + public void mixinSetAggressive(boolean aggressive) {this.setAggressive(aggressive);} + + private static final TrackedData TAMEABLE_FLAGS = DataTracker.registerData(FoxEntity.class, TrackedDataHandlerRegistry.BYTE); + private static final TrackedData OWNER_UUID = DataTracker.registerData(FoxEntity.class, TrackedDataHandlerRegistry.STRING); + private static final TrackedData WAITING_FLAG = DataTracker.registerData(FoxEntity.class, TrackedDataHandlerRegistry.BOOLEAN); + + public void playerSetWaiting(PlayerEntity player) { // 玩家修改等待状态 + if (this.foxCooldownTicks <= 0) { + if (player.getUuid().equals(this.getOwnerUuid())) { + if (!this.isWaiting()) { + this.isSleeping = random.nextBoolean(); // 随机睡觉或坐下 + } + this.setWaiting(!this.isWaiting(), "isPlayer"); // 修改等待状态 + this.tameAnimalCriteria(player); + this.foxCooldownTicks = 3; // 修改冷却(tick) + } + } + } + + public void playerTamedFox(PlayerEntity player) { + if (player != null) { + FoxEntity foxEntity = (FoxEntity) (Object) this; + this.setOwner(player); + this.setWaiting(true); + this.mixinStopActions(); + foxEntity.setPersistent(); + this.foxFollowOwnerGoal = new FoxFollowOwnerGoal(foxEntity); + ((MobEntityAccessor) this).getGoalSelector().add(5, this.foxFollowOwnerGoal); + ((MobEntityAccessor) this).getGoalSelector().add(-1, new FoxWaitingGoal(foxEntity)); + } + } + + @Inject(method = "initDataTracker", at = @At("RETURN")) + private void onInitDataTracker(DataTracker.Builder builder, CallbackInfo ci) { + builder.add(OWNER_UUID, ""); + builder.add(TAMEABLE_FLAGS, (byte) 0); + builder.add(WAITING_FLAG, this.isWaiting()); + } + +//驯服部分 + public void setOwner(PlayerEntity player) { // 设置主人 + this.setTamed(true); + this.setOwnerUuid(player.getUuid()); + this.tameAnimalCriteria(player); + } + + public void setOwnerUuid(UUID uuid) { // 设置主人UUID + String uuidString = (uuid != null) ? uuid.toString() : ""; + ((FoxEntity) (Object) this).getDataTracker().set(OWNER_UUID, uuidString); + } + + public void setTamed(boolean tamed) { // 设置驯服 + byte b = ((FoxEntity) (Object) this).getDataTracker().get(TAMEABLE_FLAGS); + if (tamed) { + ((FoxEntity) (Object) this).getDataTracker().set(TAMEABLE_FLAGS, (byte) (b | 4)); + } else { + ((FoxEntity) (Object) this).getDataTracker().set(TAMEABLE_FLAGS, (byte) (b & -5)); + } + } + + public boolean isTamed() { // 是否驯服 + FoxEntity foxEntity = (FoxEntity) (Object) this; + return foxEntity.getDataTracker() != null && (foxEntity.getDataTracker().get(TAMEABLE_FLAGS) & 4) != 0; + } + + public LivingEntity getOwner() { // 获取主人 + UUID ownerUuid = this.getOwnerUuid(); + if (ownerUuid == null) { + return null; + } + LivingEntity owner = ((EntityAccessor) this).getWorld().getPlayerByUuid(ownerUuid); + return (owner instanceof PlayerEntity) ? owner : null; + } + + public UUID getOwnerUuid() { // 获取主人UUID + String uuidString = ((FoxEntity) (Object) this).getDataTracker().get(OWNER_UUID); + if (uuidString != null && !uuidString.isEmpty()) { + try { + return UUID.fromString(uuidString); + } catch (IllegalArgumentException e) {} + } + return null; + } + + public void tameAnimalCriteria(PlayerEntity player) { // 成就 + if (player instanceof ServerPlayerEntity) { + Criteria.TAME_ANIMAL.trigger((ServerPlayerEntity) player, (FoxEntity) (Object) this); + } + } + +//等待部分 + public void setWaiting(boolean waiting) { + this.setWaiting(waiting, "notIsPlayer"); + } + public void setWaiting(boolean waiting, String isPlayerSetWaiting) { // 设置等待状态 + if (this.isTamed()) { + FoxEntity foxEntity = (FoxEntity) (Object) this; + + foxEntity.setInvulnerable(waiting); // 设置无敌状态 + foxEntity.getDataTracker().set(WAITING_FLAG, waiting); + + if (isPlayerSetWaiting.equals("isPlayer")) { + this.setFoxName(foxEntity, waiting); + } else { + this.setFoxName(foxEntity, false); // 清除等待字段 + } + } + } + + public boolean isWaiting() { // 获取等待状态 + return this.isTamed() && ((FoxEntity) (Object) this).getDataTracker().get(WAITING_FLAG); + } + + public void setFoxName(FoxEntity foxEntity, boolean waiting) { + String foxName = foxEntity.getName().getString(); // 获取当前名称 + String waitingString = Text.translatable("foxfriend.waiting").getString(); // 获取等待字段 + + if (waiting) { + if (!foxName.contains(waitingString)) { // 如果名称中不包含等待字段 + foxEntity.setCustomName(Text.literal(foxName + waitingString)); // 添加等待字段 + } + this.foxNameWaitingTicks = 50; // 显示等待状态 + } else { + String defaultFoxName = Text.translatable("entity.minecraft.fox").getString(); // 获取狐狸默认名称 + + String oldFoxName = foxName.replace(waitingString, ""); // 去除等待字段 + foxEntity.setCustomName(Text.literal(oldFoxName)); // 恢复原始名称 + + if (oldFoxName.equals(defaultFoxName)) { // 如果玩家未使用命名牌 + foxEntity.setCustomName(null); // 清除名字 + } + this.foxNameWaitingTicks = 0; + } + } + +//tick方法 + @Inject(method = "tick", at = @At("HEAD")) + private void onTick(CallbackInfo ci) { + if (!this.isTamed()) { + return; + } + + if (this.foxCooldownTicks > 0) { + this.foxCooldownTicks--; // 减少点击冷却 + } + + FoxEntity foxEntity = (FoxEntity) (Object) this; + if (this.foxNameWaitingTicks > 0) { + this.foxNameWaitingTicks--; // 减少显示时间 + if (foxNameWaitingTicks == 0) { + String foxName = foxEntity.getName().getString(); // 获取当前名称 + String waitingString = Text.translatable("foxfriend.waiting").getString(); // 获取等待字段 + String defaultFoxName = Text.translatable("entity.minecraft.fox").getString(); // 获取狐狸默认名称 + + foxName = foxName.replace(waitingString, ""); // 去除等待字段 + foxEntity.setCustomName(Text.literal(foxName)); // 恢复原始名称 + + if (foxName.equals(defaultFoxName)) { // 如果玩家未使用命名牌 + foxEntity.setCustomName(null); // 清除名字 + } + } + } + + if (!isWaiting() && this.foxFollowOwnerGoal != null) { + if (this.foxFollowOwnerGoal.teleport()) { // 尝试传送到主人 + return; + } + } + + World world = foxEntity.getEntityWorld(); + BlockPos pos = foxEntity.getBlockPos(); + FluidState fluidState = world.getFluidState(pos); + // 检查是否在液体里 + if (fluidState != null && !fluidState.isEmpty()) { + this.setWaiting(false); + } else if (this.getOwner() == null) { // 找不到主人设为等待状态 + this.setWaiting(true); + } + } + +//存储读取 +//The three methods below were changed to allow compatibility with 1.21.11 - compatibility with versions 1.21.6 - 1.21.10 +//might be possible, but not guaranteed. +// - Suny + @Inject(method = "writeCustomData", at = @At("RETURN")) + private void onWriteCustomData(WriteView view, CallbackInfo ci) { + if (this.isTamed()) { + view.putBoolean("Tamed", this.isTamed()); + view.putBoolean("Waiting", this.isWaiting()); + view.putString("Owner", this.getOwnerUuid().toString()); // 将 UUID 转换为字符串存储 + } + } + + @Inject(method = "readCustomData", at = @At("RETURN")) + private void onReadCustomData(ReadView view, CallbackInfo ci) { + if (view.contains("Owner")) { + UUID ownerUuid = tryReadOwnerUuid(view); + + if (ownerUuid != null) { + this.setOwnerUuid(ownerUuid); + this.setTamed(view.getBoolean("Tamed", false)); + this.isSleeping = view.getBoolean("Sleeping", false); + this.setWaiting(view.getBoolean("Waiting", false)); + + FoxEntity foxEntity = (FoxEntity) (Object) this; + this.mixinStopActions(); + foxEntity.setPersistent(); + this.foxFollowOwnerGoal = new FoxFollowOwnerGoal(foxEntity); + ((MobEntityAccessor) this).getGoalSelector().add(5, this.foxFollowOwnerGoal); + ((MobEntityAccessor) this).getGoalSelector().add(-1, new FoxWaitingGoal(foxEntity)); + } + } + } + + public UUID tryReadOwnerUuid(ReadView view) { + Optional element = view.read("Owner", Uuids.CODEC); + if (element.isPresent()) return element.get(); + return null; + } + +//尝试捡起物品 + @Inject(method = "canPickupItem", at = @At("HEAD"), cancellable = true) + private void onCanPickupItem(ItemStack stack, CallbackInfoReturnable cir) { + if (this.isTamed()) { // 是否驯服 + boolean canPickupItem = false; + ItemStack handItem = ((FoxEntity) (Object) this).getEquippedStack(EquipmentSlot.MAINHAND); + + if (handItem.isEmpty() || !this.canPickup(handItem)) { + canPickupItem = this.canPickup(stack); + } + + cir.setReturnValue(canPickupItem); // 设置返回值 + } + } + + public boolean canPickup(ItemStack stack) { + Item dropItem = stack.getItem(); + if (SuiKe.foxCanPickupItemList.contains(dropItem)) { + return true; + } else if (SuiKe.foxNotPickupItemList.contains(dropItem)) { + return false; + } else if ((FoodComponent) stack.get(DataComponentTypes.FOOD) != null) { + return true; + } + return false; + } + +//禁止等待时停止睡觉 + @Inject(method = "stopSleeping", at = @At("HEAD"), cancellable = true) + private void onStopSleeping(CallbackInfo ci) { + if (this.isWaiting()) { // 等待状态 + ci.cancel(); // 取消方法执行 + } + } +} + +@Mixin(Entity.class) +interface EntityAccessor { + @Accessor("world") + World getWorld(); +} + +@Mixin(MobEntity.class) +interface MobEntityAccessor { + @Accessor("navigation") + EntityNavigation getNavigation(); + @Accessor("goalSelector") + GoalSelector getGoalSelector(); +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/LivingEntityMixin.java b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/LivingEntityMixin.java new file mode 100644 index 0000000..65186b8 --- /dev/null +++ b/fabric-1.21.11/src/main/java/suike/suikefoxfriend/mixin/LivingEntityMixin.java @@ -0,0 +1,42 @@ +package suike.suikefoxfriend.mixin; + +import suike.suikefoxfriend.api.IOwnable; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.passive.FoxEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.damage.DamageTracker; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.server.network.ServerPlayerEntity; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(LivingEntity.class) +public abstract class LivingEntityMixin { + @Inject(method = "onDeath", at = @At("HEAD"), cancellable = true) + public void onDeath(DamageSource damageSource, CallbackInfo ci) { + if ((Object) this instanceof FoxEntity) { + FoxEntity fox = (FoxEntity) (Object) this; + if (!fox.getEntityWorld().isClient() && fox.getEntityWorld() instanceof ServerWorld) { + ServerWorld serverWorld = (ServerWorld) fox.getEntityWorld(); + LivingEntity owner = ((IOwnable) this).getOwner(); + if (owner instanceof ServerPlayerEntity) { + ServerPlayerEntity serverPlayer = (ServerPlayerEntity) owner; + serverPlayer.sendMessage(((LivingEntityAccessor) this).getDamageTracker().getDeathMessage()); + } + } + } + } +} + +@Mixin(LivingEntity.class) +interface LivingEntityAccessor { + @Accessor("damageTracker") + DamageTracker getDamageTracker(); +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/icon.png b/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/icon.png new file mode 100644 index 0000000..597881b Binary files /dev/null and b/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/icon.png differ diff --git a/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/lang/en_us.json b/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/lang/en_us.json new file mode 100644 index 0000000..45fc99e --- /dev/null +++ b/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "foxfriend.waiting": "-waiting..." +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/lang/zh_cn.json b/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/lang/zh_cn.json new file mode 100644 index 0000000..3ff9985 --- /dev/null +++ b/fabric-1.21.11/src/main/resources/assets/suikefoxfriend/lang/zh_cn.json @@ -0,0 +1,3 @@ +{ + "foxfriend.waiting": "-等待..." +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/resources/fabric.mod.json b/fabric-1.21.11/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..c478793 --- /dev/null +++ b/fabric-1.21.11/src/main/resources/fabric.mod.json @@ -0,0 +1,31 @@ +{ + "schemaVersion": 1, + "id": "suikefoxfriend", + "version": "5.1", + "name": "Fox Friend", + "description": "", + "authors": [ + "sui_ke" + ], + "license": "MIT", + "icon": "assets/suikefoxfriend/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "suike.suikefoxfriend.SuiKe" + ] + }, + "mixins": [ + "suikefoxfriend.mixins.json" + ], + "depends": { + "fabricloader": "*", + "minecraft": ">=1.21.11", + "java": "*", + "fabric-api": "*" + }, + "suggests": { + "another-mod": "*" + } + +} diff --git a/fabric-1.21.11/src/main/resources/suikefoxfriend.mixins.json b/fabric-1.21.11/src/main/resources/suikefoxfriend.mixins.json new file mode 100644 index 0000000..d1230b7 --- /dev/null +++ b/fabric-1.21.11/src/main/resources/suikefoxfriend.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "package": "suike.suikefoxfriend.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "FleeEntityGoalMixin", + "FoxEntityMixin", + "EntityAccessor", + "MobEntityAccessor", + "LivingEntityMixin", + "LivingEntityAccessor" + ], + "injectors": { "defaultRequire": 1 } +} \ No newline at end of file diff --git a/fabric-1.21.11/src/main/resources/thingy.mixins.json b/fabric-1.21.11/src/main/resources/thingy.mixins.json new file mode 100644 index 0000000..15bfdb0 --- /dev/null +++ b/fabric-1.21.11/src/main/resources/thingy.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "package": "org.suny.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "ExampleMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file