From 1931d4fc09f462e12be2ceb0127fa04ec61e7cd4 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 9 Dec 2011 04:40:32 +0000 Subject: [PATCH] For for updated mappings. --- .../net/minecraft/src/Chunk.java.patch | 24 ++++++------------- .../net/minecraft/src/EntityPlayer.java.patch | 8 +++---- .../net/minecraft/src/ItemRenderer.java.patch | 10 ++++---- .../net/minecraft/src/RenderItem.java.patch | 2 +- .../net/minecraft/src/Item.java.patch | 2 +- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 799878f10..613f25257 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -8,15 +8,7 @@ import java.io.PrintStream; import java.util.*; -@@ -348,6 +349,7 @@ - } - int i2 = xPosition * 16 + i; - int j2 = zPosition * 16 + k; -+ - blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff); - if(l1 != 0) - { -@@ -390,7 +392,7 @@ +@@ -390,7 +391,7 @@ TileEntity tileentity = getChunkBlockTileEntity(i, j, k); if(tileentity == null) { @@ -25,7 +17,7 @@ worldObj.setBlockTileEntity(i, j, k, tileentity); } if(tileentity != null) -@@ -398,14 +400,6 @@ +@@ -398,14 +399,6 @@ tileentity.func_35144_b(); } } @@ -40,17 +32,15 @@ } isModified = true; return true; -@@ -427,10 +421,13 @@ - } - int l1 = xPosition * 16 + i; - int i2 = zPosition * 16 + k; -+ - blocks[i << worldObj.field_35471_b | k << worldObj.field_35473_a | j] = (byte)(byte0 & 0xff); +@@ -430,7 +423,11 @@ + blocks[i << worldObj.xShift | k << worldObj.heightShift | j] = (byte)(byte0 & 0xff); if(k1 != 0) { - Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); -+ if (!worldObj.multiplayerWorld) ++ if (!worldObj.multiplayerWorld) ++ { + Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2); ++ } + removeChunkBlockTileEntity(i, j, k); } data.setNibble(i, j, k, 0); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index 0a3eff1d8..3e10b58eb 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -41,14 +41,14 @@ + f += i * i + 1; + } + -+ if(isPotionActive(Potion.potionDigSpeed)) ++ if(isPotionActive(Potion.digSpeed)) + { -+ f *= 1.0F + (float)(getActivePotionEffect(Potion.potionDigSpeed).getAmplifier() + 1) * 0.2F; ++ f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F; + } + -+ if(isPotionActive(Potion.potionDigSlow)) ++ if(isPotionActive(Potion.digSlowdown)) + { -+ f *= 1.0F - (float)(getActivePotionEffect(Potion.potionDigSlow).getAmplifier() + 1) * 0.2F; ++ f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F; + } + + if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory)) diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index bd6528e6e..a38f491e9 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -17,16 +17,16 @@ GL11.glPushMatrix(); - if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) + ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); -+ ++ + if (customRenderer != null) { -+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); -+ ForgeHooksClient.overrideTexture (itemstack.getItem()); -+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (itemstack.getItem()); ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); + } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); + ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); - renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); + renderBlocksInstance.renderBlockAsItem(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F); } else { if(itemstack.itemID < 256) diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index cbd909181..08da9b35e 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -99,7 +99,7 @@ + ForgeHooksClient.overrideTexture (Block.blocksList[i]); Block block = Block.blocksList[j1]; GL11.glPushMatrix(); - GL11.glTranslatef(l - 2, i1 + 3, -3F + field_40268_b); + GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel); @@ -215,9 +274,11 @@ if(i < 256) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index e2e0d081f..8c426a6f4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 @@ -175,6 +175,9 @@ - private String field_39006_bR; + private String potionInfo; private String itemName; + // FORGE: To disable repair recipes.