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

Fix imports and upgrade gradle to 5.5.1

Browse Source
This commit is contained in:
Prospector
2019-07-26 22:41:28 -07:00
parent e983ab5dee
commit 978380b6fd
7 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,5 @@
#Sun Nov 11 14:39:10 PST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip

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

@@ -1,10 +1,25 @@
package com.tterrag.blur;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.List;
import java.util.Map;
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.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;
@@ -19,19 +34,6 @@ 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;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.List;
import java.util.Map;
public class Blur implements ClientModInitializer {

3
src/main/java/com/tterrag/blur/mixin/MixinGameRenderer.java
View File

@@ -1,10 +1,9 @@
package com.tterrag.blur.mixin;
import net.minecraft.client.render.GameRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.util.Identifier;
@Mixin(GameRenderer.class)

10
src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java
View File

@@ -1,9 +1,5 @@
package com.tterrag.blur.mixin;
import com.tterrag.blur.Blur;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.resource.ReloadableResourceManager;
import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@@ -11,6 +7,12 @@ import org.spongepowered.asm.mixin.injection.At.Shift;
import org.spongepowered.asm.mixin.injection.Inject;
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 {

6
src/main/java/com/tterrag/blur/mixin/MixinScreen.java
View File

@@ -1,11 +1,13 @@
package com.tterrag.blur.mixin;
import com.tterrag.blur.Blur;
import net.minecraft.client.gui.screen.Screen;
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 {

2
src/main/java/com/tterrag/blur/util/ReflectionHelper.java
View File

@@ -6,7 +6,7 @@ import java.util.Arrays;
public class ReflectionHelper {
@SuppressWarnings("unchecked")
public static <T> T getValue(Class<?> cls, Object instance, String...names) {
public static <T> T getValue(Class<?> cls, Object instance, String... names) {
try {
return (T) getField(cls, names).get(instance);
} catch (IllegalAccessException e) {

24
src/main/java/com/tterrag/blur/util/ShaderResourcePack.java
View File

@@ -1,16 +1,5 @@
package com.tterrag.blur.util;
import com.google.common.collect.ImmutableSet;
import com.tterrag.blur.Blur;
import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourceReloadListener;
import net.minecraft.resource.ResourceType;
import net.minecraft.resource.metadata.PackResourceMetadata;
import net.minecraft.resource.metadata.ResourceMetadataReader;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Identifier;
import net.minecraft.util.profiler.Profiler;
import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
@@ -21,6 +10,19 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.function.Predicate;
import com.google.common.collect.ImmutableSet;
import com.tterrag.blur.Blur;
import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourceReloadListener;
import net.minecraft.resource.ResourceType;
import net.minecraft.resource.metadata.PackResourceMetadata;
import net.minecraft.resource.metadata.ResourceMetadataReader;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Identifier;
import net.minecraft.util.profiler.Profiler;
public class ShaderResourcePack implements ResourcePack, ResourceReloadListener {
protected boolean validPath(Identifier location) {