From c544f0688033a7e3677833c8d03d2eaf08532549 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 1 Jun 2017 15:47:49 -0700 Subject: [PATCH] Fix shaders not loading from mod domains Closes #3921 --- .../minecraft/client/shader/ShaderGroup.java.patch | 12 ++++++++++++ .../minecraft/client/shader/ShaderLoader.java.patch | 12 ++++++++++++ .../minecraft/client/shader/ShaderManager.java.patch | 12 ++++++++++++ src/main/resources/forge_at.cfg | 2 ++ 4 files changed, 38 insertions(+) create mode 100644 patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch create mode 100644 patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch create mode 100644 patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch new file mode 100644 index 0000000000..3941a0d28e --- /dev/null +++ b/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch @@ -0,0 +1,12 @@ +--- ../src-base/minecraft/net/minecraft/client/shader/ShaderGroup.java ++++ ../src-work/minecraft/net/minecraft/client/shader/ShaderGroup.java +@@ -179,7 +179,8 @@ + + if (framebuffer2 == null) + { +- ResourceLocation resourcelocation = new ResourceLocation("textures/effect/" + s3 + ".png"); ++ String[] rl = ResourceLocation.func_177516_a(s3); ++ ResourceLocation resourcelocation = new ResourceLocation(rl[0], "textures/effect/" + rl[1] + ".png"); + IResource iresource = null; + + try diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch new file mode 100644 index 0000000000..1c05a33781 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch @@ -0,0 +1,12 @@ +--- ../src-base/minecraft/net/minecraft/client/shader/ShaderLoader.java ++++ ../src-work/minecraft/net/minecraft/client/shader/ShaderLoader.java +@@ -61,7 +61,8 @@ + + if (shaderloader == null) + { +- ResourceLocation resourcelocation = new ResourceLocation("shaders/program/" + p_148057_2_ + p_148057_1_.func_148063_b()); ++ String[] rl = ResourceLocation.func_177516_a(p_148057_2_); ++ ResourceLocation resourcelocation = new ResourceLocation(rl[0], "shaders/program/" + rl[1] + p_148057_1_.func_148063_b()); + IResource iresource = p_148057_0_.func_110536_a(resourcelocation); + + try diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch new file mode 100644 index 0000000000..9f85920461 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch @@ -0,0 +1,12 @@ +--- ../src-base/minecraft/net/minecraft/client/shader/ShaderManager.java ++++ ../src-work/minecraft/net/minecraft/client/shader/ShaderManager.java +@@ -54,7 +54,8 @@ + public ShaderManager(IResourceManager p_i45087_1_, String p_i45087_2_) throws JsonException, IOException + { + JsonParser jsonparser = new JsonParser(); +- ResourceLocation resourcelocation = new ResourceLocation("shaders/program/" + p_i45087_2_ + ".json"); ++ String[] rl = ResourceLocation.func_177516_a(p_i45087_2_); ++ ResourceLocation resourcelocation = new ResourceLocation(rl[0], "shaders/program/" + rl[1] + ".json"); + this.field_148007_m = p_i45087_2_; + IResource iresource = null; + diff --git a/src/main/resources/forge_at.cfg b/src/main/resources/forge_at.cfg index 59bd9c1723..68aece7c27 100644 --- a/src/main/resources/forge_at.cfg +++ b/src/main/resources/forge_at.cfg @@ -315,3 +315,5 @@ public net.minecraft.command.EntitySelector func_190826_c(Ljava/lang/String;)Lja protected net.minecraft.world.Teleporter field_85192_a # world protected net.minecraft.world.Teleporter field_77187_a # random protected net.minecraft.world.Teleporter field_85191_c # destinationCoordinateCache + +public net.minecraft.util.ResourceLocation func_177516_a(Ljava/lang/String;)[Ljava/lang/String; # splitObjectName \ No newline at end of file