Merge pull request #23 from Felix14-v2/fabric-1.16

Added translations into russian

.github/workflows/gradle.yml

@@ -1,29 +0,0 @@
-on:
-  push:
-    branches: [ "fabric-1.19.3" ]
-  pull_request:
-    branches: [ "fabric-1.19.3" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build --stacktrace --info
-    - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: Blur-Artifact
-        path: build/libs/blur-*.*.jar
-        if-no-files-found: error

build.gradle

@@ -1,64 +1,62 @@
 plugins {
-	id 'fabric-loom' version '1.1-SNAPSHOT'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_1_8
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+minecraft {
+}
+
 repositories {
-	maven {
+	maven { url "https://jitpack.io" }
-		name = 'Ladysnake Mods'
-		url = 'https://ladysnake.jfrog.io/artifactory/mods'
-		content {
-			includeGroup 'io.github.ladysnake'
-			includeGroupByRegex 'io\\.github\\.onyxstudios.*'
-		}
-	}
-	maven {
-		url = 'https://maven.terraformersmc.com/releases'
-		content {
-			includeGroup 'com.terraformersmc'
-		}
-	}
-	maven {
-		url = "https://api.modrinth.com/maven"
-	}
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	minecraft "com.mojang:minecraft:${minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	mappings "net.fabricmc:yarn:${yarn_mappings}"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	modCompile "net.fabricmc:fabric-loader:${loader_version}"
-
+	modCompile "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modCompile "io.github.ladysnake:Satin:${satin_version}"
-	modImplementation "io.github.ladysnake:satin:${satin_version}"
+	include "io.github.ladysnake:Satin:${satin_version}"
-	include "io.github.ladysnake:satin:${satin_version}"
+	
-
+	modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}") {
+		exclude group: "net.fabricmc.fabric-api"
+	}
+	
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
-	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
-	include "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }
-
 processResources {
 	inputs.property "version", project.version
 
-	filesMatching("fabric.mod.json") {
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
 		expand "version": project.version
 	}
+
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
+	}
 }
 
-tasks.withType(JavaCompile).configureEach {
+// ensure that the encoding is set to UTF-8, no matter what the system default is
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+// this fixes some edge cases with special characters not displaying correctly
-	it.options.release = 17
+// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+tasks.withType(JavaCompile) {
+	options.encoding = "UTF-8"
 }
 
-java {
+// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	withSourcesJar()
+// if it is present.
+// If you remove this task, sources will not be generated.
+task sourcesJar(type: Jar, dependsOn: classes) {
+	classifier = "sources"
+	from sourceSets.main.allSource
 }
 
 jar {
@@ -69,7 +67,20 @@ jar {
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-			from components.java
+			// add all the jars that should be included when publishing to maven
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
+			}
 		}
 	}
-}
+
+	// select the repositories you want to publish to
+	repositories {
+		// uncomment to publish to the local maven
+		// mavenLocal()
+	}
+}
+

gradle.properties

@@ -2,18 +2,18 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/develop
+	# check these on https://fabricmc.net/use
-	minecraft_version=1.19.3
+	minecraft_version=1.16.5
-	yarn_mappings=1.19.3+build.3
+	yarn_mappings=1.16.5+build.5
-	loader_version=0.14.11
+	loader_version=0.11.2
 	
 # Mod Properties
-	mod_version = 2.7.0
+	mod_version = 2.1.0-1.16+fabric
 	maven_group = com.tterrag.blur
-	archives_base_name = blur
+	archives_base_name = Blur
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.69.0+1.19.3
+	fabric_version=0.31.0+1.16
-	satin_version = 1.10.0
+	mod_menu_version = 1.14.6+build.31
-	midnightlib_version=1.2.1-fabric
+	satin_version = 1.5.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

gradlew

@@ -1,129 +1,79 @@
-#!/bin/sh
+#!/usr/bin/env bash
-
-#
-# 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.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   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
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-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.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
-} >&2
+}
 
-die () {
+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
-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
+    ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
 
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        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
@@ -132,7 +82,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +90,75 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    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
+        ulimit -n $MAX_FD
-        # args, so each arg winds up back in the position where it started, but
+        if [ $? -ne 0 ] ; then
-        # possibly modified.
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        #
+        fi
-        # NB: a `for` loop captures its iteration list before it begins, so
+    else
-        # changing the positional parameters here affects neither the number of
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-        # iterations, nor the values presented in `arg`.
+    fi
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
 fi
 
-# Collect all arguments for the java command;
+# For Darwin, add options to specify how the application appears in the dock
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+if $darwin; then
-#     shell script including quotes and variable substitutions, so put them in
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#     double quotes to make sure that they get re-expanded; and
+fi
-#   * put everything else in single quotes, so that it's not re-expanded.
 
-set -- \
+# For Cygwin, switch paths to Windows format before running java
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+if $cygwin ; then
-        -classpath "$CLASSPATH" \
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-        org.gradle.wrapper.GradleWrapperMain \
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-        "$@"
 
-# Use "xargs" to parse quoted args.
+    # We build the pattern for arguments to be converted via cygpath
-#
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+    SEP=""
-#
+    for dir in $ROOTDIRSRAW ; do
-# In Bash we could simply go:
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-#
+        SEP="|"
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+    done
-#   set -- "${ARGS[@]}" "$@"
+    OURCYGPATTERN="(^($ROOTDIRS))"
-#
+    # Add a user-defined pattern to the cygpath arguments
-# but POSIX shell has neither arrays nor command substitution, so instead we
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-# post-process each arg (as a line of input to sed) to backslash-escape any
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-# character that might be a shell metacharacter, then use eval to reverse
+    fi
-# that process (while maintaining the separation between arguments), and wrap
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-# the whole thing up as a single "set" statement.
+    i=0
-#
+    for arg in "$@" ; do
-# This will of course break if any of these variables contains a newline or
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-# an unmatched quote.
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-#
 
-eval "set -- $(
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        xargs -n1 |
+        else
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+            eval `echo args$i`="\"$arg\""
-        tr '\n' ' '
+        fi
-    )" '"$@"'
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
 
