diff --git a/build.gradle b/build.gradle index 60598db..eeb9273 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ plugins { - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.4-SNAPSHOT' id 'maven-publish' - id "io.freefair.lombok" version "6.0.0-m2" + id "io.freefair.lombok" version "8.4" } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name version = "${project.minecraft_version}-${project.mod_version}" @@ -15,6 +15,7 @@ apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/g repositories { mavenCentral() + mavenLocal() // only used to build the mod locally maven { url 'https://masa.dy.fi/maven' } maven { url 'https://jitpack.io' } } @@ -24,15 +25,18 @@ dependencies { 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.19.4:${project.malilib_version}" - modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}" + modImplementation "fi.dy.masa.malilib:malilib-fabric-${project.minecraft_version}:${project.malilib_version}" + modImplementation "io.github.darkkronicle:AdvancedChatCore:${project.minecraft_version}-${project.advancedchat_version}" - implementation 'org.openjdk.nashorn:nashorn-core:15.3' - implementation 'org.javadelight:delight-nashorn-sandbox:0.2.5' + modCompileOnly "com.github.DarkKronicle.Konstruct:core:${project.konstruct_version}" + modCompileOnly "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}" - 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' + implementation 'org.openjdk.nashorn:nashorn-core:15.4' + implementation 'org.javadelight:delight-nashorn-sandbox:0.4.2' + + include 'org.openjdk.nashorn:nashorn-core:15.4' + include 'org.javadelight:delight-nashorn-sandbox:0.4.2' + include group: 'org.webjars.npm', name: 'js-beautify', version: '1.14.8' } @@ -46,14 +50,20 @@ processResources { tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" - it.options.release = 16 + it.options.release = 17 } -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" +tasks.register('sourcesJar', Jar) { + dependsOn classes + archiveClassifier = "sources" from sourceSets.main.allSource } +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + jar { from "LICENSE.txt" } diff --git a/gradle.properties b/gradle.properties index f92a853..ca5fd4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,17 @@ -minecraft_version=1.19.4 -yarn_mappings=1.19.4+build.1 -loader_version=0.14.18 -fabric_api_version=0.76.0+1.19.4 +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.4 +loader_version=0.14.22 +fabric_api_version=0.90.0+1.20.2 -mod_version=1.2.8 +mod_version=1.2.9 maven_group=io.github.darkkronicle archives_base_name=AdvancedChatFilters - -malilib_version = 0.15.2 -org.gradle.jvmargs=-Xmx1G -advancedchat_version=v1.5.10 +malilib_version=0.17.0 +advancedchat_version=1.5.11 +konstruct_version=2.0.3-build1 owo_version=2.0.0 # publishing @@ -27,4 +29,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..7f93135 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..ac72c34 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.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..0adc8e1 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/subprojects/plugins/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=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=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, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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..6689b85 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,7 +41,7 @@ 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. @@ -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/config/gui/GuiAdvancedFilterDisabled.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/GuiAdvancedFilterDisabled.java index f9951f9..e523e3a 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/GuiAdvancedFilterDisabled.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/GuiAdvancedFilterDisabled.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.MutableText; @@ -60,13 +61,12 @@ public void back() { } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { + super.render(context, mouseX, mouseY, partialTicks); int width = client.getWindow().getScaledWidth(); int y = 100; for (OrderedText warn : warning) { - drawCenteredTextWithShadow( - matrixStack, + context.drawCenteredTextWithShadow( client.textRenderer, warn, width / 2, 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 d14f0a2..51bf12d 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 @@ -29,6 +29,7 @@ import io.github.darkkronicle.advancedchatfilters.filters.ParentFilter; import io.github.darkkronicle.advancedchatfilters.filters.ReplaceFilter; import io.github.darkkronicle.advancedchatfilters.registry.MatchReplaceRegistry; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.MutableText; @@ -78,13 +79,13 @@ protected void closeGui(boolean showParent) { } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { + super.render(context, mouseX, mouseY, partialTicks); int y = test.getY() + 20; int x = 10; for (Text t : outputMessage) { if (t != null) { - textRenderer.drawWithShadow(matrixStack, t, x, y, -1); + context.drawTextWithShadow(textRenderer, t, x, y, -1); } y += textRenderer.fontHeight + 2; } 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 b7a21e2..50bb169 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 @@ -31,6 +31,7 @@ import net.fabricmc.api.EnvType; 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) @@ -121,7 +122,7 @@ private ButtonOnOff addOnOffButton( } @Override - public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { + public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { RenderUtils.color(1f, 1f, 1f, 1f); // Draw a lighter background for the hovered and the selected entry @@ -153,14 +154,14 @@ public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixS this.y + 7, Colors.getInstance().getColorOrWhite("white").color(), name, - matrixStack); + context); RenderUtils.color(1f, 1f, 1f, 1f); RenderSystem.disableBlend(); - this.drawTextFields(mouseX, mouseY, matrixStack); + this.drawTextFields(mouseX, mouseY, context); - super.render(mouseX, mouseY, selected, matrixStack); + super.render(mouseX, mouseY, selected, context); RenderUtils.disableDiffuseLighting(); } @@ -257,16 +258,16 @@ protected boolean onMouseClickedImpl(int mouseX, int mouseY, int mouseButton) { return ret; } - protected void drawTextFields(int mouseX, int mouseY, MatrixStack matrixStack) { + protected void drawTextFields(int mouseX, int mouseY, DrawContext context) { if (this.num != null) { - this.num.getTextField().render(matrixStack, mouseX, mouseY, 0f); + this.num.getTextField().render(context, mouseX, mouseY, 0f); } } @Override public void postRenderHovered( - int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { - super.postRenderHovered(mouseX, mouseY, selected, matrixStack); + int mouseX, int mouseY, boolean selected, DrawContext context) { + super.postRenderHovered(mouseX, mouseY, selected, context); List hoverLines; @@ -285,7 +286,7 @@ public void postRenderHovered( && mouseX < this.buttonStartX && mouseY >= this.y && mouseY <= this.y + this.height) { - RenderUtils.drawHoverText(mouseX, mouseY, hoverLines, matrixStack); + RenderUtils.drawHoverText(mouseX, mouseY, hoverLines, context); } } } 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 950b4cc..9d631e5 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 @@ -31,6 +31,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; /* @@ -130,7 +131,7 @@ private int addOnOffButton(int xRight, int y, ButtonListener.Type type, boolean } @Override - public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { + public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { RenderUtils.color(1f, 1f, 1f, 1f); // Draw a lighter background for the hovered and the selected entry @@ -162,28 +163,28 @@ public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixS this.y + 7, Colors.getInstance().getColorOrWhite("white").color(), name, - matrixStack); + context); RenderUtils.color(1f, 1f, 1f, 1f); RenderSystem.disableBlend(); - this.drawTextFields(mouseX, mouseY, matrixStack); + this.drawTextFields(mouseX, mouseY, context); - super.render(mouseX, mouseY, selected, matrixStack); + super.render(mouseX, mouseY, selected, context); RenderUtils.disableDiffuseLighting(); } @Override public void postRenderHovered( - int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { - super.postRenderHovered(mouseX, mouseY, selected, matrixStack); + 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, matrixStack); + RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, context); } } @@ -291,9 +292,9 @@ protected boolean onMouseClickedImpl(int mouseX, int mouseY, int mouseButton) { return ret; } - protected void drawTextFields(int mouseX, int mouseY, MatrixStack matrixStack) { + protected void drawTextFields(int mouseX, int mouseY, DrawContext context) { if (this.num != null) { - this.num.getTextField().render(matrixStack, mouseX, mouseY, 0f); + this.num.getTextField().render(context, mouseX, mouseY, 0f); } } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListAdvancedFilters.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListAdvancedFilters.java index 4046dac..f25439c 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListAdvancedFilters.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListAdvancedFilters.java @@ -16,6 +16,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; + +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; @@ -48,8 +50,8 @@ public void addTextField(TextFieldWrapper text) { } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListFilters.java b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListFilters.java index 43f280e..7a6697f 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListFilters.java +++ b/src/main/java/io/github/darkkronicle/advancedchatfilters/config/gui/WidgetListFilters.java @@ -16,6 +16,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; + +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; @@ -50,8 +52,8 @@ public void addTextField(TextFieldWrapper text) { } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2aa458f..94ff717 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.14.22", "fabric": "*", - "minecraft": ">=1.19.4", - "malilib": ">=0.15.2", - "advancedchatcore": ">=1.5.10-1.18" + "minecraft": ">=1.20.2", + "malilib": ">=0.17.0", + "advancedchatcore": ">=1.5.11-1.20.2" }, "custom": { "acmodule": true,