Blur 2.1.0 - MidnightConfig

Switch to MidnightConfig: - Much smaller file size - Live preview - Fixed #4 Chinise translation by @Enaium Update to 21w08b
Merge pull request #8 from Enaium/fabric
2025-12-15 19:25:09 +01:00 · 2021-03-05 17:52:48 +01:00 · 2021-03-05 09:55:49 +01:00 · 2021-03-05 13:06:49 +08:00 · 2020-12-20 15:05:55 +01:00 · 2020-11-08 18:09:57 +01:00
35 changed files with 607 additions and 666 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -1,126 +1,86 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven { url = "http://files.minecraftforge.net/maven" }
-        maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
-    }
-    dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' }
-}
 plugins {
- 	id 'com.matthewprenger.cursegradle' version '1.0.9'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'maven-publish'
 }

-apply plugin: 'net.minecraftforge.gradle.forge'
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8

-boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false');
-ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom';
-
-group = 'com.tterrag.blur'
-archivesBaseName = "Blur"
-version = "${mod_version}-${buildnumber}"
-
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group

 minecraft {
-    version = "${minecraft_version}-${forge_version}"
-	mappings = 'stable_29'
-	
-    runDir = 'run'
-
-	clientJvmArgs += '-Dfml.coreMods.load=com.tterrag.blur.BlurPlugin'
-	
-	replace "@VERSION@", project.version
 }

+repositories {
+	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
-    inputs.property "mcversion", project.minecraft.version
+	inputs.property "version", project.version

-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include '**/*.info'
-        include '**/*.properties'
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
+		expand "version": project.version
+	}

-        // replace version and mcversion
-        expand 'version': project.version, 'mcversion': project.minecraft.version
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude '**/*.info'
-        exclude '**/*.properties'
-    }
-}
-
-jar.manifest {
-    attributes 'FMLCorePlugin': 'com.tterrag.blur.BlurPlugin'
-    attributes 'FMLCorePluginContainsFMLMod': 'true'
-}
-
-import org.apache.tools.ant.filters.ReplaceTokens
-import groovy.json.JsonSlurper
-
-task createResourcePacks {
-	def inputFile = new File("resource_packs.json")
-	def json = new JsonSlurper().parseText(inputFile.text)
-	json.each {
-		def pack_id 	= it.key
-		def pack_name   = it.value.name
-		def pack_desc 	= it.value.description
-		def pack_radius = it.value.radius
-		
-		def taskName = "createPack" + pack_id.capitalize();
-		task "${taskName}" (type: Zip) {
-			from ('pack_template') {		
-				filter(ReplaceTokens, tokens: [
-					mod_version:	project.version.toString(),
-					pack_version: 	'3',
-					description:	pack_desc.toString(),
-					radius: 		pack_radius.toString()
-				])
-				
-				rename(/(.+)\.template/, '$1')
-			}
-			
-			from ('pack_icons') {
-				include "${pack_id}.png"
-				rename '.+', 'pack.png'
-			}
-			
-			baseName = "Blur " + pack_name
-		}
-		
-		createResourcePacks.finalizedBy taskName
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
 	}
 }

-// Not necessary atm
-// tasks.build.dependsOn createResourcePacks
-
-tasks.curseforge.enabled = !dev && project.hasProperty('curseforge_key')
-
-curseforge {
-    if (project.hasProperty('curseforge_key')) {
-        apiKey = project.curseforge_key
-    }
-
-    project {
-        id = project.project_id
-        changelogType = 'html'
-        changelog = System.getenv('CHANGELOG')
-        if (changelog == null || 'none'.equals(changelog)) {
-        	changelog = getChangelog() ?: ''
-        	changelogType = 'text'
-        }
-        releaseType = project.release_type
-		addGameVersion '1.9.4'
-		addGameVersion '1.11.2'
-		addGameVersion '1.12'
-		addGameVersion '1.12.1'
-        mainArtifact(jar) {
-            displayName = "Blur ${mod_version}"
-        }
-    }
+// 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 {
+		// uncomment to publish to the local maven
+		// mavenLocal()
+	}
 }

