commit 9c3aa34ec6700c22f639b5e2c4f5a8f0d4fc05c6 Author: funcjay Date: Thu Mar 9 23:15:45 2023 +0100 why is this screaming diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..45b608c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.gradle/ +.idea/ +build/ +out/ +run/ \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0e259d4 --- /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. diff --git a/README.md b/README.md new file mode 100644 index 0000000..5f3977a --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# BTA Female Player Mod + +A Babric mod for Better Than Adventure allowing players toggle using female player sounds. + +Might one day also include a custom player model. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4edbe04 --- /dev/null +++ b/build.gradle @@ -0,0 +1,89 @@ +plugins { + id 'babric-loom' version '0.12-SNAPSHOT' + id 'java' +} + +group = project.mod_group +archivesBaseName = project.mod_name +version = project.mod_version + +loom { + gluedMinecraftJar() + noIntermediateMappings() + customMinecraftManifest.set("https://github.com/Turnip-Labs/bta-manifest-repo/releases/download/v${project.bta_version}/${project.bta_version}.json") +} + +repositories { + mavenCentral() + maven { + name = 'Babric' + url = 'https://maven.glass-launcher.net/babric' + } + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + ivy { + url = "https://github.com/Better-than-Adventure" + patternLayout { + artifact "[organisation]/releases/download/v[revision]/[module].jar" + m2compatible = true + } + metadataSources { artifact() } + } + ivy { + url = "https://github.com/Turnip-Labs" + patternLayout { + artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar" + m2compatible = true + } + metadataSources { artifact() } + } + ivy { + url = "https://piston-data.mojang.com" + patternLayout { + artifact "v1/[organisation]/[revision]/[module].jar" + m2compatible = true + } + metadataSources { artifact() } + } +} + +dependencies { + minecraft "bta-download-repo:bta:${project.bta_version}" + mappings loom.layered() {} + + modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar + modImplementation "babric:fabric-loader:${project.loader_version}" + + // Helper library + //modImplementation "bta-halplibe:halplibe:${project.halplibe_version}" + + modImplementation "org.slf4j:slf4j-api:1.8.0-beta4" + modImplementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" + +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + withSourcesJar() +} + +tasks.withType(JavaCompile) { + options.release.set 8 +} + +jar { + from("LICENSE") { + rename { "${it}_${archivesBaseName}" } + } +} + +processResources { + inputs.property "version", version + + filesMatching("fabric.mod.json") { + expand "version": version + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f4dcbda --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +org.gradle.jvmargs=-Xmx2G + +# BTA +bta_version=1.7.6.2_02 + +# Loader Dependencies +asm_version=9.3 +mixin_version=0.11.4+mixin.0.8.5 + +# Loader +loader_version=0.14.6-babric.1 + +# HalpLibe +#halplibe_version=1.0.9 + +# Mod +mod_version=1.0.0 +mod_group=sh.hl2 +mod_name=bta-female-player diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 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..8049c68 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..744e882 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..46d2434 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + maven { + name = 'Jitpack' + url = 'https://jitpack.io' + } + maven { + name = 'Babric' + url = 'https://maven.glass-launcher.net/babric' + } + } +} \ No newline at end of file diff --git a/src/main/java/sh/hl2/btafemaleplayer/FemalePlayerBTA.java b/src/main/java/sh/hl2/btafemaleplayer/FemalePlayerBTA.java new file mode 100644 index 0000000..a05c66a --- /dev/null +++ b/src/main/java/sh/hl2/btafemaleplayer/FemalePlayerBTA.java @@ -0,0 +1,33 @@ +package sh.hl2.btafemaleplayer; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.Minecraft; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; + +public class FemalePlayerBTA implements ModInitializer { + public static final String MOD_ID = "bta-female-player"; + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + public static final Minecraft MINECRAFT = Minecraft.getMinecraft(); + + public static final String FEMSND_HURT = "femplayer.hurt"; + public static final String FEMSND_DEATH = FEMSND_HURT; + + public static final String FEM_SETTINGS_FILE = "playerGender.txt"; + + @Override + public void onInitialize() { + LOGGER.info("BTA FemPlayer - Initialized!"); + + File settingsFile = FabricLoader.getInstance().getConfigDir().resolve(FEM_SETTINGS_FILE).toFile(); + if (!settingsFile.exists()) { + GenderSettings.writeSettings(); + } + + GenderSettings.readSettings(); + } +} diff --git a/src/main/java/sh/hl2/btafemaleplayer/GenderSettings.java b/src/main/java/sh/hl2/btafemaleplayer/GenderSettings.java new file mode 100644 index 0000000..92da717 --- /dev/null +++ b/src/main/java/sh/hl2/btafemaleplayer/GenderSettings.java @@ -0,0 +1,53 @@ +package sh.hl2.btafemaleplayer; + +import net.fabricmc.loader.api.FabricLoader; + +import java.io.*; +import java.util.Scanner; + +public class GenderSettings { + private static String playerGender = "m"; + + private static final File file = FabricLoader.getInstance().getConfigDir().resolve(FemalePlayerBTA.FEM_SETTINGS_FILE).toFile(); + + public static String getGender() { + return playerGender; + } + public static void setGender(String gender) { + if (gender.equalsIgnoreCase("m") || gender.equalsIgnoreCase("f")) { + playerGender = gender.toLowerCase(); + } else { + playerGender = "m"; + FemalePlayerBTA.LOGGER.warn("BTA FemPlayer - Tried to set invalid gender!"); + FemalePlayerBTA.LOGGER.warn("BTA FemPlayer - Setting to default (Male)"); + } + } + + public static void writeSettings() { + try { + BufferedWriter writer = new BufferedWriter(new FileWriter(file)); + writer.write(playerGender); + writer.close(); + } catch (IllegalAccessException e) { + FemalePlayerBTA.LOGGER.error("BTA FemPlayer - Failed to write settings file!"); + e.printStackTrace(); + } + } + public static void readSettings() { + try { + Scanner reader = new Scanner(file); + String data = "m"; + while (reader.hasNextLine()) { + data = reader.nextLine(); + FemalePlayerBTA.LOGGER.warn("BTA FemPlayer [DEBUG] - Read gender as " + data); + } + reader.close(); + setGender(data); + } catch (FileNotFoundException e) { + FemalePlayerBTA.LOGGER.error("BTA FemPlayer - Failed to read settings file!"); + e.printStackTrace(); + } + + setGender("m"); + } +} diff --git a/src/main/java/sh/hl2/btafemaleplayer/commands/GenderCommand.java b/src/main/java/sh/hl2/btafemaleplayer/commands/GenderCommand.java new file mode 100644 index 0000000..50aef73 --- /dev/null +++ b/src/main/java/sh/hl2/btafemaleplayer/commands/GenderCommand.java @@ -0,0 +1,46 @@ +package sh.hl2.btafemaleplayer.commands; + +import net.minecraft.src.command.Command; +import net.minecraft.src.command.CommandHandler; +import net.minecraft.src.command.CommandSender; +import net.minecraft.src.command.PlayerCommandSender; +import sh.hl2.btafemaleplayer.GenderSettings; + +public class GenderCommand +extends Command { + public GenderCommand() { + super("gender"); + } + + @Override + public boolean execute(CommandHandler handler, CommandSender sender, String[] args) { + if (args.length == 0) { + return false; + } + + if (args.length == 1 && handler.isClient()) { + if (args[0].equalsIgnoreCase("male") || args[0].equalsIgnoreCase("m")) { + handler.sendCommandFeedback(sender, "Setting gender to Male"); + GenderSettings.setGender("m"); + return true; + } + if (args[0].equalsIgnoreCase("female") || args[0].equalsIgnoreCase("f")) { + handler.sendCommandFeedback(sender, "Setting gender to Female"); + GenderSettings.setGender("f"); + return true; + } + } + + return false; + } + + @Override + public boolean opRequired(String[] args) { return false; } + + @Override + public void sendCommandSyntax(CommandHandler handler, CommandSender sender) { + if (sender instanceof PlayerCommandSender) { + sender.sendMessage("/gender <[male/m] | [female/f]>"); + } + } +} diff --git a/src/main/java/sh/hl2/btafemaleplayer/mixin/CommandsMixin.java b/src/main/java/sh/hl2/btafemaleplayer/mixin/CommandsMixin.java new file mode 100644 index 0000000..8b3f84d --- /dev/null +++ b/src/main/java/sh/hl2/btafemaleplayer/mixin/CommandsMixin.java @@ -0,0 +1,16 @@ +package sh.hl2.btafemaleplayer.mixin; + +import net.minecraft.src.command.Commands; +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 sh.hl2.btafemaleplayer.commands.GenderCommand; + +@Mixin(value = Commands.class, remap = false) +public class CommandsMixin { + @Inject(method = "initCommands", at = @At("TAIL")) + private static void initCommands(CallbackInfo ci) { + Commands.commands.add(new GenderCommand()); + } +} diff --git a/src/main/java/sh/hl2/btafemaleplayer/mixin/EntityLivingMixin.java b/src/main/java/sh/hl2/btafemaleplayer/mixin/EntityLivingMixin.java new file mode 100644 index 0000000..58a7075 --- /dev/null +++ b/src/main/java/sh/hl2/btafemaleplayer/mixin/EntityLivingMixin.java @@ -0,0 +1,36 @@ +package sh.hl2.btafemaleplayer.mixin; + +import net.minecraft.src.EntityLiving; +import net.minecraft.src.EntityPlayer; +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 sh.hl2.btafemaleplayer.FemalePlayerBTA; +import sh.hl2.btafemaleplayer.GenderSettings; + +@Mixin(value = EntityLiving.class, remap = false) +public class EntityLivingMixin { + @Inject(method = "getHurtSound", at = @At("HEAD"), cancellable = true) + protected void getHurtSound(CallbackInfoReturnable cir) { + EntityLiving self = (EntityLiving) (Object) this; + + if (self instanceof EntityPlayer && GenderSettings.getGender().equalsIgnoreCase("f")) { + cir.setReturnValue(FemalePlayerBTA.FEMSND_HURT); + } + else { + cir.setReturnValue("random.hurt"); + } + } + @Inject(method = "getDeathSound", at = @At("HEAD"), cancellable = true) + protected void getDeathSound(CallbackInfoReturnable cir) { + EntityLiving self = (EntityLiving) (Object) this; + + if (self instanceof EntityPlayer && GenderSettings.getGender().equalsIgnoreCase("f")) { + cir.setReturnValue(FemalePlayerBTA.FEMSND_DEATH); + } + else { + cir.setReturnValue("random.hurt"); + } + } +} diff --git a/src/main/resources/bta-female-player.mixins.json b/src/main/resources/bta-female-player.mixins.json new file mode 100644 index 0000000..7d09079 --- /dev/null +++ b/src/main/resources/bta-female-player.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "sh.hl2.btafemaleplayer.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + ], + "client": [ + "EntityLivingMixin", + "CommandsMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..38a9a9a --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,33 @@ +{ + "schemaVersion": 1, + "id": "bta-female-player", + "version": "${version}", + + "name": "BTA Female Player", + "description": "Female Player Sounds", + "authors": [ + "Jay!" + ], + "contact": { + "homepage": "", + "sources": "" + }, + + "license": "CC0-1.0", + + "environment": "*", + "entrypoints": { + "main": [ + "sh.hl2.btafemaleplayer.FemalePlayerBTA" + ] + }, + "mixins": [ + "bta-female-player.mixins.json" + ], + + "depends": { + "fabricloader": ">=0.13.3" + }, + "suggests": { + } +} diff --git a/src/main/resources/lang/btafemaleplayer/en_US.lang b/src/main/resources/lang/btafemaleplayer/en_US.lang new file mode 100644 index 0000000..e69de29