keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix incorrectly ported patch for restoreBlurMipmap (#6450)

Browse source
This commit is contained in:
Vincent Lee 2020-01-29 15:13:08 -06:00 committed by GitHub
parent 1b618fae90
commit e539e7ecbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch
View file

@ -41,7 +41,7 @@
this.func_174967_a(p_228426_3_ + l1); this.func_174967_a(p_228426_3_ + l1);
iprofiler.func_219895_b("terrain"); iprofiler.func_219895_b("terrain");
this.func_228441_a_(RenderType.func_228639_c_(), p_228426_1_, d0, d1, d2); this.func_228441_a_(RenderType.func_228639_c_(), p_228426_1_, d0, d1, d2);
+ this.field_72777_q.func_209506_al().func_229356_a_(AtlasTexture.field_110575_b).func_174937_a(false, this.field_72777_q.field_71474_y.field_151442_I > 0); // FORGE: fix flickering leaves when mods mess up the blurMipmap settings + this.field_72777_q.func_209506_al().func_229356_a_(AtlasTexture.field_110575_b).setBlurMipmap(false, this.field_72777_q.field_71474_y.field_151442_I > 0); // FORGE: fix flickering leaves when mods mess up the blurMipmap settings
this.func_228441_a_(RenderType.func_228641_d_(), p_228426_1_, d0, d1, d2); this.func_228441_a_(RenderType.func_228641_d_(), p_228426_1_, d0, d1, d2);
+ this.field_72777_q.func_209506_al().func_229356_a_(AtlasTexture.field_110575_b).restoreLastBlurMipmap(); + this.field_72777_q.func_209506_al().func_229356_a_(AtlasTexture.field_110575_b).restoreLastBlurMipmap();
this.func_228441_a_(RenderType.func_228643_e_(), p_228426_1_, d0, d1, d2); this.func_228441_a_(RenderType.func_228643_e_(), p_228426_1_, d0, d1, d2);

13
patches/minecraft/net/minecraft/client/renderer/texture/Texture.java.patch
View file

@ -1,12 +1,21 @@
--- a/net/minecraft/client/renderer/texture/Texture.java --- a/net/minecraft/client/renderer/texture/Texture.java
+++ b/net/minecraft/client/renderer/texture/Texture.java +++ b/net/minecraft/client/renderer/texture/Texture.java
@@ -33,6 +33,11 @@ @@ -33,6 +33,20 @@
GlStateManager.func_227677_b_(3553, 10240, j); GlStateManager.func_227677_b_(3553, 10240, j);
} }
+ // FORGE: This seems to have been stripped out, but we need it + // FORGE: This seems to have been stripped out, but we need it
+ private boolean lastBlur;
+ private boolean lastMipmap;
+
+ public void setBlurMipmap(boolean blur, boolean mipmap) {
+ this.lastBlur = this.field_174940_b;
+ this.lastMipmap = this.field_174941_c;
+ func_174937_a(blur, mipmap);
+ }
+
+ public void restoreLastBlurMipmap() { + public void restoreLastBlurMipmap() {
+ func_174937_a(this.field_174940_b, this.field_174941_c); + func_174937_a(this.lastBlur, this.lastMipmap);
+ } + }
+ +
public int func_110552_b() { public int func_110552_b() {