--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,19 @@
-minecraft_version=1.10.2
-forge_version=12.18.3.2297
-mod_version=1.0.4
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G

-project_id=268324
-release_type=release
+# Fabric Properties
+	# check these on https://fabricmc.net/use
+	minecraft_version=21w08b
+	yarn_mappings=21w08b+build.20
+	loader_version=0.11.2
+	
+# Mod Properties
+	mod_version = 2.1.0-21w08b+fabric
+	maven_group = com.tterrag.blur
+	archives_base_name = Blur
+
+# Dependencies
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+	fabric_version=0.31.2+1.17
+	mod_menu_version = 2.0.0-beta.1+build.2
+	satin_version = 1.6.0-nightly.20w48a
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Aug 20 15:17:58 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
--- a/pack_icons/lite.png
+++ b/pack_icons/lite.png
--- a/pack_icons/strong.png
+++ b/pack_icons/strong.png
--- a/pack_icons/ultra_lite.png
+++ b/pack_icons/ultra_lite.png
--- a/pack_icons/ultra_strong.png
+++ b/pack_icons/ultra_strong.png
--- a/pack_template/assets/minecraft/shaders/post/fade_in_blur.json.template
+++ b/pack_template/assets/minecraft/shaders/post/fade_in_blur.json.template
@@ -1,67 +0,0 @@
-{
-    "targets": [
-        "swap"
-    ],
-    "passes": [
-        {
-            "name": "fade_in_blur",
-            "intarget": "minecraft:main",
-            "outtarget": "swap",
-            "uniforms": [
-                {
-                    "name": "BlurDir",
-                    "values": [ 1.0, 0.0 ]
-                },
-                {
-                    "name": "Radius",
-                    "values": [ @radius@.0 ]
-                }
-            ]
-        },
-        {
-            "name": "fade_in_blur",
-            "intarget": "swap",
-            "outtarget": "minecraft:main",
-            "uniforms": [
-                {
-                    "name": "BlurDir",
-                    "values": [ 0.0, 1.0 ]
-                },
-                {
-                    "name": "Radius",
-                    "values": [ @radius@.0 ]
-                }
-            ]
-        },
-        {
-            "name": "fade_in_blur",
-            "intarget": "minecraft:main",
-            "outtarget": "swap",
-            "uniforms": [
-                {
-                    "name": "BlurDir",
-                    "values": [ 1.0, 0.0 ]
-                },
-                {
-                    "name": "Radius",
-                    "values": [ @radius@.0 ]
-                }
-            ]
-        },
-        {
-            "name": "fade_in_blur",
-            "intarget": "swap",
-            "outtarget": "minecraft:main",
-            "uniforms": [
-                {
-                    "name": "BlurDir",
-                    "values": [ 0.0, 1.0 ]
-                },
-                {
-                    "name": "Radius",
-                    "values": [ @radius@.0 ]
-                }
-            ]
-        }
-    ]
-}
--- a/pack_template/pack.mcmeta.template
+++ b/pack_template/pack.mcmeta.template
@@ -1,7 +0,0 @@
-{
-  "pack": {
-    "_comment":     "This pack was made for Blur version @mod_version@",
-    "pack_format":  @pack_version@,
-    "description":  "@description@"
-  }
-}
--- a/resource_packs.json
+++ b/resource_packs.json
@@ -1,22 +0,0 @@
-{
-	"ultra_lite": {
-		"name": "Ultra Lite",
-		"radius": 2,
-		"description": "Least passes, weakest effect, greatest performance. It's like having a smudge on your glasses."
-	},
-	"lite": {
-		"name": "Lite",
-		"radius": 8,
-		"description": "Less passes, weaker effect, greater performance."
-	},
-	"strong": {
-		"name": "Strong",
-		"radius": 32,
-		"description" : "More passes, stronger effect, lesser performance."
-	},
-	"ultra_strong": {
-		"name": "Ultra Strong",
-		"radius": 64,
-		"description": "Too many passes, strongest effect, worst performance. It's like having Vaseline in your eyes."
-	}
-}
--- a/settings.gradle
+++ b/settings.gradle
@@ -0,0 +1,12 @@
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "blur"
--- a/src/main/java/com/tterrag/blur/Blur.java
+++ b/src/main/java/com/tterrag/blur/Blur.java
@@ -1,164 +1,72 @@
 package com.tterrag.blur;

