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.20.4" ]
-  pull_request:
-    branches: [ "fabric-1.20.4" ]
-
-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

.gitignore

@@ -1,20 +1,29 @@
-build/
+/download
-*.ipr
+/eclipseBin
-run/
-*.iws
-out/
-*.iml
-.gradle/
-output/
-bin/
-libs/
 
-.classpath
+## gradle
-.project
+/.gradle
-.idea/
+/build
-classes/
+
-.metadata
+## ForgeGradle
-.vscode
+/run
-.settings
+/*.launch
-*.launch
+
-.architectury-transformer/debug.log
+## eclipse
+/eclipse
+/.settings
+/.metadata
+/.classpath
+/.project
+/bin
+
+## intellij
+/out
+/.idea
+/*.iml
+/*.ipr
+/*.iws
+/atlassian-ide-plugin.xml
+
+## gedit
+*~

README.md

@@ -1,7 +0,0 @@
-Ever thought that the world behind your inventory was just too distracting?  
-Or that the default Minecraft blur effect is just too boring?  
-Then this mod is just right for you!
-
-![Image showing the Minecraft inventory with a blur effect in the background](https://cdn.modrinth.com/data/NK39zBp2/images/213f18fcf3d6c55cad164077d569e2f0339551da.webp)
-
-Download now on [Modrinth](https://modrinth.com/mod/blur-plus)

build.gradle

@@ -1,73 +1,86 @@
-import groovy.json.JsonSlurper
-import groovy.json.JsonOutput
-
 plugins {
-	id "architectury-plugin" version "3.4-SNAPSHOT"
+	id 'fabric-loom' version '0.5-SNAPSHOT'
-	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+	id 'maven-publish'
-	id "me.shedaniel.unified-publishing" version "0.1.+" apply false
-	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
-architectury {
+sourceCompatibility = JavaVersion.VERSION_1_8
-	minecraft = rootProject.minecraft_version
+targetCompatibility = JavaVersion.VERSION_1_8
+
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
+minecraft {
 }
 
-subprojects {
+repositories {
-	apply plugin: "dev.architectury.loom"
+	maven { url "https://jitpack.io" }
+}
+
+dependencies {
+	minecraft "com.mojang:minecraft:${minecraft_version}"
+	mappings "net.fabricmc:yarn:${yarn_mappings}"
+	modCompile "net.fabricmc:fabric-loader:${loader_version}"
+	modCompile "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+	modCompile "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'
+}
+processResources {
+	inputs.property "version", project.version
+
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
+		expand "version": project.version
+	}
+
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
+	}
+}
+
+// ensure that the encoding is set to UTF-8, no matter what the system default is
+// this fixes some edge cases with special characters not displaying correctly
+// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+tasks.withType(JavaCompile) {
+	options.encoding = "UTF-8"
+}
+
+// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+// 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 {
+	from "LICENSE"
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			// 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 {
-		maven {
+		// uncomment to publish to the local maven
-			url = "https://api.modrinth.com/maven"
+		// mavenLocal()
-		}
-	}
-
-	dependencies {
-		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-		// The following line declares the yarn mappings you may select this one as well.
-		mappings loom.layered {
-			it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
-			it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
-		}
 	}
 }
 
-allprojects {
-	apply plugin: "java"
-	apply plugin: "architectury-plugin"
-	apply plugin: "maven-publish"
-
-	archivesBaseName = rootProject.archives_base_name
-	version = rootProject.mod_version
-	group = rootProject.maven_group
-
-	tasks.withType(JavaCompile) {
-		options.encoding = "UTF-8"
-		options.release = 21
-	}
-	ext {
-		releaseChangelog = {
-			def changes = new StringBuilder()
-			changes << "## Blur+ v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/Motschen/Blur/commits/)"
-			def proc = "git log --max-count=1 --pretty=format:%s".execute()
-			proc.in.eachLine { line ->
-				def processedLine = line.toString()
-				if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
-					changes << "\n- ${processedLine.capitalize()}"
-				}
-			}
-			proc.waitFor()
-			return changes.toString()
-		}
-	}
-	processResources {
-		// Minify json resources
-		doLast {
-			fileTree(dir: outputs.files.asPath, include: "**/*.json").each {
-				File file -> file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
-			}
-		}
-	}
-
-	java {
-		withSourcesJar()
-	}
-}

common/build.gradle

@@ -1,24 +0,0 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
-}
-
-dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modCompileOnly "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

common/src/main/java/eu/midnightdust/blur/Blur.java

@@ -1,103 +0,0 @@
-package eu.midnightdust.blur;
-
-import eu.midnightdust.blur.config.BlurConfig;
-import eu.midnightdust.blur.util.RainbowColor;
-import eu.midnightdust.lib.util.MidnightColorUtil;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import org.joml.Math;
-import org.joml.Matrix4f;
-
-import java.awt.Color;
-import java.lang.Double;
-
-import static eu.midnightdust.blur.BlurInfo.*;
-import static eu.midnightdust.blur.util.RainbowColor.hue;
-import static eu.midnightdust.blur.util.RainbowColor.hue2;
-
-public class Blur {
-    public static final String MOD_ID = "blur";
-    public static void init() {
-        BlurConfig.init(MOD_ID, BlurConfig.class);
-    }
-
-    public static boolean doFade = false;
-
-    public static void onRender() {
-        if (!BlurInfo.doTest && BlurInfo.screenChanged) { // After the tests for blur and background color have been completed
-            Blur.onScreenChange();
-            BlurInfo.screenChanged = false;
-        }
-        BlurInfo.doTest = false; // Set the test state to completed, as tests will happen in the same tick.
-    }
-    public static void renderFadeout(DrawContext context, int width, int height, MinecraftClient client) {
-        if (BlurInfo.start >= 0 && !BlurInfo.screenHasBlur && BlurInfo.prevScreenHasBlur) { // Fade out in non-blurred screens
-            client.gameRenderer.renderBlur();
-
-            if (BlurInfo.prevScreenHasBackground && BlurConfig.useGradient) Blur.renderRotatedGradient(context, width, height);
-        }
-    }
-
-    public static void onScreenChange() {
-        if (screenHasBlur) {
-            if (doFade) {
-                start = System.currentTimeMillis();
-                doFade = false;
-            }
-        } else if (prevScreenHasBlur && BlurConfig.fadeOutTimeMillis > 0) {
-            start = System.currentTimeMillis();
-            doFade = true;
-        } else {
-            start = -1;
-            doFade = true;
-        }
-    }
-
-    public static void updateProgress(boolean fadeIn) {
-        double x;
-        if (fadeIn) {
-            x = Math.min((System.currentTimeMillis() - start) / (double) BlurConfig.fadeTimeMillis, 1);
-        }
-        else {
-            x = Math.max(1 + (start - System.currentTimeMillis()) / (double) BlurConfig.fadeOutTimeMillis, 0);
-            if (x <= 0) {
-                start = -1;
-            }
-        }
-        x = BlurConfig.animationCurve.apply(x, fadeIn);
-        x = Math.clamp(0, 1, x);
-
-        progress = Double.valueOf(x).floatValue();
-    }
-
-    public static int getBackgroundColor(boolean second) {
-        int a = second ? BlurConfig.gradientEndAlpha : BlurConfig.gradientStartAlpha;
-        var col = MidnightColorUtil.hex2Rgb(second ? BlurConfig.gradientEnd : BlurConfig.gradientStart);
-        if (BlurConfig.rainbowMode) col = second ? Color.getHSBColor(hue, 1, 1) : Color.getHSBColor(hue2, 1, 1);
-        int r = (col.getRGB() >> 16) & 0xFF;
-        int b = (col.getRGB() >> 8) & 0xFF;
-        int g = col.getRGB() & 0xFF;
-        float prog = progress;
-        a = (int) (prog * a);
-        r = (int) (prog * r);
-        g = (int) (prog * g);
-        b = (int) (prog * b);
-        return a << 24 | r << 16 | b << 8 | g;
-    }
-    public static int getRotation() {
-        if (BlurConfig.rainbowMode) return RainbowColor.rotation;
-        return BlurConfig.gradientRotation;
-    }
-    public static void renderRotatedGradient(DrawContext context, int width, int height) {
-        float diagonal = Math.sqrt((float) width*width + height*height);
-        int smallestDimension = Math.min(width, height);
-
-        context.getMatrices().push();
-        Matrix4f posMatrix = context.getMatrices().peek().getPositionMatrix();
-        posMatrix.rotationZ(Math.toRadians(getRotation()));
-        posMatrix.setTranslation(width / 2f, height / 2f, -1000); // Make the gradient's center the pivot point
-        posMatrix.scale(diagonal / smallestDimension); // Scales the gradient to the maximum diagonal value needed
-        context.fillGradient(-width / 2, -height / 2, width / 2, height / 2, Blur.getBackgroundColor(false), Blur.getBackgroundColor(true)); // Actually draw the gradient
-        context.getMatrices().pop();
-    }
-}