-exec "$JAVACMD" "$@"
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -1,89 +1,90 @@
-@rem
+@if "%DEBUG%" == "" @echo off
-@rem Copyright 2015 the original author or authors.
+@rem ##########################################################################
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem  Gradle startup script for Windows
-@rem you may not use this file except in compliance with the License.
+@rem
-@rem You may obtain a copy of the License at
+@rem ##########################################################################
-@rem
+
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem Set local scope for the variables with windows NT shell
-@rem
+if "%OS%"=="Windows_NT" setlocal
-@rem Unless required by applicable law or agreed to in writing, software
+
-@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+set DEFAULT_JVM_OPTS=
-@rem See the License for the specific language governing permissions and
+
-@rem limitations under the License.
+set DIRNAME=%~dp0
-@rem
+if "%DIRNAME%" == "" set DIRNAME=.
-
+set APP_BASE_NAME=%~n0
-@if "%DEBUG%" == "" @echo off
+set APP_HOME=%DIRNAME%
-@rem ##########################################################################
+
-@rem
+@rem Find java.exe
-@rem  Gradle startup script for Windows
+if defined JAVA_HOME goto findJavaFromJavaHome
-@rem
+
-@rem ##########################################################################
+set JAVA_EXE=java.exe
-
+%JAVA_EXE% -version >NUL 2>&1
-@rem Set local scope for the variables with windows NT shell
+if "%ERRORLEVEL%" == "0" goto init
-if "%OS%"=="Windows_NT" setlocal
+
-
+echo.
-set DIRNAME=%~dp0
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-if "%DIRNAME%" == "" set DIRNAME=.
+echo.
-set APP_BASE_NAME=%~n0
+echo Please set the JAVA_HOME variable in your environment to match the
-set APP_HOME=%DIRNAME%
+echo location of your Java installation.
-
+
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+goto fail
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
-
+:findJavaFromJavaHome
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set JAVA_HOME=%JAVA_HOME:"=%
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
+
-@rem Find java.exe
+if exist "%JAVA_EXE%" goto init
-if defined JAVA_HOME goto findJavaFromJavaHome
+
-
+echo.
-set JAVA_EXE=java.exe
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-%JAVA_EXE% -version >NUL 2>&1
+echo.
-if "%ERRORLEVEL%" == "0" goto execute
+echo Please set the JAVA_HOME variable in your environment to match the
-
+echo location of your Java installation.
-echo.
+
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+goto fail
-echo.
+
-echo Please set the JAVA_HOME variable in your environment to match the
+:init
-echo location of your Java installation.
+@rem Get command-line arguments, handling Windowz variants
-
+
-goto fail
+if not "%OS%" == "Windows_NT" goto win9xME_args
-
+if "%@eval[2+2]" == "4" goto 4NT_args
-:findJavaFromJavaHome
+
-set JAVA_HOME=%JAVA_HOME:"=%
+:win9xME_args
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+@rem Slurp the command line arguments.
-
+set CMD_LINE_ARGS=
-if exist "%JAVA_EXE%" goto execute
+set _SKIP=2
-
+
-echo.
+:win9xME_args_slurp
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+if "x%~1" == "x" goto execute
-echo.
+
-echo Please set the JAVA_HOME variable in your environment to match the
+set CMD_LINE_ARGS=%*
-echo location of your Java installation.
+goto execute
-
+
-goto fail
+:4NT_args
-
+@rem Get arguments from the 4NT Shell from JP Software
-:execute
+set CMD_LINE_ARGS=%$
-@rem Setup the command line
+
-
+:execute
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+@rem Setup the command line
-
+
-
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-@rem Execute Gradle
+
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+@rem Execute Gradle
-
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-:end
+
-@rem End local scope for the variables with windows NT shell
+:end
-if "%ERRORLEVEL%"=="0" goto mainEnd
+@rem End local scope for the variables with windows NT shell
-
+if "%ERRORLEVEL%"=="0" goto mainEnd
-:fail
+
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+:fail
-rem the _cmd.exe /c_ return code!
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+rem the _cmd.exe /c_ return code!
-exit /b 1
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-
+exit /b 1
-:mainEnd
+
-if "%OS%"=="Windows_NT" endlocal
+:mainEnd
-
+if "%OS%"=="Windows_NT" endlocal
-:omega
+
+:omega

