From cf2c0467617a620387fcbd7e4c695b29e32f2c00 Mon Sep 17 00:00:00 2001 From: Overlord Date: Fri, 28 Nov 2025 15:16:43 +0100 Subject: [PATCH] Homestead Relay v1.0.8 --- .gitattributes | 2 + .gitignore | 60 ++-- build.gradle | 88 +++++ gradle.properties | 21 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 +++++++++++++ gradlew.bat | 93 +++++ settings.gradle | 10 + .../qualityoflife/QualityOfLifeClient.java | 18 + .../quality-of-life.client.mixins.json | 11 + .../overlord/qualityoflife/QualityOfLife.java | 35 ++ .../classes/affliction/AfflictionManager.java | 150 ++++++++ .../classes/affliction/PlayerAffliction.java | 20 ++ .../controller/AfflictionController.java | 20 ++ .../controller/AutomaticUpdateController.java | 174 +++++++++ .../classes/controller/ConfigController.java | 84 +++++ .../controller/IgnoreCommandController.java | 293 ++++++++++++++++ .../controller/PingCommandController.java | 94 +++++ .../classes/controller/PurgeController.java | 71 ++++ .../classes/controller/util/Color.java | 19 + .../util/CommandExceptionFactory.java | 55 +++ .../classes/controller/util/Dimension.java | 57 +++ .../classes/controller/util/ModLogger.java | 329 ++++++++++++++++++ .../classes/controller/util/Player.java | 58 +++ .../controller/util/StackTraceUtility.java | 87 +++++ .../util/extension/ColorGradient.java | 80 +++++ .../extension/IChatCommandController.java | 17 + .../util/extension/INetworkUtility.java | 125 +++++++ .../classes/registry/ModEffects.java | 55 +++ .../classes/registry/ModPotions.java | 47 +++ .../mixin/affliction/PlayerDeathMixin.java | 43 +++ .../mixin/affliction/PotionFinishMixin.java | 39 +++ .../affliction/SplashPotionEntityMixin.java | 64 ++++ .../mixin/ignoring/ChatPacketMixin.java | 38 ++ .../mixin/stacktrace/MixinCrashReport.java | 43 +++ .../stacktrace/MixinCrashReportSection.java | 21 ++ .../resources/assets/quality-of-life/icon.png | Bin 0 -> 19004 bytes .../assets/quality-of-life/lang/en_us.json | 15 + src/main/resources/fabric.mod.json | 41 +++ .../resources/quality-of-life.mixins.json | 19 + 41 files changed, 2715 insertions(+), 36 deletions(-) create mode 100644 .gitattributes create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/client/java/com/overlord/qualityoflife/QualityOfLifeClient.java create mode 100644 src/client/resources/quality-of-life.client.mixins.json create mode 100644 src/main/java/com/overlord/qualityoflife/QualityOfLife.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/affliction/AfflictionManager.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/affliction/PlayerAffliction.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/AfflictionController.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/AutomaticUpdateController.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/ConfigController.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/IgnoreCommandController.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/PingCommandController.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/PurgeController.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/Color.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/CommandExceptionFactory.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/Dimension.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/ModLogger.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/Player.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/StackTraceUtility.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/ColorGradient.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/IChatCommandController.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/INetworkUtility.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/registry/ModEffects.java create mode 100644 src/main/java/com/overlord/qualityoflife/classes/registry/ModPotions.java create mode 100644 src/main/java/com/overlord/qualityoflife/mixin/affliction/PlayerDeathMixin.java create mode 100644 src/main/java/com/overlord/qualityoflife/mixin/affliction/PotionFinishMixin.java create mode 100644 src/main/java/com/overlord/qualityoflife/mixin/affliction/SplashPotionEntityMixin.java create mode 100644 src/main/java/com/overlord/qualityoflife/mixin/ignoring/ChatPacketMixin.java create mode 100644 src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReport.java create mode 100644 src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReportSection.java create mode 100644 src/main/resources/assets/quality-of-life/icon.png create mode 100644 src/main/resources/assets/quality-of-life/lang/en_us.json create mode 100644 src/main/resources/fabric.mod.json create mode 100644 src/main/resources/quality-of-life.mixins.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e59ca03 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/gradlew text eol=lf +*.bat text eol=crlf diff --git a/.gitignore b/.gitignore index edeba0a..8ba5637 100644 --- a/.gitignore +++ b/.gitignore @@ -1,49 +1,37 @@ -# ---> Java -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) +out/ +bin/ +run/ +build/ +.idea/ +.gradle/ +.vscode/ .mtj.tmp/ +.settings/ -# Package Files # +*.iml +*.ipr +*.iws +*.jfr +*.log *.jar *.war *.nar *.ear *.zip -*.tar.gz *.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +*.ctxt +*.hprof +*.class +*.launch +.project +*.tar.gz +.classpath +*.DS_Store hs_err_pid* replay_pid* - -# ---> Gradle -.gradle -**/build/ -!src/**/build/ - -# Ignore Gradle GUI config +hs_err_*.log +replay_*.log gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar - -# Avoid ignore Gradle wrappper properties -!gradle-wrapper.properties - -# Cache of project .gradletasknamecache - -# Eclipse Gradle plugin generated files -# Eclipse Core -.project -# JDT-specific (Eclipse Java Development Tools) -.classpath - +!gradle-wrapper.properties diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..769b326 --- /dev/null +++ b/build.gradle @@ -0,0 +1,88 @@ +plugins { + id 'fabric-loom' version "${loom_version}" + 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. +} + +loom { + splitEnvironmentSourceSets() + + mods { + "homestead-relay" { + 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 "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": inputs.properties.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + inputs.property "archivesName", project.base.archivesName + + from("LICENSE") { + rename { "${it}_${inputs.properties.archivesName}"} + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..6a96bb7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.17.2 +loom_version=1.13-SNAPSHOT + +# Mod Properties +mod_version=1.0.8 +maven_group=com.overlord.qualityoflife +archives_base_name=quality-of-life + +# Dependencies +fabric_version=0.92.6+1.20.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2e11132 --- /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-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/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/client/java/com/overlord/qualityoflife/QualityOfLifeClient.java b/src/client/java/com/overlord/qualityoflife/QualityOfLifeClient.java new file mode 100644 index 0000000..69213fe --- /dev/null +++ b/src/client/java/com/overlord/qualityoflife/QualityOfLifeClient.java @@ -0,0 +1,18 @@ +package com.overlord.qualityoflife; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import net.fabricmc.api.ClientModInitializer; + +public class QualityOfLifeClient implements ClientModInitializer +{ + public static final String MOD = "HomesteadRelay"; + public static final String MOD_ID = "homestead-relay"; + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + @Override + public void onInitializeClient() + { + LOGGER.info("[{}] Initializing (client).", MOD); + } +} diff --git a/src/client/resources/quality-of-life.client.mixins.json b/src/client/resources/quality-of-life.client.mixins.json new file mode 100644 index 0000000..3131748 --- /dev/null +++ b/src/client/resources/quality-of-life.client.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "com.overlord.qualityoflife.mixin.client", + "compatibilityLevel": "JAVA_17", + "client": [ + + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/java/com/overlord/qualityoflife/QualityOfLife.java b/src/main/java/com/overlord/qualityoflife/QualityOfLife.java new file mode 100644 index 0000000..0ae6673 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/QualityOfLife.java @@ -0,0 +1,35 @@ +package com.overlord.qualityoflife; + +import com.google.gson.Gson; +import org.slf4j.LoggerFactory; +import com.google.gson.GsonBuilder; +import net.fabricmc.api.ModInitializer; +import com.overlord.qualityoflife.classes.controller.*; +import com.overlord.qualityoflife.classes.controller.util.ModLogger; + +/** + * Mod Initializer for QoL Mod. + */ +public class QualityOfLife implements ModInitializer +{ + public static final String MOD = "HomesteadRelay"; + public static final String MOD_ID = "homestead-relay"; + public static final ModLogger LOGGER = new ModLogger(LoggerFactory.getLogger(MOD_ID)); + public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + + @Override + public void onInitialize() + { + LOGGER.setPrefix(MOD); + + LOGGER.info("Initializing (server)."); + + PurgeController.register(); // Clean-up for ServerCore mishaps + AfflictionController.register(); // Nerve Agent & Cure Handling + PingCommandController.register(); // ping-Command + IgnoreCommandController.register(); // ignore-Command + AutomaticUpdateController.register(); // Automatic updates for the mod + + LOGGER.info("Finished initializing (server)."); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/affliction/AfflictionManager.java b/src/main/java/com/overlord/qualityoflife/classes/affliction/AfflictionManager.java new file mode 100644 index 0000000..fa3af34 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/affliction/AfflictionManager.java @@ -0,0 +1,150 @@ +package com.overlord.qualityoflife.classes.affliction; + +import java.util.*; +import java.nio.file.*; +import java.io.IOException; +import com.google.gson.Gson; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.math.random.Random; +import java.util.concurrent.ConcurrentHashMap; +import com.overlord.qualityoflife.QualityOfLife; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import com.overlord.qualityoflife.classes.controller.ConfigController; + +public class AfflictionManager +{ + private static final AfflictionManager INSTANCE = new AfflictionManager(); + public static AfflictionManager instance() { return INSTANCE; } + + private final Map map = new ConcurrentHashMap<>(); + private final Gson gson = QualityOfLife.GSON; + + private static final long TICKS_PER_DAY = 24000L; + private static final long TOTAL_TICKS = TICKS_PER_DAY * 50L; // 50 MC days -> 1_200_000 ticks + + private long saveTickCounter = 0L; + + public boolean isAfflicted(UUID uuid) { + return map.containsKey(uuid); + } + + public void applyAffliction(UUID uuid) + { + if (isAfflicted(uuid)) return; + + PlayerAffliction pa = new PlayerAffliction(uuid); + map.put(uuid, pa); + saveFor(pa); + } + + public void removeAffliction(UUID uuid) + { + PlayerAffliction pa = map.remove(uuid); + if (pa == null) return; + + Path p = ConfigController.AFFLICTIONS_DIR.resolve(uuid.toString() + ".json"); + + try { + ConfigController.deleteFile(p); + } catch (IOException ignored) {} + } + + public Optional getAffliction(UUID uuid) { + return Optional.ofNullable(map.get(uuid)); + } + + public void loadAll() + { + try + { + ConfigController.forEachJsonFile(ConfigController.AFFLICTIONS_DIR, path -> + { + String json = ConfigController.readFile(path); + PlayerAffliction pa = gson.fromJson(json, PlayerAffliction.class); + if (pa != null) map.put(pa.getUuid(), pa); + }); + } + catch (IOException e) { + QualityOfLife.LOGGER.error("Failed to load afflictions", e); + } + } + + public void saveAll() + { + for (PlayerAffliction pa : map.values()) + saveFor(pa); + } + + private void saveFor(PlayerAffliction pa) + { + Path p = ConfigController.AFFLICTIONS_DIR.resolve(pa.uuid + ".json"); + + try + { + ConfigController.writeFile(p, gson.toJson(pa)); + } + catch (IOException e) { + QualityOfLife.LOGGER.error("Failed to save affliction for {}", pa.uuid, e); + } + } + + /** + * Call from server tick (main thread). Only counts while player is online. + */ + public void tick(MinecraftServer server) + { + List players = server.getPlayerManager().getPlayerList(); + + for (ServerPlayerEntity player : players) + { + UUID uuid = player.getUuid(); + PlayerAffliction pa = map.get(uuid); + if (pa == null) continue; + + pa.ticksPlayed++; + + maybeTriggerTemporaryEffect(player, pa); + + if (pa.ticksPlayed >= TOTAL_TICKS) { + player.kill(); + removeAffliction(uuid); + } + } + + saveTickCounter++; + if (saveTickCounter >= 600) + { + saveTickCounter = 0; + saveAll(); + } + } + + private void maybeTriggerTemporaryEffect(ServerPlayerEntity player, PlayerAffliction pa) + { + // progress fraction 0..1 + double progress = Math.min(1.0, (double)pa.ticksPlayed / (double)TOTAL_TICKS); + + // desired expected events per day: linear from 1/3 at day 1 to 5 at day 49/50 + double eventsPerDayAtStart = 1.0 / 3.0; + double eventsPerDayAtEnd = 7.0; + + double expectedEventsPerDay = eventsPerDayAtStart * (1.0 - progress) + eventsPerDayAtEnd * progress; + double perTickChance = expectedEventsPerDay / (double)TICKS_PER_DAY; + + Random rng = player.getRandom(); + if (rng.nextDouble() < perTickChance) + { + boolean chooseNausea = rng.nextDouble() < 0.5; + int durationTicks = 100 + rng.nextInt(100); // 5-10 seconds roughly + + player.addStatusEffect( + new StatusEffectInstance( + chooseNausea ? StatusEffects.NAUSEA : StatusEffects.DARKNESS, durationTicks, 0, + false, false, false + ) + ); + } + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/affliction/PlayerAffliction.java b/src/main/java/com/overlord/qualityoflife/classes/affliction/PlayerAffliction.java new file mode 100644 index 0000000..0b71925 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/affliction/PlayerAffliction.java @@ -0,0 +1,20 @@ +package com.overlord.qualityoflife.classes.affliction; + +import java.util.UUID; + +public class PlayerAffliction +{ + public String uuid; + public long ticksPlayed; + + public PlayerAffliction() {} + + public PlayerAffliction(UUID uuid) { + this.uuid = uuid.toString(); + this.ticksPlayed = 0L; + } + + public UUID getUuid() { + return UUID.fromString(uuid); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/AfflictionController.java b/src/main/java/com/overlord/qualityoflife/classes/controller/AfflictionController.java new file mode 100644 index 0000000..a14a4f7 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/AfflictionController.java @@ -0,0 +1,20 @@ +package com.overlord.qualityoflife.classes.controller; + +import com.overlord.qualityoflife.classes.registry.ModEffects; +import com.overlord.qualityoflife.classes.registry.ModPotions; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import com.overlord.qualityoflife.classes.affliction.AfflictionManager; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; + +public class AfflictionController +{ + public static void register() + { + ModEffects.register(); + ModPotions.register(); + + ServerLifecycleEvents.SERVER_STARTED.register(server -> AfflictionManager.instance().loadAll()); + ServerLifecycleEvents.SERVER_STOPPING.register(server -> AfflictionManager.instance().saveAll()); + ServerTickEvents.END_SERVER_TICK.register(server -> AfflictionManager.instance().tick(server)); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/AutomaticUpdateController.java b/src/main/java/com/overlord/qualityoflife/classes/controller/AutomaticUpdateController.java new file mode 100644 index 0000000..8eedfec --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/AutomaticUpdateController.java @@ -0,0 +1,174 @@ +package com.overlord.qualityoflife.classes.controller; + +import java.nio.file.Path; +import java.util.Optional; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.channels.FileChannel; +import java.nio.file.StandardCopyOption; +import java.nio.file.StandardOpenOption; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; +import net.minecraft.server.MinecraftServer; +import java.util.concurrent.CompletableFuture; +import com.overlord.qualityoflife.QualityOfLife; +import com.google.gson.annotations.SerializedName; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import com.overlord.qualityoflife.classes.controller.util.extension.INetworkUtility; + +@SuppressWarnings("SameParameterValue") +public class AutomaticUpdateController extends INetworkUtility +{ + private static final String api = "https://cdn.security-command.org/homestead"; + private static final String info = api + "/latest.json"; + + private static Stats latest = null; + private static boolean update = false; + + private record Stats( + @SerializedName("version") String version, + @SerializedName("file") String filename, + @SerializedName("sha256") String checksum + ) + { + public String location() { + return api + "/" + filename; + } + } + + public static void register() + { + ServerLifecycleEvents.SERVER_STARTED.register(AutomaticUpdateController::checkForUpdate); + ServerLifecycleEvents.SERVER_STOPPING.register(AutomaticUpdateController::updateFile); + } + + // update (check, download, verify) + + private static void checkForUpdate(MinecraftServer server) + { + CompletableFuture.runAsync(() -> + { + try + { + String json = fetch(info, 5_000, 15_000); + if (json == null || json.isBlank()) + throw new RuntimeException("No metadata found."); + + Stats meta = QualityOfLife.GSON.fromJson(json, Stats.class); + if (meta == null || meta.version == null) + throw new RuntimeException("Invalid metadata."); + + latest = meta; + + if (!isNewerVersion(meta.version(), getCurrentVersion())) + { + QualityOfLife.LOGGER.info("Currently using the latest version of the mod."); + return; + } + + Path tmp = downloadFile( + meta.location(), + ConfigController.UPDATES_DIR.resolve(meta.filename() + ".tmp") + ); + + if (!verifySha256(tmp, meta.checksum())) + { + Files.deleteIfExists(tmp); + throw new RuntimeException("Invalid SHA-256 checksum."); + } + + Path staged = ConfigController.UPDATES_DIR.resolve(meta.filename()); + Files.move(tmp, staged, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE); + + update = true; + + QualityOfLife.LOGGER.warn("Successfully fetched new mod version from api, will be applied on next restart."); + } + catch (Exception e) + { + QualityOfLife.LOGGER.error("Error while checking for updates! '{}'", e.getMessage(), e); + } + }); + } + + // move/replace + + private static void updateFile(MinecraftServer server) + { + try + { + if (latest == null || !update) return; + + Path orig = getCurrentModFile(QualityOfLife.MOD_ID); + Path dest = ConfigController.MODS_DIR.resolve(latest.filename()); + Path file = ConfigController.UPDATES_DIR.resolve(latest.filename()); + + Files.move(file, dest, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE); + + if (orig != null) + Files.deleteIfExists(orig); + + try (FileChannel chan = FileChannel.open(ConfigController.MODS_DIR, StandardOpenOption.READ)) + { + // flush changes to the disk + chan.force(true); + } + catch (Throwable ignored) {} + + latest = null; + + Files.deleteIfExists(file); + } + catch (Exception e) + { + QualityOfLife.LOGGER.error("Error while updating file! '{}'", e.getMessage(), e); + } + } + + // utility + + private static String getCurrentVersion() + { + Optional mc = FabricLoader.getInstance().getModContainer(QualityOfLife.MOD_ID); + + return mc.isPresent() + ? mc.get().getMetadata().getVersion().getFriendlyString() + : "0.0.0"; + } + + private static Path getCurrentModFile(String modId) throws IOException + { + try (var stream = Files.newDirectoryStream(ConfigController.MODS_DIR, modId + "-*.jar")) + { + for (Path file : stream) + return file; + } + + return null; + } + + private static boolean isNewerVersion(String a, String b) + { + if (a == null) return false; + if (b == null || b.isEmpty()) return true; + + String[] A = a.split("\\."); + String[] B = b.split("\\."); + + int n = Math.max(A.length, B.length); + for (int i = 0; i < n; i++) + { + int ai = i < A.length ? parseIntSafe(A[i]) : 0; + int bi = i < B.length ? parseIntSafe(B[i]) : 0; + + if (ai > bi) return true; + if (ai < bi) return false; + } + + return false; + } + + private static int parseIntSafe(String s) { + try { return Integer.parseInt(s.replaceAll("[^0-9]", "")); } catch (Exception e) { return 0; } + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/ConfigController.java b/src/main/java/com/overlord/qualityoflife/classes/controller/ConfigController.java new file mode 100644 index 0000000..dd189df --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/ConfigController.java @@ -0,0 +1,84 @@ +package com.overlord.qualityoflife.classes.controller; + +import java.nio.file.Path; +import java.io.IOException; +import java.nio.file.Files; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import java.nio.file.StandardOpenOption; +import net.fabricmc.loader.api.FabricLoader; +import com.overlord.qualityoflife.QualityOfLife; + +public class ConfigController +{ + public static final Path MODS_DIR = FabricLoader.getInstance().getGameDir().resolve("mods"); + public static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir().resolve(QualityOfLife.MOD_ID); + public static final Path AFFLICTIONS_DIR = CONFIG_DIR.resolve("afflictions"); + public static final Path UPDATES_DIR = CONFIG_DIR.resolve("updates"); + public static final Path IGNORES_DIR = CONFIG_DIR.resolve("ignores"); + + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + + static + { + try + { + Files.createDirectories(CONFIG_DIR); + Files.createDirectories(AFFLICTIONS_DIR); + Files.createDirectories(UPDATES_DIR); + Files.createDirectories(IGNORES_DIR); + } + catch (IOException e) + { + throw new RuntimeException("Failed to create mod directories.", e); + } + } + + /** + * Read a JSON file from the mod directory + */ + public static String readFile(Path filePath) throws IOException { + return Files.readString(filePath); + } + + /** + * Write a JSON file to the mod directory + */ + public static void writeFile(Path filePath, String content) throws IOException { + Files.writeString(filePath, content, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); + } + + /** + * Delete a file from the mod directory + */ + public static void deleteFile(Path filePath) throws IOException { + Files.deleteIfExists(filePath); + } + + /** + * List all JSON files in a directory + */ + public static void forEachJsonFile(Path directory, JsonFileConsumer consumer) throws IOException + { + try (var ds = Files.newDirectoryStream(directory, "*.json")) + { + for (Path p : ds) + { + try + { + consumer.accept(p); + } + catch (Throwable t) + { + QualityOfLife.LOGGER.error("Error processing file {}", p, t); + } + } + } + } + + @FunctionalInterface + public interface JsonFileConsumer + { + void accept(Path path) throws IOException; + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/IgnoreCommandController.java b/src/main/java/com/overlord/qualityoflife/classes/controller/IgnoreCommandController.java new file mode 100644 index 0000000..e341ca8 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/IgnoreCommandController.java @@ -0,0 +1,293 @@ +package com.overlord.qualityoflife.classes.controller; + +import java.util.*; +import java.nio.file.Path; +import java.io.IOException; + +import com.overlord.qualityoflife.classes.controller.util.CommandExceptionFactory; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.minecraft.text.Text; +import com.mojang.brigadier.Command; +import java.util.concurrent.ConcurrentHashMap; +import com.overlord.qualityoflife.QualityOfLife; +import com.mojang.brigadier.context.CommandContext; +import net.minecraft.server.command.CommandManager; +import com.mojang.brigadier.arguments.BoolArgumentType; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.command.argument.EntityArgumentType; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.overlord.qualityoflife.classes.controller.util.Player; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import com.overlord.qualityoflife.classes.controller.util.extension.IChatCommandController; + +public class IgnoreCommandController implements IChatCommandController +{ + public static class IgnoreData + { + public boolean globally = false; + public Set mutedBy = ConcurrentHashMap.newKeySet(); + } + + private static final Map ignoreMap = new ConcurrentHashMap<>(); + + public static void register() + { + ServerLifecycleEvents.SERVER_STARTED.register(server -> IgnoreCommandController.loadAll()); + ServerLifecycleEvents.SERVER_STOPPING.register(server -> IgnoreCommandController.saveAll()); + + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> + { + dispatcher.register(CommandManager.literal("ignore") + .then(CommandManager.argument("player", EntityArgumentType.player()) + .executes(IgnoreCommandController::executeIgnore) + .then(CommandManager.argument("global", BoolArgumentType.bool()) + .requires(source -> source.hasPermissionLevel(Player.PERMISSION_LEVEL_OP)) + .executes(IgnoreCommandController::executeIgnoreGlobal))) + .then(CommandManager.literal("list") + .executes(IgnoreCommandController::executeList)) + ); + + dispatcher.register(CommandManager.literal("unignore") + .then(CommandManager.argument("player", EntityArgumentType.player()) + .executes(IgnoreCommandController::executeUnignore) + .then(CommandManager.argument("global", BoolArgumentType.bool()) + .requires(source -> source.hasPermissionLevel(Player.PERMISSION_LEVEL_OP)) + .executes(IgnoreCommandController::executeUnignoreGlobal))) + ); + }); + } + + private static int executeIgnore(CommandContext context) throws CommandSyntaxException + { + ServerCommandSource source = context.getSource(); + ServerPlayerEntity executor = source.getPlayerOrThrow(); + ServerPlayerEntity target = EntityArgumentType.getPlayer(context, "player"); + + if (executor.getUuid().equals(target.getUuid())) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.INVALID_ARGUMENT, + "You cannot ignore yourself!" + ); + } + + UUID targetUuid = target.getUuid(); + IgnoreData data = ignoreMap.computeIfAbsent(targetUuid, k -> new IgnoreData()); + + if (data.mutedBy.contains(executor.getUuid())) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.WARNING, + "You're already ignoring '" + target.getName().getString() + "'." + ); + } + + data.mutedBy.add(executor.getUuid()); + save(targetUuid); + + source.sendFeedback(() -> Text.literal("Now ignoring '" + target.getName().getString() + "'."), false); + + return Command.SINGLE_SUCCESS; + } + + private static int executeIgnoreGlobal(CommandContext context) throws CommandSyntaxException + { + ServerCommandSource source = context.getSource(); + ServerPlayerEntity target = EntityArgumentType.getPlayer(context, "player"); + boolean global = BoolArgumentType.getBool(context, "global"); + + if (global) + { + UUID targetUuid = target.getUuid(); + IgnoreData data = ignoreMap.computeIfAbsent(targetUuid, k -> new IgnoreData()); + + if (data.globally) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.WARNING, + "'" + target.getName().getString() + "' is already being ignored globally." + ); + } + + data.globally = true; + save(targetUuid); + + source.sendFeedback(() -> Text.literal("'" + target.getName().getString() + "' is now globally ignored."), true); + return Command.SINGLE_SUCCESS; + } + + return executeIgnore(context); + } + + private static int executeUnignore(CommandContext context) throws CommandSyntaxException + { + ServerCommandSource source = context.getSource(); + ServerPlayerEntity executor = source.getPlayerOrThrow(); + ServerPlayerEntity target = EntityArgumentType.getPlayer(context, "player"); + + UUID targetUuid = target.getUuid(); + IgnoreData data = ignoreMap.get(targetUuid); + + if (executor.getUuid().equals(target.getUuid())) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.INVALID_ARGUMENT, + "You cannot unignore yourself!" + ); + } + + if (data == null || !data.mutedBy.contains(executor.getUuid())) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.WARNING, + "You're currently not ignoring '" + target.getName().getString() + "'." + ); + } + + data.mutedBy.remove(executor.getUuid()); + save(targetUuid); + + source.sendFeedback(() -> Text.literal("No longer ignoring '" + target + "'."), false); + + return Command.SINGLE_SUCCESS; + } + + private static int executeUnignoreGlobal(CommandContext context) throws CommandSyntaxException + { + ServerCommandSource source = context.getSource(); + ServerPlayerEntity target = EntityArgumentType.getPlayer(context, "player"); + boolean global = BoolArgumentType.getBool(context, "global"); + + UUID targetUuid = target.getUuid(); + IgnoreData data = ignoreMap.get(targetUuid); + + if (data == null) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.WARNING, + "'" + target.getName().getString() + "' is currently not ignored." + ); + } + + if (global) + { + if (!data.globally) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.WARNING, + "'" + target.getName().getString() + "' is currently not globally ignored." + ); + } + + data.globally = false; + source.sendFeedback(() -> Text.literal("'" + target.getName().getString() + "' is no longer globally ignored."), true); + } + else + { + return executeUnignore(context); + } + + save(targetUuid); + + return Command.SINGLE_SUCCESS; + } + + private static int executeList(CommandContext context) throws CommandSyntaxException + { + ServerCommandSource source = context.getSource(); + ServerPlayerEntity executor = source.getPlayerOrThrow(); + + List ignoringList = new ArrayList<>(); + + for (Map.Entry entry : ignoreMap.entrySet()) + { + if (entry.getValue().mutedBy.contains(executor.getUuid())) + ignoringList.add(entry.getKey()); + } + + if (ignoringList.isEmpty()) + { + throw CommandExceptionFactory.create( + CommandExceptionFactory.ExceptionType.WARNING, + "You're currently not ignoring anyone." + ); + } + + StringBuilder list = new StringBuilder("Ignoring: "); + for (UUID uuid : ignoringList) + list.append(uuid).append(", "); + String result = list.substring(0, list.length() - 2); + + source.sendFeedback(() -> Text.literal(result), false); + + return Command.SINGLE_SUCCESS; + } + + /** + * Check if a message from sender should be visible to receiver + * Returns true if the message should be blocked + */ + public static boolean shouldBlockMessage(UUID sender, UUID receiver) + { + IgnoreData data = ignoreMap.get(sender); + + if (data == null) return false; + if (data.globally) return true; + + return data.mutedBy.contains(receiver); + } + + public static void loadAll() + { + try + { + ConfigController.forEachJsonFile(ConfigController.IGNORES_DIR, path -> + { + String json = ConfigController.readFile(path); + IgnoreData data = QualityOfLife.GSON.fromJson(json, IgnoreData.class); + + UUID playerUuid = UUID.fromString(path.getFileName().toString().replace(".json", "")); + + if (data != null) + ignoreMap.put(playerUuid, data); + }); + } + catch (IOException e) + { + QualityOfLife.LOGGER.error("Failed to load ignore data", e); + } + } + + public static void saveAll() { + for (UUID uuid : ignoreMap.keySet()) + save(uuid); + } + + private static void save(UUID playerUuid) + { + IgnoreData data = ignoreMap.get(playerUuid); + + if (data == null || (data.mutedBy.isEmpty() && !data.globally)) + { + try + { + ConfigController.deleteFile(ConfigController.IGNORES_DIR.resolve(playerUuid + ".json")); + } + catch (IOException ignored) {} + + return; + } + + Path p = ConfigController.IGNORES_DIR.resolve(playerUuid + ".json"); + + try + { + ConfigController.writeFile(p, QualityOfLife.GSON.toJson(data)); + } + catch (IOException e) + { + QualityOfLife.LOGGER.error("Failed to save ignore data for {}", playerUuid, e); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/PingCommandController.java b/src/main/java/com/overlord/qualityoflife/classes/controller/PingCommandController.java new file mode 100644 index 0000000..5bec823 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/PingCommandController.java @@ -0,0 +1,94 @@ +package com.overlord.qualityoflife.classes.controller; + +import java.util.Collection; +import net.minecraft.text.Text; +import com.mojang.brigadier.Command; +import net.minecraft.text.MutableText; +import net.minecraft.server.command.CommandManager; +import com.mojang.brigadier.context.CommandContext; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.command.argument.EntityArgumentType; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.overlord.qualityoflife.classes.controller.util.Color; +import com.overlord.qualityoflife.classes.controller.util.Player; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import com.overlord.qualityoflife.classes.controller.util.CommandExceptionFactory; +import com.overlord.qualityoflife.classes.controller.util.extension.IChatCommandController; + +public class PingCommandController implements IChatCommandController +{ + public static void register() + { + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> + { + dispatcher.register(CommandManager.literal("ping") + .executes(PingCommandController::execute) + .then(CommandManager.argument("target", EntityArgumentType.players()) + .requires(source -> source.hasPermissionLevel(Player.PERMISSION_LEVEL_OP)) // Op-only check + .executes(PingCommandController::executeWithTargets)) + ); + }); + } + + private static int execute(CommandContext context) throws CommandSyntaxException + { + ServerCommandSource source = context.getSource(); + + if (source.getPlayer() != null) + { + ServerPlayerEntity player = source.getPlayer(); + + player.sendMessage(getFormattedPingText(Player.of(player))); + } + else throw CommandExceptionFactory.create("This command has to be run by a player."); + + return Command.SINGLE_SUCCESS; + } + + public static int executeWithTargets(CommandContext context) throws CommandSyntaxException + { + Collection players = EntityArgumentType.getPlayers(context, "target"); + ServerCommandSource source = context.getSource(); + + MutableText response = Text.empty(); + + int i = 0; + int size = players.size(); + + for (ServerPlayerEntity serverPlayer : players) + { + boolean newline = players.size() > 1 && !(i == size-1); + + response.append(getFormattedPingText( + Player.of(serverPlayer), newline + )); + + i++; + } + + source.sendFeedback(() -> response, false); + + return Command.SINGLE_SUCCESS; + } + + private static Text getFormattedPingText(Player player) + { + return getFormattedPingText(player, false); + } + + private static Text getFormattedPingText(Player player, boolean appendNewline) + { + int ping = player.getPing(); + + Text pingValue = Text.literal(String.valueOf(ping)) + .styled(style -> style.withColor(Color.fromPing(ping))); + + return Text.literal("") + .append(player.display) + .append(": ") + .append(pingValue) + .append("ms") + .append(appendNewline ? "\n" : ""); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/PurgeController.java b/src/main/java/com/overlord/qualityoflife/classes/controller/PurgeController.java new file mode 100644 index 0000000..e852aeb --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/PurgeController.java @@ -0,0 +1,71 @@ +package com.overlord.qualityoflife.classes.controller; + +import java.util.Queue; +import java.util.LinkedList; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; + +public class PurgeController +{ + private static final int BATCH_SIZE = 20; + private static boolean purgeRegistered = true; + private static final Queue queue = new LinkedList<>(); + + public static void register() + { + ServerLifecycleEvents.SERVER_STARTED.register(PurgeController::iterateEntities); + ServerTickEvents.END_SERVER_TICK.register(PurgeController::iterateQueue); + ServerEntityEvents.ENTITY_LOAD.register(PurgeController::discardEntity); + } + + private static boolean validEntity(ServerWorld world, Entity entity) + { + NbtCompound nbt = new NbtCompound(); + entity.writeNbt(nbt); + + return (!world.isClient && nbt.getBoolean("NoAI")); + } + + private static void iterateEntities(MinecraftServer server) + { + for (ServerWorld world : server.getWorlds()) + world.iterateEntities().forEach(entity -> queueEntity(world, entity)); + } + + private static void iterateQueue(MinecraftServer server) + { + if (!purgeRegistered) return; + + if (queue.isEmpty()) + { + purgeRegistered = false; + return; + } + + int count = 0; + while (count < BATCH_SIZE && !queue.isEmpty()) + { + Entity entity = queue.poll(); + + if (entity != null && entity.isAlive()) + entity.remove(Entity.RemovalReason.DISCARDED); + + count++; + } + } + + private static void queueEntity(ServerWorld world, Entity entity) { + if (validEntity(world, entity)) + queue.add(entity); + } + + private static void discardEntity(Entity entity, ServerWorld world) { + if (validEntity(world, entity)) + entity.remove(Entity.RemovalReason.DISCARDED); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/Color.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/Color.java new file mode 100644 index 0000000..b00332d --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/Color.java @@ -0,0 +1,19 @@ +package com.overlord.qualityoflife.classes.controller.util; + +import com.overlord.qualityoflife.classes.controller.util.extension.ColorGradient; + +public class Color +{ + private static final int MAX_PING = 1000; + private static final int[] COLORS_CACHE_PING = new int[MAX_PING + 1]; + private static final ColorGradient PING_GRADIENT = new ColorGradient(120f, 0f); + + public static int fromPing(int ping) + { + ping = Math.max(0, Math.min(ping, MAX_PING)); + + if (COLORS_CACHE_PING[ping] != 0) return COLORS_CACHE_PING[ping]; + + return COLORS_CACHE_PING[ping] = (PING_GRADIENT.getColor(ping / (float) MAX_PING)).toRgbInt(); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/CommandExceptionFactory.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/CommandExceptionFactory.java new file mode 100644 index 0000000..360ee99 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/CommandExceptionFactory.java @@ -0,0 +1,55 @@ +package com.overlord.qualityoflife.classes.controller.util; + +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; + +public class CommandExceptionFactory +{ + private CommandExceptionFactory() {} + + public enum ExceptionType { + WARNING, + GENERIC, + INVALID_ARGUMENT, + UNKNOWN_PLAYER, + NO_PERMISSION + } + + /** + * Create a plain exception with the given message. + * @param message the literal message shown to the player + */ + public static CommandSyntaxException create(String message) { + return new SimpleCommandExceptionType( + Text.literal(message).styled(style -> style.withColor(Formatting.RED)) + ).create(); + } + + /** + * Create a typed exception that may prepend or style the text differently. + * @param type the category of error + * @param message the literal message shown to the player + */ + public static CommandSyntaxException create(ExceptionType type, String message) + { + Text text = switch (type) + { + case WARNING -> + Text.literal(message).formatted(Formatting.YELLOW); + case GENERIC -> + Text.literal(message).formatted(Formatting.RED); + case INVALID_ARGUMENT -> + Text.literal("Invalid argument: ").formatted(Formatting.YELLOW) + .append(Text.literal(message).formatted(Formatting.RED)); + case UNKNOWN_PLAYER -> + Text.literal("Unknown player: ").formatted(Formatting.YELLOW) + .append(Text.literal(message).formatted(Formatting.RED)); + case NO_PERMISSION -> + Text.literal("Insufficient permission.").formatted(Formatting.RED); + }; + + return new SimpleCommandExceptionType(text).create(); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/Dimension.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/Dimension.java new file mode 100644 index 0000000..66515b9 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/Dimension.java @@ -0,0 +1,57 @@ +package com.overlord.qualityoflife.classes.controller.util; + +import net.minecraft.world.World; +import net.minecraft.util.Identifier; +import net.minecraft.util.Formatting; +import net.minecraft.registry.RegistryKey; + +public class Dimension +{ + public enum Type + { + IDENTIFIER, + READABLE + } + + public static String getNormalizedName(RegistryKey dimension) + { + return getNormalizedName(dimension, Type.READABLE); + } + + public static String getNormalizedName(RegistryKey dimension, Type type) + { + Identifier id = dimension.getValue(); + + String namespace = id.getNamespace(); + String path = id.getPath(); + + if (!"minecraft".equals(namespace) || type.equals(Type.IDENTIFIER)) + return (namespace + ":" + path); + + return switch (path) + { + case "overworld" -> "Overworld"; + case "the_nether" -> "Nether"; + case "the_end" -> "End"; + default -> "Unknown (" + id + ")"; + }; + } + + public static Formatting getColorByDimension(String dimension) + { + String key = dimension.contains(":") ? dimension.split(":", 2)[1] : dimension; + + return switch (key) + { + case "overworld" -> Formatting.GREEN; + case "the_nether" -> Formatting.DARK_RED; + case "the_end" -> Formatting.LIGHT_PURPLE; + default -> Formatting.BLACK; + }; + } + + public static Formatting getColorByDimension(RegistryKey dimension) + { + return getColorByDimension(dimension.getValue().getPath()); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/ModLogger.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/ModLogger.java new file mode 100644 index 0000000..1293f5b --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/ModLogger.java @@ -0,0 +1,329 @@ +package com.overlord.qualityoflife.classes.controller.util; + +import org.slf4j.Logger; + +/** + * Wraps a Logger to automatically prefix all messages with a mod identifier + */ +public class ModLogger implements Logger +{ + private final Logger delegate; + private String globalPrefix = ""; + + public ModLogger(Logger logger) { + this.delegate = logger; + } + + public void setPrefix(String prefix) { + this.globalPrefix = prefix == null || prefix.isEmpty() ? "" : "[" + prefix + "] "; + } + + private String addPrefix(String msg) { + return globalPrefix + msg; + } + + @Override + public String getName() { + return delegate.getName(); + } + + @Override + public boolean isTraceEnabled() { + return delegate.isTraceEnabled(); + } + + @Override + public void trace(String msg) { + delegate.trace(addPrefix(msg)); + } + + @Override + public void trace(String format, Object arg) { + delegate.trace(addPrefix(format), arg); + } + + @Override + public void trace(String format, Object arg1, Object arg2) { + delegate.trace(addPrefix(format), arg1, arg2); + } + + @Override + public void trace(String format, Object... arguments) { + delegate.trace(addPrefix(format), arguments); + } + + @Override + public void trace(String msg, Throwable t) { + delegate.trace(addPrefix(msg), t); + } + + @Override + public boolean isTraceEnabled(org.slf4j.Marker marker) { + return delegate.isTraceEnabled(marker); + } + + @Override + public void trace(org.slf4j.Marker marker, String msg) { + delegate.trace(marker, addPrefix(msg)); + } + + @Override + public void trace(org.slf4j.Marker marker, String format, Object arg) { + delegate.trace(marker, addPrefix(format), arg); + } + + @Override + public void trace(org.slf4j.Marker marker, String format, Object arg1, Object arg2) { + delegate.trace(marker, addPrefix(format), arg1, arg2); + } + + @Override + public void trace(org.slf4j.Marker marker, String format, Object... argArray) { + delegate.trace(marker, addPrefix(format), argArray); + } + + @Override + public void trace(org.slf4j.Marker marker, String msg, Throwable t) { + delegate.trace(marker, addPrefix(msg), t); + } + + @Override + public boolean isDebugEnabled() { + return delegate.isDebugEnabled(); + } + + @Override + public void debug(String msg) { + delegate.debug(addPrefix(msg)); + } + + @Override + public void debug(String format, Object arg) { + delegate.debug(addPrefix(format), arg); + } + + @Override + public void debug(String format, Object arg1, Object arg2) { + delegate.debug(addPrefix(format), arg1, arg2); + } + + @Override + public void debug(String format, Object... arguments) { + delegate.debug(addPrefix(format), arguments); + } + + @Override + public void debug(String msg, Throwable t) { + delegate.debug(addPrefix(msg), t); + } + + @Override + public boolean isDebugEnabled(org.slf4j.Marker marker) { + return delegate.isDebugEnabled(marker); + } + + @Override + public void debug(org.slf4j.Marker marker, String msg) { + delegate.debug(marker, addPrefix(msg)); + } + + @Override + public void debug(org.slf4j.Marker marker, String format, Object arg) { + delegate.debug(marker, addPrefix(format), arg); + } + + @Override + public void debug(org.slf4j.Marker marker, String format, Object arg1, Object arg2) { + delegate.debug(marker, addPrefix(format), arg1, arg2); + } + + @Override + public void debug(org.slf4j.Marker marker, String format, Object... argArray) { + delegate.debug(marker, addPrefix(format), argArray); + } + + @Override + public void debug(org.slf4j.Marker marker, String msg, Throwable t) { + delegate.debug(marker, addPrefix(msg), t); + } + + @Override + public boolean isInfoEnabled() { + return delegate.isInfoEnabled(); + } + + @Override + public void info(String msg) { + delegate.info(addPrefix(msg)); + } + + @Override + public void info(String format, Object arg) { + delegate.info(addPrefix(format), arg); + } + + @Override + public void info(String format, Object arg1, Object arg2) { + delegate.info(addPrefix(format), arg1, arg2); + } + + @Override + public void info(String format, Object... arguments) { + delegate.info(addPrefix(format), arguments); + } + + @Override + public void info(String msg, Throwable t) { + delegate.info(addPrefix(msg), t); + } + + @Override + public boolean isInfoEnabled(org.slf4j.Marker marker) { + return delegate.isInfoEnabled(marker); + } + + @Override + public void info(org.slf4j.Marker marker, String msg) { + delegate.info(marker, addPrefix(msg)); + } + + @Override + public void info(org.slf4j.Marker marker, String format, Object arg) { + delegate.info(marker, addPrefix(format), arg); + } + + @Override + public void info(org.slf4j.Marker marker, String format, Object arg1, Object arg2) { + delegate.info(marker, addPrefix(format), arg1, arg2); + } + + @Override + public void info(org.slf4j.Marker marker, String format, Object... argArray) { + delegate.info(marker, addPrefix(format), argArray); + } + + @Override + public void info(org.slf4j.Marker marker, String msg, Throwable t) { + delegate.info(marker, addPrefix(msg), t); + } + + @Override + public boolean isWarnEnabled() { + return delegate.isWarnEnabled(); + } + + @Override + public void warn(String msg) { + delegate.warn(addPrefix(msg)); + } + + @Override + public void warn(String format, Object arg) { + delegate.warn(addPrefix(format), arg); + } + + @Override + public void warn(String format, Object arg1, Object arg2) { + delegate.warn(addPrefix(format), arg1, arg2); + } + + @Override + public void warn(String format, Object... arguments) { + delegate.warn(addPrefix(format), arguments); + } + + @Override + public void warn(String msg, Throwable t) { + delegate.warn(addPrefix(msg), t); + } + + @Override + public boolean isWarnEnabled(org.slf4j.Marker marker) { + return delegate.isWarnEnabled(marker); + } + + @Override + public void warn(org.slf4j.Marker marker, String msg) { + delegate.warn(marker, addPrefix(msg)); + } + + @Override + public void warn(org.slf4j.Marker marker, String format, Object arg) { + delegate.warn(marker, addPrefix(format), arg); + } + + @Override + public void warn(org.slf4j.Marker marker, String format, Object arg1, Object arg2) { + delegate.warn(marker, addPrefix(format), arg1, arg2); + } + + @Override + public void warn(org.slf4j.Marker marker, String format, Object... argArray) { + delegate.warn(marker, addPrefix(format), argArray); + } + + @Override + public void warn(org.slf4j.Marker marker, String msg, Throwable t) { + delegate.warn(marker, addPrefix(msg), t); + } + + @Override + public boolean isErrorEnabled() { + return delegate.isErrorEnabled(); + } + + @Override + public void error(String msg) { + delegate.error(addPrefix(msg)); + } + + @Override + public void error(String format, Object arg) { + delegate.error(addPrefix(format), arg); + } + + @Override + public void error(String format, Object arg1, Object arg2) { + delegate.error(addPrefix(format), arg1, arg2); + } + + @Override + public void error(String format, Object... arguments) { + delegate.error(addPrefix(format), arguments); + } + + @Override + public void error(String msg, Throwable t) { + delegate.error(addPrefix(msg), t); + } + + @Override + public boolean isErrorEnabled(org.slf4j.Marker marker) { + return delegate.isErrorEnabled(marker); + } + + @Override + public void error(org.slf4j.Marker marker, String msg) { + delegate.error(marker, addPrefix(msg)); + } + + @Override + public void error(org.slf4j.Marker marker, String format, Object arg) { + delegate.error(marker, addPrefix(format), arg); + } + + @Override + public void error(org.slf4j.Marker marker, String format, Object arg1, Object arg2) { + delegate.error(marker, addPrefix(format), arg1, arg2); + } + + @Override + public void error(org.slf4j.Marker marker, String format, Object... argArray) { + delegate.error(marker, addPrefix(format), argArray); + } + + @Override + public void error(org.slf4j.Marker marker, String msg, Throwable t) { + delegate.error(marker, addPrefix(msg), t); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/Player.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/Player.java new file mode 100644 index 0000000..26f9800 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/Player.java @@ -0,0 +1,58 @@ +package com.overlord.qualityoflife.classes.controller.util; + +import java.util.UUID; +import net.minecraft.text.Text; +import net.minecraft.server.network.ServerPlayerEntity; + +public class Player +{ + public String name = null; + public Text display = null; + public UUID identifier = null; + + private final ServerPlayerEntity player; + + public static final int PERMISSION_LEVEL_OP = 2; + + public Player(ServerPlayerEntity _player) + { + this.player = _player; + this.name = player.getName().getString(); + this.display = player.getDisplayName() != null ? player.getDisplayName() : Text.of(this.name); + this.identifier = player.getUuid(); + } + + public static Player of(ServerPlayerEntity _player) { + return new Player(_player); + } + + public String getPosition() { + var pos = player.getPos(); + return String.format("%.2f %.2f %.2f", pos.x, pos.y, pos.z); + } + + public String getPosition(String format) { + var pos = player.getPos(); + return String.format(format, pos.x, pos.y, pos.z); + } + + public String getDimension() { + return Dimension.getNormalizedName(player.getWorld().getRegistryKey()); + } + + public String getDimension(Dimension.Type type) { + return Dimension.getNormalizedName(player.getWorld().getRegistryKey(), type); + } + + public void sendMessage(Text message) { + player.sendMessage(message, false); + } + + public void sendMessage(Text message, boolean overlay) { + player.sendMessage(message, overlay); + } + + public int getPing() { + return player.pingMilliseconds; + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/StackTraceUtility.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/StackTraceUtility.java new file mode 100644 index 0000000..07911ff --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/StackTraceUtility.java @@ -0,0 +1,87 @@ +package com.overlord.qualityoflife.classes.controller.util; + +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; +import org.spongepowered.asm.mixin.transformer.ClassInfo; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +/** + * Based on MixinTrace + */ +public class StackTraceUtility +{ + public static void printTrace(StackTraceElement[] stackTrace, StringBuilder crashReportBuilder) + { + if (stackTrace != null && stackTrace.length > 0) + { + crashReportBuilder.append("\nMixins in Stacktrace:"); + + try + { + List classNames = new ArrayList<>(); + for (StackTraceElement el : stackTrace) + { + if (!classNames.contains(el.getClassName())) + classNames.add(el.getClassName()); + } + + boolean found = false; + for (String className : classNames) + { + ClassInfo classInfo = ClassInfo.fromCache(className); + + if (classInfo != null) + { + Object mixinInfoSetObject; + + try + { + //noinspection JavaReflectionMemberAccess + Method getMixins = ClassInfo.class.getDeclaredMethod("getMixins"); + + getMixins.setAccessible(true); + mixinInfoSetObject = getMixins.invoke(classInfo); + } + catch (Exception e) + { + var mixinsField = ClassInfo.class.getDeclaredField("mixins"); + + mixinsField.setAccessible(true); + mixinInfoSetObject = mixinsField.get(classInfo); + } + + @SuppressWarnings("unchecked") Set mixinInfoSet = (Set) mixinInfoSetObject; + + if (!mixinInfoSet.isEmpty()) + { + crashReportBuilder.append("\n\t"); + crashReportBuilder.append(className); + crashReportBuilder.append(":"); + + for (IMixinInfo info : mixinInfoSet) + { + crashReportBuilder.append("\n\t\t"); + crashReportBuilder.append(info.getClassName()); + crashReportBuilder.append(" ("); + crashReportBuilder.append(info.getConfig().getName()); + crashReportBuilder.append(")"); + } + + found = true; + } + } + } + + if (!found) + crashReportBuilder.append(" None found"); + } + catch (Exception e) + { + crashReportBuilder.append(" Failed to find Mixin metadata: ").append(e); + } + } + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/ColorGradient.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/ColorGradient.java new file mode 100644 index 0000000..5962337 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/ColorGradient.java @@ -0,0 +1,80 @@ +package com.overlord.qualityoflife.classes.controller.util.extension; + +public record ColorGradient(float startHue, float endHue, float saturation, float value) +{ + public ColorGradient(float startHue, float endHue) + { + this(startHue, endHue, 1.0f, 1.0f); + } + + public ColorGradient { + startHue = normalizeHue(startHue); + endHue = normalizeHue(endHue); + saturation = clamp(saturation); + value = clamp(value); + } + + public RgbColor getColor(float ratio) + { + ratio = clamp(ratio); + + float delta = normalizeDelta(endHue - startHue); + float hue = normalizeHue((startHue + delta * ratio)); // Interpolate along shortest arc + + return hsvToRgb(hue, saturation, value); + } + + private static float normalizeHue(float hue) + { + hue %= 360; + + return hue < 0 ? hue + 360 : hue; + } + + private static float normalizeDelta(float delta) + { + // Normalize delta to [-180, 180] range for shortest direction + return delta > 180 + ? delta - 360 + : delta < -180 + ? delta + 360 + : delta; + } + + private static float clamp(float v) { + return Math.max(0f, Math.min(1f, v)); + } + + private static RgbColor hsvToRgb(float h, float s, float v) + { + float c = v * s; + float x = c * (1 - Math.abs((h / 60) % 2 - 1)); + float m = v - c; + + float rPrime = 0, gPrime = 0, bPrime = 0; + + if (h < 60) { rPrime = c; gPrime = x; } + else if (h < 120) { rPrime = x; gPrime = c; } + else if (h < 180) { gPrime = c; bPrime = x; } + else if (h < 240) { gPrime = x; bPrime = c; } + else if (h < 300) { rPrime = x; bPrime = c; } + else { rPrime = c; bPrime = x; } + + int r = Math.round((rPrime + m) * 255); + int g = Math.round((gPrime + m) * 255); + int b = Math.round((bPrime + m) * 255); + + return new RgbColor(r, g, b); + } + + public record RgbColor(int red, int green, int blue) + { + public int toRgbInt() { + return (this.red() << 16) | (this.green() << 8) | this.blue(); + } + + public String toHex() { + return String.format("#%02X%02X%02X", this.red(), this.green(), this.blue()); + } + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/IChatCommandController.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/IChatCommandController.java new file mode 100644 index 0000000..b905564 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/IChatCommandController.java @@ -0,0 +1,17 @@ +package com.overlord.qualityoflife.classes.controller.util.extension; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.server.command.ServerCommandSource; +import org.slf4j.Logger; +import com.overlord.qualityoflife.QualityOfLife; + +public interface IChatCommandController +{ + String MOD_ID = QualityOfLife.MOD_ID; + Logger LOGGER = QualityOfLife.LOGGER; + + static void register() {} + private static int execute(CommandContext context) throws CommandSyntaxException { return Command.SINGLE_SUCCESS; } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/INetworkUtility.java b/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/INetworkUtility.java new file mode 100644 index 0000000..ff6c91f --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/controller/util/extension/INetworkUtility.java @@ -0,0 +1,125 @@ +package com.overlord.qualityoflife.classes.controller.util.extension; + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.nio.file.Path; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.net.HttpURLConnection; +import java.security.MessageDigest; +import java.io.ByteArrayOutputStream; +import java.nio.file.StandardCopyOption; +import java.nio.charset.StandardCharsets; + +@SuppressWarnings("SameParameterValue") +public abstract class INetworkUtility +{ + protected static final String USER_AGENT = "QoL-AutoUpdater/1.0"; + protected static final String ALGORITHM = "SHA-256"; + protected static final int BUFFER_SIZE = 65536; // 64 KB + + private static HttpURLConnection getConnection(String url) throws IOException { + return getConnection(url, "GET", 5_000, 15_000, null); + } + + private static HttpURLConnection getConnection(String url, int connTimeoutMs, int readTimeoutMs) throws IOException { + return getConnection(url, "GET", connTimeoutMs, readTimeoutMs, null); + } + + private static HttpURLConnection getConnection(String url, int connTimeoutMs, int readTimeoutMs, Map properties) throws IOException { + return getConnection(url, "GET", connTimeoutMs, readTimeoutMs, properties); + } + + private static HttpURLConnection getConnection(String url, String method, int connTimeoutMs, int readTimeoutMs, Map properties) throws IOException + { + HttpURLConnection connection = (HttpURLConnection)new URL(url).openConnection(); + + connection.setRequestProperty("User-Agent", USER_AGENT); + connection.setInstanceFollowRedirects(true); + connection.setConnectTimeout(connTimeoutMs); + connection.setReadTimeout(readTimeoutMs); + connection.setRequestMethod(method); + + if (properties != null) + { + for (Map.Entry e : properties.entrySet()) + { + if (e.getKey() == null || e.getValue() == null) continue; + + connection.setRequestProperty(e.getKey(), e.getValue()); + } + } + + return connection; + } + + protected static String fetch(String url, int connTimeoutMs, int readTimeoutMs) throws IOException + { + HttpURLConnection conn = getConnection(url, "GET", connTimeoutMs, readTimeoutMs, null); + + int code = conn.getResponseCode(); + + if (code / 100 != 2) + throw new IOException("HTTP " + code + " from " + url); + + try (InputStream in = conn.getInputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream()) + { + int r; + byte[] buf = new byte[BUFFER_SIZE]; + + while ((r = in.read(buf)) != -1) + bout.write(buf, 0, r); + + return bout.toString(StandardCharsets.UTF_8); + } + } + + protected static Path downloadFile(String url, Path out) throws IOException + { + Map properties = new HashMap<>(); + properties.put("Accept", "application/octet-stream, */*"); + properties.put("Connection", "keep-alive"); + + HttpURLConnection conn = getConnection(url, "GET", 5_000, 15_000, properties); + + int code = conn.getResponseCode(); + + if (code / 100 != 2) + throw new IOException("HTTP " + code + " from " + url); + + try (InputStream in = conn.getInputStream()) + { + Files.copy(in, out, StandardCopyOption.REPLACE_EXISTING); + } + finally + { + conn.disconnect(); + } + + return out; + } + + protected static boolean verifySha256(Path file, String expectedHex) throws Exception + { + MessageDigest md = MessageDigest.getInstance(ALGORITHM); + + try (InputStream is = Files.newInputStream(file)) + { + int r; + byte[] buf = new byte[BUFFER_SIZE]; + + while ((r = is.read(buf)) != -1) + md.update(buf, 0, r); + } + + byte[] digest = md.digest(); + StringBuilder sb = new StringBuilder(); + + for (byte b : digest) + sb.append(String.format("%02x", b)); + + return sb.toString().equalsIgnoreCase(expectedHex); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/registry/ModEffects.java b/src/main/java/com/overlord/qualityoflife/classes/registry/ModEffects.java new file mode 100644 index 0000000..8e02874 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/registry/ModEffects.java @@ -0,0 +1,55 @@ +package com.overlord.qualityoflife.classes.registry; + +import net.minecraft.util.Identifier; +import net.minecraft.registry.Registry; +import net.minecraft.registry.Registries; +import com.overlord.qualityoflife.QualityOfLife; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectCategory; + +/** + * A tiny invisible marker effect. It does nothing, is registered only so the potion can contain + * something and have a color. The affliction gameplay is handled in AfflictionManager (server JSON). + */ +public class ModEffects +{ + public static StatusEffect BLACK_POISON_MARKER; + public static StatusEffect CURE_BLACK_POISON_MARKER; + + public static final Identifier BLACK_POISON_MARKER_ID = new Identifier(QualityOfLife.MOD_ID, "black_poison_marker"); + public static final Identifier CURE_BLACK_POISON_MARKER_ID = new Identifier(QualityOfLife.MOD_ID, "cure_black_poison_marker"); + + public static void register() + { + BLACK_POISON_MARKER = new SimpleStatusEffect(StatusEffectCategory.HARMFUL, 0x000000); // black + CURE_BLACK_POISON_MARKER = new SimpleStatusEffect(StatusEffectCategory.BENEFICIAL, 0xffffff); // white + + Registry.register(Registries.STATUS_EFFECT, BLACK_POISON_MARKER_ID, BLACK_POISON_MARKER); + Registry.register(Registries.STATUS_EFFECT, CURE_BLACK_POISON_MARKER_ID, CURE_BLACK_POISON_MARKER); + } + + /** + * Simple StatusEffect subclass to work around protected constructor + */ + private static class SimpleStatusEffect extends StatusEffect + { + public SimpleStatusEffect(StatusEffectCategory category, int color) { + super(category, color); + } + + @Override + public boolean isBeneficial() { + return false; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public boolean canApplyUpdateEffect(int duration, int amplifier) { + return false; + } + } +} diff --git a/src/main/java/com/overlord/qualityoflife/classes/registry/ModPotions.java b/src/main/java/com/overlord/qualityoflife/classes/registry/ModPotions.java new file mode 100644 index 0000000..7858fe5 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/classes/registry/ModPotions.java @@ -0,0 +1,47 @@ +package com.overlord.qualityoflife.classes.registry; + +import net.minecraft.item.Items; +import net.minecraft.potion.Potion; +import net.minecraft.potion.Potions; +import net.minecraft.util.Identifier; +import net.minecraft.registry.Registry; +import net.minecraft.registry.Registries; +import com.overlord.qualityoflife.QualityOfLife; +import net.minecraft.recipe.BrewingRecipeRegistry; +import net.minecraft.entity.effect.StatusEffectInstance; + +public class ModPotions +{ + public static Potion BLACK_POISON; + public static Potion CURE_POTION; + + public static final Identifier BLACK_POISON_ID = new Identifier(QualityOfLife.MOD_ID, "black_poison"); + public static final Identifier CURE_POTION_ID = new Identifier(QualityOfLife.MOD_ID, "black_poison_cure"); + + public static void register() + { + StatusEffectInstance markerInstance = new StatusEffectInstance( + ModEffects.BLACK_POISON_MARKER, 1, 0, + false, false, false + ); + + StatusEffectInstance cureInstance = new StatusEffectInstance( + ModEffects.CURE_BLACK_POISON_MARKER, 1, 0, + false, false, false + ); + + BLACK_POISON = new Potion(markerInstance); + CURE_POTION = new Potion(cureInstance); + + Registry.register(Registries.POTION, BLACK_POISON_ID, BLACK_POISON); + Registry.register(Registries.POTION, CURE_POTION_ID, CURE_POTION); + + registerBrewing(); + } + + private static void registerBrewing() + { + BrewingRecipeRegistry.registerPotionRecipe(Potions.AWKWARD, Items.POISONOUS_POTATO, BLACK_POISON); + BrewingRecipeRegistry.registerPotionRecipe(Potions.AWKWARD, Items.ENCHANTED_GOLDEN_APPLE, CURE_POTION); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/mixin/affliction/PlayerDeathMixin.java b/src/main/java/com/overlord/qualityoflife/mixin/affliction/PlayerDeathMixin.java new file mode 100644 index 0000000..fe01756 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/mixin/affliction/PlayerDeathMixin.java @@ -0,0 +1,43 @@ +package com.overlord.qualityoflife.mixin.affliction; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import net.minecraft.text.Text; +import net.minecraft.server.PlayerManager; +import net.minecraft.server.network.ServerPlayerEntity; +import com.overlord.qualityoflife.classes.affliction.AfflictionManager; + +/** + * Intercepts player death to broadcast custom death message for afflicted players + */ +@Mixin(ServerPlayerEntity.class) +public class PlayerDeathMixin +{ + /** + * Redirect the call to PlayerManager.broadcast(Text, boolean) made from ServerPlayerEntity.onDeath + * Yarn/official mappings for 1.20.1: "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V" + */ + @Redirect( + method = "onDeath", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V" + ) + ) + private void redirectBroadcastOnDeath(PlayerManager manager, Text originalMessage, boolean actionBar) + { + ServerPlayerEntity player = (ServerPlayerEntity)(Object)this; + + if (AfflictionManager.instance().isAfflicted(player.getUuid())) + { + String deathMessage = player.getEntityName() + " died due to organ failure."; + manager.broadcast(Text.literal(deathMessage), false); + return; + } + + // Not afflicted: preserve vanilla behaviour + manager.broadcast(originalMessage, actionBar); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/mixin/affliction/PotionFinishMixin.java b/src/main/java/com/overlord/qualityoflife/mixin/affliction/PotionFinishMixin.java new file mode 100644 index 0000000..90c2424 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/mixin/affliction/PotionFinishMixin.java @@ -0,0 +1,39 @@ +package com.overlord.qualityoflife.mixin.affliction; + +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.world.World; +import net.minecraft.item.ItemStack; +import net.minecraft.item.PotionItem; +import net.minecraft.util.Identifier; +import net.minecraft.potion.PotionUtil; +import net.minecraft.entity.LivingEntity; +import net.minecraft.registry.Registries; +import net.minecraft.entity.player.PlayerEntity; +import com.overlord.qualityoflife.classes.registry.ModPotions; +import com.overlord.qualityoflife.classes.affliction.AfflictionManager; + +/** + * Hooks into PotionItem.finishUsing to handle custom potion effects + * Only triggers when potion drinking is actually finished (not on cancel/slot switch) + */ +@Mixin(PotionItem.class) +public class PotionFinishMixin +{ + @Inject(method = "finishUsing", at = @At("HEAD")) + private void onPotionFinish(ItemStack stack, World world, LivingEntity user, CallbackInfoReturnable cir) + { + if (world.isClient) return; + if (!(user instanceof PlayerEntity player)) return; + + Identifier potionId = Registries.POTION.getId(PotionUtil.getPotion(stack)); + + if (potionId.equals(ModPotions.BLACK_POISON_ID)) + AfflictionManager.instance().applyAffliction(player.getUuid()); + if (potionId.equals(ModPotions.CURE_POTION_ID)) + AfflictionManager.instance().removeAffliction(player.getUuid()); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/mixin/affliction/SplashPotionEntityMixin.java b/src/main/java/com/overlord/qualityoflife/mixin/affliction/SplashPotionEntityMixin.java new file mode 100644 index 0000000..9548a1f --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/mixin/affliction/SplashPotionEntityMixin.java @@ -0,0 +1,64 @@ +package com.overlord.qualityoflife.mixin.affliction; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; + +import net.minecraft.util.math.Box; +import net.minecraft.potion.Potion; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; +import net.minecraft.potion.PotionUtil; +import net.minecraft.util.hit.HitResult; +import net.minecraft.entity.LivingEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.thrown.PotionEntity; +import com.overlord.qualityoflife.classes.registry.ModPotions; +import com.overlord.qualityoflife.classes.registry.ModEffects; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.overlord.qualityoflife.classes.affliction.AfflictionManager; + +/** + * Intercepts potion collision so we can: + */ +@Mixin(PotionEntity.class) +public class SplashPotionEntityMixin +{ + @Inject(method = "onCollision", at = @At("TAIL")) + private void onCollisionHook(HitResult hitResult, CallbackInfo ci) + { + PotionEntity self = (PotionEntity) (Object) this; + if (!(self.getWorld() instanceof ServerWorld serverWorld)) return; + + ItemStack stack = self.getStack(); + Potion potion = PotionUtil.getPotion(stack); + if (potion == null) return; + + Identifier id = net.minecraft.registry.Registries.POTION.getId(potion); + if (id == null) return; + + double x = self.getX(); + double y = self.getY(); + double z = self.getZ(); + Box area = new Box(x - 3.0, y - 3.0, z - 3.0, x + 3.0, y + 3.0, z + 3.0); + + if (id.equals(ModPotions.BLACK_POISON_ID)) + { + for (LivingEntity e : serverWorld.getEntitiesByClass(LivingEntity.class, area, ent -> ent instanceof PlayerEntity)) + { + PlayerEntity p = (PlayerEntity)e; + AfflictionManager.instance().applyAffliction(p.getUuid()); + } + } + else if (id.equals(ModPotions.CURE_POTION_ID)) + { + for (LivingEntity e : serverWorld.getEntitiesByClass(LivingEntity.class, area, ent -> ent instanceof PlayerEntity)) + { + PlayerEntity p = (PlayerEntity)e; + AfflictionManager.instance().removeAffliction(p.getUuid()); + p.removeStatusEffect(ModEffects.BLACK_POISON_MARKER); + } + } + } +} diff --git a/src/main/java/com/overlord/qualityoflife/mixin/ignoring/ChatPacketMixin.java b/src/main/java/com/overlord/qualityoflife/mixin/ignoring/ChatPacketMixin.java new file mode 100644 index 0000000..e1e19c6 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/mixin/ignoring/ChatPacketMixin.java @@ -0,0 +1,38 @@ +package com.overlord.qualityoflife.mixin.ignoring; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.UUID; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket; +import com.overlord.qualityoflife.classes.controller.IgnoreCommandController; + +/** + * Intercepts chat messages being sent to players + * Filters messages per-player based on ignore settings + */ +@Mixin(ServerPlayNetworkHandler.class) +public class ChatPacketMixin +{ + @Shadow + public ServerPlayerEntity player; + + @Inject( + method = "sendPacket(Lnet/minecraft/network/packet/Packet;)V", + at = @At("HEAD"), + cancellable = true + ) + private void filterChatPacket(net.minecraft.network.packet.Packet packet, CallbackInfo ci) + { + if (!(packet instanceof ChatMessageS2CPacket chatPacket)) return; + + UUID senderUuid = chatPacket.sender(); + if (senderUuid == null) return; + if (IgnoreCommandController.shouldBlockMessage(senderUuid, player.getUuid())) ci.cancel(); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReport.java b/src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReport.java new file mode 100644 index 0000000..456bd73 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReport.java @@ -0,0 +1,43 @@ +package com.overlord.qualityoflife.mixin.stacktrace; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.util.crash.CrashReport; +import com.overlord.qualityoflife.classes.controller.util.StackTraceUtility; + +/** + * Based on MixinTrace + */ +@Mixin(value = CrashReport.class) +@SuppressWarnings("MissingOrInvalidOpcode") +public abstract class MixinCrashReport +{ + @Shadow private StackTraceElement[] stackTrace; + + @Inject( + method = "addStackTrace", + at = @At( + value = "FIELD", + target = "Lnet/minecraft/util/crash/CrashReport;otherSections:Ljava/util/List;" + ) + ) + @SuppressWarnings("SpellCheckingInspection") + private void mixinAddTrace(StringBuilder crashReportBuilder, CallbackInfo ci) + { + int trailingNewlineCount = 0; + + if (crashReportBuilder.charAt(crashReportBuilder.length() - 1) == '\n') + { + crashReportBuilder.deleteCharAt(crashReportBuilder.length() - 1); + trailingNewlineCount++; + } + + StackTraceUtility.printTrace(stackTrace, crashReportBuilder); + + crashReportBuilder.append("\n".repeat(trailingNewlineCount)); + } +} diff --git a/src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReportSection.java b/src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReportSection.java new file mode 100644 index 0000000..b649bf0 --- /dev/null +++ b/src/main/java/com/overlord/qualityoflife/mixin/stacktrace/MixinCrashReportSection.java @@ -0,0 +1,21 @@ +package com.overlord.qualityoflife.mixin.stacktrace; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.util.crash.CrashReportSection; +import com.overlord.qualityoflife.classes.controller.util.StackTraceUtility; + +@Mixin(value = CrashReportSection.class) +public abstract class MixinCrashReportSection +{ + @Shadow private StackTraceElement[] stackTrace; + + @Inject(method = "addStackTrace", at = @At("TAIL")) + private void mixinAddTrace(StringBuilder crashReportBuilder, CallbackInfo ci) { + StackTraceUtility.printTrace(stackTrace, crashReportBuilder); + } +} diff --git a/src/main/resources/assets/quality-of-life/icon.png b/src/main/resources/assets/quality-of-life/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2b87e835a702b645e714686737b23c01a5358805 GIT binary patch literal 19004 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.17.2", + "minecraft": "~1.20.1", + "java": ">=17", + "fabric-api": "*" + }, + "suggests": { + "another-mod": "*" + } +} \ No newline at end of file diff --git a/src/main/resources/quality-of-life.mixins.json b/src/main/resources/quality-of-life.mixins.json new file mode 100644 index 0000000..ab82616 --- /dev/null +++ b/src/main/resources/quality-of-life.mixins.json @@ -0,0 +1,19 @@ +{ + "required": true, + "package": "com.overlord.qualityoflife.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "affliction.PlayerDeathMixin", + "affliction.PotionFinishMixin", + "affliction.SplashPotionEntityMixin", + "ignoring.ChatPacketMixin", + "stacktrace.MixinCrashReport", + "stacktrace.MixinCrashReportSection" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +}