diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java index 66a9f6c2..1a68d7d3 100644 --- a/src/main/java/codechicken/nei/NEIClientUtils.java +++ b/src/main/java/codechicken/nei/NEIClientUtils.java @@ -15,6 +15,8 @@ import codechicken.nei.api.GuiInfo; import codechicken.nei.api.IInfiniteItemHandler; import codechicken.nei.api.ItemInfo; import com.google.common.collect.Iterables; +import java.io.PrintWriter; +import java.io.StringWriter; import java.math.BigInteger; import java.math.RoundingMode; import java.text.DecimalFormat; @@ -29,6 +31,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; @@ -39,6 +42,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; @@ -445,4 +450,30 @@ public class NEIClientUtils extends NEIServerUtils { mc().getSoundHandler() .playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } + + public static void reportErrorBuffered(Throwable e, Set buffer, String cause) { + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw)); + String stackTrace = cause + sw; + if (buffer.contains(stackTrace)) return; + + System.err.println("Error while rendering: " + cause); + e.printStackTrace(); + buffer.add(stackTrace); + + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (player != null) { + IChatComponent chat = new ChatComponentTranslation("nei.chat.render.error"); + chat.getChatStyle().setColor(EnumChatFormatting.RED); + player.addChatComponentMessage(chat); + } + } + + public static void reportErrorBuffered(Throwable e, Set buffer, ItemStack cause) { + if (cause != null) { + reportErrorBuffered(e, buffer, cause.toString()); + } else { + reportErrorBuffered(e, buffer, "null"); + } + } } diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index b4720a14..716e2855 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -9,8 +9,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientUtils; import codechicken.nei.recipe.StackInfo; import java.awt.Point; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -270,14 +268,7 @@ public class GuiContainerManager { if (!checkMatrixStack()) throw new IllegalStateException("Modelview matrix stack too deep"); if (Tessellator.instance.isDrawing) throw new IllegalStateException("Still drawing"); } catch (Exception e) { - StringWriter sw = new StringWriter(); - e.printStackTrace(new PrintWriter(sw)); - String stackTrace = itemstack + sw.toString(); - if (!stackTraces.contains(stackTrace)) { - System.err.println("Error while rendering: " + itemstack); - e.printStackTrace(); - stackTraces.add(stackTrace); - } + NEIClientUtils.reportErrorBuffered(e, stackTraces, itemstack); restoreMatrixStack(); if (Tessellator.instance.isDrawing) Tessellator.instance.draw(); @@ -579,17 +570,28 @@ public class GuiContainerManager { public void drawSlotItem(Slot slot, ItemStack stack, int x, int y, String quantity) { // for lighting correction boolean glRescale = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL); + float zLevel = drawItems.zLevel += 100F; - if (window instanceof IGuiSlotDraw) { - ((IGuiSlotDraw) window).drawSlotItem(slot, stack, x, y, quantity); - } else { + try { + if (window instanceof IGuiSlotDraw) { + ((IGuiSlotDraw) window).drawSlotItem(slot, stack, x, y, quantity); + } else { - if (quantity == null) { - quantity = stack != null && stack.stackSize > 1 ? String.valueOf(stack.stackSize) : ""; + if (quantity == null) { + quantity = stack != null && stack.stackSize > 1 ? String.valueOf(stack.stackSize) : ""; + } + + drawItems.renderItemAndEffectIntoGUI(fontRenderer, renderEngine, stack, x, y); + drawItems.renderItemOverlayIntoGUI(fontRenderer, renderEngine, stack, x, y, quantity); } + } catch (Exception e) { + NEIClientUtils.reportErrorBuffered(e, stackTraces, stack); - drawItems.renderItemAndEffectIntoGUI(fontRenderer, renderEngine, stack, x, y); - drawItems.renderItemOverlayIntoGUI(fontRenderer, renderEngine, stack, x, y, quantity); + restoreMatrixStack(); + if (Tessellator.instance.isDrawing) Tessellator.instance.draw(); + + drawItems.zLevel = zLevel; + drawItems.renderItemIntoGUI(fontRenderer, renderEngine, new ItemStack(Blocks.fire), x, y); } if (glRescale) { @@ -597,6 +599,7 @@ public class GuiContainerManager { } else { GL11.glDisable(GL12.GL_RESCALE_NORMAL); } + drawItems.zLevel = zLevel - 100; } /** diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 9b876a9a..08e09d2f 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -70,6 +70,7 @@ nei.chat.rain.off=Rain turned off nei.chat.time=Day %d. %d:00 nei.chat.give.noitem=No such item. nei.chat.recipe.error=There was error during loading recipe. Please check log for details. +nei.chat.render.error=There was error during rendering item. Please check log for details. nei.options=NEI Options nei.options.back=Back