common/src/main/java/eu/midnightdust/blur/BlurInfo.java

@@ -1,32 +0,0 @@
-package eu.midnightdust.blur;
-
-import eu.midnightdust.blur.config.BlurConfig;
-import net.minecraft.client.gui.screen.Screen;
-
-public class BlurInfo {
-    public static long start;
-    public static float progress;
-
-    public static boolean prevScreenHasBlur;
-    public static boolean screenHasBlur;
-
-    public static boolean prevScreenHasBackground;
-    public static boolean screenHasBackground;
-
-    public static boolean doTest = true;
-    public static boolean screenChanged = true;
-    public static long lastScreenChange = System.currentTimeMillis();
-
-    public static void reset(Screen newScreen) {
-        // Here, we reset all tests, to check if the new screen has blur and/or a background
-        if (newScreen != null && BlurConfig.excludedScreens.contains(newScreen.getClass().getCanonicalName())) return;
-        prevScreenHasBlur = screenHasBlur;
-        prevScreenHasBackground = screenHasBackground;
-        screenHasBlur = false;
-        screenHasBackground = false;
-        doTest = true;
-        screenChanged = true;
-        start = -1;
-        lastScreenChange = System.currentTimeMillis();
-    }
-}

common/src/main/java/eu/midnightdust/blur/config/BlurConfig.java