-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
+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;

-import com.google.common.base.Throwables;
-import com.tterrag.blur.util.ShaderResourcePack;
+public class Blur implements ClientModInitializer {

-import static com.tterrag.blur.Blur.*;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiChat;
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraft.client.resources.IResourcePack;
-import net.minecraft.client.resources.SimpleReloadableResourceManager;
-import net.minecraft.client.shader.Shader;
-import net.minecraft.client.shader.ShaderGroup;
-import net.minecraft.client.shader.ShaderUniform;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.GuiOpenEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.Mod.Instance;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
-import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent;
-import net.minecraftforge.fml.relauncher.ReflectionHelper;
-
-@Mod(modid = MODID, name = MOD_NAME, version = VERSION, acceptedMinecraftVersions = "[1.9, 1.13)", clientSideOnly = true, guiFactory = "com.tterrag.blur.config.BlurGuiFactory")
-public class Blur {
-    
    public static final String MODID = "blur";
-    public static final String MOD_NAME = "Blur";
-    public static final String VERSION = "@VERSION@";
-    
-    @Instance
-    public static Blur instance;
-    
-    public Configuration config;
-    
-    private String[] blurExclusions;

-    private Field _listShaders;
    private long start;
-    private int fadeTime;
-    
-    public int radius; // Store default so we don't trigger an extra reload
-    private int colorFirst, colorSecond;
-    
-    @Nonnull
-    private ShaderResourcePack dummyPack = new ShaderResourcePack();
-    
-    @SuppressWarnings("unchecked")
-    public Blur() {
-        ((List<IResourcePack>)ReflectionHelper.getPrivateValue(Minecraft.class, Minecraft.getMinecraft(), "field_110449_ao", "defaultResourcePacks")).add(dummyPack);
-    }
-    
-    @EventHandler
-    public void preInit(FMLPreInitializationEvent event) {
-        MinecraftForge.EVENT_BUS.register(this);
-        
-        // Add our dummy resourcepack
-        ((SimpleReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(dummyPack);
-        
-        config = new Configuration(new File(event.getModConfigurationDirectory(), "blur.cfg"));
-        saveConfig();
-    }
-    
-    private void saveConfig() {
-        
-        blurExclusions = config.getStringList("guiExclusions", Configuration.CATEGORY_GENERAL, new String[] {
-                GuiChat.class.getName(),
-        }, "A list of classes to be excluded from the blur shader.");
-        
-        fadeTime = config.getInt("fadeTime", Configuration.CATEGORY_GENERAL, 200, 0, Integer.MAX_VALUE, "The time it takes for the blur to fade in, in ms.");
-        
-        int r = config.getInt("radius", Configuration.CATEGORY_GENERAL, 12, 1, 100, "The radius of the blur effect. This controls how \"strong\" the blur is.");
-        if (r != radius) {
-            radius = r;
-            dummyPack.onResourceManagerReload(Minecraft.getMinecraft().getResourceManager());
-            if (Minecraft.getMinecraft().world != null) {
-                Minecraft.getMinecraft().entityRenderer.stopUseShader();
-            }
-        }
+    public int colorFirst, colorSecond;

-        colorFirst = Integer.parseUnsignedInt(
-                config.getString("gradientStartColor",  Configuration.CATEGORY_GENERAL, "75000000", "The start color of the background gradient. Given in ARGB hex."),
-                16
-        );
-        
-        colorSecond = Integer.parseUnsignedInt(
-                config.getString("gradientEndColor",    Configuration.CATEGORY_GENERAL, "75000000", "The end color of the background gradient. Given in ARGB hex."),
-                16
-        );
-        
-        config.save();
-    }
-    
-    @SubscribeEvent
-    public void onConfigChanged(OnConfigChangedEvent event) {
-        if (event.getModID().equals(MODID)) {
-            saveConfig();
-        }
-    }
-    
-    @SubscribeEvent
-    public void onGuiChange(GuiOpenEvent event) {
-        if (_listShaders == null) {
-            _listShaders = ReflectionHelper.findField(ShaderGroup.class, "field_148031_d", "listShaders");
-        }
-        if (Minecraft.getMinecraft().world != null) {
-            EntityRenderer er = Minecraft.getMinecraft().entityRenderer;
-            boolean excluded = event.getGui() == null || ArrayUtils.contains(blurExclusions, event.getGui().getClass().getName());
-            if (!er.isShaderActive() && !excluded) {
-                er.loadShader(new ResourceLocation("shaders/post/fade_in_blur.json"));
-                start = System.currentTimeMillis();
-            } else if (er.isShaderActive() && excluded) {
-                er.stopUseShader();
+    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 float getProgress() {
-        return Math.min((System.currentTimeMillis() - start) / (float) fadeTime, 1);
-    }
-    
-    @SubscribeEvent
-    public void onRenderTick(RenderTickEvent event) {
-        if (event.phase == Phase.END && Minecraft.getMinecraft().currentScreen != null && Minecraft.getMinecraft().entityRenderer.isShaderActive()) {
-            ShaderGroup sg = Minecraft.getMinecraft().entityRenderer.getShaderGroup();
-            try {
-                @SuppressWarnings("unchecked")
-                List<Shader> shaders = (List<Shader>) _listShaders.get(sg);
-                for (Shader s : shaders) {
-                    ShaderUniform su = s.getShaderManager().getShaderUniform("Progress");
-                    if (su != null) {
-                        su.set(getProgress());
-                    }
+
+    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;
                }
-            } catch (IllegalArgumentException | IllegalAccessException e) {
-                Throwables.propagate(e);
+            } else {
+                start = -1;
+                doFade = true;
            }
        }
    }
-    
-    public static int getBackgroundColor(boolean second) {
-        int color = second ? instance.colorSecond : instance.colorFirst;
+
+    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();
+        float prog = INSTANCE.getProgress();
        a *= prog;
        r *= prog;
        g *= prog;
--- a/src/main/java/com/tterrag/blur/BlurPlugin.java
+++ b/src/main/java/com/tterrag/blur/BlurPlugin.java
@@ -1,33 +0,0 @@
-package com.tterrag.blur;
-
-import java.util.Map;
-
-import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
-
-@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE)
-public class BlurPlugin implements IFMLLoadingPlugin {
-
-    @Override
-    public String[] getASMTransformerClass() {
-        return new String[] { "com.tterrag.blur.BlurTransformer" };
-    }
-
-    @Override
-    public String getModContainerClass() {
-        return null;
-    }
-
-    @Override
-    public String getSetupClass() {
-        return null;
-    }
-
-    @Override
-    public void injectData(Map<String, Object> data) {
-    }
-
-    @Override
-    public String getAccessTransformerClass() {
-        return null;
-    }
-}
--- a/src/main/java/com/tterrag/blur/BlurTransformer.java
+++ b/src/main/java/com/tterrag/blur/BlurTransformer.java
@@ -1,79 +0,0 @@
-package com.tterrag.blur;
-
-import java.util.Iterator;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.InsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-
-public class BlurTransformer implements IClassTransformer {
-
-    private static final String GUI_SCREEN_CLASS_NAME = "net.minecraft.client.gui.GuiScreen";
-    
-    private static final String DRAW_WORLD_BAGKGROUND_METHOD = "drawWorldBackground";
-    private static final String DRAW_WORLD_BAGKGROUND_METHOD_OBF = "func_146270_b";
-    
-    private static final String BLUR_MAIN_CLASS = "com/tterrag/blur/Blur";
-    private static final String COLOR_HOOK_METHOD_NAME = "getBackgroundColor";
-    private static final String COLOR_HOOK_METHOD_DESC = "(Z)I";
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass) {
-        if (transformedName.equals(GUI_SCREEN_CLASS_NAME)) {
-            System.out.println("Transforming Class [" + transformedName + "], Method [" + DRAW_WORLD_BAGKGROUND_METHOD + "]");
-
-            ClassNode classNode = new ClassNode();
-            ClassReader classReader = new ClassReader(basicClass);
-            classReader.accept(classNode, 0);
-
-            Iterator<MethodNode> methods = classNode.methods.iterator();
-            
-            while (methods.hasNext()) {
-                MethodNode m = methods.next();
-                if (m.name.equals(DRAW_WORLD_BAGKGROUND_METHOD) || m.name.equals(DRAW_WORLD_BAGKGROUND_METHOD_OBF)) {
-                    for (int i = 0; i < m.instructions.size(); i++) {
-                        AbstractInsnNode next = m.instructions.get(i);
-                        
-//                        if (next.getOpcode() == Opcodes.INVOKEVIRTUAL && ((MethodInsnNode)next).name.equals(DRAW_GRADIENT_RECT_METHOD_NAME)) {
-//                            while (!(next instanceof LabelNode)) {
-//                                m.instructions.remove(next);
-//                                next = m.instructions.get(--i);
-//                            }
-//                            break;
-//                        }
-                        if (next.getOpcode() == Opcodes.LDC) {
-                            System.out.println("Modifying GUI background darkness... ");
-                            AbstractInsnNode colorHook = new MethodInsnNode(Opcodes.INVOKESTATIC, BLUR_MAIN_CLASS, COLOR_HOOK_METHOD_NAME, COLOR_HOOK_METHOD_DESC, false);
-                            AbstractInsnNode colorHook2 = colorHook.clone(null);
-                            
-                            // Replace LDC with hooks
-                            m.instructions.set(next, colorHook);
-                            m.instructions.set(colorHook.getNext(), colorHook2);
-
-                            // Load boolean constants for method param
-                            m.instructions.insertBefore(colorHook, new InsnNode(Opcodes.ICONST_1));
-                            m.instructions.insertBefore(colorHook2, new InsnNode(Opcodes.ICONST_0));
-                            break;
-                        }
-                    }
-                    break;
-                }
-            }
-            
-            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-            classNode.accept(cw);
-            System.out.println("Transforming " + transformedName + " Finished.");
-            return cw.toByteArray();
-        }
-    
-        return basicClass;
-    }
-
-}
--- a/src/main/java/com/tterrag/blur/config/BlurConfig.java
+++ b/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;
+}
--- a/src/main/java/com/tterrag/blur/config/BlurConfigGui.java
+++ b/src/main/java/com/tterrag/blur/config/BlurConfigGui.java
@@ -1,43 +0,0 @@
-package com.tterrag.blur.config;
-
-import javax.annotation.Nonnull;
-
-import com.tterrag.blur.Blur;
-
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.resources.I18n;
-import net.minecraftforge.common.config.ConfigElement;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.fml.client.config.GuiConfig;
-import net.minecraftforge.fml.client.config.GuiConfigEntries;
-
-public class BlurConfigGui extends GuiConfig {
-
-    public BlurConfigGui(GuiScreen parentScreen) {
-        super(parentScreen, new ConfigElement(Blur.instance.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), Blur.MODID, false, false, I18n.format(Blur.MODID + ".config.title"));
-    }
-    
-    @Override
-    public void initGui() {
-        if (this.entryList == null || this.needsRefresh)
-        {
-            this.entryList = new GuiConfigEntries(this, mc) {
-                @SuppressWarnings({ "unused", "null" })
-                @Override
-                protected void drawContainerBackground(@Nonnull Tessellator tessellator) {
-                    if (mc.world == null) {
-                        super.drawContainerBackground(tessellator);
-                    }
-                }
-            };
-            this.needsRefresh = false;
-        }
-        super.initGui();
-    }
-    
-    @Override
-    public void drawDefaultBackground() {
-        drawWorldBackground(0);
-    }
-}
--- a/src/main/java/com/tterrag/blur/config/BlurGuiFactory.java
+++ b/src/main/java/com/tterrag/blur/config/BlurGuiFactory.java
@@ -1,41 +0,0 @@
-package com.tterrag.blur.config;
-
-import java.util.Set;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraftforge.fml.client.IModGuiFactory;
-
-public class BlurGuiFactory implements IModGuiFactory {
-
-    @Override
-    public void initialize(Minecraft minecraftInstance) {}
-
-    @Override
-    public Class<? extends GuiScreen> mainConfigGuiClass() {
-        return BlurConfigGui.class;
-    }
-
-    @Override
-    public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
-        return null;
-    }
-
-    @Override
-    @Deprecated
-    public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
-        return null;
-    }
-
-//  1.12
-//	@Override
-	public boolean hasConfigGui() {
-		return true;
-	}
-	
-//  1.12
-//	@Override
-	public GuiScreen createConfigGui(GuiScreen parentScreen) {
-		return new BlurConfigGui(parentScreen);
-	}
-}
--- a/src/main/java/com/tterrag/blur/config/MidnightConfig.java
+++ b/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;
+    }
+}
--- a/src/main/java/com/tterrag/blur/config/ModMenuIntegration.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/tterrag/blur/util/ShaderResourcePack.java
+++ b/src/main/java/com/tterrag/blur/util/ShaderResourcePack.java
@@ -1,89 +0,0 @@
-package com.tterrag.blur.util;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-import com.tterrag.blur.Blur;
-
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.IResourceManagerReloadListener;
-import net.minecraft.client.resources.IResourcePack;
-import net.minecraft.client.resources.data.IMetadataSection;
-import net.minecraft.client.resources.data.MetadataSerializer;
-import net.minecraft.client.resources.data.PackMetadataSection;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.TextComponentString;
-
-public class ShaderResourcePack implements IResourcePack, IResourceManagerReloadListener {
-	
-	protected boolean validPath(ResourceLocation location) {
-		return location.getResourceDomain().equals("minecraft") && location.getResourcePath().startsWith("shaders/");
-	}
-	
-	private final Map<ResourceLocation, String> loadedData = new HashMap<>();
-
-	@Override
-	public InputStream getInputStream(ResourceLocation location) throws IOException {
-        if (validPath(location)) {
-            String s = loadedData.computeIfAbsent(location, loc -> {
-                InputStream in = Blur.class.getResourceAsStream("/" + location.getResourcePath());
-                StringBuilder data = new StringBuilder();
-                Scanner scan = new Scanner(in);
-                try {
-                    while (scan.hasNextLine()) {
-                        data.append(scan.nextLine().replaceAll("@radius@", Integer.toString(Blur.instance.radius))).append('\n');
-                    }
-                } finally {
-                    scan.close();
-                }
-                return data.toString();
-            });
-
-            return new ByteArrayInputStream(s.getBytes());
-        }
-        throw new FileNotFoundException(location.toString());
-	}
-
-	@Override
-	public boolean resourceExists(ResourceLocation location) {
-		return validPath(location) && Blur.class.getResource("/" + location.getResourcePath()) != null;
-	}
-
-	@Override
-	public Set<String> getResourceDomains() {
-		return ImmutableSet.of("minecraft");
-	}
-
-	@SuppressWarnings({ "unchecked", "null" })
-    @Override
-	public <T extends IMetadataSection> T getPackMetadata(MetadataSerializer metadataSerializer, String metadataSectionName) throws IOException {
-	    if ("pack".equals(metadataSectionName)) {
-	        return (T) new PackMetadataSection(new TextComponentString("Blur's default shaders"), 3);
-	    }
-	    return null;
-    }
-
-	@Override
-	public BufferedImage getPackImage() throws IOException {
-		throw new FileNotFoundException("pack.png");
-	}
-
-	@Override
-	public String getPackName() {
-		return "Blur dummy resource pack";
-	}
-	
-	@Override
-	public void onResourceManagerReload(IResourceManager resourceManager) {
-	    loadedData.clear();
-	}
-
-}
--- a/src/main/resources/assets/blur/icon.png
+++ b/src/main/resources/assets/blur/icon.png
--- a/src/main/resources/assets/blur/lang/de_de.json
+++ b/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"
+}
--- a/src/main/resources/assets/blur/lang/en_US.lang
+++ b/src/main/resources/assets/blur/lang/en_US.lang
@@ -1 +0,0 @@
-blur.config.title=Blur Config
--- a/src/main/resources/assets/blur/lang/en_gb.json
+++ b/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"
+}
--- a/src/main/resources/assets/blur/lang/en_us.json
+++ b/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"
+}
--- a/src/main/resources/assets/blur/lang/zh_cn.json
+++ b/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": "渐变结束色"
+}
--- a/src/main/resources/assets/blur/shaders/post/fade_in_blur.json
+++ b/src/main/resources/assets/blur/shaders/post/fade_in_blur.json
@@ -4,7 +4,7 @@
    ],
    "passes": [
        {
-            "name": "fade_in_blur",
+            "name": "blur:fade_in_blur",
            "intarget": "minecraft:main",
            "outtarget": "swap",
            "uniforms": [
@@ -14,12 +14,12 @@
                },
                {
                    "name": "Radius",
-                    "values": [ @radius@.0 ]
+                    "values": [ 8.0 ]
                }
            ]
        },
        {
-            "name": "fade_in_blur",
+            "name": "blur:fade_in_blur",
            "intarget": "swap",
            "outtarget": "minecraft:main",
            "uniforms": [
@@ -29,12 +29,12 @@
                },
                {
                    "name": "Radius",
-                    "values": [ @radius@.0 ]
+                    "values": [ 8.0 ]
                }
            ]
        },
        {
-            "name": "fade_in_blur",
+            "name": "blur:fade_in_blur",
            "intarget": "minecraft:main",
            "outtarget": "swap",
            "uniforms": [
@@ -44,12 +44,12 @@
                },
                {
                    "name": "Radius",
-                    "values": [ @radius@.0 ]
+                    "values": [ 8.0 ]
                }
            ]
        },
        {
-            "name": "fade_in_blur",
+            "name": "blur:fade_in_blur",
            "intarget": "swap",
            "outtarget": "minecraft:main",
            "uniforms": [
@@ -59,7 +59,7 @@
                },
                {
                    "name": "Radius",
-                    "values": [ @radius@.0 ]
+                    "values": [ 8.0 ]
                }
            ]
        }
