From 64952331e2d3404d814f2d06ce3c1c87ca503e8b Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Thu, 11 Dec 2014 16:40:28 -0800 Subject: [PATCH] Fix texture stitcher not using all avalible spaces. Closes #1557 --- .../client/renderer/texture/Stitcher.java.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch index d1d9830e5..ccd683730 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch @@ -5,7 +5,16 @@ if (flag4 ^ flag5) { - flag1 = !flag4; -+ flag1 = flag5 && flag3; //Forge: Bug fix: Attempt to fill all downward space before expanding width ++ flag1 = flag4; //Forge: Bug fix: Fixed inverted logic. flag1 = addNewColumn, flag4 = expandWidth } else { +@@ -183,7 +183,7 @@ + + j = Math.max(p_94311_1_.func_94197_a(), p_94311_1_.func_94199_b()); + +- if (MathHelper.func_151236_b((flag1 ? this.field_94315_d : this.field_94318_c) + j) > (flag1 ? this.field_94313_f : this.field_94316_e)) ++ if (MathHelper.func_151236_b((!flag1 ? this.field_94315_d : this.field_94318_c) + j) > (!flag1 ? this.field_94313_f : this.field_94316_e)) //Forge: Width and height were swapped. + { + return false; + }