Update to 1.18

* Create sv_se.json

mid-tier translations as a save, i'm gonna think about them later

* Update sv_se.json

better translations

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -25,6 +25,9 @@ repositories {
 			includeGroup 'com.terraformersmc'
 		}
 	}
+	maven {
+		url = "https://api.modrinth.com/maven"
+	}
 }
 
 dependencies {
@@ -35,10 +38,9 @@ dependencies {
 	modImplementation "io.github.ladysnake:satin:${satin_version}"
 	include "io.github.ladysnake:satin:${satin_version}"
 
-	modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
-	modRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
-
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
+	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+	include "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }
 
 processResources {

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17-pre3
-	yarn_mappings=1.17-pre3+build.2
-	loader_version=0.11.3
+	minecraft_version=1.18
+	yarn_mappings=1.18+build.1
+	loader_version=0.12.8
 	
 # Mod Properties
-	mod_version = 2.2.1-1.17+fabric
+	mod_version = 2.4.1
 	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.34.8+1.17
-	modmenu_version = 2.0.0-beta.7
-	satin_version = 1.6.0-nightly.1.17-pre3
+	fabric_version=0.44.0+1.18
+	satin_version = 1.7.0
+	midnightlib_version=0.3.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.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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,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
+
 # 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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 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.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # 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,9 +121,9 @@ 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
@@ -98,7 +132,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
@@ -106,80 +140,95 @@ location of your Java installation."
 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
-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" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     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, 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.
 
-# 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"
+# 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
+        # 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" "$@"

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

@@ -7,13 +7,17 @@ import ladysnake.satin.api.managed.ShaderEffectManager;
 import ladysnake.satin.api.managed.uniform.Uniform1f;
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.Screen;
 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 static final String MODID = "blur";
+    public static List<String> defaultExclusions = new ArrayList<>();
 
     private long start;
     public int colorFirst, colorSecond;
@@ -26,6 +30,10 @@ public class Blur implements ClientModInitializer {
 
     @Override
     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");
+        defaultExclusions.add("net.optifine.gui.GuiChatOF");
         BlurConfig.init("blur", BlurConfig.class);
 
         ShaderEffectRenderCallback.EVENT.register((deltaTick) -> {
@@ -39,7 +47,7 @@ public class Blur implements ClientModInitializer {
     private boolean doFade = false;
     public void onScreenChange(Screen newGui) {
         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) {
                 blur.setUniformValue("Radius", (float) BlurConfig.radius);
                 colorFirst = Integer.parseUnsignedInt(String.valueOf(BlurConfig.gradientStartColor), 16);

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

@@ -1,11 +1,13 @@
 package com.tterrag.blur.config;
 
+import com.tterrag.blur.Blur;
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.client.gui.screen.ChatScreen;
+
+import java.util.List;
 
 public class BlurConfig extends MidnightConfig {
     @Entry
-    public static String[] blurExclusions = new String[]{ ChatScreen.class.getName() };
+    public static List<String> blurExclusions = Blur.defaultExclusions;
     @Entry(min = 0, max = 5000, width = 4)
     public static int fadeTimeMillis = 200;
     @Entry(min = 0, max = 500, width = 3)
@@ -14,4 +16,6 @@ public class BlurConfig extends MidnightConfig {
     public static int gradientStartColor = 75000000;
     @Entry(min = 0, max = 99999999, width = 8)
     public static int gradientEndColor = 75000000;
+    @Entry
+    public static boolean showScreenTitle = false;
 }

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

@@ -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");
-    }
-}

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

@@ -4,19 +4,17 @@ 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 = "openScreen",
+    @Inject(method = "setScreen",
             at = @At(value = "FIELD",
                      target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
                      opcode = Opcodes.PUTFIELD))

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

@@ -1,27 +1,57 @@
 package com.tterrag.blur.mixin;
 
+import com.tterrag.blur.config.BlurConfig;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.TextColor;
+import net.minecraft.util.Formatting;
+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 class MixinScreen {
+public abstract class MixinScreen {
+
+    @Shadow @Nullable protected MinecraftClient client;
+
+    @Shadow protected TextRenderer textRenderer;
+
+    @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);
+        }
+    }
+    @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(
             method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
             constant = @Constant(intValue = -1072689136))
-    private int getFirstBackgroundColor(int color) {
+    private int blur$getFirstBackgroundColor(int color) {
         return Blur.INSTANCE.getBackgroundColor(false);
     }
 
     @ModifyConstant(
             method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
             constant = @Constant(intValue = -804253680))
-    private int getSecondBackgroundColor(int color) {
+    private int blur$getSecondBackgroundColor(int color) {
         return Blur.INSTANCE.getBackgroundColor(true);
     }
 }

src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -1,390 +0,0 @@
-package eu.midnightdust.lib.config;
-
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.Selectable;
-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.ClickableWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
-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.LiteralText;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Formatting;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Field;
-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 v1.0.4
-// Single class config library - feel free to copy!
-// Changelog:
-// - 1.0.4:
-// - Number field length is now configurable
-// - Fixed number fields being empty
-// - 1.0.3:
-// - Text field length is now configurable
-// - Better separation of client and server
-// - 1.0.2:
-// - Update to 21w20a
-// - 1.0.1:
-// - Fixed buttons not working in fullscreen
-// - 1.0.0:
-// - The config screen no longer shows the entries of all instances of MidnightConfig
-// - Compatible with servers!
-// - Scrollable!
-// - Comment support!
-// - Fresh New Design
-
-/** Based on https://github.com/Minenash/TinyConfig
- *  Credits to Minenash */
-
-@SuppressWarnings("unchecked")
-public class MidnightConfig {
-    public static boolean useTooltipForTitle = true; // Render title as tooltip or as simple text
-
-    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;
-        int max;
-        Map.Entry<TextFieldWidget,Text> error;
-        Object defaultValue;
-        Object value;
-        String tempValue;
-        boolean inLimits = true;
-        String id;
-    }
-
-    public static final Map<String,Class<?>> configClass = new HashMap<>();
-    private static Path path;
-
-    private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
-
-    public static void init(String modid, Class<?> config) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
-        configClass.put(modid, config);
-
-        for (Field field : config.getFields()) {
-            EntryInfo info = new EntryInfo();
-            if (field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class))
-                if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info);
-            if (field.isAnnotationPresent(Entry.class))
-                try {
-                    info.defaultValue = field.get(null);
-                } catch (IllegalAccessException ignored) {}
-        }
-        try { gson.fromJson(Files.newBufferedReader(path), config); }
-        catch (Exception e) { write(modid); }
-
-        for (EntryInfo info : entries) {
-            if (info.field.isAnnotationPresent(Entry.class))
-                try {
-                    info.value = info.field.get(null);
-                    info.tempValue = info.value.toString();
-                } catch (IllegalAccessException ignored) {
-                }
-        }
-    }
-    @Environment(EnvType.CLIENT)
-    private static void initClient(String modid, Field field, EntryInfo info) {
-        Class<?> type = field.getType();
-        Entry e = field.getAnnotation(Entry.class);
-        info.width = e != null ? e.width() : 0;
-        info.field = field;
-        info.id = modid;
-
-        if (e != null) {
-            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) {
-                info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
-                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(modid + ".midnightconfig." + "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);
-            }
-        }
-        entries.add(info);
-    }
-
-    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(".")) {
-                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(String modid) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
-        try {
-            if (!Files.exists(path)) Files.createFile(path);
-            Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    @Environment(EnvType.CLIENT)
-    public static Screen getScreen(Screen parent, String modid) {
-        return new MidnightConfigScreen(parent, modid);
-    }
-    @Environment(EnvType.CLIENT)
-    private static class MidnightConfigScreen extends Screen {
-
-        protected MidnightConfigScreen(Screen parent, String modid) {
-            super(new TranslatableText(modid + ".midnightconfig." + "title"));
-            this.parent = parent;
-            this.modid = modid;
-            this.translationPrefix = modid + ".midnightconfig.";
-        }
-        private final String translationPrefix;
-        private final Screen parent;
-        private final String modid;
-        private MidnightConfigListWidget list;
-
-        // Real Time config update //
-        @Override
-        public void tick() {
-            for (EntryInfo info : entries)
-                try { info.field.set(null, info.value); }
-                catch (IllegalAccessException ignored) {}
-        }
-
-        @Override
-        protected void init() {
-            super.init();
-
-            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
-                try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
-                catch (Exception e) { write(modid); }
-
-                for (EntryInfo info : entries) {
-                    if (info.field.isAnnotationPresent(Entry.class)) {
-                        try {
-                            info.value = info.field.get(null);
-                            info.tempValue = info.value.toString();
-                        } catch (IllegalAccessException ignored) {
-                        }
-                    }
-                }
-                Objects.requireNonNull(client).openScreen(parent);
-            }));
-
-            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
-                for (EntryInfo info : entries)
-                    if (info.id.equals(modid)) {
-                        try {
-                            info.field.set(null, info.value);
-                        } catch (IllegalAccessException ignored) {}
-                    }
-                write(modid);
-                Objects.requireNonNull(client).openScreen(parent);
-            }));
-
-            this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-            this.addSelectableChild(this.list);
-            for (EntryInfo info : entries) {
-                if (info.id.equals(modid)) {
-                    TranslatableText name = new TranslatableText(translationPrefix + info.field.getName());
-                    ButtonWidget resetButton = new ButtonWidget(width - 155, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
-                        info.value = info.defaultValue;
-                        info.tempValue = info.value.toString();
-                        double scrollAmount = list.getScrollAmount();
-                        Objects.requireNonNull(client).openScreen(this);
-                        list.setScrollAmount(scrollAmount);
-                    }));
-
-                    if (info.widget instanceof Map.Entry) {
-                        Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
-                        if (info.field.getType().isEnum()) widget.setValue(value -> new TranslatableText(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-                        this.list.addButton(new ButtonWidget(width - 110, 0,100, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,name);
-                    } else if (info.widget != null) {
-                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, 100, 20, null);
-                        widget.setMaxLength(info.width);
-                        widget.setText(info.tempValue);
-                        Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
-                        widget.setTextPredicate(processor);
-                        this.list.addButton(widget, resetButton, name);
-                    } else {
-                        ButtonWidget dummy = new ButtonWidget(-10, 0, 0, 0, Text.of(""), null);
-                        this.list.addButton(dummy,dummy,name);
-                    }
-                }
-            }
-
-        }
-        @Override
-        public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-            this.renderBackground(matrices);
-            this.list.render(matrices, mouseX, mouseY, delta);
-
-            int stringWidth = (int) (title.getString().length() * 2.75f);
-            if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
-            else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
-
-            for (EntryInfo info : entries) {
-                if (info.id.equals(modid)) {
-                    if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
-                        ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
-                        Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
-                        TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName());
-                        String key = translationPrefix + info.field.getName() + ".tooltip";
-
-                        if (info.error != null && text.equals(name)) renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
-                        else if (I18n.hasTranslation(key) && text.equals(name)) {
-                            List<Text> list = new ArrayList<>();
-                            for (String str : I18n.translate(key).split("\n"))
-                                list.add(new LiteralText(str));
-                            renderTooltip(matrices, list, mouseX, mouseY);
-                        }
-                    }
-                }
-            }
-            super.render(matrices,mouseX,mouseY,delta);
-        }
-    }
-    @Environment(EnvType.CLIENT)
-    public static class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
-        TextRenderer textRenderer;
-
-        public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
-            super(minecraftClient, i, j, k, l, m);
-            this.centerListVertically = false;
-            textRenderer = minecraftClient.textRenderer;
-        }
-        @Override
-        public int getScrollbarPositionX() { return this.width -7; }
-
-        public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) {
-            this.addEntry(ButtonEntry.create(button, text, resetButton));
-        }
-        @Override
-        public int getRowWidth() { return 10000; }
-        public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
-            for (ButtonEntry buttonEntry : this.children()) {
-                for (ClickableWidget ClickableWidget : buttonEntry.buttons) {
-                    if (ClickableWidget.isMouseOver(mouseX, mouseY)) {
-                        return Optional.of(ClickableWidget);
-                    }
-                }
-            }
-            return Optional.empty();
-        }
-    }
-    public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
-        private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        private final List<ClickableWidget> buttons = new ArrayList<>();
-        private final List<ClickableWidget> resetButtons = new ArrayList<>();
-        private final List<Text> texts = new ArrayList<>();
-        private final List<ClickableWidget> buttonsWithResetButtons = new ArrayList<>();
-        public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
-
-        private ButtonEntry(ClickableWidget button, Text text, ClickableWidget resetButton) {
-            buttonsWithText.put(button,text);
-            this.buttons.add(button);
-            this.resetButtons.add(resetButton);
-            this.texts.add(text);
-            this.buttonsWithResetButtons.add(button);
-            this.buttonsWithResetButtons.add(resetButton);
-        }
-        public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton) {
-            return new ButtonEntry(button, text, resetButton);
-        }
-        public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            this.buttons.forEach(button -> {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
-            });
-            this.texts.forEach(text -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
-            this.resetButtons.forEach((button) -> {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
-            });
-        }
-        public List<? extends Element> children() {
-            return buttonsWithResetButtons;
-        }
-
-        public List<? extends Selectable> method_37025() {
-            return buttonsWithResetButtons;
-        }
-    }
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Entry {
-        int width() default 100;
-        double min() default Double.MIN_NORMAL;
-        double max() default Double.MAX_VALUE;
-    }
-    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {}
-
-    public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
-        public boolean shouldSkipClass(Class<?> clazz) { return false; }
-        public boolean shouldSkipField(FieldAttributes fieldAttributes) {
-            return fieldAttributes.getAnnotation(Entry.class) == null;
-        }
-    }
-}

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

