mirror of
https://github.com/Motschen/Blur.git
synced 2025-12-15 11:15:09 +01:00
Blur 2.4.0 - Ingame-Configurable Exclusions & Fixes
- Made Blur exclusions configurable in-game - ReplayMod and ProjectInception screens are excluded by default - Update to MidnightLib 3.0.0 - Fix version in fabric.mod.json
This commit is contained in:
@@ -19,8 +19,8 @@ repositories {
|
|||||||
includeGroupByRegex 'io\\.github\\.onyxstudios.*'
|
includeGroupByRegex 'io\\.github\\.onyxstudios.*'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
flatDir {
|
maven {
|
||||||
dirs 'local_maven'
|
url = "https://api.modrinth.com/maven"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,8 +33,8 @@ dependencies {
|
|||||||
include "io.github.ladysnake:satin:${satin_version}"
|
include "io.github.ladysnake:satin:${satin_version}"
|
||||||
|
|
||||||
implementation 'com.google.code.findbugs:jsr305:3.0.2'
|
implementation 'com.google.code.findbugs:jsr305:3.0.2'
|
||||||
modImplementation "eu.midnightdust:midnightlib:${midnightlib_version}"
|
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
|
||||||
include "eu.midnightdust:midnightlib:${midnightlib_version}"
|
include "maven.modrinth:midnightlib:${project.midnightlib_version}"
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
loader_version=0.12.3
|
loader_version=0.12.3
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 2.3.0-1.17+fabric
|
mod_version = 2.4.0
|
||||||
maven_group = com.tterrag.blur
|
maven_group = com.tterrag.blur
|
||||||
archives_base_name = Blur
|
archives_base_name = blur
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
||||||
fabric_version=0.41.0+1.17
|
fabric_version=0.41.0+1.17
|
||||||
satin_version = 1.6.4
|
satin_version = 1.6.4
|
||||||
midnightlib_version=0.2.8
|
midnightlib_version=0.3.0
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https://services.gradle.org/distributions/gradle-7.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
269
gradlew
vendored
Normal file → Executable file
269
gradlew
vendored
Normal file → Executable file
@@ -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");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -17,67 +17,101 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
##
|
#
|
||||||
## 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/master/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
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
PRG="$0"
|
app_path=$0
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
# Need this for daisy-chained symlinks.
|
||||||
ls=`ls -ld "$PRG"`
|
while
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
[ -h "$app_path" ]
|
||||||
PRG="$link"
|
do
|
||||||
else
|
ls=$( ls -ld "$app_path" )
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
link=${ls#*' -> '}
|
||||||
fi
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
APP_NAME="Gradle"
|
||||||
APP_BASE_NAME=`basename "$0"`
|
APP_BASE_NAME=${0##*/}
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# 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"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD="maximum"
|
MAX_FD=maximum
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "`uname`" in
|
case "$( uname )" in #(
|
||||||
CYGWIN* )
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
cygwin=true
|
Darwin* ) darwin=true ;; #(
|
||||||
;;
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
Darwin* )
|
NONSTOP* ) nonstop=true ;;
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
else
|
else
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD="java"
|
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.
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
@@ -106,80 +140,95 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
case $MAX_FD in #(
|
||||||
if [ $? -eq 0 ] ; then
|
max*)
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
warn "Could not query maximum file descriptor limit"
|
||||||
fi
|
esac
|
||||||
ulimit -n $MAX_FD
|
case $MAX_FD in #(
|
||||||
if [ $? -ne 0 ] ; then
|
'' | soft) :;; #(
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
*)
|
||||||
fi
|
ulimit -n "$MAX_FD" ||
|
||||||
else
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
0) set -- ;;
|
|
||||||
1) set -- "$args0" ;;
|
|
||||||
2) set -- "$args0" "$args1" ;;
|
|
||||||
3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
save () {
|
# * args from the command line
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
# * the main class name
|
||||||
echo " "
|
# * -classpath
|
||||||
}
|
# * -D...appname settings
|
||||||
APP_ARGS=`save "$@"`
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 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 \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# 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" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
|
|||||||
Binary file not shown.
@@ -7,13 +7,17 @@ import ladysnake.satin.api.managed.ShaderEffectManager;
|
|||||||
import ladysnake.satin.api.managed.uniform.Uniform1f;
|
import ladysnake.satin.api.managed.uniform.Uniform1f;
|
||||||
import net.fabricmc.api.ClientModInitializer;
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.gui.screen.ChatScreen;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import org.apache.commons.lang3.ArrayUtils;
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class Blur implements ClientModInitializer {
|
public class Blur implements ClientModInitializer {
|
||||||
|
|
||||||
public static final String MODID = "blur";
|
public static final String MODID = "blur";
|
||||||
|
public static List<String> defaultExclusions = new ArrayList<>();
|
||||||
|
|
||||||
private long start;
|
private long start;
|
||||||
public int colorFirst, colorSecond;
|
public int colorFirst, colorSecond;
|
||||||
@@ -26,6 +30,9 @@ public class Blur implements ClientModInitializer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
|
defaultExclusions.add(ChatScreen.class.getName());
|
||||||
|
defaultExclusions.add("com.replaymod.lib.de.johni0702.minecraft.gui.container.AbstractGuiOverlay$UserInputGuiScreen");
|
||||||
|
defaultExclusions.add("ai.arcblroth.projectInception.client.InceptionInterfaceScreen");
|
||||||
BlurConfig.init("blur", BlurConfig.class);
|
BlurConfig.init("blur", BlurConfig.class);
|
||||||
|
|
||||||
ShaderEffectRenderCallback.EVENT.register((deltaTick) -> {
|
ShaderEffectRenderCallback.EVENT.register((deltaTick) -> {
|
||||||
@@ -39,7 +46,7 @@ public class Blur implements ClientModInitializer {
|
|||||||
private boolean doFade = false;
|
private boolean doFade = false;
|
||||||
public void onScreenChange(Screen newGui) {
|
public void onScreenChange(Screen newGui) {
|
||||||
if (MinecraftClient.getInstance().world != null) {
|
if (MinecraftClient.getInstance().world != null) {
|
||||||
boolean excluded = newGui == null || ArrayUtils.contains(BlurConfig.blurExclusions, newGui.getClass().getName());
|
boolean excluded = newGui == null || BlurConfig.blurExclusions.contains(newGui.getClass().getName());
|
||||||
if (!excluded) {
|
if (!excluded) {
|
||||||
blur.setUniformValue("Radius", (float) BlurConfig.radius);
|
blur.setUniformValue("Radius", (float) BlurConfig.radius);
|
||||||
colorFirst = Integer.parseUnsignedInt(String.valueOf(BlurConfig.gradientStartColor), 16);
|
colorFirst = Integer.parseUnsignedInt(String.valueOf(BlurConfig.gradientStartColor), 16);
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package com.tterrag.blur.config;
|
package com.tterrag.blur.config;
|
||||||
|
|
||||||
|
import com.tterrag.blur.Blur;
|
||||||
import eu.midnightdust.lib.config.MidnightConfig;
|
import eu.midnightdust.lib.config.MidnightConfig;
|
||||||
import net.minecraft.client.gui.screen.ChatScreen;
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class BlurConfig extends MidnightConfig {
|
public class BlurConfig extends MidnightConfig {
|
||||||
@Entry
|
@Entry
|
||||||
public static String[] blurExclusions = new String[]{ ChatScreen.class.getName() };
|
public static List<String> blurExclusions = Blur.defaultExclusions;
|
||||||
@Entry(min = 0, max = 5000, width = 4)
|
@Entry(min = 0, max = 5000, width = 4)
|
||||||
public static int fadeTimeMillis = 200;
|
public static int fadeTimeMillis = 200;
|
||||||
@Entry(min = 0, max = 500, width = 3)
|
@Entry(min = 0, max = 500, width = 3)
|
||||||
@@ -14,4 +16,6 @@ public class BlurConfig extends MidnightConfig {
|
|||||||
public static int gradientStartColor = 75000000;
|
public static int gradientStartColor = 75000000;
|
||||||
@Entry(min = 0, max = 99999999, width = 8)
|
@Entry(min = 0, max = 99999999, width = 8)
|
||||||
public static int gradientEndColor = 75000000;
|
public static int gradientEndColor = 75000000;
|
||||||
|
@Entry
|
||||||
|
public static boolean showScreenTitle = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
package com.tterrag.blur.config;
|
|
||||||
|
|
||||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
|
||||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
public class ModMenuIntegration implements ModMenuApi {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
|
||||||
return parent -> BlurConfig.getScreen(parent,"blur");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,11 @@
|
|||||||
package com.tterrag.blur.mixin;
|
package com.tterrag.blur.mixin;
|
||||||
|
|
||||||
|
import com.tterrag.blur.config.BlurConfig;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.font.TextRenderer;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
|
import net.minecraft.text.TextColor;
|
||||||
|
import net.minecraft.util.Formatting;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
@@ -22,24 +26,32 @@ public abstract class MixinScreen {
|
|||||||
|
|
||||||
@Shadow @Nullable protected MinecraftClient client;
|
@Shadow @Nullable protected MinecraftClient client;
|
||||||
|
|
||||||
@Inject(at = @At("HEAD"), method = "render")
|
@Shadow protected TextRenderer textRenderer;
|
||||||
private void reloadShader(MatrixStack matrixStack, int i, int j, float f, CallbackInfo ci) {
|
|
||||||
if (this.getClass().toString().toLowerCase(Locale.ROOT).contains("midnight") && this.client != null) {
|
@Inject(at = @At("HEAD"), method = "tick")
|
||||||
|
private void blur$reloadShader(CallbackInfo ci) {
|
||||||
|
if (this.getClass().toString().toLowerCase(Locale.ROOT).contains("midnightconfigscreen") && this.client != null) {
|
||||||
Blur.INSTANCE.onScreenChange(this.client.currentScreen);
|
Blur.INSTANCE.onScreenChange(this.client.currentScreen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@Inject(at = @At("TAIL"), method = "render")
|
||||||
|
private void blur$showScreenTitle(MatrixStack matrixStack, int i, int j, float f, CallbackInfo ci) {
|
||||||
|
if (BlurConfig.showScreenTitle && this.client != null && this.client.currentScreen != null) {
|
||||||
|
this.textRenderer.drawWithShadow(matrixStack, this.client.currentScreen.getClass().getName(), 0, 0, 16777215, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ModifyConstant(
|
@ModifyConstant(
|
||||||
method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
|
method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
|
||||||
constant = @Constant(intValue = -1072689136))
|
constant = @Constant(intValue = -1072689136))
|
||||||
private int getFirstBackgroundColor(int color) {
|
private int blur$getFirstBackgroundColor(int color) {
|
||||||
return Blur.INSTANCE.getBackgroundColor(false);
|
return Blur.INSTANCE.getBackgroundColor(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ModifyConstant(
|
@ModifyConstant(
|
||||||
method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
|
method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
|
||||||
constant = @Constant(intValue = -804253680))
|
constant = @Constant(intValue = -804253680))
|
||||||
private int getSecondBackgroundColor(int color) {
|
private int blur$getSecondBackgroundColor(int color) {
|
||||||
return Blur.INSTANCE.getBackgroundColor(true);
|
return Blur.INSTANCE.getBackgroundColor(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
{
|
{
|
||||||
"blur.midnightconfig.title": "Blur Konfiguration",
|
"blur.midnightconfig.title": "Blur Konfiguration",
|
||||||
|
"blur.midnightconfig.blurExclusions": "Blur-Ausnahmen",
|
||||||
"blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
|
"blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
|
||||||
"blur.midnightconfig.radius": "Radius",
|
"blur.midnightconfig.radius": "Radius",
|
||||||
"blur.midnightconfig.gradientStartColor": "Farbverlauf-Anfangsfarbe",
|
"blur.midnightconfig.gradientStartColor": "Farbverlauf-Anfangsfarbe",
|
||||||
"blur.midnightconfig.gradientEndColor": "Farbverlauf-Endfarbe"
|
"blur.midnightconfig.gradientEndColor": "Farbverlauf-Endfarbe",
|
||||||
|
"blur.midnightconfig.showScreenTitle": "Zeige Bildschirmtitel"
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
{
|
{
|
||||||
"blur.midnightconfig.title": "Blur Config",
|
"blur.midnightconfig.title": "Blur Config",
|
||||||
"blur.midnightconfig.blurExclusions": "§cBlur Exclusions are currently not configurable in-game!",
|
"blur.midnightconfig.blurExclusions": "Blur Exclusions",
|
||||||
"blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
|
"blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
|
||||||
"blur.midnightconfig.radius": "Radius",
|
"blur.midnightconfig.radius": "Radius",
|
||||||
"blur.midnightconfig.gradientStartColor": "Gradient Start Color",
|
"blur.midnightconfig.gradientStartColor": "Gradient Start Color",
|
||||||
"blur.midnightconfig.gradientEndColor": "Gradient End Color"
|
"blur.midnightconfig.gradientEndColor": "Gradient End Color",
|
||||||
|
"blur.midnightconfig.showScreenTitle": "Show screen title"
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"blur.midnightconfig.title": "Definições de desfoque",
|
"blur.midnightconfig.title": "Definições de desfoque",
|
||||||
"blur.midnightconfig.blurExclusions": "Exclusões de desfoque não são configuráveis em jogo no momento.",
|
"blur.midnightconfig.blurExclusions": "Exclusões de desfoque",
|
||||||
"blur.midnightconfig.fadeTimeMillis": "Esmaecimento (em milissegundos)",
|
"blur.midnightconfig.fadeTimeMillis": "Esmaecimento (em milissegundos)",
|
||||||
"blur.midnightconfig.radius": "Raio",
|
"blur.midnightconfig.radius": "Raio",
|
||||||
"blur.midnightconfig.gradientStartColor": "Cor de início do gradiente",
|
"blur.midnightconfig.gradientStartColor": "Cor de início do gradiente",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"blur.midnightconfig.title": "Настройки Blur",
|
"blur.midnightconfig.title": "Настройки Blur",
|
||||||
"blur.midnightconfig.blurExclusions": "В настоящее время исключения для размытия не настраиваются в игре.",
|
"blur.midnightconfig.blurExclusions": "Исключения размытия",
|
||||||
"blur.midnightconfig.fadeTimeMillis": "Время размытия (в милисекундах)",
|
"blur.midnightconfig.fadeTimeMillis": "Время размытия (в милисекундах)",
|
||||||
"blur.midnightconfig.radius": "Радиус размытия",
|
"blur.midnightconfig.radius": "Радиус размытия",
|
||||||
"blur.midnightconfig.gradientStartColor": "Верхний цвет градиента",
|
"blur.midnightconfig.gradientStartColor": "Верхний цвет градиента",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"schemaVersion": 1,
|
"schemaVersion": 1,
|
||||||
"id": "blur",
|
"id": "blur",
|
||||||
"name": "Blur (Fabric)",
|
"name": "Blur (Fabric)",
|
||||||
"version": "2.3.0",
|
"version": "$version",
|
||||||
"environment": "client",
|
"environment": "client",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"icon": "assets/blur/icon.png",
|
"icon": "assets/blur/icon.png",
|
||||||
|
|||||||
Reference in New Issue
Block a user