diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 43ee8d6..cd7237a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/src/main/java/com/tterrag/blur/Blur.java b/src/main/java/com/tterrag/blur/Blur.java index a0f4e60..790a38f 100644 --- a/src/main/java/com/tterrag/blur/Blur.java +++ b/src/main/java/com/tterrag/blur/Blur.java @@ -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 { diff --git a/src/main/java/com/tterrag/blur/mixin/MixinGameRenderer.java b/src/main/java/com/tterrag/blur/mixin/MixinGameRenderer.java index 2e0b572..f8e3910 100644 --- a/src/main/java/com/tterrag/blur/mixin/MixinGameRenderer.java +++ b/src/main/java/com/tterrag/blur/mixin/MixinGameRenderer.java @@ -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) diff --git a/src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java b/src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java index dd36787..dce9ee5 100644 --- a/src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java +++ b/src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java @@ -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 { diff --git a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java b/src/main/java/com/tterrag/blur/mixin/MixinScreen.java index 331d702..ba898cc 100644 --- a/src/main/java/com/tterrag/blur/mixin/MixinScreen.java +++ b/src/main/java/com/tterrag/blur/mixin/MixinScreen.java @@ -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 { diff --git a/src/main/java/com/tterrag/blur/util/ReflectionHelper.java b/src/main/java/com/tterrag/blur/util/ReflectionHelper.java index eb930cf..2c609cf 100644 --- a/src/main/java/com/tterrag/blur/util/ReflectionHelper.java +++ b/src/main/java/com/tterrag/blur/util/ReflectionHelper.java @@ -4,16 +4,16 @@ import java.lang.reflect.Field; import java.util.Arrays; public class ReflectionHelper { - + @SuppressWarnings("unchecked") - public static T getValue(Class cls, Object instance, String...names) { + public static T getValue(Class cls, Object instance, String... names) { try { return (T) getField(cls, names).get(instance); } catch (IllegalAccessException e) { throw new RuntimeException(e); } } - + public static Field getField(Class cls, String... names) { for (String name : names) { Field f = getFieldInternal(cls, name); diff --git a/src/main/java/com/tterrag/blur/util/ShaderResourcePack.java b/src/main/java/com/tterrag/blur/util/ShaderResourcePack.java index f1c10c2..43f6831 100644 --- a/src/main/java/com/tterrag/blur/util/ShaderResourcePack.java +++ b/src/main/java/com/tterrag/blur/util/ShaderResourcePack.java @@ -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) {