settings.gradle

@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'

src/main/java/com/tterrag/blur/Blur.java

@@ -1,7 +1,7 @@
 package com.tterrag.blur;
 
 import com.tterrag.blur.config.BlurConfig;
-import eu.midnightdust.lib.util.MidnightColorUtil;
+import com.tterrag.blur.config.MidnightConfig;
 import ladysnake.satin.api.event.ShaderEffectRenderCallback;
 import ladysnake.satin.api.managed.ManagedShaderEffect;
 import ladysnake.satin.api.managed.ShaderEffectManager;
@@ -10,45 +10,45 @@ import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.Identifier;
+import org.apache.commons.lang3.ArrayUtils;
 
 public class Blur implements ClientModInitializer {
 
     public static final String MODID = "blur";
-    public static long start;
-    public static long fadeOutProgress;
 
-    private static final ManagedShaderEffect blur = ShaderEffectManager.getInstance().manage(new Identifier(MODID, "shaders/post/fade_in_blur.json"),
+    private long start;
-            shader -> shader.setUniformValue("Radius", (float) BlurConfig.radius));
+    public int colorFirst, colorSecond;
-    private static final Uniform1f blurProgress = blur.findUniform1f("Progress");
+
+    private final ManagedShaderEffect blur = ShaderEffectManager.getInstance().manage(new Identifier(MODID, "shaders/post/fade_in_blur.json"),
+            shader -> shader.setUniformValue("Radius", BlurConfig.radius));
+    private final Uniform1f blurProgress = blur.findUniform1f("Progress");
+
+    public static final Blur INSTANCE = new Blur();
 
     @Override
     public void onInitializeClient() {
-        BlurConfig.init("blur", BlurConfig.class);
+        MidnightConfig.init("blur", BlurConfig.class);
 
         ShaderEffectRenderCallback.EVENT.register((deltaTick) -> {
             if (start > 0) {
-                blurProgress.set(getProgress(MinecraftClient.getInstance().currentScreen != null));
+                blurProgress.set(getProgress());
                 blur.render(deltaTick);
             }
         });
     }
 
-    private static boolean doFade = false;
+    private boolean doFade = false;
-
+    public void onScreenChange(Screen newGui) {
-    public static void onScreenChange(Screen newGui) {
         if (MinecraftClient.getInstance().world != null) {
-            boolean excluded = newGui == null || BlurConfig.blurExclusions.stream().anyMatch(exclusion -> newGui.getClass().getName().contains(exclusion));
+            boolean excluded = newGui == null || ArrayUtils.contains(BlurConfig.blurExclusions, newGui.getClass().getName());
             if (!excluded) {
-                if (BlurConfig.showScreenTitle) System.out.println(newGui.getClass().getName());
+                blur.setUniformValue("Radius", BlurConfig.radius);
-                blur.setUniformValue("Radius", (float) BlurConfig.radius);
+                colorFirst = Integer.parseUnsignedInt(String.valueOf(BlurConfig.gradientStartColor), 16);
+                colorSecond = Integer.parseUnsignedInt(String.valueOf(BlurConfig.gradientEndColor), 16);
                 if (doFade) {
                     start = System.currentTimeMillis();
                     doFade = false;
                 }
-                fadeOutProgress = BlurConfig.fadeOutTimeMillis;
-            } else if (newGui == null && fadeOutProgress > 0) {
-                blur.setUniformValue("Radius", (float) BlurConfig.radius);
-                start = System.currentTimeMillis();
             } else {
                 start = -1;
                 doFade = true;
@@ -56,26 +56,17 @@ public class Blur implements ClientModInitializer {
         }
     }
 
-    private static float getProgress(boolean fadeIn) {
+    private float getProgress() {
-        if (fadeIn) {
+        return Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeTimeMillis, 1);
-            float x = Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeTimeMillis, 1);
-            if (BlurConfig.ease) x *= (2 - x);  // easeInCubic
-            return x;
-        }
-        else {
-            float x = Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeOutTimeMillis, 1);
-            if (BlurConfig.ease) x *= (2 - x);  // easeOutCubic
-            return -x + BlurConfig.fadeOutTimeMillis;
-        }
     }
 
-    public static int getBackgroundColor(boolean second, Screen screen) {
+    public int getBackgroundColor(boolean second) {
-        int a = second ? BlurConfig.gradientEndAlpha : BlurConfig.gradientStartAlpha;
+        int color = second ? colorSecond : colorFirst;
-        var col = MidnightColorUtil.hex2Rgb(second ? BlurConfig.gradientEnd : BlurConfig.gradientStart);
+        int a = color >>> 24;
-        int r = (col.getRGB() >> 16) & 0xFF;
+        int r = (color >> 16) & 0xFF;
-        int b = (col.getRGB() >> 8) & 0xFF;
+        int b = (color >> 8) & 0xFF;
-        int g = col.getRGB() & 0xFF;
+        int g = color & 0xFF;
-        float prog = getProgress(screen != null);
+        float prog = INSTANCE.getProgress();
         a *= prog;
         r *= prog;
         g *= prog;

src/main/java/com/tterrag/blur/config/BlurConfig.java

@@ -1,39 +1,16 @@
 package com.tterrag.blur.config;
 
-import com.google.common.collect.Lists;
-import eu.midnightdust.lib.config.MidnightConfig;
 import net.minecraft.client.gui.screen.ChatScreen;
 
-import java.util.List;
-
 public class BlurConfig extends MidnightConfig {
-    public static final String style = "style";
+    @Entry
-    public static final String misc = "misc";
+    public static String[] blurExclusions = new String[]{ ChatScreen.class.getName() };
-
+    @Entry(min = 0, max = 5000)
-
-    @Entry(category = misc)
-    public static List<String> blurExclusions = Lists.newArrayList(ChatScreen.class.getName(),
-        "com.replaymod.lib.de.johni0702.minecraft.gui.container.AbstractGuiOverlay$UserInputGuiScreen",
-        "ai.arcblroth.projectInception.client.InceptionInterfaceScreen",
-        "net.optifine.gui.GuiChatOF",
-        "io.github.darkkronicle.advancedchatcore.chat.AdvancedChatScreen",
-        "net.coderbot.iris.gui.screen.ShaderPackScreen");
-    @Entry(category = style, min = 0, max = 5000, width = 4)
     public static int fadeTimeMillis = 200;
-    @Entry(category = style, min = 0, max = 5000, width = 4)
+    @Entry(min = 0, max = 500)
-    public static int fadeOutTimeMillis = 200;
-    @Entry(category = style)
-    public static boolean ease = true;
-    @Entry(category = style, isSlider = true, min = 0, max = 100)
     public static int radius = 8;
-    @Entry(category = style, isColor = true, width = 7, min = 7)
+    @Entry(min = 0, max = 99999999)
-    public static String gradientStart = "#000000";
+    public static int gradientStartColor = 75000000;
-    @Entry(category = style, isSlider = true, min = 0, max = 255)
+    @Entry(min = 0, max = 99999999)
-    public static int gradientStartAlpha = 75;
+    public static int gradientEndColor = 75000000;
-    @Entry(category = style, isColor = true, width = 7, min = 7)
+}
-    public static String gradientEnd = "#000000";
-    @Entry(category = style, isSlider = true, min = 0, max = 255)
-    public static int gradientEndAlpha = 75;
-    @Entry(category = misc)
-    public static boolean showScreenTitle = false;
-}

src/main/java/com/tterrag/blur/config/MidnightConfig.java

@@ -0,0 +1,293 @@
+package com.tterrag.blur.config;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.tterrag.blur.Blur;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ScreenTexts;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.*;
+import net.minecraft.util.Formatting;
+
+import java.lang.annotation.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+// MidnightConfig v0.1.0 - Modified for Blur //
+
+/* Based on https://github.com/Minenash/TinyConfig
+   Credits to Minenash - CC0-1.0
+   You can copy this class to get a standalone version of MidnightConfig */
+
+@SuppressWarnings("rawtypes")
+public class MidnightConfig {
+
+    private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
+    private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
+
+    private static final List<EntryInfo> entries = new ArrayList<>();
+
+    protected static class EntryInfo {
+        Field field;
+        Object widget;
+        int width;
+        Method dynamicTooltip;
+        Map.Entry<TextFieldWidget,Text> error;
+        Object defaultValue;
+        Object value;
+        String tempValue;
+        boolean inLimits = true;
+    }
+
+    private static Class configClass;
+    private static String translationPrefix;
+    private static Path path;
+
+    private static final Gson gson = new GsonBuilder()
+            .excludeFieldsWithModifiers(Modifier.TRANSIENT)
+            .excludeFieldsWithModifiers(Modifier.PRIVATE)
+            .setPrettyPrinting()
+            .create();
+
+    public static void init(String modid, Class<?> config) {
+        translationPrefix = modid + ".midnightconfig.";
+        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
+        configClass = config;
+
+        for (Field field : config.getFields()) {
+            Class<?> type = field.getType();
+            EntryInfo info = new EntryInfo();
+
+            Entry e;
+            try { e = field.getAnnotation(Entry.class); }
+            catch (Exception ignored) { continue; }
+
+            info.width = e.width();
+            info.field = field;
+
+            if (type == int.class)         textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
+            else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false);
+            else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true);
+            else if (type == boolean.class) {
+                Function<Object,Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
+                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
+                    info.value = !(Boolean) info.value;
+                    button.setMessage(func.apply(info.value));
+                }, func);
+            }
+            else if (type.isEnum()) {
+                List<?> values = Arrays.asList(field.getType().getEnumConstants());
+                Function<Object,Text> func = value -> new TranslatableText(translationPrefix + "enum." + type.getSimpleName() + "." + info.value.toString());
+                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object,Text>>( button -> {
+                    int index = values.indexOf(info.value) + 1;
+                    info.value = values.get(index >= values.size()? 0 : index);
+                    button.setMessage(func.apply(info.value));
+                }, func);
+            }
+            else
+                continue;
+
+            entries.add(info);
+
+            try { info.defaultValue = field.get(null); }
+            catch (IllegalAccessException ignored) {}
+
+            try {
+                info.dynamicTooltip = config.getMethod(e.dynamicTooltip());
+                info.dynamicTooltip.setAccessible(true);
+            } catch (Exception ignored) {}
+
+        }
+
+        try { gson.fromJson(Files.newBufferedReader(path), config); }
+        catch (Exception e) { write(); }
+
+        for (EntryInfo info : entries) {
+            try {
+                info.value = info.field.get(null);
+                info.tempValue = info.value.toString();
+            }
+            catch (IllegalAccessException ignored) {}
+        }
+
+    }
+
+    private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
+        boolean isNumber = pattern != null;
+        info.widget = (BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) (t, b) -> s -> {
+            s = s.trim();
+            if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches()))
+                return false;
+
+            Number value = 0;
+            boolean inLimits = false;
+            System.out.println(((isNumber ^ s.isEmpty())));
+            System.out.println(!s.equals("-") && !s.equals("."));
+            info.error = null;
+            if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".") && Double.parseDouble(s) < 999999999) {
+                value = f.apply(s);
+                inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
+                info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ?
+                        "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
+                        "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
+            }
+
+            info.tempValue = s;
+            t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777);
+            info.inLimits = inLimits;
+            b.active = entries.stream().allMatch(e -> e.inLimits);
+
+            if (inLimits)
+                info.value = isNumber? value : s;
+
+            return true;
+        };
+    }
+
+    public static void write() {
+        try {
+            if (!Files.exists(path)) Files.createFile(path);
+            Files.write(path, gson.toJson(configClass.newInstance()).getBytes());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public Screen getScreen(Screen parent) {
+        return new TinyConfigScreen(parent);
+    }
+
+    private static class TinyConfigScreen extends Screen {
+        protected TinyConfigScreen(Screen parent) {
+            super(new TranslatableText(MidnightConfig.translationPrefix + "title"));
+            this.parent = parent;
+        }
+        private final Screen parent;
+
+        // Real Time config update //
+        @Override
+        public void tick() {
+            for (EntryInfo info : entries)
+                try { info.field.set(null, info.value); }
+                catch (IllegalAccessException ignore) {}
+            Blur.INSTANCE.onScreenChange(this);
+        }
+
+        @Override
+        protected void init() {
+            super.init();
+            this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+                try { gson.fromJson(Files.newBufferedReader(path), configClass); }
+                catch (Exception e) { write(); }
+
+                for (EntryInfo info : entries) {
+                    try {
+                        info.value = info.field.get(null);
+                        info.tempValue = info.value.toString();
+                    }
+                    catch (IllegalAccessException ignored) {}
+                }
+                    Objects.requireNonNull(client).openScreen(parent);
+            }));
+
+            ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+                for (EntryInfo info : entries)
+                    try { info.field.set(null, info.value); }
+                    catch (IllegalAccessException ignore) {}
+                write();
+                Objects.requireNonNull(client).openScreen(parent);
+            }));
+
+            int y = 45;
+            for (EntryInfo info : entries) {
+                addButton(new ButtonWidget(width - 155, y, 40,20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
+                    info.value = info.defaultValue;
+                    info.tempValue = info.value.toString();
+                    Objects.requireNonNull(client).openScreen(this);
+                })));
+
+                if (info.widget instanceof Map.Entry) {
+                    Map.Entry<ButtonWidget.PressAction,Function<Object,Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
+                    addButton(new ButtonWidget(width-110,y,info.width,20, widget.getValue().apply(info.value), widget.getKey()));
+                }
+                else {
+                    TextFieldWidget widget = addButton(new TextFieldWidget(textRenderer, width-110, y, info.width, 20, null));
+                    widget.setText(info.tempValue);
+
+                    Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget,done);
+
+                    widget.setTextPredicate(processor);
+
+                    children.add(widget);
+                }
+                y += 25;
+            }
+
+        }
+        int aniX = this.width / 2;
+        @Override
+        public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+            this.renderBackground(matrices);
+
+            if (aniX < this.width / 2) {
+                aniX = aniX +40;
+            }
+
+            int stringWidth = (int) (title.getString().length() * 2.75f);
+            this.fillGradient(matrices, this.width / 2 - stringWidth, 10, this.width /2 + stringWidth, 29, -1072689136, -804253680);
+            if (client.world == null) {
+                this.fillGradient(matrices, this.width / 2 - aniX, 35, width / 2 + aniX, this.height - 40, -1072689136, -804253680);
+            }
+
+            super.render(matrices, mouseX, mouseY, delta);
+            drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+
+            int y = 40;
+            for (EntryInfo info : entries) {
+                drawTextWithShadow(matrices, textRenderer, new TranslatableText(translationPrefix + info.field.getName()), 12, y + 10, 0xFFFFFF);
+
+                if (info.error != null && info.error.getKey().isMouseOver(mouseX,mouseY))
+                    renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
+                else if (mouseY >= y && mouseY < (y + 25)) {
+                    if (info.dynamicTooltip != null) {
+                        try {
+                            renderTooltip(matrices, (List<Text>) info.dynamicTooltip.invoke(null, entries), mouseX, mouseY);
+                            y += 25;
+                            continue;
+                        } catch (Exception e) { e.printStackTrace(); }
+                    }
+                    String key = translationPrefix + info.field.getName() + ".tooltip";
+                    if (I18n.hasTranslation(key)) {
+                        List<Text> list = new ArrayList<>();
+                        for (String str : I18n.translate(key).split("\n"))
+                            list.add(new LiteralText(str));
+                        renderTooltip(matrices, list, mouseX, mouseY);
+                    }
+                }
+                y += 25;
+            }
+        }
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.FIELD)
+    public @interface Entry {
+        String dynamicTooltip() default "";
+        int width() default 100;
+        double min() default Double.MIN_NORMAL;
+        double max() default Double.MAX_VALUE;
+    }
+}