@@ -1,105 +0,0 @@
-package eu.midnightdust.blur.config;
-
-import com.google.common.collect.Lists;
-import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.client.MinecraftClient;
-
-import java.util.List;
-import java.util.function.Function;
-
-import static java.lang.Math.*;
-
-public class BlurConfig extends MidnightConfig {
-    public static final String ANIMATIONS = "animations";
-    public static final String STYLE = "style";
-    public static final String SCREENS = "screens";
-    @Entry @Hidden public static int configVersion = 2;
-
-    @Comment(category = SCREENS, centered = true)
-    public static Comment _general;
-    @Entry(category = SCREENS)
-    public static boolean blurContainers = true;
-    @Entry(category = SCREENS)
-    public static boolean blurTitleScreen = false;
-    @Condition(requiredOption = "blurTitleScreen", visibleButLocked = true)
-    @Entry(category = SCREENS)
-    public static boolean darkenTitleScreen = false;
-    @Comment(category = SCREENS, centered = true)
-    public static Comment _advanced;
-    @Entry(category = SCREENS) // Screens where Blur+ should not apply transition effects (mostly dynamically blurred screens)
-    public static List<String> excludedScreens = Lists.newArrayList("net.irisshaders.iris.gui.screen.ShaderPackScreen");
-    @Entry(category = SCREENS) // Screens where the vanilla blur effect should be force enabled
-    public static List<String> forceEnabledScreens = Lists.newArrayList("dev.emi.emi.screen.RecipeScreen");
-    @Entry(category = SCREENS) // Screens where the vanilla blur effect should be force disabled
-    public static List<String> forceDisabledScreens = Lists.newArrayList();
-
-    @Comment(category = STYLE, centered = true)
-    public static Comment _blur;
-    @Entry(category = STYLE, isSlider = true, min = 0, max = 20)
-    public static int radius = 5;
-    @Comment(category = STYLE, centered = true)
-    public static Comment _gradient;
-    @Entry(category = STYLE)
-    public static boolean useGradient = true;
-    @Condition(requiredOption = "useGradient", visibleButLocked = true)
-    @Entry(category = STYLE, isColor = true, width = 7, min = 7)
-    public static String gradientStart = "#000000";
-    @Condition(requiredOption = "useGradient", visibleButLocked = true)
-    @Entry(category = STYLE, isSlider = true, min = 0, max = 255)
-    public static int gradientStartAlpha = 75;
-    @Condition(requiredOption = "useGradient", visibleButLocked = true)
-    @Entry(category = STYLE, isColor = true, width = 7, min = 7)
-    public static String gradientEnd = "#000000";
-    @Condition(requiredOption = "useGradient", visibleButLocked = true)
-    @Entry(category = STYLE, isSlider = true, min = 0, max = 255)
-    public static int gradientEndAlpha = 75;
-    @Condition(requiredOption = "useGradient", visibleButLocked = true)
-    @Entry(category = STYLE, isSlider = true, min = 0, max = 360)
-    public static int gradientRotation = 0;
-    @Entry(category = STYLE)
-    public static boolean rainbowMode = false;
-
-    @Comment(category = ANIMATIONS, centered = true)
-    public static Comment _animations;
-    @Entry(category = ANIMATIONS, min = 0, max = 2000, isSlider = true)
-    public static int fadeTimeMillis = 300;
-    @Entry(category = ANIMATIONS, min = 0, max = 2000, isSlider = true)
-    public static int fadeOutTimeMillis = 300;
-    @Entry(category = ANIMATIONS)
-    public static BlurConfig.Easing animationCurve = Easing.FLAT;
-
-    @Override
-    public void writeChanges(String modid) {
-        super.writeChanges(modid);
-        if (MinecraftClient.getInstance().options != null)
-            MinecraftClient.getInstance().options.getMenuBackgroundBlurriness().setValue(radius);
-    }
-
-    public enum Easing {
-        // Based on https://gist.github.com/dev-hydrogen/21a66f83f0386123e0c0acf107254843
-        // Thank you very much!
-
-        FLAT(x -> x,                                    x -> x),
-        SINE(x -> 1 - cos(x * PI) / 2,                  x -> sin(x * PI) / 2),
-        QUAD(x -> x * x,                                x -> 1 - (1 - x) * (1 - x)),
-        CUBIC(x -> x * x * x,                           x -> 1 - pow(1 - x, 3)),
-        QUART(x -> x * x * x * x,                       x -> 1 - pow(1 - x, 4)),
-        QUINT(x -> x * x * x * x * x,                   x -> 1 - pow(1 - x, 5)),
-        EXPO(x -> x == 0 ? 0 : pow(2, 10 * x - 10),     x -> x == 1 ? 1 : 1 - pow(2, -10 * x)),
-        CIRC(x -> 1 - sqrt(1 - pow(x, 2)),              x -> sqrt(1 - pow(x - 1, 2))),
-        BACK(x -> 2.70158 * x * x * x - 1.70158 * x * x,x -> 1 + 2.70158 * pow(x - 1, 3) + 1.70158 * pow(x - 1, 2)),
-        ELASTIC(x -> x == 0 ? 0 : x == 1 ? 1 : -pow(2, 10 * x - 10) * sin((x * 10 - 10.75) * ((2 * PI) / 3)), x -> x == 0 ? 0 : x == 1 ? 1 : pow(2, -10 * x) * sin((x * 10 - 0.75) * ((2 * PI) / 3)) + 1);
-
-        final Function<Double, Number> functionIn;
-        final Function<Double, Number> functionOut;
-
-        Easing(Function<Double, Number> functionIn, Function<Double, Number> functionOut) {
-            this.functionIn = functionIn;
-            this.functionOut = functionOut;
-        }
-        public Double apply(Double x, boolean in) {
-            if (in) return functionIn.apply(x).doubleValue();
-            return functionOut.apply(x).doubleValue();
-        }
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinGameOptions.java

@@ -1,22 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import net.minecraft.client.option.GameOptions;
-import net.minecraft.client.option.SimpleOption;
-import org.spongepowered.asm.mixin.Final;
-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.Redirect;
-
-@Mixin(GameOptions.class)
-public abstract class MixinGameOptions {
-    @Shadow @Final private SimpleOption<Integer> menuBackgroundBlurriness;
-    @Shadow @Final private SimpleOption<Double> chatLineSpacing;
-
-    @Redirect(method = "<init>", at = @At(value = "NEW", target = "net/minecraft/client/option/SimpleOption$ValidatingIntSliderCallbacks", ordinal = 2))
-    private SimpleOption.ValidatingIntSliderCallbacks blur$increaseMaxBlurriness(int minInclusive, int maxInclusive) {
-        if (this.menuBackgroundBlurriness == null && this.chatLineSpacing != null)
-            return new SimpleOption.ValidatingIntSliderCallbacks(minInclusive, 20);
-        return new SimpleOption.ValidatingIntSliderCallbacks(minInclusive, maxInclusive);
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinGameRenderer.java

@@ -1,18 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.blur.BlurInfo;
-import net.minecraft.client.render.GameRenderer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-@Mixin(GameRenderer.class)
-public class MixinGameRenderer {
-    @ModifyVariable(method = "renderBlur", at = @At("STORE"), ordinal = 0)
-    private float blur$modifyRadius(float radius) { // Modify the radius based on the animation progress
-        if (!BlurInfo.screenChanged && BlurInfo.start >= 0) // Only update the progress after all tests have been completed
-            Blur.updateProgress(BlurInfo.screenHasBlur);
-        return radius * BlurInfo.progress;
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinHandledScreen.java

@@ -1,29 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.blur.config.BlurConfig;
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.text.Text;
-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.callback.CallbackInfo;
-
-@Mixin(HandledScreen.class)
-public class MixinHandledScreen extends Screen {
-    protected MixinHandledScreen(Text title) {
-        super(title);
-    }
-
-    @Inject(method = "renderBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawBackground(Lnet/minecraft/client/gui/DrawContext;FII)V", shift = At.Shift.BEFORE))
-    private void blur$renderContainerBlur(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
-        if (BlurConfig.blurContainers) this.applyBlur();
-    }
-    @Inject(at = @At("HEAD"), method = "render")
-    public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (PlatformFunctions.getPlatformName().equals("neoforge")) Blur.onRender();
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinInGameHud.java

@@ -1,30 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.blur.BlurInfo;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.hud.InGameHud;
-import net.minecraft.client.render.RenderTickCounter;
-import org.spongepowered.asm.mixin.Final;
-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 {
-    @Final @Shadow private MinecraftClient client;
-
-    @Inject(at = @At("TAIL"), method = "render")
-    public void blur$renderFadeOut(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) { // Adds a fade-out effect when a player is in a world and closes all screens
-        if (client.currentScreen == null && client.world != null && BlurInfo.start >= 0 && BlurInfo.prevScreenHasBlur) {
-            BlurInfo.doTest = false;
-            BlurInfo.screenChanged = false;
-            this.client.gameRenderer.renderBlur();
-
-            if (BlurInfo.prevScreenHasBackground) Blur.renderRotatedGradient(context, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
-        }
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinMidnightConfig$EntryInfo.java

@@ -1,26 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.client.MinecraftClient;
-import org.spongepowered.asm.mixin.Final;
-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;
-
-import java.util.Objects;
-
-@Mixin(value = MidnightConfig.EntryInfo.class, remap = false)
-public abstract class MixinMidnightConfig$EntryInfo {
-    @Shadow @Final public String modid;
-    @Shadow @Final public String fieldName;
-    @Shadow Object value;
-
-    @Inject(at = @At(value = "TAIL"), method = "updateFieldValue")
-    private void blur$instantlyApplyRadius(CallbackInfo ci) {
-        if (Objects.equals(modid, Blur.MOD_ID) && Objects.equals(fieldName, "radius"))
-            MinecraftClient.getInstance().options.getMenuBackgroundBlurriness().setValue((int) value);
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinMidnightConfig.java

@@ -1,17 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import eu.midnightdust.blur.config.BlurConfig;
-import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.client.MinecraftClient;
-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.callback.CallbackInfo;
-
-@Mixin(MidnightConfig.class)
-public abstract class MixinMidnightConfig {
-    @Inject(at = @At(value = "INVOKE", target = "Lcom/google/gson/Gson;fromJson(Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object;", shift = At.Shift.AFTER), remap = false, method = "loadValuesFromJson")
-    private static void blur$syncRadius(CallbackInfo ci) {
-        BlurConfig.radius = MinecraftClient.getInstance().options.getMenuBackgroundBlurrinessValue();
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinMinecraftClient.java

@@ -1,30 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.blur.BlurInfo;
-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.callback.CallbackInfo;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-
-@Mixin(MinecraftClient.class)
-public class MixinMinecraftClient {
-
-    @Inject(method = "setScreen",
-            at = @At(value = "FIELD",
-                     target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
-                     opcode = Opcodes.PUTFIELD))
-    private void blur$onScreenOpen(Screen newScreen, CallbackInfo info) {
-        if (BlurInfo.lastScreenChange < System.currentTimeMillis() - 100) { // For some reason, in certain scenarios the screen is set to a new one multiple times in a tick. We want to avoid that.
-            // Here, we reset all tests, to check if the new screen has blur and/or a background
-            BlurInfo.reset(newScreen);
-
-            // Manually activate the onScreenChange method when all screens are closed (in-game)
-            if (newScreen == null) Blur.onScreenChange();
-        }
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java

@@ -1,65 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import eu.midnightdust.blur.BlurInfo;
-import eu.midnightdust.blur.config.BlurConfig;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-
-import eu.midnightdust.blur.Blur;
-
-import net.minecraft.client.gui.screen.Screen;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Screen.class)
-public abstract class MixinScreen {
-    @Shadow @Final protected Text title;
-    @Shadow protected MinecraftClient client;
-    @Shadow public int width;
-    @Shadow public int height;
-    @Shadow protected abstract void applyBlur();
-
-    @Inject(at = @At("HEAD"), method = "render")
-    public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        Blur.onRender();
-        Blur.renderFadeout(context, width, height, client);
-    }
-
-    @Inject(at = @At("HEAD"), method = "applyBlur", cancellable = true)
-    public void blur$getBlurEnabled(CallbackInfo ci) {
-        if (BlurConfig.forceDisabledScreens.contains(this.getClass().getCanonicalName())) {
-            ci.cancel(); return;
-        }
-        if (!BlurConfig.excludedScreens.contains(this.getClass().getCanonicalName()))
-            BlurInfo.screenHasBlur = true; // Test if the screen has blur
-    }
-
-    @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderBackgroundTexture(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/util/Identifier;IIFFII)V"), method = "renderDarkening(Lnet/minecraft/client/gui/DrawContext;IIII)V")
-    private void blur$applyGradient(DrawContext context, Identifier texture, int x, int y, float u, float v, int width, int height, Operation<Void> original) {
-        if (BlurConfig.useGradient) {
-            blur$renderGradient(context); // Replaces the background texture with a gradient
-        } else original.call(context, texture, x, y, u, v, width, height);
-    }
-
-    @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;fillGradient(IIIIII)V"), method = "renderInGameBackground")
-    public void blur$rotatedGradient(DrawContext context, int startX, int startY, int endX, int endY, int colorStart, int colorEnd, Operation<Void> original) {
-        blur$renderGradient(context);
-    }
-    @Unique
-    private void blur$renderGradient(DrawContext context) {
-        BlurInfo.screenHasBackground = true; // Test if the screen has a background
-        if (BlurConfig.forceEnabledScreens.contains(this.getClass().getCanonicalName()))
-            this.applyBlur();
-
-        Blur.renderRotatedGradient(context, width, height); // Replaces the default gradient with our rotated one
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/MixinTitleScreen.java

@@ -1,28 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.blur.config.BlurConfig;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.text.Text;
-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.callback.CallbackInfo;
-
-@Mixin(TitleScreen.class)
-public abstract class MixinTitleScreen extends Screen {
-    protected MixinTitleScreen(Text title) {
-        super(title);
-    }
-
-    @Inject(method = "renderPanoramaBackground", at = @At("TAIL"))
-    private void blur$renderTitleBlur(DrawContext context, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
-        if (BlurConfig.blurTitleScreen) {
-            Blur.updateProgress(true);
-            this.applyBlur();
-            if (BlurConfig.darkenTitleScreen) this.renderDarkening(context);
-        }
-    }
-}

common/src/main/java/eu/midnightdust/blur/mixin/ScreenAccessor.java

@@ -1,11 +0,0 @@
-package eu.midnightdust.blur.mixin;
-
-import net.minecraft.client.gui.screen.Screen;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(Screen.class)
-public interface ScreenAccessor {
-    @Invoker("applyBlur")
-    void forceApplyBlur();
-}

common/src/main/java/eu/midnightdust/blur/util/RainbowColor.java

@@ -1,21 +0,0 @@
-package eu.midnightdust.blur.util;
-
-import eu.midnightdust.blur.config.BlurConfig;
-
-public class RainbowColor {
-    public static int rotation;
-    public static float hue;
-    public static float hue2 = 0.35f;
-
-    public static void tick() {
-        if (BlurConfig.rainbowMode) {
-            if (hue >= 1) hue = 0f;
-            hue += 0.01f;
-            if (hue2 >= 1) hue2 = 0f;
-            hue2 += 0.01f;
-
-            if (rotation >= 360) rotation = 0;
-            rotation += 1;
-        }
-    }
-}

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

@@ -1,36 +0,0 @@
-{
-  "blur.midnightconfig.title": "Blur+ Konfiguration",
-  "blur.midnightconfig.category.animations": "Animationen",
-  "blur.midnightconfig.category.screens": "Bildschirme",
-  "blur.midnightconfig.category.style": "Stil",
-  "blur.midnightconfig.blurContainers": "Unschärfe in Containern",
-  "blur.midnightconfig.blurTitleScreen": "Unschärfe im Titelbildschirm",
-  "blur.midnightconfig.darkenTitleScreen": "Abgedunkelter Titelhintergrund",
-  "blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
-  "blur.midnightconfig.fadeOutTimeMillis": "Ausblendzeit (in Millisekunden)",
-  "blur.midnightconfig.animationCurve": "Animationskurve",
-  "blur.midnightconfig.enum.Easing.FLAT": "Flach",
-  "blur.midnightconfig.enum.Easing.SINE": "Sinus",
-  "blur.midnightconfig.enum.Easing.QUAD": "Quadriert",
-  "blur.midnightconfig.enum.Easing.CUBIC": "Kubiert",
-  "blur.midnightconfig.enum.Easing.QUART": "Quart",
-  "blur.midnightconfig.enum.Easing.QUINT": "Quint",
-  "blur.midnightconfig.enum.Easing.EXPO": "Expo",
-  "blur.midnightconfig.enum.Easing.CIRC": "Kreis",
-  "blur.midnightconfig.enum.Easing.BACK": "Zurück",
-  "blur.midnightconfig.enum.Easing.ELASTIC": "Elastisch",
-  "blur.midnightconfig.radius": "Radius",
-  "blur.midnightconfig.rainbowMode": "Regenbogenmodus \uD83C\uDF08",
-  "blur.midnightconfig.useGradient": "Farbverlauf im Hintergrund",
-  "blur.midnightconfig.gradientStart": "Farbverlauf-Anfangsfarbe",
-  "blur.midnightconfig.gradientEnd": "Farbverlauf-Endfarbe",
-  "blur.midnightconfig.gradientStartAlpha": "Farbverlauf-Anfangstransparenz",
-  "blur.midnightconfig.gradientEndAlpha": "Farbverlauf-Endstransparenz",
-  "blur.midnightconfig.gradientRotation": "Farbverlauf-Rotation",
-  "blur.midnightconfig.excludedScreens": "Ausgeschlossene Bildschirme",
-  "blur.midnightconfig._general": "§7⛏ Generell",
-  "blur.midnightconfig._advanced": "§7⚒ Fortgeschritten",
-  "blur.midnightconfig._blur": "§7▒ Unschärfe",
-  "blur.midnightconfig._gradient": "§7\uD83D\uDFE2 Farbverlauf",
-  "blur.midnightconfig._animations": "§7\uD83D\uDCFD Animationen"
-}

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

@@ -1,4 +0,0 @@
-{
-  "blur.midnightconfig.gradientStart": "Gradient Start Colour",
-  "blur.midnightconfig.gradientEnd": "Gradient End Colour"
-}

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

@@ -1,42 +0,0 @@
-{
-  "blur.midnightconfig.title": "Blur+ Config",
-  "blur.midnightconfig.category.animations": "Animations",
-  "blur.midnightconfig.category.style": "Style",
-  "blur.midnightconfig.category.screens": "Screens",
-  "blur.midnightconfig.blurContainers": "Apply Blur to Containers",
-  "blur.midnightconfig.blurTitleScreen": "Apply Blur to Title Screen",
-  "blur.midnightconfig.darkenTitleScreen": "Darken Title Screen Background",
-  "blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
-  "blur.midnightconfig.fadeOutTimeMillis": "Fade Out Time (in milliseconds)",
-  "blur.midnightconfig.animationCurve": "Animation Curve",
-  "blur.midnightconfig.enum.Easing.FLAT": "Flat",
-  "blur.midnightconfig.enum.Easing.SINE": "Sine",
-  "blur.midnightconfig.enum.Easing.QUAD": "Quad",
-  "blur.midnightconfig.enum.Easing.CUBIC": "Cubic",
-  "blur.midnightconfig.enum.Easing.QUART": "Quart",
-  "blur.midnightconfig.enum.Easing.QUINT": "Quint",
-  "blur.midnightconfig.enum.Easing.EXPO": "Expo",
-  "blur.midnightconfig.enum.Easing.CIRC": "Circ",
-  "blur.midnightconfig.enum.Easing.BACK": "Back",
-  "blur.midnightconfig.enum.Easing.ELASTIC": "Elastic",
-  "blur.midnightconfig.radius": "Radius",
-  "blur.midnightconfig.radius.label.tooltip": "Mirror of \"Menu Background Blur\" found in Minecraft's Accessibility Settings",
-  "blur.midnightconfig.rainbowMode": "Rainbow Mode \uD83C\uDF08",
-  "blur.midnightconfig.useGradient": "Gradient as Background",
-  "blur.midnightconfig.gradientStart": "Gradient Start Color",
-  "blur.midnightconfig.gradientEnd": "Gradient End Color",
-  "blur.midnightconfig.gradientStartAlpha": "Gradient Start Alpha",
-  "blur.midnightconfig.gradientEndAlpha": "Gradient End Alpha",
-  "blur.midnightconfig.gradientRotation": "Gradient Rotation",
-  "blur.midnightconfig.excludedScreens": "Excluded Screens",
-  "blur.midnightconfig.excludedScreens.tooltip": "Screens that Blur+ should not animate",
-  "blur.midnightconfig.forceEnabledScreens": "Force-enabled Screens",
-  "blur.midnightconfig.forceEnabledScreens.tooltip": "Screens where the vanilla blur effect should be force-enabled\nMight not work 100% of the time",
-  "blur.midnightconfig.forceDisabledScreens": "Force-disabled Screens",
-  "blur.midnightconfig.forceDisabledScreens.tooltip": "Screens where the vanilla blur effect should be force-disabled",
-  "blur.midnightconfig._general": "§7⛏ General",
-  "blur.midnightconfig._advanced": "§7⚒ Advanced",
-  "blur.midnightconfig._blur": "§7▒ Blur",
-  "blur.midnightconfig._gradient": "§7\uD83D\uDFE2 Gradient",
-  "blur.midnightconfig._animations": "§7\uD83D\uDCFD Animations"
-}

common/src/main/resources/assets/blur/lang/es_mx.json

@@ -1,27 +0,0 @@
-{
-  "blur.midnightconfig.title": "Configuración de Blur+",
-  "blur.midnightconfig.category.animations": "Animaciones",
-  "blur.midnightconfig.category.style": "Estilo",
-  "blur.midnightconfig.blurContainers": "Aplicar desenfoque a los contenedores",
-  "blur.midnightconfig.fadeTimeMillis": "Tiempo de desvanecimiento (en milisegundos)",
-  "blur.midnightconfig.fadeOutTimeMillis": "Tiempo de desvanecimiento de salida (en milisegundos)",
-  "blur.midnightconfig.animationCurve": "Curva de animación",
-  "blur.midnightconfig.enum.Easing.FLAT": "Plano",
-  "blur.midnightconfig.enum.Easing.SINE": "Seno",
-  "blur.midnightconfig.enum.Easing.QUAD": "Cuadrático",
-  "blur.midnightconfig.enum.Easing.CUBIC": "Cúbico",
-  "blur.midnightconfig.enum.Easing.QUART": "Cuarto",
-  "blur.midnightconfig.enum.Easing.QUINT": "Quinto",
-  "blur.midnightconfig.enum.Easing.EXPO": "Exponencial",
-  "blur.midnightconfig.enum.Easing.CIRC": "Circular",
-  "blur.midnightconfig.enum.Easing.BACK": "Atrás",
-  "blur.midnightconfig.enum.Easing.ELASTIC": "Elástico",
-  "blur.midnightconfig.radius": "Radio",
-  "blur.midnightconfig.rainbowMode": "Modo Arcoíris \uD83C\uDF08",
-  "blur.midnightconfig.useGradient": "Usar degradado como fondo",
-  "blur.midnightconfig.gradientStart": "Color de inicio del degradado",
-  "blur.midnightconfig.gradientEnd": "Color de fin del degradado",
-  "blur.midnightconfig.gradientStartAlpha": "Alfa de inicio del degradado",
-  "blur.midnightconfig.gradientEndAlpha": "Alfa de fin del degradado",
-  "blur.midnightconfig.gradientRotation": "Rotación del degradado"
-}

common/src/main/resources/assets/blur/lang/fr_fr.json

@@ -1,12 +0,0 @@
-{
-  "blur.midnightconfig.title": "Configuration du flou",
-  "blur.midnightconfig.blurExclusions": "Flouter les exclusions",
-  "blur.midnightconfig.fadeTimeMillis": "Temps de fondu (en millisecondes)",
-  "blur.midnightconfig.ease": "Fluidité de l'animation",
-  "blur.midnightconfig.radius": "Rayon",
-  "blur.midnightconfig.gradientStart": "Couleur de départ du dégradé",
-  "blur.midnightconfig.gradientEnd": "Couleur de fin du dégradé",
-  "blur.midnightconfig.gradientStartAlpha": "Alpha de début du dégradé",
-  "blur.midnightconfig.gradientEndAlpha": "Alpha de fin du dégradé",
-  "blur.midnightconfig.showScreenTitle": "Montrer le titre de l'écran"
-}

common/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": "화면 타이틀 보기"
-}

common/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"
-}

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

@@ -1,27 +0,0 @@
-{
-  "blur.midnightconfig.title": "Настройки Blur+",
-  "blur.midnightconfig.category.animations": "Анимации",
-  "blur.midnightconfig.category.style": "Стиль",
-  "blur.midnightconfig.blurContainers": "Применять размытие к контейнерам",
-  "blur.midnightconfig.fadeTimeMillis": "Время размытия (в миллисекундах)",
-  "blur.midnightconfig.fadeOutTimeMillis": "Время затухания (в миллисекундах)",
-  "blur.midnightconfig.animationCurve": "Кривая анимации",
-  "blur.midnightconfig.enum.Easing.FLAT": "Плоская",
-  "blur.midnightconfig.enum.Easing.SINE": "Синусоидальная",
-  "blur.midnightconfig.enum.Easing.QUAD": "Квадратная",
-  "blur.midnightconfig.enum.Easing.CUBIC": "Кубическая",
-  "blur.midnightconfig.enum.Easing.QUART": "Квартовая",
-  "blur.midnightconfig.enum.Easing.QUINT": "Квинтовая",
-  "blur.midnightconfig.enum.Easing.EXPO": "Экспоненциальная",
-  "blur.midnightconfig.enum.Easing.CIRC": "Круговая",
-  "blur.midnightconfig.enum.Easing.BACK": "Обратная",
-  "blur.midnightconfig.enum.Easing.ELASTIC": "Упругая",
-  "blur.midnightconfig.radius": "Радиус размытия",
-  "blur.midnightconfig.rainbowMode": "Радужный режим \uD83C\uDF08",
-  "blur.midnightconfig.useGradient": "Градиент в качестве фона",
-  "blur.midnightconfig.gradientStart": "Верхний цвет градиента",
-  "blur.midnightconfig.gradientEnd": "Нижний цвет градиента",
-  "blur.midnightconfig.gradientStartAlpha": "Альфа-начало градиента",
-  "blur.midnightconfig.gradientEndAlpha": "Альфа-конец градиента",
-  "blur.midnightconfig.gradientRotation": "Вращение градиента"
-}

common/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"
-}

common/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": "Показати назву екрана"
-}

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

@@ -1,28 +0,0 @@
-{
-  "blur.midnightconfig.title": "模糊 (Blur+) 配置",
-  "blur.midnightconfig.category.animations": "动画",
-  "blur.midnightconfig.category.style": "样式",
-  "blur.midnightconfig.blurContainers": "使用容器时启用",
-  "blur.midnightconfig.fadeTimeMillis": "淡入时间（毫秒）",
-  "blur.midnightconfig.fadeOutTimeMillis": "淡出时间（毫秒）",
-  "blur.midnightconfig.animationCurve": "动画曲线",
-  "blur.midnightconfig.enum.Easing.FLAT": "平滑（Flat）",
-  "blur.midnightconfig.enum.Easing.SINE": "正弦（Sine）",
-  "blur.midnightconfig.enum.Easing.QUAD": "二次（Quad）",
-  "blur.midnightconfig.enum.Easing.CUBIC": "三次（Cubic）",
-  "blur.midnightconfig.enum.Easing.QUART": "四次（Quart）",
-  "blur.midnightconfig.enum.Easing.QUINT": "五次（Quint）",
-  "blur.midnightconfig.enum.Easing.EXPO": "指数（Expo）",
-  "blur.midnightconfig.enum.Easing.CIRC": "圆周（Circ）",
-  "blur.midnightconfig.enum.Easing.BACK": "回弹（Back）",
-  "blur.midnightconfig.enum.Easing.ELASTIC": "弹性（Elastic）",
-  "blur.midnightconfig.radius": "半径",
-  "blur.midnightconfig.rainbowMode": "彩虹模式 \uD83C\uDF08",
-  "blur.midnightconfig.useGradient": "背景渐变",
-  "blur.midnightconfig.gradientStart": "渐变起始色",
-  "blur.midnightconfig.gradientEnd": "渐变结束色",
-  "blur.midnightconfig.gradientStartAlpha": "渐变起始 Alpha 通道",
-  "blur.midnightconfig.gradientEndAlpha": "渐变结束 Alpha 通道",
-  "blur.midnightconfig.gradientRotation": "渐变旋转",
-  "blur.midnightconfig.excludedScreens": "禁用的界面"
-}

common/src/main/resources/assets/blur/lang/zh_tw.json

@@ -1,28 +0,0 @@
-{
-  "blur.midnightconfig.title": "Blur+ 設定",
-  "blur.midnightconfig.category.animations": "動畫",
-  "blur.midnightconfig.category.style": "風格",
-  "blur.midnightconfig.blurContainers": "對容器套用模糊",
-  "blur.midnightconfig.fadeTimeMillis": "淡入時間（毫秒）",
-  "blur.midnightconfig.fadeOutTimeMillis": "淡出時間（毫秒）",
-  "blur.midnightconfig.animationCurve": "動畫曲線",
-  "blur.midnightconfig.enum.Easing.FLAT": "線性（Flat）",
-  "blur.midnightconfig.enum.Easing.SINE": "正弦（Sine）",
-  "blur.midnightconfig.enum.Easing.QUAD": "二次（Quad）",
-  "blur.midnightconfig.enum.Easing.CUBIC": "三次（Cubic）",
-  "blur.midnightconfig.enum.Easing.QUART": "四次（Quart）",
-  "blur.midnightconfig.enum.Easing.QUINT": "五次（Quint）",
-  "blur.midnightconfig.enum.Easing.EXPO": "指數（Expo）",
-  "blur.midnightconfig.enum.Easing.CIRC": "圓形（Circ）",
-  "blur.midnightconfig.enum.Easing.BACK": "回彈（Back）",
-  "blur.midnightconfig.enum.Easing.ELASTIC": "彈性（Elastic）",
-  "blur.midnightconfig.radius": "半徑",
-  "blur.midnightconfig.rainbowMode": "彩虹模式 🌈",
-  "blur.midnightconfig.useGradient": "漸變背景",
-  "blur.midnightconfig.gradientStart": "漸變起始顏色",
-  "blur.midnightconfig.gradientEnd": "漸變結束顏色",
-  "blur.midnightconfig.gradientStartAlpha": "漸變起始 Alpha",
-  "blur.midnightconfig.gradientEndAlpha": "漸變結束 Alpha",
-  "blur.midnightconfig.gradientRotation": "漸變旋轉",
-  "blur.midnightconfig.excludedScreens": "排除畫面"
-}

common/src/main/resources/blur.mixins.json

@@ -1,21 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "eu.midnightdust.blur.mixin",
-  "compatibilityLevel": "JAVA_21",
-  "client": [
-    "MixinGameOptions",
-    "MixinGameRenderer",
-    "MixinHandledScreen",
-    "MixinInGameHud",
-    "MixinMidnightConfig",
-    "MixinMidnightConfig$EntryInfo",
-    "MixinMinecraftClient",
-    "MixinScreen",
-    "MixinTitleScreen",
-    "ScreenAccessor"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

fabric/build.gradle

@@ -1,102 +0,0 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-    id "me.shedaniel.unified-publishing"
-}
-
-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentFabric.extendsFrom common
-    archivesBaseName = rootProject.archives_base_name + "-fabric"
-    version = rootProject.mod_version + "+" + rootProject.minecraft_version
-}
-
-dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-}
-
-processResources {
-    inputs.property "version", rootProject.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": rootProject.version
-    }
-}
-
-shadowJar {
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-unifiedPublishing {
-    project {
-        displayName = "Blur+ $rootProject.version - Fabric $project.minecraft_version"
-        releaseType = "$project.release_type"
-        changelog = releaseChangelog()
-        gameVersions = []
-        gameLoaders = ["fabric","quilt"]
-        mainPublication remapJar
-        relations {
-            depends {
-                curseforge = "fabric-api"
-                modrinth = "fabric-api"
-            }
-            includes {
-                curseforge = "midnightlib"
-                modrinth = "midnightlib"
-            }
-        }
-
-        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
-        if (CURSEFORGE_TOKEN != null) {
-            curseforge {
-                token = CURSEFORGE_TOKEN
-                id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-
-        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
-        if (MODRINTH_TOKEN != null) {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = rootProject.modrinth_id
-                version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-    }
-}

fabric/src/main/java/eu/midnightdust/blur/fabric/BlurFabric.java

@@ -1,18 +0,0 @@
-package eu.midnightdust.blur.fabric;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.blur.util.RainbowColor;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-
-public class BlurFabric implements ModInitializer, ClientModInitializer {
-    @Override
-    public void onInitialize() {
-        Blur.init();
-    }
-    @Override
-    public void onInitializeClient() {
-        ClientTickEvents.END_CLIENT_TICK.register(client -> RainbowColor.tick());
-    }
-}

fabric/src/main/resources/fabric.mod.json

@@ -1,36 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "blur",
-  "name": "Blur+",
-  "version": "$version",
-  "environment": "client",
-  "license": "MIT",
-  "icon": "assets/blur/icon.png",
-  "entrypoints": {
-    "main": [
-      "eu.midnightdust.blur.fabric.BlurFabric"
-    ],
-    "client": [
-      "eu.midnightdust.blur.fabric.BlurFabric"
-    ]
-  },
-  "contact": {
-    "homepage": "https://modrinth.com/mod/blur-fabric",
-    "sources": "https://github.com/Motschen/Blur",
-    "issues": "https://github.com/Motschen/Blur/issues"
-  },
-  "authors": [
-    "Motschen",
-    "tterrag1098",
-    "Pyrofab",
-    "backryun",
-    "byquanton"
-  ],
-  "description": "Various enhancements for the blur effect behind Minecraft GUIs",
-  "mixins": [
-    "blur.mixins.json"
-  ],
-  "depends": {
-    "minecraft": ">=1.21.2"
-  }
-}

gradle.properties

@@ -1,27 +1,19 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx1G
-org.gradle.parallel=true
-
-minecraft_version=1.21.4
-supported_versions=1.21.5
-yarn_mappings=1.21.4+build.1
-enabled_platforms=fabric,neoforge
 
+# Fabric Properties
+	# check these on https://fabricmc.net/use
+	minecraft_version=1.16.5
+	yarn_mappings=1.16.5+build.5
+	loader_version=0.11.2
+	
 # Mod Properties
-mod_version=5.2.0
+	mod_version = 2.1.0-1.16+fabric
-maven_group=eu.midnightdust.blur
+	maven_group = com.tterrag.blur
-archives_base_name=blur
+	archives_base_name = Blur
-release_type=release
-curseforge_id=393563
-modrinth_id=NK39zBp2
 
-# Modloaders
+# Dependencies
-fabric_loader_version=0.16.9
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_api_version=0.111.0+1.21.4
+	fabric_version=0.31.0+1.16
-
+	mod_menu_version = 1.14.6+build.31
-neoforge_version=21.4.10-beta
+	satin_version = 1.5.1
-yarn_mappings_patch_neoforge_version = 1.21+build.4
-
-# Libraries
-midnightlib_version = 1.7.0+1.21.4
-modmenu_version = 11.0.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+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

neoforge/build.gradle

@@ -1,115 +0,0 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-    id "me.shedaniel.unified-publishing"
-}
-
-repositories {
-    maven {
-        name = 'NeoForged'
-        url = 'https://maven.neoforged.net/releases'
-    }
-}
-
-
-architectury {
-    platformSetupLoomIde()
-    neoForge()
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
-configurations {
-    common {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentNeoForge.extendsFrom common
-
-    // Files in this configuration will be bundled into your mod using the Shadow plugin.
-    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
-    shadowBundle {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-    archivesBaseName = rootProject.archives_base_name + "-neoforge"
-    version = rootProject.mod_version + "+" + rootProject.minecraft_version
-}
-
-dependencies {
-    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
-    modImplementation ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge")
-
-    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
-    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
-}
-
-processResources {
-    inputs.property 'version', rootProject.version
-
-    filesMatching('META-INF/neoforge.mods.toml') {
-        expand version: rootProject.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowBundle]
-    archiveClassifier = 'dev-shadow'
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-unifiedPublishing {
-    project {
-        displayName = "Blur+ $rootProject.version - NeoForge $project.minecraft_version"
-        releaseType = "$project.release_type"
-        changelog = releaseChangelog()
-        gameVersions = []
-        gameLoaders = ["neoforge"]
-        mainPublication remapJar
-        relations {
-            depends {
-                curseforge = "midnightlib"
-                modrinth = "midnightlib"
-            }
-        }
-
-        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
-        if (CURSEFORGE_TOKEN != null) {
-            curseforge {
-                token = CURSEFORGE_TOKEN
-                id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-
-        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
-        if (MODRINTH_TOKEN != null) {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = rootProject.modrinth_id
-                version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-    }
-}

neoforge/gradle.properties

@@ -1 +0,0 @@
-loom.platform=neoforge

neoforge/src/main/java/eu/midnightdust/blur/neoforge/BlurNeoForge.java

@@ -1,24 +0,0 @@
-package eu.midnightdust.blur.neoforge;
-
-import eu.midnightdust.blur.Blur;
-import eu.midnightdust.blur.util.RainbowColor;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.client.event.ClientTickEvent;
-
-@Mod(value = Blur.MOD_ID, dist = Dist.CLIENT)
-public class BlurNeoForge {
-    public BlurNeoForge() {
-        Blur.init();
-    }
-
-    @EventBusSubscriber(modid = Blur.MOD_ID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT)
-    public static class ClientGameEvents {
-        @SubscribeEvent
-        public static void endClientTick(ClientTickEvent.Post event) {
-            RainbowColor.tick();
-        }
-    }
-}

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,31 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[2,)"
-#issueTrackerURL = ""
-license = "MIT License"
-
-[[mods]]
-modId = "blur"
-version = "${version}"
-displayName = "Blur+"
-logoFile = "blur.png"
-authors = "Motschen, tterrag1098, Pyrofab, backryun, byquanton"
-description = '''
-Various enhancements for the blur effect behind Minecraft GUIs
-'''
-
-[[mixins]]
-config = "blur.mixins.json"
-
-[[dependencies.blur]]
-modId = "neoforge"
-mandatory = true
-versionRange = "[21.0,)"
-ordering = "NONE"
-side = "CLIENT"
-
-[[dependencies.blur]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.21.2,)"
-ordering = "NONE"
-side = "CLIENT"

settings.gradle

@@ -1,15 +1,12 @@
 pluginManagement {
     repositories {
-        maven { url "https://maven.fabricmc.net/" }
+        jcenter()
-        maven { url "https://maven.architectury.dev/" }
+        maven {
-        maven { url "https://maven.neoforged.net/releases" }
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
         gradlePluginPortal()
     }
 }
 
-include("common")
+rootProject.name = "blur"
-include("fabric")
-include("neoforge")
-//include("quilt")
-
-rootProject.name = "blur"

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

@@ -0,0 +1,76 @@
+package com.tterrag.blur;
+
+import com.tterrag.blur.config.BlurConfig;
+import com.tterrag.blur.config.MidnightConfig;
+import ladysnake.satin.api.event.ShaderEffectRenderCallback;
+import ladysnake.satin.api.managed.ManagedShaderEffect;
+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.Screen;
+import net.minecraft.util.Identifier;
+import org.apache.commons.lang3.ArrayUtils;
+
+public class Blur implements ClientModInitializer {
+
+    public static final String MODID = "blur";
+
+    private long start;
+    public int colorFirst, colorSecond;
+
+    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() {
+        MidnightConfig.init("blur", BlurConfig.class);
+
+        ShaderEffectRenderCallback.EVENT.register((deltaTick) -> {
+            if (start > 0) {
+                blurProgress.set(getProgress());
+                blur.render(deltaTick);
+            }
+        });
+    }
+
+    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());
+            if (!excluded) {
+                blur.setUniformValue("Radius", 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;
+                }
+            } else {
+                start = -1;
+                doFade = true;
+            }
+        }
+    }
+
+    private float getProgress() {
+        return Math.min((System.currentTimeMillis() - start) / (float) BlurConfig.fadeTimeMillis, 1);
+    }
+
+    public int getBackgroundColor(boolean second) {
+        int color = second ? colorSecond : colorFirst;
+        int a = color >>> 24;
+        int r = (color >> 16) & 0xFF;
+        int b = (color >> 8) & 0xFF;
+        int g = color & 0xFF;
+        float prog = INSTANCE.getProgress();
+        a *= prog;
+        r *= prog;
+        g *= prog;
+        b *= prog;
+        return a << 24 | r << 16 | b << 8 | g;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.tterrag.blur.config;
+
+import net.minecraft.client.gui.screen.ChatScreen;
+
+public class BlurConfig extends MidnightConfig {
+    @Entry
+    public static String[] blurExclusions = new String[]{ ChatScreen.class.getName() };
+    @Entry(min = 0, max = 5000)
+    public static int fadeTimeMillis = 200;
+    @Entry(min = 0, max = 500)
+    public static int radius = 8;
+    @Entry(min = 0, max = 99999999)
+    public static int gradientStartColor = 75000000;
+    @Entry(min = 0, max = 99999999)
+    public static int gradientEndColor = 75000000;
+}

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/MixinMinecraftClient.java

@@ -0,0 +1,26 @@
+package com.tterrag.blur.mixin;
+
+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",
+            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.INSTANCE.onScreenChange(newScreen);
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.tterrag.blur.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+import com.tterrag.blur.Blur;
+
+import net.minecraft.client.gui.screen.Screen;
+
+@Mixin(Screen.class)
+public class MixinScreen {
+
+    @ModifyConstant(
+            method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
+            constant = @Constant(intValue = -1072689136))
+    private int 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) {
+        return Blur.INSTANCE.getBackgroundColor(true);
+    }
+}

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

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

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

@@ -0,0 +1,7 @@
+{
+  "blur.midnightconfig.title": "Blur Config",
+  "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

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

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

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

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

@@ -0,0 +1,7 @@
+{
+  "blur.midnightconfig.title": "模糊配置",
+  "blur.midnightconfig.fadeTimeMillis": "淡入时间(毫秒)",
+  "blur.midnightconfig.radius": "半径",
+  "blur.midnightconfig.gradientStartColor": "渐变起始色",
+  "blur.midnightconfig.gradientEndColor": "渐变结束色"
+}

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

@@ -0,0 +1,67 @@
+{
+    "targets": [
+        "swap"
+    ],
+    "passes": [
+        {
+            "name": "blur:fade_in_blur",
+            "intarget": "minecraft:main",
+            "outtarget": "swap",
+            "uniforms": [
+                {
+                    "name": "BlurDir",
+                    "values": [ 1.0, 0.0 ]
+                },
+                {
+                    "name": "Radius",
+                    "values": [ 8.0 ]
+                }
+            ]
+        },
+        {
+            "name": "blur:fade_in_blur",
+            "intarget": "swap",
+            "outtarget": "minecraft:main",
+            "uniforms": [
+                {
+                    "name": "BlurDir",
+                    "values": [ 0.0, 1.0 ]
+                },
+                {
+                    "name": "Radius",
+                    "values": [ 8.0 ]
+                }
+            ]
+        },
+        {
+            "name": "blur:fade_in_blur",
+            "intarget": "minecraft:main",
+            "outtarget": "swap",
+            "uniforms": [
+                {
+                    "name": "BlurDir",
+                    "values": [ 1.0, 0.0 ]
+                },
+                {
+                    "name": "Radius",
+                    "values": [ 8.0 ]
+                }
+            ]
+        },
+        {
+            "name": "blur:fade_in_blur",
+            "intarget": "swap",
+            "outtarget": "minecraft:main",
+            "uniforms": [
+                {
+                    "name": "BlurDir",
+                    "values": [ 0.0, 1.0 ]
+                },
+                {
+                    "name": "Radius",
+                    "values": [ 8.0 ]
+                }
+            ]
+        }
+    ]
+}

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

@@ -0,0 +1,33 @@
+#version 120
+
+uniform sampler2D DiffuseSampler;
+
+varying vec2 texCoord;
+varying vec2 oneTexel;
+
+uniform vec2 InSize;
+
+uniform vec2 BlurDir;
+uniform float Radius;
+uniform float Progress;
+
+void main() {
+    vec4 blurred = vec4(0.0);
+    float totalStrength = 0.0;
+    float totalAlpha = 0.0;
+    float totalSamples = 0.0;
+    float progRadius = floor(Radius * Progress);
+    for(float r = -progRadius; r <= progRadius; r += 1.0) {
+        vec4 sample = texture2D(DiffuseSampler, texCoord + oneTexel * r * BlurDir);
+
+		// Accumulate average alpha
+        totalAlpha = totalAlpha + sample.a;
+        totalSamples = totalSamples + 1.0;
+
+		// Accumulate smoothed blur
+        float strength = 1.0 - abs(r / progRadius);
+        totalStrength = totalStrength + strength;
+        blurred = blurred + sample;
+    }
+    gl_FragColor = vec4(blurred.rgb / (progRadius * 2.0 + 1.0), totalAlpha);
+}

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

@@ -0,0 +1,21 @@
+{
+    "blend": {
+        "func": "add",
+        "srcrgb": "one",
+        "dstrgb": "zero"
+    },
+    "vertex": "sobel",
+    "fragment": "blur:fade_in_blur",
+    "attributes": [ "Position" ],
+    "samplers": [
+        { "name": "DiffuseSampler" }
+    ],
+    "uniforms": [
+        { "name": "ProjMat",     "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
+        { "name": "InSize",      "type": "float",     "count": 2,  "values": [ 1.0, 1.0 ] },
+        { "name": "OutSize",     "type": "float",     "count": 2,  "values": [ 1.0, 1.0 ] },
+        { "name": "BlurDir",     "type": "float",     "count": 2,  "values": [ 1.0, 1.0 ] },
+        { "name": "Radius",      "type": "float",     "count": 1,  "values": [ 5.0 ] },
+        { "name": "Progress",    "type": "float",     "count": 1,  "values": [ 0.0 ] }
+    ]
+}

src/main/resources/fabric.mod.json

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

src/main/resources/mixins.blur.json

@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "package": "com.tterrag.blur.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+  	"MixinScreen",
+    "MixinMinecraftClient"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}