@@ -1,7 +1,9 @@
 {
   "blur.midnightconfig.title": "Blur Konfiguration",
+  "blur.midnightconfig.blurExclusions": "Blur-Ausnahmen",
   "blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
   "blur.midnightconfig.radius": "Radius",
   "blur.midnightconfig.gradientStartColor": "Farbverlauf-Anfangsfarbe",
-  "blur.midnightconfig.gradientEndColor": "Farbverlauf-Endfarbe"
+  "blur.midnightconfig.gradientEndColor": "Farbverlauf-Endfarbe",
+  "blur.midnightconfig.showScreenTitle": "Zeige Bildschirmtitel"
 }

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

@@ -1,8 +1,9 @@
 {
   "blur.midnightconfig.title": "Blur Config",
-  "blur.midnightconfig.blurExclusions": "Blur Exclusions are currently not configurable in-game!",
+  "blur.midnightconfig.blurExclusions": "Blur Exclusions",
   "blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
   "blur.midnightconfig.radius": "Radius",
   "blur.midnightconfig.gradientStartColor": "Gradient Start Color",
-  "blur.midnightconfig.gradientEndColor": "Gradient End Color"
+  "blur.midnightconfig.gradientEndColor": "Gradient End Color",
+  "blur.midnightconfig.showScreenTitle": "Show screen title"
 }

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

@@ -0,0 +1,8 @@
+{
+  "blur.midnightconfig.title": "Definições de desfoque",
+  "blur.midnightconfig.blurExclusions": "Exclusões de desfoque",
+  "blur.midnightconfig.fadeTimeMillis": "Esmaecimento (em milissegundos)",
+  "blur.midnightconfig.radius": "Raio",
+  "blur.midnightconfig.gradientStartColor": "Cor de início do gradiente",
+  "blur.midnightconfig.gradientEndColor": "Cor de término do gradiente"
+}

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

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

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

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

src/main/resources/fabric.mod.json

@@ -2,16 +2,13 @@
   "schemaVersion": 1,
   "id": "blur",
   "name": "Blur (Fabric)",
-  "version": "2.1.0",
+  "version": "$version",
   "environment": "client",
   "license": "MIT",
   "icon": "assets/blur/icon.png",
   "entrypoints": {
     "client": [
       "com.tterrag.blur.Blur::INSTANCE"
-    ],
-    "modmenu": [
-      "com.tterrag.blur.config.ModMenuIntegration"
     ]
   },
   "contact": {
@@ -27,4 +24,4 @@
   "mixins": [
     "mixins.blur.json"
   ]
-}
+}