--- a/src/main/resources/assets/blur/shaders/program/fade_in_blur.fsh
+++ b/src/main/resources/assets/blur/shaders/program/fade_in_blur.fsh
--- a/src/main/resources/assets/blur/shaders/program/fade_in_blur.json
+++ b/src/main/resources/assets/blur/shaders/program/fade_in_blur.json
@@ -5,7 +5,7 @@
        "dstrgb": "zero"
    },
    "vertex": "sobel",
-    "fragment": "fade_in_blur",
+    "fragment": "blur:fade_in_blur",
    "attributes": [ "Position" ],
    "samplers": [
        { "name": "DiffuseSampler" }
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,30 @@
+{
+  "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"
+  },
+  "authors": [
+    "tterrag1098",
+    "Pyrofab",
+    "Motschen"
+  ],
+  "description": "Modifies the background behind Minecraft GUIs to have a blur effect",
+  "mixins": [
+    "mixins.blur.json"
+  ]
+}
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,16 +0,0 @@
-[
-{
-  "modid": "blur",
-  "name": "Blur",
-  "description": "Adds a blurry background when viewing GUIs",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
-  "url": "http://tterrag.com",
-  "updateUrl": "http://ci.tterrag.com/job/BlurBG",
-  "authorList": ["tterrag"],
-  "credits": "",
-  "logoFile": "",
-  "screenshots": [],
-  "dependencies": []
-}
-]
--- a/src/main/resources/mixins.blur.json
+++ b/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
+  }
+}
Author	SHA1	Message	Date
Motschen	a520948fff	Blur 2.1.0 - MidnightConfig Switch to MidnightConfig: - Much smaller file size - Live preview - Fixed #4 Chinise translation by @Enaium Update to 21w08b	2021-03-05 17:52:48 +01:00
Motschen	40d63109f3	Merge pull request #8 from Enaium/fabric Create zh_cn.json	2021-03-05 09:55:49 +01:00
Enaium	a6b70f1c6a	Create zh_cn.json	2021-03-05 13:06:49 +08:00
Motschen	d42905746b	Use official Satin build, Gradle cleanup, Remove unneeded dependencies	2020-12-20 15:05:55 +01:00
Motschen	432934b056	2.0.0 - AutoConfig and Fade Fix	2020-11-08 18:09:57 +01:00
Motschen	f8a4dd71fd	Merge pull request #1 from Pyrofab/fabric Update to 1.16.2	2020-08-17 15:31:34 +02:00
Pyrofab	d117c98de2	Bump version to 1.0.7	2020-08-17 09:56:47 +02:00
Pyrofab	fd84d68897	Update to 1.16.2	2020-08-17 09:49:13 +02:00
Motschen	7e8194a529	Port to 1.16-rc1	2020-06-21 12:33:45 +02:00
Pyrofab	28a8530c52	Update to 19w34a	2019-08-27 15:09:36 +02:00
Pyrofab	cb98527f94	Fix excluded GUIs being ignored	2019-07-30 22:34:28 +02:00
Pyrofab	3cf6a03361	Update contained satin	2019-07-30 22:29:06 +02:00
Pyrofab	d1d9468482	Move Blur to Satin	2019-07-29 22:30:48 +02:00
Prospector	a7c8ff7526	Fix config file name	2019-07-28 12:38:15 -07:00
Prospector	c4e1d33ade	Fix formatting that was changed	2019-07-27 11:40:39 -07:00
Prospector	fd386e7585	Remove wildcard imports because it seems like you'd not like them	2019-07-26 22:49:55 -07:00
Prospector	978380b6fd	Fix imports and upgrade gradle to 5.5.1	2019-07-26 22:41:28 -07:00
Prospector	e983ab5dee	Update to 1.14.4	2019-07-26 22:16:22 -07:00
tterrag	19085b6496	Fix gradient not fading in	2018-12-13 13:06:16 -05:00
tterrag	a6d95dbb45	Bump to loader .65, fix MixinMinecraftClient target strings	2018-12-13 13:01:12 -05:00
tterrag	7ee13a4435	Actual mod version	2018-12-13 02:05:57 -05:00
tterrag	4dc9e52793	gradle properties	2018-12-13 02:05:12 -05:00
tterrag	f28de240fe	Drop buildnumber from version for now	2018-12-13 02:04:32 -05:00
tterrag	0450c9238a	Clean up buildscript	2018-12-13 02:03:17 -05:00
tterrag	65d9375bfe	Add rudimentary config file	2018-12-13 02:00:27 -05:00
tterrag	3bffe56f39	Remove old transformer and tabs->spaces	2018-12-12 14:44:14 -05:00
tterrag	12c5daa5f6	Clean up reflection, add resource pack image and reload listener	2018-12-12 14:41:22 -05:00
tterrag	20fdff17ff	Fix reflection for prod	2018-12-11 15:05:40 -05:00
tterrag	a75f9f8570	Basic port to fabric - no configs yet	2018-12-11 10:54:26 -05:00