From 4c3e6ed139b335aff487391897ad399a5d703b63 Mon Sep 17 00:00:00 2001 From: Brennan Ward Date: Sat, 28 Jul 2018 20:39:40 -0400 Subject: [PATCH] Improve crash report details (#5011) --- .../client/renderer/RenderItem.java.patch | 14 +++++++++++--- .../crash/CrashReportCategory.java.patch | 9 +++++++++ .../entity/player/InventoryPlayer.java.patch | 9 +++++++++ .../minecraft/tileentity/TileEntity.java.patch | 9 +++++++++ .../net/minecraft/world/World.java.patch | 18 ++++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch index 5c0b6a8a9..1f558710e 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch @@ -72,7 +72,15 @@ this.func_180454_a(p_191962_1_, p_191962_4_); GlStateManager.func_179118_c(); GlStateManager.func_179101_C(); -@@ -413,9 +398,12 @@ +@@ -367,6 +352,7 @@ + return String.valueOf((Object)p_184391_2_.func_77973_b()); + } + }); ++ crashreportcategory.func_189529_a("Registry Name", () -> String.valueOf(p_184391_2_.func_77973_b().getRegistryName())); + crashreportcategory.func_189529_a("Item Aux", new ICrashReportDetail() + { + public String call() throws Exception +@@ -413,9 +399,12 @@ p_180453_1_.func_175063_a(s, (float)(p_180453_3_ + 19 - 2 - p_180453_1_.func_78256_a(s)), (float)(p_180453_4_ + 6 + 3), 16777215); GlStateManager.func_179145_e(); GlStateManager.func_179126_j(); @@ -86,7 +94,7 @@ { GlStateManager.func_179140_f(); GlStateManager.func_179097_i(); -@@ -424,11 +412,10 @@ +@@ -424,11 +413,10 @@ GlStateManager.func_179084_k(); Tessellator tessellator = Tessellator.func_178181_a(); BufferBuilder bufferbuilder = tessellator.func_178180_c(); @@ -102,7 +110,7 @@ this.func_181565_a(bufferbuilder, p_180453_3_ + 2, p_180453_4_ + 13, 13, 2, 0, 0, 0, 255); this.func_181565_a(bufferbuilder, p_180453_3_ + 2, p_180453_4_ + 13, i, 1, j >> 16 & 255, j >> 8 & 255, j & 255, 255); GlStateManager.func_179147_l(); -@@ -1099,6 +1086,7 @@ +@@ -1099,6 +1087,7 @@ this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.LOAD.func_185110_a(), "structure_block"); this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.CORNER.func_185110_a(), "structure_block"); this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.DATA.func_185110_a(), "structure_block"); diff --git a/patches/minecraft/net/minecraft/crash/CrashReportCategory.java.patch b/patches/minecraft/net/minecraft/crash/CrashReportCategory.java.patch index ad471ba84..d50b54fd8 100644 --- a/patches/minecraft/net/minecraft/crash/CrashReportCategory.java.patch +++ b/patches/minecraft/net/minecraft/crash/CrashReportCategory.java.patch @@ -14,3 +14,12 @@ return this.field_85075_d.length; } } +@@ -206,7 +209,7 @@ + { + try + { +- return String.format("ID #%d (%s // %s)", i, p_180523_2_.func_149739_a(), p_180523_2_.getClass().getCanonicalName()); ++ return String.format("ID #%d (%s // %s // %s)", i, p_180523_2_.func_149739_a(), p_180523_2_.getClass().getName(), p_180523_2_.getRegistryName()); + } + catch (Throwable var2) + { diff --git a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch index a80b6972c..4e029b08b 100644 --- a/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch @@ -24,3 +24,12 @@ } public boolean func_70441_a(ItemStack p_70441_1_) +@@ -444,6 +452,8 @@ + CrashReportCategory crashreportcategory = crashreport.func_85058_a("Item being added"); + crashreportcategory.func_71507_a("Item ID", Integer.valueOf(Item.func_150891_b(p_191971_2_.func_77973_b()))); + crashreportcategory.func_71507_a("Item data", Integer.valueOf(p_191971_2_.func_77960_j())); ++ crashreportcategory.func_189529_a("Registry Name", () -> String.valueOf(p_191971_2_.func_77973_b().getRegistryName())); ++ crashreportcategory.func_189529_a("Item Class", () -> p_191971_2_.func_77973_b().getClass().getName()); + crashreportcategory.func_189529_a("Item name", new ICrashReportDetail() + { + public String call() throws Exception diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch index ee4616fc7..d9e519c0e 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch +++ b/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch @@ -66,6 +66,15 @@ public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_) { double d0 = (double)this.field_174879_c.func_177958_n() + 0.5D - p_145835_1_; +@@ -244,7 +252,7 @@ + + try + { +- return String.format("ID #%d (%s // %s)", i, Block.func_149729_e(i).func_149739_a(), Block.func_149729_e(i).getClass().getCanonicalName()); ++ return String.format("ID #%d (%s // %s // %s)", i, Block.func_149729_e(i).func_149739_a(), Block.func_149729_e(i).getClass().getName(), Block.func_149729_e(i).getRegistryName()); + } + catch (Throwable var3) + { @@ -297,6 +305,204 @@ { } diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch index d16c40043..1757acc9e 100644 --- a/patches/minecraft/net/minecraft/world/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -154,6 +154,15 @@ if (p_175695_3_ != EnumFacing.WEST) { this.func_190524_a(p_175695_1_.func_177976_e(), p_175695_2_, p_175695_1_); +@@ -507,7 +559,7 @@ + { + try + { +- return String.format("ID #%d (%s // %s)", Block.func_149682_b(p_190524_2_), p_190524_2_.func_149739_a(), p_190524_2_.getClass().getCanonicalName()); ++ return String.format("ID #%d (%s // %s // %s)", Block.func_149682_b(p_190524_2_), p_190524_2_.func_149739_a(), p_190524_2_.getClass().getName(), p_190524_2_.getRegistryName()); + } + catch (Throwable var2) + { @@ -527,11 +579,11 @@ { IBlockState iblockstate = this.func_180495_p(p_190529_1_); @@ -168,6 +177,15 @@ } catch (Throwable throwable) { +@@ -543,7 +595,7 @@ + { + try + { +- return String.format("ID #%d (%s // %s)", Block.func_149682_b(p_190529_2_), p_190529_2_.func_149739_a(), p_190529_2_.getClass().getCanonicalName()); ++ return String.format("ID #%d (%s // %s // %s)", Block.func_149682_b(p_190529_2_), p_190529_2_.func_149739_a(), p_190529_2_.getClass().getName(), p_190529_2_.getRegistryName()); + } + catch (Throwable var2) + { @@ -588,7 +640,7 @@ { IBlockState iblockstate = this.func_180495_p(blockpos1);