From 7b19768c4cce1bddd7a479a2aac7acb10c218436 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Fri, 4 Apr 2014 14:20:56 -0700 Subject: [PATCH] Fix line offset in Minecraft patch, and mix RenderPlayer looping once to many on multi-pass items. --- .../net/minecraft/client/Minecraft.java.patch | 18 +++++++++--------- .../renderer/entity/RenderPlayer.java.patch | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 6569649b8b..b69cba71a7 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -72,7 +72,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.field_71474_y.field_74330_P = false; -@@ -1296,7 +1310,7 @@ +@@ -1297,7 +1311,7 @@ if (this.field_71439_g.func_82246_f(i, j, k)) { @@ -81,7 +81,7 @@ this.field_71439_g.func_71038_i(); } } -@@ -1377,11 +1391,12 @@ +@@ -1378,11 +1392,12 @@ int j = this.field_71476_x.field_72312_c; int k = this.field_71476_x.field_72309_d; @@ -96,7 +96,7 @@ { flag = false; this.field_71439_g.func_71038_i(); -@@ -1408,7 +1423,8 @@ +@@ -1409,7 +1424,8 @@ { ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g(); @@ -106,7 +106,7 @@ { this.field_71460_t.field_78516_c.func_78445_c(); } -@@ -1607,6 +1623,8 @@ +@@ -1608,6 +1624,8 @@ while (Mouse.next()) { @@ -115,7 +115,7 @@ i = Mouse.getEventButton(); if (field_142025_a && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) -@@ -2074,6 +2092,11 @@ +@@ -2075,6 +2093,11 @@ public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_) { @@ -127,7 +127,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2086,6 +2109,18 @@ +@@ -2087,6 +2110,18 @@ if (this.field_71437_Z != null) { this.field_71437_Z.func_71263_m(); @@ -146,7 +146,7 @@ } this.field_71437_Z = null; -@@ -2234,113 +2269,10 @@ +@@ -2235,113 +2270,10 @@ if (this.field_71476_x != null) { boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d; @@ -262,7 +262,7 @@ if (flag) { j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + this.field_71439_g.field_71071_by.field_70461_c; -@@ -2507,8 +2439,15 @@ +@@ -2508,8 +2440,15 @@ p_70001_1_.func_76472_a("gl_max_texture_size", Integer.valueOf(func_71369_N())); } @@ -278,7 +278,7 @@ for (int i = 16384; i > 0; i >>= 1) { GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); -@@ -2516,6 +2455,7 @@ +@@ -2517,6 +2456,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch index b9959b1dc0..6cf9d9e4d1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java.patch @@ -156,7 +156,7 @@ if (itemstack1.func_77973_b().func_77623_v()) { - for (k = 0; k <= 1; ++k) -+ for (k = 0; k <= itemstack1.func_77973_b().getRenderPasses(itemstack1.func_77960_j()); ++k) ++ for (k = 0; k < itemstack1.func_77973_b().getRenderPasses(itemstack1.func_77960_j()); ++k) { int i = itemstack1.func_77973_b().func_82790_a(itemstack1, k); f12 = (float)(i >> 16 & 255) / 255.0F;