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

Update to 1.14.4

Browse Source
This commit is contained in:
Prospector
2019-07-26 22:16:22 -07:00
parent 19085b6496
commit e983ab5dee
15 changed files with 172 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,27 @@
package com.tterrag.blur;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.tterrag.blur.mixin.MixinGameRenderer;
import com.tterrag.blur.util.ReflectionHelper;
import com.tterrag.blur.util.ShaderResourcePack;
import net.fabricmc.api.ClientModInitializer;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gl.GlUniform;
import net.minecraft.client.gl.PostProcessShader;
import net.minecraft.client.gl.ShaderEffect;
import net.minecraft.client.gui.screen.ChatScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.resource.ClientResourcePackContainer;
import net.minecraft.client.texture.NativeImage;
import net.minecraft.resource.*;
import net.minecraft.resource.ResourcePackContainer.Factory;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Identifier;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.logging.log4j.LogManager;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
@@ -11,45 +33,14 @@ import java.nio.file.StandardOpenOption;
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
public class Blur implements ClientModInitializer {
import org.apache.commons.lang3.ArrayUtils;
import org.apache.logging.log4j.LogManager;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.tterrag.blur.mixin.MixinWorldRenderer;
import com.tterrag.blur.util.ReflectionHelper;
import com.tterrag.blur.util.ShaderResourcePack;
import net.fabricmc.api.ModInitializer;
import net.minecraft.class_279;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gl.GlUniform;
import net.minecraft.client.gl.Shader;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.ingame.ChatGui;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.resource.ClientResourcePackContainer;
import net.minecraft.client.texture.NativeImage;
import net.minecraft.resource.ReloadableResourceManager;
import net.minecraft.resource.ResourcePackCompatibility;
import net.minecraft.resource.ResourcePackContainer;
import net.minecraft.resource.ResourcePackContainer.Factory;
import net.minecraft.resource.ResourcePackContainer.SortingDirection;
import net.minecraft.resource.ResourcePackContainerManager;
import net.minecraft.resource.ResourcePackCreator;
import net.minecraft.text.StringTextComponent;
import net.minecraft.util.Identifier;
public class Blur implements ModInitializer {
public static final String MODID = "blur";
public static final String MOD_NAME = "Blur";
public static final String VERSION = "@VERSION@";
static class ConfigJson {
String[] blurExclusions = new String[] { ChatGui.class.getName() };
String[] blurExclusions = new String[]{ChatScreen.class.getName()};
int fadeTimeMillis = 200;
int radius = 8;
String gradientStartColor = "75000000";
@@ -61,10 +52,9 @@ public class Blur implements ModInitializer {
public ConfigJson configs = new ConfigJson();
public int colorFirst, colorSecond;
@Nonnull
private ShaderResourcePack dummyPack = new ShaderResourcePack();
public static Blur instance;
public Blur() throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
@@ -75,13 +65,13 @@ public class Blur implements ModInitializer {
public <T extends ResourcePackContainer> void registerContainer(Map<String, T> var1, Factory<T> factory) {
NativeImage img = null;
try {
img = NativeImage.fromInputStream(dummyPack.openRoot("pack.png"));
img = NativeImage.read(dummyPack.openRoot("icon.png"));
} catch (IOException e) {
LogManager.getLogger().error("Could not load blur's pack.png", e);
LogManager.getLogger().error("Could not load blur's icon.png", e);
}
@SuppressWarnings("unchecked")
T var3 = (T) new ClientResourcePackContainer("blur", true, () -> dummyPack, new StringTextComponent(dummyPack.getName()), new StringTextComponent("Default shaders for Blur"),
ResourcePackCompatibility.COMPATIBLE, SortingDirection.BOTTOM, true, img);
T var3 = (T) new ClientResourcePackContainer("blur", true, () -> dummyPack, new LiteralText(dummyPack.getName()), new LiteralText("Default shaders for Blur"),
ResourcePackCompatibility.COMPATIBLE, ResourcePackContainer.InsertionPosition.BOTTOM, true, img);
if (var3 != null) {
var1.put("blur", var3);
}
@@ -90,9 +80,9 @@ public class Blur implements ModInitializer {
instance = this;
}
@Override
public void onInitialize() {
public void onInitializeClient() {
Path config = MinecraftClient.getInstance().runDirectory.toPath().resolve(Paths.get("config", "blur.cfg"));
File configFile = config.toFile();
try {
@@ -110,43 +100,43 @@ public class Blur implements ModInitializer {
}
public void registerReloadListeners(ReloadableResourceManager manager) {
manager.addListener(dummyPack);
manager.addPack(dummyPack);
}
public void onGuiChange(Gui newGui) {
public void onScreenChange(Screen newGui) {
if (_listShaders == null) {
_listShaders = ReflectionHelper.getField(class_279.class, "field_1497");
_listShaders = ReflectionHelper.getField(ShaderEffect.class, "field_1497", "passes");
}
if (MinecraftClient.getInstance().world != null) {
WorldRenderer er = MinecraftClient.getInstance().worldRenderer;
GameRenderer er = MinecraftClient.getInstance().gameRenderer;
boolean excluded = newGui == null || ArrayUtils.contains(configs.blurExclusions, newGui.getClass().getName());
if (!er.method_3175() && !excluded) {
((MixinWorldRenderer)er).invokeLoadShader(new Identifier("shaders/post/fade_in_blur.json"));
if (!er.isShaderEnabled() && !excluded) {
((MixinGameRenderer) er).invokeLoadShader(new Identifier("shaders/post/fade_in_blur.json"));
start = System.currentTimeMillis();
} else if (er.method_3175() && excluded) {
er.method_3207();
} else if (er.isShaderEnabled() && excluded) {
er.disableShader();
}
}
}
public int getRadius() {
return configs.radius;
}
private float getProgress() {
return Math.min((System.currentTimeMillis() - start) / (float) configs.fadeTimeMillis, 1);
}
public void onPostRenderTick() {
if (MinecraftClient.getInstance().currentGui != null && MinecraftClient.getInstance().worldRenderer.method_3175()) {
class_279 sg = MinecraftClient.getInstance().worldRenderer.method_3183();
if (MinecraftClient.getInstance().currentScreen != null && MinecraftClient.getInstance().gameRenderer.isShaderEnabled()) {
ShaderEffect sg = MinecraftClient.getInstance().gameRenderer.getShader();
try {
@SuppressWarnings("unchecked")
List<Shader> shaders = (List<Shader>) _listShaders.get(sg);
for (Shader s : shaders) {
GlUniform su = s.method_1295().getUniformByName("Progress");
List<PostProcessShader> shaders = (List<PostProcessShader>) _listShaders.get(sg);
for (PostProcessShader s : shaders) {
GlUniform su = s.getProgram().getUniformByName("Progress");
if (su != null) {
su.method_1251(getProgress());
su.set(getProgress());
}
}
} catch (IllegalArgumentException | IllegalAccessException e) {
@@ -154,7 +144,7 @@ public class Blur implements ModInitializer {
}
}
}
public int getBackgroundColor(boolean second) {
int color = second ? colorSecond : colorFirst;
int a = color >>> 24;