src/main/java/com/tterrag/blur/config/ModMenuIntegration.java

@@ -0,0 +1,15 @@
+package com.tterrag.blur.config;
+
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
+import io.github.prospector.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 -> new BlurConfig().getScreen(parent);
+    }
+}

src/main/java/com/tterrag/blur/mixin/MixinInGameHud.java

@@ -1,25 +0,0 @@
-package com.tterrag.blur.mixin;
-
-import com.tterrag.blur.Blur;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.util.math.MatrixStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(InGameHud.class)
-public class MixinInGameHud extends DrawableHelper {
-    @Shadow private int scaledWidth;
-    @Shadow private int scaledHeight;
-    @Shadow private MinecraftClient client;
-    @Inject(at = @At("HEAD"), method = "render")
-    public void blur$onRender(MatrixStack matrices, float tickDelta, CallbackInfo ci) {
-        if (client.currentScreen == null && client.world != null && Blur.start > 0) {
-            this.fillGradient(matrices, 0, 0, this.scaledWidth, this.scaledHeight, Blur.getBackgroundColor(false, null), Blur.getBackgroundColor(true, null));
-        }
-    }
-}

src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java

@@ -4,21 +4,23 @@ import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.tterrag.blur.Blur;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.resource.ReloadableResourceManager;
 
 @Mixin(MinecraftClient.class)
 public class MixinMinecraftClient {
 
-    @Inject(method = "setScreen",
+    @Inject(method = "openScreen",
             at = @At(value = "FIELD",
                      target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
                      opcode = Opcodes.PUTFIELD))
     private void onScreenOpen(Screen newScreen, CallbackInfo info) {
-        Blur.onScreenChange(newScreen);
+        Blur.INSTANCE.onScreenChange(newScreen);
     }
 }

src/main/java/com/tterrag/blur/mixin/MixinScreen.java

@@ -1,44 +1,27 @@
 package com.tterrag.blur.mixin;
 
-import net.minecraft.client.MinecraftClient;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 import com.tterrag.blur.Blur;
 
 import net.minecraft.client.gui.screen.Screen;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Locale;
 
 @Mixin(Screen.class)
-public abstract class MixinScreen {
+public class MixinScreen {
-
-    @Shadow @Nullable protected MinecraftClient client;
-
-    @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.onScreenChange(this.client.currentScreen);
-        }
-    }
 
     @ModifyConstant(
             method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
             constant = @Constant(intValue = -1072689136))
-    private int blur$getFirstBackgroundColor(int color) {
+    private int getFirstBackgroundColor(int color) {
-        return Blur.getBackgroundColor(false, client.currentScreen);
+        return Blur.INSTANCE.getBackgroundColor(false);
     }
 
     @ModifyConstant(
             method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
             constant = @Constant(intValue = -804253680))
-    private int blur$getSecondBackgroundColor(int color) {
+    private int getSecondBackgroundColor(int color) {
-        return Blur.getBackgroundColor(true, client.currentScreen);
+        return Blur.INSTANCE.getBackgroundColor(true);
     }
 }

src/main/resources/assets/blur/lang/de_de.json

@@ -1,12 +1,7 @@
 {
   "blur.midnightconfig.title": "Blur Konfiguration",
-  "blur.midnightconfig.blurExclusions": "Blur-Ausnahmen",
   "blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
-  "blur.midnightconfig.ease": "Geschmeidige Animation",
   "blur.midnightconfig.radius": "Radius",
-  "blur.midnightconfig.gradientStart": "Farbverlauf-Anfangsfarbe",
+  "blur.midnightconfig.gradientStartColor": "Farbverlauf-Anfangsfarbe",
-  "blur.midnightconfig.gradientEnd": "Farbverlauf-Endfarbe",
+  "blur.midnightconfig.gradientEndColor": "Farbverlauf-Endfarbe"
-  "blur.midnightconfig.gradientStartAlpha": "Farbverlauf-Anfangstransparenz",
-  "blur.midnightconfig.gradientEndAlpha": "Farbverlauf-Endstransparenz",
-  "blur.midnightconfig.showScreenTitle": "Zeige Bildschirmtitel"
 }

src/main/resources/assets/blur/lang/en_gb.json

@@ -1,4 +1,7 @@
 {
-  "blur.midnightconfig.gradientStart": "Gradient Start Colour",
+  "blur.midnightconfig.title": "Blur Config",
-  "blur.midnightconfig.gradientEnd": "Gradient End Colour"
+  "blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
+  "blur.midnightconfig.radius": "Radius",
+  "blur.midnightconfig.gradientStartColor": "Gradient Start Colour",
+  "blur.midnightconfig.gradientEndColor": "Gradient End Colour"
 }

src/main/resources/assets/blur/lang/en_us.json

@@ -1,15 +1,7 @@
 {
   "blur.midnightconfig.title": "Blur Config",
-  "blur.midnightconfig.category.style": "Style",
-  "blur.midnightconfig.category.misc": "Miscellaneous",
-  "blur.midnightconfig.blurExclusions": "Blur Exclusions",
   "blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
-  "blur.midnightconfig.fadeOutTimeMillis": "Fade Out Time (in milliseconds)",
-  "blur.midnightconfig.ease": "Ease Animation",
   "blur.midnightconfig.radius": "Radius",
-  "blur.midnightconfig.gradientStart": "Gradient Start Color",
+  "blur.midnightconfig.gradientStartColor": "Gradient Start Color",
-  "blur.midnightconfig.gradientEnd": "Gradient End Color",
+  "blur.midnightconfig.gradientEndColor": "Gradient End Color"
-  "blur.midnightconfig.gradientStartAlpha": "Gradient Start Alpha",
-  "blur.midnightconfig.gradientEndAlpha": "Gradient End Alpha",
-  "blur.midnightconfig.showScreenTitle": "Show screen title"
 }

src/main/resources/assets/blur/lang/ko_kr.json

@@ -1,11 +0,0 @@
-{
-  "blur.midnightconfig.title": "Blur 설정",
-  "blur.midnightconfig.blurExclusions": "블러 제외",
-  "blur.midnightconfig.fadeTimeMillis": "페이드 시간 (밀리초 단위)",
-  "blur.midnightconfig.radius": "범위",
-  "blur.midnightconfig.gradientStart": "그라디언트 시작 색상",
-  "blur.midnightconfig.gradientEnd": "그라디언트 종료 색상",
-  "blur.midnightconfig.gradientStartAlpha": "그라디언트 시작 알파",
-  "blur.midnightconfig.gradientEndAlpha": "그라디언트 종료 알파",
-  "blur.midnightconfig.showScreenTitle": "화면 타이틀 보기"
-}

src/main/resources/assets/blur/lang/pt_br.json

@@ -1,12 +0,0 @@
-{
-  "blur.midnightconfig.title": "Configuração de desfoque",
-  "blur.midnightconfig.blurExclusions": "Desfocar exclusões",
-  "blur.midnightconfig.fadeTimeMillis": "Tempo de desvanecimento (em milissegundos)",
-  "blur.midnightconfig.ease": "Animação fácil",
-  "blur.midnightconfig.radius": "Raio",
-  "blur.midnightconfig.gradientStart": "Cor inicial do gradiente",
-  "blur.midnightconfig.gradientEnd": "Cor final do gradiente",
-  "blur.midnightconfig.gradientStartAlpha": "Alfa de início gradiente",
-  "blur.midnightconfig.gradientEndAlpha": "Alfa de Gradiente Final",
-  "blur.midnightconfig.showScreenTitle": "Mostrar título da tela"
-}

src/main/resources/assets/blur/lang/ru_ru.json

@@ -1,8 +1,7 @@
 {
   "blur.midnightconfig.title": "Настройки Blur",
-  "blur.midnightconfig.blurExclusions": "Исключения размытия",
   "blur.midnightconfig.fadeTimeMillis": "Время размытия (в милисекундах)",
   "blur.midnightconfig.radius": "Радиус размытия",
-  "blur.midnightconfig.gradientStart": "Верхний цвет градиента",
+  "blur.midnightconfig.gradientStartColor": "Верхний цвет градиента",
-  "blur.midnightconfig.gradientEnd": "Нижний цвет градиента"
+  "blur.midnightconfig.gradientEndColor": "Нижний цвет градиента"
 }

src/main/resources/assets/blur/lang/sv_se.json

@@ -1,9 +0,0 @@
-{
-  "blur.midnightconfig.title": "Blur Config",
-  "blur.midnightconfig.blurExclusions": "Undantag till Blur",
-  "blur.midnightconfig.fadeTimeMillis": "Toningstid (i millisekunder)",
-  "blur.midnightconfig.radius": "Radie",
-  "blur.midnightconfig.gradientStart": "Toningsfärg (start)",
-  "blur.midnightconfig.gradientEnd": "Toningsfärg (slut)",
-  "blur.midnightconfig.showScreenTitle": "Visa skärmtitel"
-}

src/main/resources/assets/blur/lang/uk_ua.json

@@ -1,12 +0,0 @@
-{
-  "blur.midnightconfig.title": "Конфігурація Blur",
-  "blur.midnightconfig.blurExclusions": "Винятки розмиття",
-  "blur.midnightconfig.fadeTimeMillis": "Час появи розмиття (у мілісекундах)",
-  "blur.midnightconfig.ease": "Пом'якшення анімації",
-  "blur.midnightconfig.radius": "Радіус",
-  "blur.midnightconfig.gradientStart": "Початковий колір градієнта",
-  "blur.midnightconfig.gradientEnd": "Кінцевий колір градієнта",
-  "blur.midnightconfig.gradientStartAlpha": "Початкова прозорість градієнта",
-  "blur.midnightconfig.gradientEndAlpha": "Кінцева прозорість градієнтаa",
-  "blur.midnightconfig.showScreenTitle": "Показати назву екрана"
-}

src/main/resources/assets/blur/lang/zh_cn.json

@@ -1,12 +1,7 @@
 {
   "blur.midnightconfig.title": "模糊配置",
-  "blur.midnightconfig.blurExclusions": "模糊排除",
   "blur.midnightconfig.fadeTimeMillis": "淡入时间(毫秒)",
-  "blur.midnightconfig.ease": "简单动画",
   "blur.midnightconfig.radius": "半径",
-  "blur.midnightconfig.gradientStart": "渐变起始色",
+  "blur.midnightconfig.gradientStartColor": "渐变起始色",
-  "blur.midnightconfig.gradientEnd": "渐变结束色",
+  "blur.midnightconfig.gradientEndColor": "渐变结束色"
-  "blur.midnightconfig.gradientStartAlpha": "渐变起始阿尔法通道",
-  "blur.midnightconfig.gradientEndAlpha": "渐变结束阿尔法通道",
-  "blur.midnightconfig.showScreenTitle": "显示屏幕标题"
 }

src/main/resources/assets/blur/shaders/program/fade_in_blur.fsh

@@ -1,9 +1,9 @@
-#version 150
+#version 120
 
 uniform sampler2D DiffuseSampler;
 
-in vec2 texCoord;
+varying vec2 texCoord;
-in vec2 oneTexel;
+varying vec2 oneTexel;
 
 uniform vec2 InSize;
 
@@ -11,8 +11,6 @@ uniform vec2 BlurDir;
 uniform float Radius;
 uniform float Progress;
 
-out vec4 fragColor;
-
 void main() {
     vec4 blurred = vec4(0.0);
     float totalStrength = 0.0;
@@ -20,7 +18,7 @@ void main() {
     float totalSamples = 0.0;
     float progRadius = floor(Radius * Progress);
     for(float r = -progRadius; r <= progRadius; r += 1.0) {
-        vec4 sample = texture(DiffuseSampler, texCoord + oneTexel * r * BlurDir);
+        vec4 sample = texture2D(DiffuseSampler, texCoord + oneTexel * r * BlurDir);
 
 		// Accumulate average alpha
         totalAlpha = totalAlpha + sample.a;
@@ -31,5 +29,5 @@ void main() {
         totalStrength = totalStrength + strength;
         blurred = blurred + sample;
     }
-    fragColor = vec4(blurred.rgb / (progRadius * 2.0 + 1.0), totalAlpha);
+    gl_FragColor = vec4(blurred.rgb / (progRadius * 2.0 + 1.0), totalAlpha);
 }

src/main/resources/assets/blur/shaders/program/fade_in_blur.json

@@ -1,8 +1,8 @@
 {
     "blend": {
         "func": "add",
-        "srcrgb": "srcalpha",
+        "srcrgb": "one",
-        "dstrgb": "1-srcalpha"
+        "dstrgb": "zero"
     },
     "vertex": "sobel",
     "fragment": "blur:fade_in_blur",

src/main/resources/fabric.mod.json

@@ -2,29 +2,32 @@
   "schemaVersion": 1,
   "id": "blur",
   "name": "Blur (Fabric)",
-  "version": "$version",
+  "version": "2.1.0",
   "environment": "client",
   "license": "MIT",
   "icon": "assets/blur/icon.png",
   "entrypoints": {
     "client": [
-      "com.tterrag.blur.Blur"
+      "com.tterrag.blur.Blur::INSTANCE"
+    ],
+    "modmenu": [
+      "com.tterrag.blur.config.ModMenuIntegration"
     ]
   },
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/blur-fabric",
-    "sources": "https://github.com/Motschen/Blur",
     "issues": "https://github.com/Motschen/Blur/issues"
   },
+  "depends": {
+    "minecraft": "1.16.x"
+  },
   "authors": [
     "tterrag1098",
     "Pyrofab",
-    "Motschen",
+    "Motschen"
-    "backryun",
-    "byquanton"
   ],
   "description": "Modifies the background behind Minecraft GUIs to have a blur effect",
   "mixins": [
     "mixins.blur.json"
   ]
-}
+}

src/main/resources/mixins.blur.json

@@ -1,12 +1,10 @@
 {
   "required": true,
-  "minVersion": "0.8",
   "package": "com.tterrag.blur.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_8",
   "client": [
   	"MixinScreen",
-    "MixinMinecraftClient",
+    "MixinMinecraftClient"
-    "MixinInGameHud"
   ],
   "injectors": {
     "defaultRequire": 1