From 086d02896f853a3368649fa99fb465cbd2eab5b1 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Sun, 29 Jun 2014 16:14:57 -0700 Subject: [PATCH] Fix creative inventory tabs not blending base don items rendered. Closes #1179 --- .../client/gui/inventory/GuiContainerCreative.java.patch | 5 +++-- .../minecraft/client/renderer/entity/RenderItem.java.patch | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch index b8c171c2f4..b481e48ddc 100644 --- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch @@ -239,15 +239,16 @@ int k = p_147049_1_.func_78020_k(); int l = 28 * k; byte b0 = 0; -@@ -828,6 +913,7 @@ +@@ -828,6 +913,8 @@ } GL11.glDisable(GL11.GL_LIGHTING); + GL11.glColor3f(1F, 1F, 1F); //Forge: Reset color in case Items change it. ++ GL11.glEnable(GL11.GL_BLEND); //Forge: Make sure blend is enabled else tabs show a white border. this.func_73729_b(l, i1, j, k, 28, b0); this.field_73735_i = 100.0F; field_146296_j.field_77023_b = 100.0F; -@@ -854,6 +940,15 @@ +@@ -854,6 +941,15 @@ { this.field_146297_k.func_147108_a(new GuiStats(this, this.field_146297_k.field_71439_g.func_146107_m())); } diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch index 9f5c66189f..86e1f95b57 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch @@ -310,7 +310,7 @@ + + private static RenderItem instance; + /** -+ * Returns a single lazy loaded instance of RenderItem, for use in mods who ++ * Returns a single lazy loaded instance of RenderItem, for use in mods who + * don't care about the interaction of other objects on the current state of the RenderItem they are using. + * @return A global instance of RenderItem + */