commit 10f350a1b3cacdbb81728b4393e0f726844926f7 Author: sophie Date: Fri Sep 13 17:17:39 2024 +0300 first commit diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..dcc09ce --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,37 @@ +# 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: [ + 21, # Current Java LTS + ] + runs-on: node-1 6 + steps: + - name: checkout repository + uses: https://github.com/actions/checkout@v4 + - name: validate gradle wrapper + uses: https://github.com/gradle/wrapper-validation-action@v2 + - name: setup jdk ${{ matrix.java }} + uses: https://github.com/actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + uses: https://github.com/actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.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/.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..9dfaede --- /dev/null +++ b/README.MD @@ -0,0 +1,13 @@ +# AnimalRP port to Fabric + +Order of importance: +TODO: + +- [ ] Database +- [ ] Player leashing +- [No] Cooldowns +- [No] Emotes +- [x] Bee +- [x] Cat +- [x] Dog +- [x] Fox \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3f79d18 --- /dev/null +++ b/build.gradle @@ -0,0 +1,93 @@ +plugins { + id 'fabric-loom' version '1.7-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://maven.nucleoid.xyz/" + name "Nucleoid" + } +} + +loom { + splitEnvironmentSourceSets() + + mods { + "animal-rp" { + 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}" + modImplementation include("eu.pb4:placeholder-api:2.4.1+1.21") + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 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 { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// 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/gradle.properties b/gradle.properties new file mode 100644 index 0000000..38ca5f0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# 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.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.16.4 + +# Mod Properties +mod_version=1.0.0 +maven_group=ovh.sad.animalrp +archives_base_name=animal-rp + +# Dependencies +fabric_version=0.103.0+1.21.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 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..9355b41 --- /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.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/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. +# +# 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 +' "$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 + +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=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" ) + 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, 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" \ + -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..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 + +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..75c4d72 --- /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/main/java/ovh/sad/animalrp/AnimalRP.java b/src/main/java/ovh/sad/animalrp/AnimalRP.java new file mode 100644 index 0000000..280072a --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/AnimalRP.java @@ -0,0 +1,68 @@ +package ovh.sad.animalrp; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.minecraft.util.Identifier; +import ovh.sad.animalrp.animals.Animal; +import ovh.sad.animalrp.animals.Cat; +import ovh.sad.animalrp.animals.Dog; +import ovh.sad.animalrp.animals.Fox; +import ovh.sad.animalrp.animals.Bee; + +import ovh.sad.animalrp.commands.InteractionCommand; +import ovh.sad.animalrp.commands.NoChatCommand; +import ovh.sad.animalrp.commands.TfCommand; +import ovh.sad.animalrp.util.Mood; +import eu.pb4.placeholders.api.PlaceholderContext; +import eu.pb4.placeholders.api.PlaceholderHandler; +import eu.pb4.placeholders.api.PlaceholderResult; +import eu.pb4.placeholders.api.Placeholders; + +import java.util.HashMap; +import java.util.UUID; + +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class AnimalRP implements ModInitializer { + public static HashMap users = new HashMap<>(); + public static HashMap noChat = new HashMap<>(); + public static HashMap animals = new HashMap<>(); + // public static Emote emotes; + + public static final String MOD_ID = "animal-rp"; + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + @Override + public void onInitialize() { + animals.put("cat", new Cat()); + animals.put("dog", new Dog()); + animals.put("fox", new Fox()); + animals.put("bee", new Bee()); + Placeholders.register(Identifier.of("animalrp", "animalcolor"), new PlaceholderHandler() { + @Override + public PlaceholderResult onPlaceholderRequest(PlaceholderContext ctx, @Nullable String arg) { + if (!ctx.hasPlayer()) + return PlaceholderResult.invalid("No player!"); + Animal animal = users.get(ctx.player().getUuid()); + if(animal == null) + return PlaceholderResult.value(""); + return PlaceholderResult.value(""); + } + }); + + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> { + (new TfCommand()).Command(dispatcher, registryAccess, environment); + (new NoChatCommand()).Command(dispatcher, registryAccess, environment); + + + (new InteractionCommand("headpats", Mood.HAPPY, "%s petted you! %s", "You petted %s! %s")).Command(dispatcher, registryAccess, environment); + (new InteractionCommand("kiss", Mood.CUTE, "%s kissed you.. 0////0 %s", "You kissed %s.. 0////0 %s")).Command(dispatcher, registryAccess, environment); + (new InteractionCommand("bite", Mood.ANGRY, "%s bit you!! Σ(っﾟДﾟ)っ %s", "You bit %s! (○｀д´)ﾉｼ %s")).Command(dispatcher, registryAccess, environment); + (new InteractionCommand("scratch", Mood.ANGRY, "%s SCRATCHES YOU! Ow! %s", "You channel your inner evil, and scratch %s! %s")).Command(dispatcher, registryAccess, environment); + (new InteractionCommand("hug", Mood.HAPPY, "%s hugs you! How heartwarming. %s", "You hug %s! How heartwarming. %s")).Command(dispatcher, registryAccess, environment); + (new InteractionCommand("cuddle", Mood.CUTE, "%s cuddles with you. %s", "You and %s start cuddling. How cute! %s")).Command(dispatcher, registryAccess, environment); + }); + } +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/animals/Animal.java b/src/main/java/ovh/sad/animalrp/animals/Animal.java new file mode 100644 index 0000000..7ee5cfc --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/animals/Animal.java @@ -0,0 +1,24 @@ +package ovh.sad.animalrp.animals; + +import java.util.ArrayList; +import java.util.HashMap; + +import net.minecraft.item.Item; +import net.minecraft.sound.SoundEvent; +import ovh.sad.animalrp.util.Mood; + +public abstract class Animal { + public String name; + public String catchphrase; + public String color; + public HashMap moodSounds = new HashMap(); + public ArrayList superfoods = new ArrayList(); + + Animal(String name, String catchphrase, String color) { + this.name = name; + this.catchphrase = catchphrase; + this.color = color; + } + + public abstract String chatTransformations(String message); +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/animals/Bee.java b/src/main/java/ovh/sad/animalrp/animals/Bee.java new file mode 100644 index 0000000..3abbfef --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/animals/Bee.java @@ -0,0 +1,194 @@ +package ovh.sad.animalrp.animals; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import net.fabricmc.fabric.api.event.player.UseItemCallback; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.FoodComponent; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Identifier; +import net.minecraft.util.TypedActionResult; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.util.Mood; +import ovh.sad.animalrp.util.TextDestroyer; + +public class Bee extends Animal { + class Row { + Item mat; + Integer times; + } + + ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); + + private static Item[] _allFlowers = { Items.ALLIUM, Items.AZURE_BLUET, Items.BLUE_ORCHID, + Items.CORNFLOWER, Items.DANDELION, Items.LILY_OF_THE_VALLEY, Items.OXEYE_DAISY, + Items.POPPY, Items.TORCHFLOWER, Items.ORANGE_TULIP, Items.PINK_TULIP, Items.RED_TULIP, + Items.WHITE_TULIP }; + public static List allFlowers = Arrays.asList(_allFlowers); + public static Identifier beeFoodKey = Identifier.of("animalrp", "bee_food"); + public static HashMap inARow = new HashMap(); + TextDestroyer destroyer = new TextDestroyer(new String[] { + ">_<", "*buzz*", + ";3", ":3", "εწз", " ≧◠◡◠≦ ", "*stings you*", "*humms*", + "*i'm a bee*" + }, new String[][] { + { "e", "ee" }, + { "b", "bzz" }, + { "h", "hh" }, + { "ie", "ee" }, + { "be", "bee" }, + { "E", "EE" }, + { "B", "BZZ" }, + { "H", "HH" }, + { "IE", "EE" }, + { "BE", "BEE" } + }); + + ArrayList sneakers = new ArrayList(); + + public static Boolean isItemARP(ItemStack is) { + return (allFlowers.contains(is.getItem()) && is.get(DataComponentTypes.FOOD) != null); + } + + public Bee() { + super("bee", "Buzz...", "#FFFF00"); + this.moodSounds.put(Mood.HAPPY, SoundEvents.ENTITY_BEE_LOOP); + this.moodSounds.put(Mood.CUTE, SoundEvents.ENTITY_BEE_LOOP); + this.moodSounds.put(Mood.SAD, SoundEvents.ENTITY_BEE_HURT); + this.moodSounds.put(Mood.STRESSED, SoundEvents.ENTITY_BEE_STING); + this.moodSounds.put(Mood.ANGRY, SoundEvents.ENTITY_BEE_LOOP_AGGRESSIVE); + UseItemCallback.EVENT.register((player, world, hand) -> { + Animal animal = AnimalRP.users.get(player.getUuid()); + + ItemStack item = player.getStackInHand(hand); + + if (item == null) // air interact + return TypedActionResult.pass(item); + + if (!allFlowers.contains(item.getItem())) { // not a flower + return TypedActionResult.pass(item); + } + + Boolean incorrect = false; + + if (animal == null) { + incorrect = true; + } else { + if (animal.name != this.name) { + incorrect = true; + } + } + + if (incorrect) { + if (Bee.isItemARP(item)) { + item.remove(DataComponentTypes.FOOD); + + return TypedActionResult.pass(item); + } + return TypedActionResult.pass(item); + } + + if (Bee.isItemARP(item)) { // correct animal, but foodkey already set + return TypedActionResult.pass(item); + } + + FoodComponent food = new FoodComponent.Builder() + .statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 * 4, 1, true, true, true), 1) + .alwaysEdible() + .nutrition(4) + .saturationModifier(9.4f) + .build(); + + item.set(DataComponentTypes.FOOD, food); + + return TypedActionResult.pass(item); + }); + } + + // Called from the FoodEating mixin. + // Called only if the player is a animal and a bee. + public void onEat(ServerPlayerEntity player, ItemStack item) { + if (!allFlowers.contains(item.getItem())) { // not a flower + return; + } + + Row row = inARow.get(player.getUuid()); // make a new row + if (row == null) { // none yet + row = new Row(); + row.mat = item.getItem(); + row.times = 1; + } else { + if (row.mat.equals(item.getItem())) { // mat is same as in row, increase time + row.times += 1; + } else { + row.mat = item.getItem(); // mat not same, change mat, reset time + row.times = 1; + } + } + + if (row.times > 20) { + player.addStatusEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 20 * 10, 1, true, true)); + } + if (row.times > 30) { + if (row.times > 40) { + player.addStatusEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 20 * 10, 3, true, true)); + } else { + player.addStatusEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 20 * 5, 2, true, true)); + } + } + + inARow.put(player.getUuid(), row); + } + + // Called from the 'Sneaking' mixin. + public void onSneak(ServerPlayerEntity player, boolean status) { + Animal animal = AnimalRP.users.get(player.getUuid()); + if (animal == null) + return; + if (animal.name != this.name) + return; + + Block type = player.getWorld().getBlockState(player.getBlockPos().down()).getBlock(); + + if (status + && type != Blocks.AIR && type != Blocks.WATER) { + if (!sneakers.contains(player.getUuid())) { + sneakers.add(player.getUuid()); + executor.schedule(new Runnable() { + @Override + public void run() { + if (sneakers.contains(player.getUuid())) + sneakers.remove(player.getUuid()); + } + }, 1, TimeUnit.SECONDS); + } else { + sneakers.remove(player.getUuid()); + player.addStatusEffect( + new StatusEffectInstance(StatusEffects.LEVITATION, 20, 5, true, true, true)); + player.getWorld().playSound(player, player.getBlockPos(), + animal.moodSounds.get(Mood.HAPPY), SoundCategory.PLAYERS, 10F, 1); + } + } + } + + @Override + public String chatTransformations(String message) { + return destroyer.destroy(message); + } +} diff --git a/src/main/java/ovh/sad/animalrp/animals/Cat.java b/src/main/java/ovh/sad/animalrp/animals/Cat.java new file mode 100644 index 0000000..8b10092 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/animals/Cat.java @@ -0,0 +1,60 @@ +package ovh.sad.animalrp.animals; + +import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents; +import net.minecraft.entity.damage.DamageTypes; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundEvents; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.util.Mood; +import ovh.sad.animalrp.util.TextDestroyer; + +public class Cat extends Animal { + TextDestroyer destroyer = new TextDestroyer(new String[]{ + ">_<", ":3", "ʕʘ‿ʘʔ", ":D", "._.", + ";3", "xD", "ㅇㅅㅇ", + ">_>", "ÙωÙ", "UwU", "OwO", ":P", + "(◠‿◠✿)", "^_^", ";_;", + "x3", "(• o •)", "<_<" + }, new String[][]{ + {"l", "w"}, + {"r", "w"}, + {"th", "d"}, + {"L", "W"}, + {"R", "W"}, + {"TH", "D"} + }); + + public Cat() { + super("cat", "Nya~", "#F2BDCD"); + this.moodSounds.put(Mood.HAPPY, SoundEvents.ENTITY_CAT_PURR); + this.moodSounds.put(Mood.CUTE, SoundEvents.ENTITY_CAT_PURREOW); + this.moodSounds.put(Mood.SAD, SoundEvents.ENTITY_CAT_AMBIENT); + this.moodSounds.put(Mood.STRESSED, SoundEvents.ENTITY_CAT_STRAY_AMBIENT); + this.moodSounds.put(Mood.ANGRY, SoundEvents.ENTITY_CAT_HISS); + + this.superfoods.add(Items.COOKED_COD); + this.superfoods.add(Items.COD); + this.superfoods.add(Items.COOKED_SALMON); + this.superfoods.add(Items.SALMON); + + ServerLivingEntityEvents.AFTER_DAMAGE.register((entity, source, baseDmg, dmg, blocked) -> { + if (entity instanceof ServerPlayerEntity player) { + Animal animal = AnimalRP.users.get(player.getUuid()); + + if (animal == null || !animal.name.equals(this.name)) { + return; + } + + if (source.isOf(DamageTypes.FALL)) { + player.setHealth(Math.max(player.getMaxHealth(), player.getHealth() + 5)); + } + } + }); + } + + @Override + public String chatTransformations(String message) { + return destroyer.destroy(message); + } +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/animals/Dog.java b/src/main/java/ovh/sad/animalrp/animals/Dog.java new file mode 100644 index 0000000..dfd7eab --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/animals/Dog.java @@ -0,0 +1,50 @@ +package ovh.sad.animalrp.animals; + +import net.fabricmc.fabric.api.event.player.AttackEntityCallback; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.item.Items; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.ActionResult; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.util.Mood; +import ovh.sad.animalrp.util.TextDestroyer; + +public class Dog extends Animal { + TextDestroyer destroyer = new TextDestroyer(new String[] { + "Woof!", "Bark :3", + "Arf", "bark bark bark", "arf~" + }, new String[][] { + }); + + public Dog() { + super("dog", "Arf!", "#ff8c00"); + this.moodSounds.put(Mood.HAPPY, SoundEvents.ENTITY_WOLF_AMBIENT); + this.moodSounds.put(Mood.CUTE, SoundEvents.ENTITY_WOLF_STEP); + this.moodSounds.put(Mood.SAD, SoundEvents.ENTITY_WOLF_WHINE); + this.moodSounds.put(Mood.STRESSED, SoundEvents.ENTITY_WOLF_SHAKE); + this.moodSounds.put(Mood.ANGRY, SoundEvents.ENTITY_WOLF_GROWL); + + this.superfoods.add(Items.CHICKEN); + this.superfoods.add(Items.BEEF); + this.superfoods.add(Items.PORKCHOP); + + AttackEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> { + Animal animal = AnimalRP.users.get(player.getUuid()); + + if (animal == null) + return ActionResult.PASS; + if (animal.name != this.name) + return ActionResult.PASS; + player.removeStatusEffect(StatusEffects.SPEED); + player.addStatusEffect( + new StatusEffectInstance(StatusEffects.SPEED, 20, 2, true, true, true)); + return ActionResult.PASS; + }); + } + + @Override + public String chatTransformations(String message) { + return destroyer.destroy(message); + } +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/animals/Fox.java b/src/main/java/ovh/sad/animalrp/animals/Fox.java new file mode 100644 index 0000000..bbe79bd --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/animals/Fox.java @@ -0,0 +1,64 @@ +package ovh.sad.animalrp.animals; + +import java.util.Random; + +import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundEvents; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.util.Mood; +import ovh.sad.animalrp.util.TextDestroyer; + +public class Fox extends Animal { + TextDestroyer destroyer = new TextDestroyer(new String[] { + "yap", + "*yap yap*", + "*beeps*", + "*barks*", + "*screeches*", + ":3" + }, new String[][] { + { "you", "u" }, + { "o", "yo" }, + { "i", "yi" }, + { "!", " !" }, + { "?", " ?" } + }); + Random rand = new Random(); + + public Fox() { + super("fox", "Yap!", "#FF8000"); + this.moodSounds.put(Mood.HAPPY, SoundEvents.ENTITY_FOX_SNIFF); + this.moodSounds.put(Mood.CUTE, SoundEvents.ENTITY_FOX_SLEEP); + this.moodSounds.put(Mood.SAD, SoundEvents.ENTITY_FOX_SNIFF); + this.moodSounds.put(Mood.STRESSED, SoundEvents.ENTITY_FOX_AGGRO); + this.moodSounds.put(Mood.ANGRY, SoundEvents.ENTITY_FOX_BITE); + + this.superfoods.add(Items.APPLE); + this.superfoods.add(Items.GLOW_BERRIES); + + ServerLivingEntityEvents.AFTER_DAMAGE.register((entity, source, baseDmg, dmg, blocked) -> { + if(!(source.getSource() instanceof ServerPlayerEntity)) return; + if(entity instanceof PlayerEntity) return; + + Entity victim = entity; + ServerPlayerEntity damager = (ServerPlayerEntity) source.getSource(); + + Animal animal = AnimalRP.users.get(damager.getUuid()); + + if (animal == null || !animal.name.equals(this.name)) { + return; + } + + victim.damage(victim.getDamageSources().playerAttack(damager), dmg * 0.25F); + }); + } + + @Override + public String chatTransformations(String message) { + return this.destroyer.destroy(message); + } +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/animals/beeold.txt b/src/main/java/ovh/sad/animalrp/animals/beeold.txt new file mode 100644 index 0000000..253ff49 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/animals/beeold.txt @@ -0,0 +1,165 @@ +package ovh.sad.animalrp.animals; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import net.fabricmc.fabric.api.event.player.UseItemCallback; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.FoodComponent; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Identifier; +import net.minecraft.util.TypedActionResult; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.util.Mood; +import ovh.sad.animalrp.util.TextDestroyer; + +public class Bee extends Animal { + class Row { + Item mat; + Integer times; + } + + ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); + + private static Item[] _allFlowers = { Items.ALLIUM, Items.AZURE_BLUET, Items.BLUE_ORCHID, + Items.CORNFLOWER, Items.DANDELION, Items.LILY_OF_THE_VALLEY, Items.OXEYE_DAISY, + Items.POPPY, Items.TORCHFLOWER, Items.ORANGE_TULIP, Items.PINK_TULIP, Items.RED_TULIP, + Items.WHITE_TULIP }; + public static List allFlowers = Arrays.asList(_allFlowers); + public static Identifier beeFoodKey = Identifier.of("animalrp", "bee_food"); + public static HashMap inARow = new HashMap(); + TextDestroyer destroyer = new TextDestroyer(new String[] { + ">_<", "*buzz*", + ";3", ":3", "εწз", " ≧◠◡◠≦ ", "*stings you*", "*humms*", + "*i'm a bee*" + }, new String[][] { + { "e", "ee" }, + { "b", "bzz" }, + { "h", "hh" }, + { "ie", "ee" }, + { "be", "bee" }, + { "E", "EE" }, + { "B", "BZZ" }, + { "H", "HH" }, + { "IE", "EE" }, + { "BE", "BEE" } + }); + + ArrayList sneakers = new ArrayList(); + + public Bee() { + super("bee", "Buzz...", "#FFFF00"); + this.moodSounds.put(Mood.HAPPY, SoundEvents.ENTITY_BEE_LOOP); + this.moodSounds.put(Mood.CUTE, SoundEvents.ENTITY_BEE_LOOP); + this.moodSounds.put(Mood.SAD, SoundEvents.ENTITY_BEE_HURT); + this.moodSounds.put(Mood.STRESSED, SoundEvents.ENTITY_BEE_STING); + this.moodSounds.put(Mood.ANGRY, SoundEvents.ENTITY_BEE_LOOP_AGGRESSIVE); + UseItemCallback.EVENT.register((player, world, hand) -> { + System.out.println("1"); + Animal animal = AnimalRP.users.get(player.getUuid()); + + ItemStack item = player.getStackInHand(hand); + + if (item == null) // air interact + return TypedActionResult.pass(item); + System.out.println("2"); + + if (!allFlowers.contains(item.getItem())) { // not a flower + return TypedActionResult.pass(item); + } + System.out.println("3"); + + Boolean incorrect = false; + + if (animal == null) { + incorrect = true; + } else { + if (animal.name != this.name) { + incorrect = true; + } + } + System.out.println("3"); + + if (incorrect) { + if (item.get(AnimalRP.BEE_FOOD) != null) { + item.remove(AnimalRP.BEE_FOOD); + item.remove(DataComponentTypes.FOOD); + + return TypedActionResult.success(item, false); + } + return TypedActionResult.fail(item); + } + System.out.println("4"); + + if (item.get(AnimalRP.BEE_FOOD) != null) { // correct animal, but foodkey already set + return TypedActionResult.fail(item); + } + System.out.println("5"); +// .statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20 *4, 1, true, true, true), 1) + + FoodComponent food = new FoodComponent.Builder() + .alwaysEdible() + .nutrition(4) + .saturationModifier(9.4f) + .build(); + System.out.println("6"); + + item.set(DataComponentTypes.FOOD, food); + item.set(AnimalRP.BEE_FOOD, false); + System.out.println("7"); + + return TypedActionResult.success(item, false); + }); + } + + // called from the 'Sneaking' mixin. + public void onSneak(ServerPlayerEntity player, boolean status) { + Animal animal = AnimalRP.users.get(player.getUuid()); + if (animal == null) + return; + if (animal.name != this.name) + return; + + Block type = player.getWorld().getBlockState(player.getBlockPos().down()).getBlock(); + + if (status + && type != Blocks.AIR && type != Blocks.WATER) { + if (!sneakers.contains(player.getUuid())) { + sneakers.add(player.getUuid()); + executor.schedule(new Runnable() { + @Override + public void run() { + if (sneakers.contains(player.getUuid())) + sneakers.remove(player.getUuid()); + } + }, 1, TimeUnit.SECONDS); + } else { + sneakers.remove(player.getUuid()); + player.addStatusEffect( + new StatusEffectInstance(StatusEffects.LEVITATION, 20, 5, true, true, true)); + player.getWorld().playSound(player, player.getBlockPos(), + animal.moodSounds.get(Mood.HAPPY), SoundCategory.PLAYERS, 10F, 1); + } + } + } + + @Override + public String chatTransformations(String message) { + return destroyer.destroy(message); + } +} diff --git a/src/main/java/ovh/sad/animalrp/commands/InteractionCommand.java b/src/main/java/ovh/sad/animalrp/commands/InteractionCommand.java new file mode 100644 index 0000000..8eeff06 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/commands/InteractionCommand.java @@ -0,0 +1,84 @@ +package ovh.sad.animalrp.commands; + +import com.mojang.brigadier.CommandDispatcher; + +import eu.pb4.placeholders.api.TextParserUtils; +import net.minecraft.command.CommandRegistryAccess; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.text.Text; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.animals.Animal; +import ovh.sad.animalrp.util.Mood; + +public class InteractionCommand { + String command; + String toThem; + String toYou; + Mood mood; + + public InteractionCommand(String command, Mood mood, String toThem, String toYou) { + this.command = command; + this.toThem = toThem; + this.toYou = toYou; + this.mood = mood; + } + + @SuppressWarnings("deprecation") + public void Command(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, + CommandManager.RegistrationEnvironment environment) { + dispatcher.register(CommandManager.literal(this.command) + .then(CommandManager.argument("player", EntityArgumentType.player()) + .executes(context -> { + Entity sender = context.getSource().getEntity(); + + if (!(sender instanceof ServerPlayerEntity)) { + context.getSource().sendFeedback( + () -> Text.literal("I'm sorry console.").withColor(8421504), false); + return 0; + } + + ServerPlayerEntity player = context.getSource().getPlayer(); + + Animal aplayer = AnimalRP.users.get(player.getUuid()); + + if (aplayer == null) { + context.getSource().sendFeedback( + () -> Text.literal("Only animals can interact with other animals :(").withColor(8421504), false); + return 0; + } + + ServerPlayerEntity splayer = EntityArgumentType.getPlayer(context, "player"); + + if (splayer.getName() == player.getName()) { + context.getSource().sendFeedback( + () -> Text.literal("You can't " + this.command + " yourself.").withColor(8421504), false); + return 0; + } + Animal asplayer = AnimalRP.users.get(splayer.getUuid()); + + if (asplayer == null) { + context.getSource().sendFeedback( + () -> Text.literal(splayer.getName() + " is not an animal! :(").withColor(8421504), false); + return 0; + } + + splayer.sendMessage(TextParserUtils.formatText( + String.format(this.toThem, + "" + player.getName().getString() + "", + "" + aplayer.catchphrase))); + player.sendMessage(TextParserUtils.formatText( + String.format(this.toYou, + "" + splayer.getName().getString() + "", + "" + asplayer.catchphrase))); + player.getWorld().playSound(splayer, splayer.getBlockPos(), asplayer.moodSounds.get(this.mood), SoundCategory.PLAYERS, 1F, + 1); + return 1; + }))); + } + +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/commands/NoChatCommand.java b/src/main/java/ovh/sad/animalrp/commands/NoChatCommand.java new file mode 100644 index 0000000..fc1050d --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/commands/NoChatCommand.java @@ -0,0 +1,33 @@ +package ovh.sad.animalrp.commands; + +import java.util.UUID; + +import com.mojang.brigadier.CommandDispatcher; + +import net.minecraft.command.CommandRegistryAccess; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.Text; +import ovh.sad.animalrp.AnimalRP; + +public class NoChatCommand { + public void Command(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, + CommandManager.RegistrationEnvironment environment) { + dispatcher.register(CommandManager.literal("disableanimalchat").executes(context -> { + UUID userUuid = context.getSource().getEntity().getUuid(); + + Boolean isDisabled = AnimalRP.noChat.get(context.getSource().getEntity().getUuid()); + if(isDisabled == null) isDisabled = false; + if(isDisabled) { // + context.getSource().sendFeedback(() -> Text.literal("AnimalRP's chat modifications are now enabled for you.").withColor(65280), false); + AnimalRP.noChat.remove(userUuid); + } else { + context.getSource().sendFeedback(() -> Text.literal("AnimalRP's chat modifications are now disabled for you.").withColor(16711680), false); + AnimalRP.noChat.put(userUuid, true); + } + + return 0; + })); + } + +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/commands/TfCommand.java b/src/main/java/ovh/sad/animalrp/commands/TfCommand.java new file mode 100644 index 0000000..3a6222e --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/commands/TfCommand.java @@ -0,0 +1,72 @@ +package ovh.sad.animalrp.commands; + +import java.util.Map.Entry; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; + +import net.minecraft.command.CommandRegistryAccess; +import net.minecraft.entity.Entity; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.animals.Animal; + +public class TfCommand { + public void Command(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, + CommandManager.RegistrationEnvironment environment) { + dispatcher.register(CommandManager.literal("tf") + .then(CommandManager.argument("animal", StringArgumentType.string()) + .executes(context -> { + final Entity entity = context.getSource().getEntity(); + final String animalString = StringArgumentType.getString(context, "animal"); + System.out.println(animalString); + System.out.println(animalString.length()); + + Animal animal = AnimalRP.animals.get(animalString); + + if (animalString.equals("off")) { + if (AnimalRP.users.get(entity.getUuid()) == null) { + context.getSource().sendFeedback( + () -> Text.literal("You do not have a animal set."), false); + return 0; + } + AnimalRP.users.remove(entity.getUuid()); + context.getSource().sendFeedback( + () -> Text.literal("You no longer have a animal set."), false); + return 0; + } + + if (animal == null) { + classicError(context.getSource()); + return 0; + } + + AnimalRP.users.put(entity.getUuid(), animal); + context.getSource() + .sendFeedback( + () -> Text.literal("You are now an " + animalString + "! ") + .append(Text.literal(animal.catchphrase) + .formatted(Formatting.ITALIC).withColor( + Integer.parseInt(animal.color.substring(1), + 16))), + false); + return 1; + }))); + } + + void classicError(ServerCommandSource source) { + MutableText options = Text.literal("Your options are: "); + for (Entry entry : AnimalRP.animals.entrySet()) { + options.append(Text.literal(entry.getKey() + " ") + .withColor(Integer.parseInt(entry.getValue().color.substring(1), 16))); + } + source.sendFeedback(() -> Text.literal("Invalid animal!").withColor(16711680), false); + source.sendFeedback(() -> options, false); + source.sendFeedback(() -> Text.literal("Use /tf off to disable the changes."), false); + + } +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/mixin/DecoratedMessage.java b/src/main/java/ovh/sad/animalrp/mixin/DecoratedMessage.java new file mode 100644 index 0000000..5170c2c --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/mixin/DecoratedMessage.java @@ -0,0 +1,41 @@ +package ovh.sad.animalrp.mixin; + +import java.util.Random; + +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +import net.minecraft.network.message.SignedMessage; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.text.Text; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.animals.Animal; +import ovh.sad.animalrp.util.Mood; + +@Mixin(value = ServerPlayNetworkHandler.class, priority = 1) // make sure we run FIRST +public abstract class DecoratedMessage { + @Shadow + public ServerPlayerEntity player; + @Unique + Random random = new Random(); + + @ModifyVariable(method = "handleDecoratedMessage", at = @At(value = "HEAD"), argsOnly = true) + public @NotNull SignedMessage modifyChatMessageSentByPlayers(@NotNull SignedMessage original) { + Animal animal = AnimalRP.users.get(player.getUuid()); + if (animal == null) + return original; + if (random.nextDouble() < 0.08) { + player.getWorld().playSound(player, player.getBlockPos(), + animal.moodSounds.get(Mood.HAPPY), SoundCategory.PLAYERS, 10F, 1); + } + + return original + .withUnsignedContent(Text.literal(animal.chatTransformations(original.getContent().getString()))); + } +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/mixin/FoodEating.java b/src/main/java/ovh/sad/animalrp/mixin/FoodEating.java new file mode 100644 index 0000000..3b76714 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/mixin/FoodEating.java @@ -0,0 +1,49 @@ +package ovh.sad.animalrp.mixin; + +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 net.minecraft.component.type.FoodComponent; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.world.World; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.animals.Animal; +import ovh.sad.animalrp.animals.Bee; + +@Mixin(value = LivingEntity.class) +public class FoodEating { + @Inject(method = "eatFood", at = @At("HEAD")) + public void eatFood(World world, ItemStack stack, FoodComponent foodComponent, CallbackInfoReturnable cfr) { + LivingEntity entity = (LivingEntity) (Object) this; + if(entity.getType().equals(EntityType.PLAYER)) { + ServerPlayerEntity player = (ServerPlayerEntity) entity; + + Animal animal = AnimalRP.users.get(player.getUuid()); + + if (animal != null) { + if(animal.name == "bee") { + ((Bee)animal).onEat(player, stack); + } + if (animal.superfoods.contains(stack.getItem())) { + player.getHungerManager().add(4, 9.4f); + + StatusEffectInstance effect = player.getStatusEffect(StatusEffects.SPEED); + int duration = 20 * 4; + + if (effect != null) { + duration += effect.getDuration(); + } + player.addStatusEffect( + new StatusEffectInstance(StatusEffects.SPEED, duration, 1, true, true, true)); + } + } + } + } +} diff --git a/src/main/java/ovh/sad/animalrp/mixin/Sneaking.java b/src/main/java/ovh/sad/animalrp/mixin/Sneaking.java new file mode 100644 index 0000000..b0ed500 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/mixin/Sneaking.java @@ -0,0 +1,24 @@ +package ovh.sad.animalrp.mixin; + +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; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.server.network.ServerPlayerEntity; +import ovh.sad.animalrp.AnimalRP; +import ovh.sad.animalrp.animals.Bee; + +@Mixin(Entity.class) +public class Sneaking { + @Inject(method = "setSneaking", at = @At("HEAD")) + public void setSneaking(boolean sneaking, CallbackInfo info) { + Entity entity = (Entity) (Object) this; + if(entity.getType() == EntityType.PLAYER) { + Bee bee = (Bee)AnimalRP.animals.get("bee"); + bee.onSneak((ServerPlayerEntity)entity, sneaking); + } + } +} diff --git a/src/main/java/ovh/sad/animalrp/util/Cooldown.java b/src/main/java/ovh/sad/animalrp/util/Cooldown.java new file mode 100644 index 0000000..a92c524 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/util/Cooldown.java @@ -0,0 +1,35 @@ +package ovh.sad.animalrp.util; + +import com.google.gson.JsonObject; + +public class Cooldown { + public long timeCreated; + public Integer length; + public String type; + + public long getTime() { + return this.timeCreated - (System.currentTimeMillis() - this.length); + } + + public boolean isExpired() { + return this.getTime() <= 0; + } + + public JsonObject toJson() { + JsonObject obj = new JsonObject(); + obj.addProperty("timeCreated", this.timeCreated); + obj.addProperty("length", this.length); + obj.addProperty("type", this.type); + + return obj; + } + + public static Cooldown fromJson(JsonObject obj) { + Cooldown cldn = new Cooldown(); + cldn.timeCreated = obj.get("timeCreated").getAsLong(); + cldn.length = obj.get("length").getAsInt(); + cldn.type = obj.get("type").getAsString(); + + return cldn; + } +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/util/Mood.java b/src/main/java/ovh/sad/animalrp/util/Mood.java new file mode 100644 index 0000000..f6db956 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/util/Mood.java @@ -0,0 +1,5 @@ +package ovh.sad.animalrp.util; + +public enum Mood { + HAPPY,SAD,STRESSED,ANGRY,CUTE +} \ No newline at end of file diff --git a/src/main/java/ovh/sad/animalrp/util/TextDestroyer.java b/src/main/java/ovh/sad/animalrp/util/TextDestroyer.java new file mode 100644 index 0000000..da08032 --- /dev/null +++ b/src/main/java/ovh/sad/animalrp/util/TextDestroyer.java @@ -0,0 +1,44 @@ +package ovh.sad.animalrp.util; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +public class TextDestroyer { + String[] expressions; + String[][] replaces; + + public TextDestroyer(String[] expressions, String[][] replaces) { + this.expressions = expressions; + this.replaces = replaces; + } + + public String destroy(String message) { + final String[] words = message.split(" "); + final List out = new ArrayList<>(); + + Random y = new Random(); + + for (String word : words) { + if((word.startsWith("[") && word.endsWith("]")) || word.startsWith("@")) { + out.add(word); + continue; + } + + if(y.nextBoolean()){ + out.add(word); + continue; + }; + + for(String[] replacing: this.replaces) { + word = word.replace(replacing[0], replacing[1]); + } + + out.add(word); + + if(y.nextDouble() < 0.12) out.add(this.expressions[y.nextInt(this.expressions.length)]); + } + + return String.join(" ", out); + } +} \ No newline at end of file diff --git a/src/main/resources/animal-rp.mixins.json b/src/main/resources/animal-rp.mixins.json new file mode 100644 index 0000000..24c165f --- /dev/null +++ b/src/main/resources/animal-rp.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "package": "ovh.sad.animalrp.mixin", + "compatibilityLevel": "JAVA_21", + "server": [ + "DecoratedMessage", + "FoodEating", + "Sneaking" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/animal-rp/icon.png b/src/main/resources/assets/animal-rp/icon.png new file mode 100644 index 0000000..7ad3f50 Binary files /dev/null and b/src/main/resources/assets/animal-rp/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..e62a05f --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,34 @@ +{ + "schemaVersion": 1, + "id": "animal-rp", + "version": "${version}", + "name": "Animal RP", + "description": "This is an example description! Tell everyone what your mod is about!", + "authors": [ + "Me!" + ], + "contact": { + "homepage": "https://fabricmc.net/", + "sources": "https://github.com/FabricMC/fabric-example-mod" + }, + "license": "CC0-1.0", + "icon": "assets/animal-rp/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "ovh.sad.animalrp.AnimalRP" + ] + }, + "mixins": [ + "animal-rp.mixins.json" + ], + "depends": { + "fabricloader": ">=0.16.4", + "minecraft": "~1.21.1", + "java": ">=21", + "fabric-api": "*" + }, + "suggests": { + "another-mod": "*" + } +} \ No newline at end of file