Motschen/Blur
1
0
Fork 0
mirror of https://github.com/Motschen/Blur.git synced 2025-12-16 03:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.17-pre3

Browse Source
This commit is contained in:
Pyrofab
2021-06-02 14:33:24 +02:00
parent a520948fff
commit e1346d2516
11 changed files with 169 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/tterrag/blur/Blur.java
View File

@@ -20,7 +20,7 @@ public class Blur implements ClientModInitializer {
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));
shader -> shader.setUniformValue("Radius", (float) BlurConfig.radius));
private final Uniform1f blurProgress = blur.findUniform1f("Progress");
public static final Blur INSTANCE = new Blur();
@@ -42,7 +42,7 @@ public class Blur implements ClientModInitializer {
if (MinecraftClient.getInstance().world != null) {
boolean excluded = newGui == null || ArrayUtils.contains(BlurConfig.blurExclusions, newGui.getClass().getName());
if (!excluded) {
blur.setUniformValue("Radius", BlurConfig.radius);
blur.setUniformValue("Radius", (float) BlurConfig.radius);
colorFirst = Integer.parseUnsignedInt(String.valueOf(BlurConfig.gradientStartColor), 16);
colorSecond = Integer.parseUnsignedInt(String.valueOf(BlurConfig.gradientEndColor), 16);
if (doFade) {

16
src/main/java/com/tterrag/blur/config/MidnightConfig.java
View File

@@ -51,7 +51,7 @@ public class MidnightConfig {
boolean inLimits = true;
}
private static Class configClass;
private static Class<?> configClass;
private static String translationPrefix;
private static Path path;
@@ -159,7 +159,7 @@ public class MidnightConfig {
public static void write() {
try {
if (!Files.exists(path)) Files.createFile(path);
Files.write(path, gson.toJson(configClass.newInstance()).getBytes());
Files.write(path, gson.toJson(configClass.getConstructor().newInstance()).getBytes());
} catch (Exception e) {
e.printStackTrace();
}
@@ -189,7 +189,7 @@ public class MidnightConfig {
@Override
protected void init() {
super.init();
this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
this.addDrawableChild(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(); }
@@ -203,7 +203,7 @@ public class MidnightConfig {
Objects.requireNonNull(client).openScreen(parent);
}));
ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
ButtonWidget done = this.addDrawableChild(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) {}
@@ -213,7 +213,7 @@ public class MidnightConfig {
int y = 45;
for (EntryInfo info : entries) {
addButton(new ButtonWidget(width - 155, y, 40,20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
addDrawableChild(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);
@@ -221,17 +221,17 @@ public class MidnightConfig {
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()));
addDrawableChild(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));
TextFieldWidget widget = addDrawableChild(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);
this.addSelectableChild(widget);
}
y += 25;
}

4
src/main/java/com/tterrag/blur/config/ModMenuIntegration.java
View File

@@ -1,7 +1,7 @@
package com.tterrag.blur.config;
import io.github.prospector.modmenu.api.ConfigScreenFactory;
import io.github.prospector.modmenu.api.ModMenuApi;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;

12
src/main/resources/assets/blur/shaders/program/fade_in_blur.fsh
View File

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

4
src/main/resources/assets/blur/shaders/program/fade_in_blur.json
View File

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