diff --git a/.gitignore b/.gitignore index 6492a02..8dfb399 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,14 @@ .idea/ +.vscode/ *.iml *.ipr *.iws lib/ run/ out/ +bin/ build/ .gradle/ classes/ lombok.config -extra.properties \ No newline at end of file +extra.properties diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..0595fbe --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,31 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Minecraft Client", + "request": "launch", + "cwd": "${workspaceFolder}/run", + "console": "integratedTerminal", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "-Dfabric.dli.config\u003dG:\\minesuperior\\chat\\AdvancedChatFilters\\.gradle\\loom-cache\\launch.cfg -Dfabric.dli.env\u003dclient -Dfabric.dli.main\u003dnet.fabricmc.loader.impl.launch.knot.KnotClient", + "args": "", + "env": {}, + "projectName": "AdvancedChatFilters" + }, + { + "type": "java", + "name": "Minecraft Server", + "request": "launch", + "cwd": "${workspaceFolder}/run", + "console": "integratedTerminal", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "-Dfabric.dli.config\u003dG:\\minesuperior\\chat\\AdvancedChatFilters\\.gradle\\loom-cache\\launch.cfg -Dfabric.dli.env\u003dserver -Dfabric.dli.main\u003dnet.fabricmc.loader.impl.launch.knot.KnotServer", + "args": "nogui", + "env": {}, + "projectName": "AdvancedChatFilters" + } + ] +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6524266..1395151 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,24 @@ plugins { - id 'fabric-loom' version '1.0-SNAPSHOT' - id 'maven-publish' - id "io.freefair.lombok" version "6.0.0-m2" + id "fabric-loom" version "1.11-SNAPSHOT" + id "maven-publish" + id "io.freefair.lombok" version "8.10" } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +// apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/gradle/publish.gradle' + +sourceCompatibility = JavaVersion.VERSION_21 +targetCompatibility = JavaVersion.VERSION_21 archivesBaseName = project.archives_base_name version = "${project.minecraft_version}-${project.mod_version}" group = project.maven_group -apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/gradle/publish.gradle' - repositories { mavenCentral() mavenLocal() // only used to build the mod locally @@ -24,17 +30,21 @@ dependencies { 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_api_version}" - modImplementation "fi.dy.masa.malilib:malilib-fabric-1.20.2:${project.malilib_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "com.github.sakura-ryoko:malilib:${project.malilib_version}" //modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}" - modImplementation "io.github.darkkronicle:AdvancedChatCore:1.20.4-1.5.10" // only used to build the mod locally + modImplementation "io.github.darkkronicle:AdvancedChatCore:${project.minecraft_version}-${project.mod_version}" + // modImplementation files("libs/AdvancedChatCore-${project.advancedchat_version}.jar") + + modImplementation "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}" + modImplementation "com.github.DarkKronicle.Konstruct:core:${project.konstruct_version}" implementation 'org.openjdk.nashorn:nashorn-core:15.3' implementation 'org.javadelight:delight-nashorn-sandbox:0.2.5' include 'org.openjdk.nashorn:nashorn-core:15.3' include 'org.javadelight:delight-nashorn-sandbox:0.2.5' - include group: 'org.webjars.bower', name: 'js-beautify', version: '1.9.0' + // include group: 'org.webjars.bower', name: 'js-beautify', version: '1.9.0' } @@ -48,11 +58,16 @@ processResources { tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" - it.options.release = 16 + it.options.release = 21 } -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" +// task sourcesJar(type: Jar, dependsOn: classes) { +// classifier = "sources" +// from sourceSets.main.allSource +// } +tasks.register('sourcesJar', Jar) { + dependsOn classes + archiveClassifier.set('sources') from sourceSets.main.allSource } @@ -77,6 +92,6 @@ publishing { // select the repositories you want to publish to repositories { // uncomment to publish to the local maven - // mavenLocal() + mavenLocal() } } diff --git a/gradle.properties b/gradle.properties index 4aab7cb..00ff8c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,19 @@ -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.3 -fabric_api_version=0.92.0+1.20.4 +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +minecraft_version=1.21.8 +yarn_mappings=1.21.8+build.1 +loader_version=0.17.2 +loom_version=1.11-SNAPSHOT -mod_version=1.2.8 +fabric_version=0.132.0+1.21.8 + +mod_version=1.8.0 maven_group=io.github.darkkronicle archives_base_name=AdvancedChatFilters -malilib_version = 0.17.0 -org.gradle.jvmargs=-Xmx1G -advancedchat_version=v1.5.10 +malilib_version=1.21.8-0.25.5-sakura.4 +konstruct_version=2.0.3-build1 owo_version=2.0.0 # publishing @@ -27,4 +31,4 @@ project_logo=https://raw.githubusercontent.com/DarkKronicle/AdvancedChatFilters/ project_color=0x134bff changelog_hide_unimportant_commits=true changelog_max_commit_search=200 -discord_webhook_changelog_line_limit=10 \ No newline at end of file +discord_webhook_changelog_line_limit=10 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c08e4f..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index df3a6fe..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,97 +119,131 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# 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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 28690fe..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -75,15 +76,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 \ No newline at end of file +:omega diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/AdvancedChatFilters.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/AdvancedChatFilters.java index 0ac99d5..eb62fa9 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/AdvancedChatFilters.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/AdvancedChatFilters.java @@ -7,7 +7,6 @@ */ package io.github.darkkronicle.advancedchatfilters; -import fi.dy.masa.malilib.event.InitializationHandler; import io.github.darkkronicle.advancedchatcore.ModuleHandler; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/Filter.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/Filter.java index f6dac0d..944ebf0 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/Filter.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/Filter.java @@ -308,7 +308,7 @@ public static NotifySound fromNotifySoundName(String notifysound) { continue; } if (r.event - .getId() + .id() .getPath() .replaceAll("\\.", "_") .toLowerCase() diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/GuiFilterEditor.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/GuiFilterEditor.java index 51bf12d..be0b727 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/GuiFilterEditor.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/GuiFilterEditor.java @@ -18,7 +18,6 @@ import fi.dy.masa.malilib.gui.button.IButtonActionListener; import fi.dy.masa.malilib.gui.widgets.WidgetDropDownList; import fi.dy.masa.malilib.util.StringUtils; -import io.github.darkkronicle.Konstruct.NodeException; import io.github.darkkronicle.advancedchatcore.ModuleHandler; import io.github.darkkronicle.advancedchatcore.config.gui.widgets.WidgetColor; import io.github.darkkronicle.advancedchatcore.config.gui.widgets.WidgetLabelHoverable; @@ -47,7 +46,6 @@ public class GuiFilterEditor extends GuiBase { private GuiTextFieldGeneric name; private GuiTextFieldGeneric findString; private GuiTextFieldGeneric replaceString; - private WidgetDropDownList replaceTypeWidget; private WidgetToggle setTextColor; private WidgetColor textColor; private WidgetToggle setBackgroundColor; @@ -130,7 +128,6 @@ public void save() { filter.getReplaceTo().config.setValueFromString(replaceString.getText()); filter.getTextColor().config.setValueFromString(textColor.getText()); filter.getReplaceTextColor().config.setBooleanValue(setTextColor.isCurrentlyOn()); - filter.getReplaceType().config.setOptionListValue(replaceTypeWidget.getSelectedEntry()); filter.getBackgroundColor() .config .setValueFromString(backgroundColor.getText()); @@ -169,24 +166,26 @@ private void createButtons(int x, int y) { y += labelHeight + 2; stripColors = new WidgetToggle(x, y, 100, false, "advancedchatfilters.config.filter.textcoloractive", filter.getStripColors().config.getBooleanValue()); this.addButton(stripColors, null); - y += stripColors.getHeight() + 4; + y += stripColors.getHeight() + 10; // Find type button y += this.addLabel(x, y, filter.getFindType().config) + 2; ConfigButtonOptionList findType = new ConfigButtonOptionList(x, y, 100, 20, filter.getFindType().config); this.addButton(findType, null); - y += findType.getHeight() + 4; + y += findType.getHeight() + 10; y += this.addLabel(x, y, filter.getReplaceType().config) + 2; - replaceTypeWidget = new WidgetDropDownList<>(x, y, 100, 20, 200, 10, ImmutableList.copyOf(MatchReplaceRegistry.getInstance().getAll()), MatchReplaceRegistry.MatchReplaceOption::getDisplayName); - replaceTypeWidget.setZLevel(replaceTypeWidget.getHeight() + 100); - replaceTypeWidget.setSelectedEntry((MatchReplaceRegistry.MatchReplaceOption) filter.getReplaceType().config.getOptionListValue()); + ConfigButtonOptionList replaceTypeWidget = new ConfigButtonOptionList(x, y, 100, 20, filter.getReplaceType().config); this.addWidget(replaceTypeWidget); - y += stripColors.getHeight() + 4; + y += stripColors.getHeight() + 10; // Text color this.addLabel(x, y, filter.getTextColor().config); - y += this.addLabel(x + getWidth() / 2, y, filter.getReplaceTextColor().config) + 1; + y += this.addLabel( + 120, // x + getWidth() / 2, + y, + filter.getReplaceTextColor().config + ) + 1; textColor = new WidgetColor( x, @@ -197,24 +196,36 @@ private void createButtons(int x, int y) { textRenderer); this.addTextField(textColor, null); setTextColor = new WidgetToggle( - x + getWidth() / 2 + 1, - y, getWidth() / 2 - 1, - false, - "advancedchatfilters.config.filter.textcoloractive", - filter.getReplaceTextColor().config.getBooleanValue() + 120, // x + getWidth() / 2 + 1, + y, + getWidth() / 2 - 1, + false, + "advancedchatfilters.config.filter.textcoloractive", + filter.getReplaceTextColor().config.getBooleanValue() ); this.addButton(setTextColor, null); - y += findType.getHeight() + 2; + y += findType.getHeight() + 10; // Background color // If the HUD module isn't active, changing this will do nothing boolean enableBackgroundColor = ModuleHandler.getInstance().fromId("advancedchathud").isPresent(); if (enableBackgroundColor) { this.addLabel(x, y, filter.getBackgroundColor().config); - y += this.addLabel(x + getWidth() / 2, y, filter.getReplaceBackgroundColor().config) + 1; + y += this.addLabel( + 120, // x + getWidth() / 2, + y, + filter.getReplaceBackgroundColor().config + ) + 1; } backgroundColor = new WidgetColor(x, y, getWidth() / 2 - 1, 18, filter.getBackgroundColor().config.get(), textRenderer); - setBackgroundColor = new WidgetToggle(x + getWidth() / 2 + 1, y, getWidth() / 2 - 1, false, "advancedchatfilters.config.filter.backgroundcoloractive", filter.getReplaceBackgroundColor().config.getBooleanValue()); + setBackgroundColor = new WidgetToggle( + 120, // x + getWidth() / 2 + 1, + y, + getWidth() / 2 - 1, + false, + "advancedchatfilters.config.filter.backgroundcoloractive", + filter.getReplaceBackgroundColor().config.getBooleanValue() + ); if (enableBackgroundColor) { this.addTextField(backgroundColor, null); this.addButton(setBackgroundColor, null); @@ -295,7 +306,7 @@ private void updateTestMessage() { MutableText output = StyleFormatter.formatText(testFilter.filter(parent, input, input, result).orElse(input)); outputMessageBuilder.append("Output Message: ", Style.EMPTY.withFormatting(Formatting.BOLD, Formatting.GRAY)); outputMessageBuilder.append(output); - } catch (NodeException e) { + } catch (Exception e) { outputMessageBuilder.append("Konstruct error! " + e.getMessage(), Style.EMPTY.withFormatting(Formatting.RED)); } built.add(outputMessageBuilder.build()); diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/SharingScreen.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/SharingScreen.java index fc06d83..dfdac53 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/SharingScreen.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/SharingScreen.java @@ -103,8 +103,7 @@ public void actionPerformedWithButton(ButtonBase button, int mouseButton) { // If you don't use deprecated it won't work Filter filter = filterSave.load( - new JsonParser() - .parse(parent.text.getText()) + JsonParser.parseString(parent.text.getText()) .getAsJsonObject()); if (filter == null) { throw new NullPointerException("Filter is null!"); diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetAdvancedFilterEntry.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetAdvancedFilterEntry.java index 50bb169..701ee43 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetAdvancedFilterEntry.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetAdvancedFilterEntry.java @@ -7,7 +7,6 @@ */ package io.github.darkkronicle.advancedchatfilters.config.gui; -import com.mojang.blaze3d.systems.RenderSystem; import fi.dy.masa.malilib.gui.button.ButtonBase; import fi.dy.masa.malilib.gui.button.ButtonGeneric; import fi.dy.masa.malilib.gui.button.ButtonOnOff; @@ -32,7 +31,6 @@ import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.util.math.MatrixStack; @Environment(EnvType.CLIENT) public class WidgetAdvancedFilterEntry extends WidgetListEntryBase { @@ -122,48 +120,55 @@ private ButtonOnOff addOnOffButton( } @Override - public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { - RenderUtils.color(1f, 1f, 1f, 1f); + public void render(DrawContext context, int mouseX, int mouseY, boolean selected) { + // RenderUtils.color(1f, 1f, 1f, 1f); // TODO: Determine if required // Draw a lighter background for the hovered and the selected entry if (selected || this.isMouseOver(mouseX, mouseY)) { RenderUtils.drawRect( - this.x, - this.y, - this.width, - this.height, - Colors.getInstance().getColorOrWhite("listhover").color()); + context, // TODO: Ensure this is correct + this.x, + this.y, + this.width, + this.height, + Colors.getInstance().getColorOrWhite("listhover").color() + ); } else if (this.isOdd) { RenderUtils.drawRect( - this.x, - this.y, - this.width, - this.height, - Colors.getInstance().getColorOrWhite("list1").color()); + context, // TODO: Ensure this is correct + this.x, + this.y, + this.width, + this.height, + Colors.getInstance().getColorOrWhite("list1").color() + ); } else { RenderUtils.drawRect( - this.x, - this.y, - this.width, - this.height, - Colors.getInstance().getColorOrWhite("list2").color()); + context, // TODO: Ensure this is correct + this.x, + this.y, + this.width, + this.height, + Colors.getInstance().getColorOrWhite("list2").color() + ); } String name = this.filter.getDisplayName(); this.drawString( - this.x + 4, - this.y + 7, - Colors.getInstance().getColorOrWhite("white").color(), - name, - context); + context, + this.x + 4, + this.y + 7, + Colors.getInstance().getColorOrWhite("white").color(), + name + ); - RenderUtils.color(1f, 1f, 1f, 1f); - RenderSystem.disableBlend(); + // RenderUtils.color(1f, 1f, 1f, 1f); // TODO: Determine if required + // RenderSystem.disableBlend(); // TODO: Determine if required - this.drawTextFields(mouseX, mouseY, context); + this.drawTextFields(context, mouseX, mouseY); - super.render(mouseX, mouseY, selected, context); + super.render(context, mouseX, mouseY, selected); - RenderUtils.disableDiffuseLighting(); + // RenderUtils.disableDiffuseLighting(); // TODO: Determine if required } private static class ButtonListener implements IButtonActionListener { @@ -258,35 +263,36 @@ protected boolean onMouseClickedImpl(int mouseX, int mouseY, int mouseButton) { return ret; } - protected void drawTextFields(int mouseX, int mouseY, DrawContext context) { + protected void drawTextFields(DrawContext context, int mouseX, int mouseY) { if (this.num != null) { this.num.getTextField().render(context, mouseX, mouseY, 0f); } } @Override - public void postRenderHovered( - int mouseX, int mouseY, boolean selected, DrawContext context) { - super.postRenderHovered(mouseX, mouseY, selected, context); + public void postRenderHovered(DrawContext context, int mouseX, int mouseY, boolean selected) { + super.postRenderHovered(context, mouseX, mouseY, selected); List hoverLines; if (filter.isImported()) { hoverLines = this.filter.getHoverLines(); } else { - hoverLines = - Arrays.asList( - StringUtils.translate( - "advancedchatfilters.config.filtermenu.info.import") - .split("\n")); + hoverLines = Arrays.asList( + StringUtils.translate( + "advancedchatfilters.config.filtermenu.info.import" + ).split("\n") + ); } if (hoverLines != null && hoverLines.size() > 0) { - if (mouseX >= this.x - && mouseX < this.buttonStartX - && mouseY >= this.y - && mouseY <= this.y + this.height) { - RenderUtils.drawHoverText(mouseX, mouseY, hoverLines, context); + if ( + mouseX >= this.x && + mouseX < this.buttonStartX && + mouseY >= this.y && + mouseY <= this.y + this.height + ) { + RenderUtils.drawHoverText(context, mouseX, mouseY, hoverLines); } } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetFilterEntry.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetFilterEntry.java index 9d631e5..d44ae65 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetFilterEntry.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetFilterEntry.java @@ -7,7 +7,6 @@ */ package io.github.darkkronicle.advancedchatfilters.config.gui; -import com.mojang.blaze3d.systems.RenderSystem; import fi.dy.masa.malilib.gui.GuiBase; import fi.dy.masa.malilib.gui.button.ButtonBase; import fi.dy.masa.malilib.gui.button.ButtonGeneric; @@ -32,11 +31,9 @@ import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.util.math.MatrixStack; /* This class is based heavily off of https://github.com/maruohon/minihud/blob/d565d39c68bdcd3ed1e1cf2007491e03d9659f34/src/main/java/fi/dy/masa/minihud/gui/widgets/WidgetShapeEntry.java#L19 which is off the GNU LGPL - */ @Environment(EnvType.CLIENT) public class WidgetFilterEntry extends WidgetListEntryBase { @@ -131,60 +128,68 @@ private int addOnOffButton(int xRight, int y, ButtonListener.Type type, boolean } @Override - public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { - RenderUtils.color(1f, 1f, 1f, 1f); + public void render(DrawContext context, int mouseX, int mouseY, boolean selected) { + // RenderUtils.color(1f, 1f, 1f, 1f); // TODO: Determine if required // Draw a lighter background for the hovered and the selected entry if (selected || this.isMouseOver(mouseX, mouseY)) { RenderUtils.drawRect( - this.x, - this.y, - this.width, - this.height, - Colors.getInstance().getColorOrWhite("listhover").color()); + context, // TODO: determine if correct + this.x, + this.y, + this.width, + this.height, + Colors.getInstance().getColorOrWhite("listhover").color() + ); } else if (this.isOdd) { RenderUtils.drawRect( - this.x, - this.y, - this.width, - this.height, - Colors.getInstance().getColorOrWhite("list1").color()); + context, // TODO: determine if correct + this.x, + this.y, + this.width, + this.height, + Colors.getInstance().getColorOrWhite("list1").color() + ); } else { RenderUtils.drawRect( - this.x, - this.y, - this.width, - this.height, - Colors.getInstance().getColorOrWhite("list2").color()); + context, // TODO: determine if correct + this.x, + this.y, + this.width, + this.height, + Colors.getInstance().getColorOrWhite("list2").color() + ); } String name = this.filter.getName().config.getStringValue(); this.drawString( - this.x + 4, - this.y + 7, - Colors.getInstance().getColorOrWhite("white").color(), - name, - context); + context, + this.x + 4, + this.y + 7, + Colors.getInstance().getColorOrWhite("white").color(), + name + ); - RenderUtils.color(1f, 1f, 1f, 1f); - RenderSystem.disableBlend(); + // RenderUtils.color(1f, 1f, 1f, 1f); // TODO: Determine if required + // RenderSystem.disableBlend(); // TODO: Determine if required this.drawTextFields(mouseX, mouseY, context); - super.render(mouseX, mouseY, selected, context); + super.render(context, mouseX, mouseY, selected); - RenderUtils.disableDiffuseLighting(); + // RenderUtils.disableDiffuseLighting(); // TODO: Determine if required } @Override - public void postRenderHovered( - int mouseX, int mouseY, boolean selected, DrawContext context) { - super.postRenderHovered(mouseX, mouseY, selected, context); - - if (mouseX >= this.x - && mouseX < this.buttonStartX - && mouseY >= this.y - && mouseY <= this.y + this.height) { - RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, context); + public void postRenderHovered(DrawContext context, int mouseX, int mouseY, boolean selected) { + super.postRenderHovered(context, mouseX, mouseY, selected); + + if ( + mouseX >= this.x && + mouseX < this.buttonStartX && + mouseY >= this.y && + mouseY <= this.y + this.height + ) { + RenderUtils.drawHoverText(context, mouseX, mouseY, this.hoverLines); } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/NarratorProcessor.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/NarratorProcessor.java index d74faae..13dce8d 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/NarratorProcessor.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/NarratorProcessor.java @@ -53,7 +53,7 @@ public String getName() { @Override public io.github.darkkronicle.Konstruct.parser.Result parse(ParseContext context, List input) { io.github.darkkronicle.Konstruct.parser.Result r1 = Function.parseArgument(context, input, 0); - Narrator.getNarrator().say(r1.getContent().getString(), false); + Narrator.getNarrator().say(r1.getContent().getString(), false, 1.0f); return io.github.darkkronicle.Konstruct.parser.Result.success(new NullObject()); } @@ -75,7 +75,7 @@ private static String translate(String key) { @Override public Result processMatches(Text text, Text unfiltered, SearchResult search) { String content = search.getGroupReplacements(message.config.getStringValue(), 0); - Narrator.getNarrator().say(content, false); + Narrator.getNarrator().say(content, false, 1.0f); return Result.getFromBool(true); } diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/SoundProcessor.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/SoundProcessor.java index 919b302..27e9f38 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/SoundProcessor.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/filters/processors/SoundProcessor.java @@ -94,7 +94,7 @@ public IntRange getArgumentCount() { } public static SoundEvent getEvent(String name) { - return SoundEvent.of(new Identifier(name)); + return SoundEvent.of(Identifier.of(name)); } /* How the filter notifies the client of a found string. diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/scripting/util/TextBuilder.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/scripting/util/TextBuilder.java index 1d624a0..e68cd2f 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/scripting/util/TextBuilder.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/scripting/util/TextBuilder.java @@ -7,6 +7,7 @@ */ package io.github.darkkronicle.advancedchatfilters.scripting.util; +import java.net.URI; import java.util.ArrayList; import java.util.List; import java.util.function.Function; @@ -133,7 +134,7 @@ public TextBuilder setStrikethrough(boolean strikethrough) { */ public TextBuilder setFont(String namespace, String name) { // Dunno if this will do anything or how it works - applyStyle(style -> style.withFont(new Identifier(namespace, name))); + applyStyle(style -> style.withFont(Identifier.of(namespace, name))); return this; } @@ -156,13 +157,13 @@ public TextBuilder concatenate(String content) { * @param action Action that will be set * @param value Content of that action */ - public TextBuilder setClickEvent(String action, String value) { - ClickEvent.Action clickAction = ClickEvent.Action.valueOf(action); - if (!clickAction.isUserDefinable()) { + public TextBuilder setClickEvent(ClickEvent event) { + if (!event.getAction().isUserDefinable()) { return this; } - ClickEvent event = new ClickEvent(clickAction, value); + applyStyle(style -> style.withClickEvent(event)); + return this; } @@ -172,7 +173,7 @@ public TextBuilder setClickEvent(String action, String value) { * @param hoverText Text for hover */ public TextBuilder setHoverText(Text hoverText) { - HoverEvent hover = new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverText); + HoverEvent hover = new HoverEvent.ShowText(hoverText); applyStyle(style -> style.withHoverEvent(hover)); return this; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a17f1ab..cbd6931 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -20,11 +20,11 @@ ] }, "depends": { - "fabricloader": ">=0.14.18", + "fabricloader": ">=0.16.3", "fabric": "*", - "minecraft": ">=1.20", - "malilib": ">=0.16.0", - "advancedchatcore": ">=1.5.10-1.19" + "minecraft": ">=1.21.4", + "malilib": ">=0.21.0", + "advancedchatcore": ">=1.7.0" }, "custom": { "acmodule": true,