--- a/net/minecraft/client/renderer/ItemRenderer.java +++ b/net/minecraft/client/renderer/ItemRenderer.java @@ -54,7 +54,7 @@ public ItemRenderer(TextureManager p_i46552_1_, ModelManager p_i46552_2_, ItemColors p_i46552_3_) { this.field_175057_n = p_i46552_1_; - this.field_175059_m = new ItemModelMesher(p_i46552_2_); + this.field_175059_m = new net.minecraftforge.client.ItemModelMesherForge(p_i46552_2_); for(Item item : Registry.field_212630_s) { if (!field_195411_c.contains(item)) { @@ -91,7 +91,7 @@ p_229111_8_ = this.field_175059_m.func_178083_a().func_174953_a(new ModelResourceLocation("minecraft:trident#inventory")); } - p_229111_8_.func_177552_f().func_181688_b(p_229111_2_).func_228830_a_(p_229111_3_, p_229111_4_); + p_229111_8_ = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(p_229111_4_, p_229111_8_, p_229111_2_, p_229111_3_); p_229111_4_.func_227861_a_(-0.5D, -0.5D, -0.5D); if (!p_229111_8_.func_188618_c() && (p_229111_1_.func_77973_b() != Items.field_203184_eO || flag1)) { RenderType rendertype = RenderTypeLookup.func_228389_a_(p_229111_1_); @@ -105,7 +105,7 @@ IVertexBuilder ivertexbuilder = func_229113_a_(p_229111_5_, rendertype1, true, p_229111_1_.func_77962_s()); this.func_229114_a_(p_229111_8_, p_229111_1_, p_229111_6_, p_229111_7_, p_229111_4_, ivertexbuilder); } else { - ItemStackTileEntityRenderer.field_147719_a.func_228364_a_(p_229111_1_, p_229111_4_, p_229111_5_, p_229111_6_, p_229111_7_); + p_229111_1_.func_77973_b().getItemStackTileEntityRenderer().func_228364_a_(p_229111_1_, p_229111_4_, p_229111_5_, p_229111_6_, p_229111_7_); } p_229111_4_.func_227865_b_(); @@ -129,7 +129,7 @@ float f = (float)(i >> 16 & 255) / 255.0F; float f1 = (float)(i >> 8 & 255) / 255.0F; float f2 = (float)(i & 255) / 255.0F; - p_229112_2_.func_227889_a_(matrixstack$entry, bakedquad, f, f1, f2, p_229112_5_, p_229112_6_); + p_229112_2_.addVertexData(matrixstack$entry, bakedquad, f, f1, f2, p_229112_5_, p_229112_6_, true); } } @@ -215,6 +215,7 @@ crashreportcategory.func_189529_a("Item Type", () -> { 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 Damage", () -> { return String.valueOf(p_184391_2_.func_77952_i()); }); @@ -246,18 +247,16 @@ irendertypebuffer$impl.func_228461_a_(); } - if (p_180453_2_.func_77951_h()) { + if (p_180453_2_.func_77973_b().showDurabilityBar(p_180453_2_)) { RenderSystem.disableDepthTest(); RenderSystem.disableTexture(); RenderSystem.disableAlphaTest(); RenderSystem.disableBlend(); Tessellator tessellator = Tessellator.func_178181_a(); BufferBuilder bufferbuilder = tessellator.func_178180_c(); - float f = (float)p_180453_2_.func_77952_i(); - float f1 = (float)p_180453_2_.func_77958_k(); - float f2 = Math.max(0.0F, (f1 - f) / f1); - int i = Math.round(13.0F - f * 13.0F / f1); - int j = MathHelper.func_181758_c(f2 / 3.0F, 1.0F, 1.0F); + double health = p_180453_2_.func_77973_b().getDurabilityForDisplay(p_180453_2_); + int i = Math.round(13.0F - (float)health * 13.0F); + int j = p_180453_2_.func_77973_b().getRGBDurabilityForDisplay(p_180453_2_); 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); RenderSystem.enableBlend(); @@ -295,4 +294,9 @@ public void func_195410_a(IResourceManager p_195410_1_) { this.field_175059_m.func_178085_b(); } + + @Override + public net.minecraftforge.resource.IResourceType getResourceType() { + return net.minecraftforge.resource.VanillaResourceType.MODELS; + } }