diff --git a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch index 306da85741..386cc420aa 100644 --- a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch @@ -25,40 +25,18 @@ } public void func_149674_a(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) -@@ -62,25 +64,28 @@ +@@ -62,7 +64,9 @@ public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_) { - if (!p_149690_1_.field_72995_K) + super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_); -+ /* -+ if (!p_149690_1_.isRemote) ++ ++ if (false && !p_149690_1_.field_72995_K) { int j1 = 1; - if (p_149690_5_ >= 3) - { -- j1 = 2 + p_149690_1_.field_73012_v.nextInt(3); -+ j1 = 2 + p_149690_1_.rand.nextInt(3); - - if (p_149690_7_ > 0) - { -- j1 += p_149690_1_.field_73012_v.nextInt(p_149690_7_ + 1); -+ j1 += p_149690_1_.rand.nextInt(p_149690_7_ + 1); - } - } - - for (int k1 = 0; k1 < j1; ++k1) - { -- this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(Items.field_151075_bm)); -+ this.dropBlockAsItem(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(Items.nether_wart)); - } - } -+ */ - } - - public Item func_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_) -@@ -109,4 +114,23 @@ +@@ -109,4 +113,23 @@ this.field_149883_a[i] = p_149651_1_.func_94245_a(this.func_149641_N() + "_stage_" + i); } } diff --git a/patches/minecraft/net/minecraft/block/BlockStem.java.patch b/patches/minecraft/net/minecraft/block/BlockStem.java.patch index 41d698267f..b8009e99ff 100644 --- a/patches/minecraft/net/minecraft/block/BlockStem.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockStem.java.patch @@ -39,45 +39,16 @@ { f1 = 3.0F; } -@@ -215,28 +217,30 @@ +@@ -215,7 +217,7 @@ { super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_); - if (!p_149690_1_.field_72995_K) -+ /* -+ if (!p_149690_1_.isRemote) ++ if (false && !p_149690_1_.field_72995_K) { Item item = null; -- if (this.field_149877_a == Blocks.field_150423_aK) -+ if (this.field_149877_a == Blocks.pumpkin) - { -- item = Items.field_151080_bb; -+ item = Items.pumpkin_seeds; - } - -- if (this.field_149877_a == Blocks.field_150440_ba) -+ if (this.field_149877_a == Blocks.melon_block) - { -- item = Items.field_151081_bc; -+ item = Items.melon_seeds; - } - - for (int j1 = 0; j1 < 3; ++j1) - { -- if (p_149690_1_.field_73012_v.nextInt(15) <= p_149690_5_) -+ if (p_149690_1_.rand.nextInt(15) <= p_149690_5_) - { -- this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(item)); -+ this.dropBlockAsItem(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(item)); - } - } - } -+ */ - } - - public Item func_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_) -@@ -282,4 +286,22 @@ +@@ -282,4 +284,22 @@ { this.func_149874_m(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_); } diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index 407d4ee1bf..7804c622ce 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -22,83 +22,41 @@ @SideOnly(Side.CLIENT) public class ItemRenderer { -@@ -49,32 +57,43 @@ +@@ -49,13 +57,24 @@ public void func_78443_a(EntityLivingBase p_78443_1_, ItemStack p_78443_2_, int p_78443_3_) { + this.renderItem(p_78443_1_, p_78443_2_, p_78443_3_, EQUIPPED); + } + -+ public void renderItem(EntityLivingBase par1EntityLivingBase, ItemStack par2ItemStack, int par3, ItemRenderType type) ++ public void renderItem(EntityLivingBase p_78443_1_, ItemStack p_78443_2_, int p_78443_3_, ItemRenderType type) + { GL11.glPushMatrix(); TextureManager texturemanager = this.field_78455_a.func_110434_K(); -- Item item = p_78443_2_.func_77973_b(); -+ Item item = par2ItemStack.func_77973_b(); + Item item = p_78443_2_.func_77973_b(); Block block = Block.func_149634_a(item); - if (p_78443_2_.func_94608_d() == 0 && item instanceof ItemBlock && RenderBlocks.func_147739_a(block.func_149645_b())) -+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack, type); ++ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(p_78443_2_, type); + if (customRenderer != null) { -+ texturemanager.func_110577_a(texturemanager.func_130087_a(par2ItemStack.func_94608_d())); -+ ForgeHooksClient.renderEquippedItem(type, customRenderer, field_147720_h, par1EntityLivingBase, par2ItemStack); ++ texturemanager.func_110577_a(texturemanager.func_130087_a(p_78443_2_.func_94608_d())); ++ ForgeHooksClient.renderEquippedItem(type, customRenderer, field_147720_h, p_78443_1_, p_78443_2_); + } -+ else if (par2ItemStack.func_94608_d() == 0 && item instanceof ItemBlock && RenderBlocks.func_147739_a(block.func_149645_b())) ++ else if (p_78443_2_.func_94608_d() == 0 && item instanceof ItemBlock && RenderBlocks.func_147739_a(block.func_149645_b())) + { texturemanager.func_110577_a(texturemanager.func_130087_a(0)); -- if (p_78443_2_ != null && p_78443_2_.func_77973_b() instanceof ItemCloth) -+ if (par2ItemStack != null && par2ItemStack.func_77973_b() instanceof ItemCloth) - { - GL11.glEnable(GL11.GL_BLEND); - GL11.glDepthMask(false); - OpenGlHelper.func_148821_a(770, 771, 1, 0); -- this.field_147720_h.func_147800_a(block, p_78443_2_.func_77960_j(), 1.0F); -+ this.field_147720_h.func_147800_a(block, par2ItemStack.func_77960_j(), 1.0F); - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_BLEND); - } - else - { -- this.field_147720_h.func_147800_a(block, p_78443_2_.func_77960_j(), 1.0F); -+ this.field_147720_h.func_147800_a(block, par2ItemStack.func_77960_j(), 1.0F); - } - } - else - { -- IIcon iicon = p_78443_1_.func_70620_b(p_78443_2_, p_78443_3_); -+ IIcon iicon = par1EntityLivingBase.func_70620_b(par2ItemStack, par3); - - if (iicon == null) - { -@@ -82,7 +101,7 @@ - return; - } - -- texturemanager.func_110577_a(texturemanager.func_130087_a(p_78443_2_.func_94608_d())); -+ texturemanager.func_110577_a(texturemanager.func_130087_a(par2ItemStack.func_94608_d())); - TextureUtil.func_147950_a(false, false); - Tessellator tessellator = Tessellator.field_78398_a; - float f = iicon.func_94209_e(); + if (p_78443_2_ != null && p_78443_2_.func_77973_b() instanceof ItemCloth) @@ -100,7 +119,7 @@ GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F); func_78439_a(tessellator, f1, f2, f, f3, iicon.func_94211_a(), iicon.func_94216_b(), 0.0625F); - if (p_78443_2_.func_77962_s() && p_78443_3_ == 0) -+ if (par2ItemStack.hasEffect(par3)) ++ if (p_78443_2_.hasEffect(p_78443_3_)) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); -@@ -132,7 +151,7 @@ - } - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); -- texturemanager.func_110577_a(texturemanager.func_130087_a(p_78443_2_.func_94608_d())); -+ texturemanager.func_110577_a(texturemanager.func_130087_a(par2ItemStack.func_94608_d())); - TextureUtil.func_147945_b(); - } - @@ -273,7 +292,7 @@ RenderPlayer renderplayer; Render render; 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 a81766c65b..3dfed079a7 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch @@ -209,32 +209,17 @@ } catch (Throwable throwable) { -@@ -518,26 +578,45 @@ +@@ -518,7 +578,8 @@ throw new ReportedException(crashreport); } - if (p_82406_3_.func_77962_s()) -+ /* Forge: Bugfix, Move this to a per-render pass, modders must handle themselves -+ if (par3ItemStack.hasEffect()) ++ // Forge: Bugfix, Move this to a per-render pass, modders must handle themselves ++ if (false && p_82406_3_.func_77962_s()) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); -- p_82406_2_.func_110577_a(field_110798_h); -+ par2TextureManager.bindTexture(RES_ITEM_GLINT); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); -- this.func_77018_a(p_82406_4_ * 431278612 + p_82406_5_ * 32178161, p_82406_4_ - 2, p_82406_5_ - 2, 20, 20); -+ this.renderGlint(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } -+ */ - - this.field_77023_b -= 50.0F; +@@ -538,6 +599,23 @@ } } @@ -258,7 +243,7 @@ private void func_77018_a(int p_77018_1_, int p_77018_2_, int p_77018_3_, int p_77018_4_, int p_77018_5_) { for (int j1 = 0; j1 < 2; ++j1) -@@ -638,4 +717,42 @@ +@@ -638,4 +716,42 @@ { this.func_76986_a((EntityItem)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); } diff --git a/patches/minecraft/net/minecraft/server/management/PlayerManager.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerManager.java.patch index ffd28afeaf..adb6ee9e7c 100644 --- a/patches/minecraft/net/minecraft/server/management/PlayerManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerManager.java.patch @@ -56,7 +56,7 @@ { this.func_151252_a(PlayerManager.this.field_72701_a.func_147438_o(i, j, k)); } -@@ -410,37 +420,42 @@ +@@ -410,13 +420,14 @@ { int l; @@ -67,25 +67,13 @@ j = this.field_73264_c.field_77275_b * 16; this.func_151251_a(new S21PacketChunkData(PlayerManager.this.field_72701_a.func_72964_e(this.field_73264_c.field_77276_a, this.field_73264_c.field_77275_b), false, this.field_73260_f)); -+ /* Forge: Grabs ALL tile entities is costly on a modded server, only send needed ones - for (k = 0; k < 16; ++k) +- for (k = 0; k < 16; ++k) ++ // Forge: Grabs ALL tile entities is costly on a modded server, only send needed ones ++ for (k = 0; false && k < 16; ++k) { -- if ((this.field_73260_f & 1 << k) != 0) -+ if ((this.flagsYAreasToUpdate & 1 << k) != 0) + if ((this.field_73260_f & 1 << k) != 0) { - l = k << 4; -- List list = PlayerManager.this.field_72701_a.func_147486_a(i, l, j, i + 16, l + 16, j + 16); -+ List list = PlayerManager.this.theWorldServer.func_147486_a(i, l, j, i + 16, l + 16, j + 16); - - for (int i1 = 0; i1 < list.size(); ++i1) - { -- this.func_151252_a((TileEntity)list.get(i1)); -+ this.sendTileToAllPlayersWatchingChunk((TileEntity)list.get(i1)); - } - } - } -+ */ - } +@@ -433,14 +444,17 @@ else { this.func_151251_a(new S22PacketMultiBlockChange(this.field_73262_e, this.field_151254_d, PlayerManager.this.field_72701_a.func_72964_e(this.field_73264_c.field_77276_a, this.field_73264_c.field_77275_b))); diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index b69386d8ad..8a3c3af133 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -1,5 +1,5 @@ net/minecraft/client/particle/EntityDiggingFX.(Lnet/minecraft/world/World;DDDDDDLnet/minecraft/block/Block;II)V=|p_i1234_1_,p_i1234_2_,p_i1234_4_,p_i1234_6_,p_i1234_8_,p_i1234_10_,p_i1234_12_,p_i1234_14_,p_i1234_15_,side -net/minecraft/client/renderer/ItemRenderer.renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer/ItemRenderType;)V=|p_78443_1_,p_78443_2_,p_78443_3_,type +net/minecraft/client/renderer/ItemRenderer.renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V=|p_78443_1_,p_78443_2_,p_78443_3_,type net/minecraft/client/renderer/RenderGlobal.drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V=|p_72717_1_,p_72717_2_,p_72717_3_ net/minecraft/client/renderer/entity/RenderItem.renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V=|p_77020_1_,p_77020_2_,p_77020_3_,p_77020_4_,p_77020_5_,p_77020_6_,p_77020_7_,pass net/minecraft/client/renderer/entity/RenderItem.renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V=|p_77015_1_,p_77015_2_,p_77015_3_,p_77015_4_,p_77015_5_,renderEffect