From d08641aae5c4b81661b671ac3756b411959c22bd Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 6 Dec 2011 07:41:59 +0000 Subject: [PATCH] Fixed fortune enchant. This breaks forge's quantityDropped signature, be careful when updating mods. --- .../net/minecraft/src/Block.java.patch | 23 ++++++++++--------- .../net/minecraft/src/Block.java.patch | 18 ++++++++------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/patches/minecraft/net/minecraft/src/Block.java.patch b/patches/minecraft/net/minecraft/src/Block.java.patch index 07adca7714..0e126e746b 100644 --- a/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/patches/minecraft/net/minecraft/src/Block.java.patch @@ -25,7 +25,7 @@ } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -438,25 +441,41 @@ +@@ -438,25 +441,42 @@ { return 1; } @@ -33,9 +33,9 @@ + + /* FORGE: Metadata-sensitive version. + */ -+ public int quantityDropped(int i, Random random) ++ public int quantityDropped(int meta, int fortune, Random random) + { -+ return quantityDropped(random); ++ return func_40198_a(fortune, random); + } + public int idDropped(int i, Random random, int j) @@ -65,28 +65,29 @@ + /* FORGE: This function returns the complete list of drops for a block. + */ + public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { -+ ArrayList tr=new ArrayList(); ++ int i, int j, int k, int md, int fortune) { ++ ++ ArrayList tr = new ArrayList(); + -+ int q=quantityDropped(md,world.rand); -+ for(int n=0; n 0) { -+ tr.add(new ItemStack(id,1,damageDropped(md))); ++ tr.add(new ItemStack(id, 1, damageDropped(md))); + } + } + return tr; } public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) -@@ -470,18 +489,13 @@ +@@ -470,18 +490,13 @@ { return; } - int j1 = func_40198_a(i1, world.rand); - for(int k1 = 0; k1 < j1; k1++) - { -+ ArrayList ar = getBlockDropped(world,i,j,k,l); ++ ArrayList ar = getBlockDropped(world, i, j, k, l, i1); + for (ItemStack ist : ar) { if(world.rand.nextFloat() > f) { @@ -101,7 +102,7 @@ } } -@@ -805,6 +819,107 @@ +@@ -805,6 +820,107 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } diff --git a/patches/minecraft_server/net/minecraft/src/Block.java.patch b/patches/minecraft_server/net/minecraft/src/Block.java.patch index ed12169be5..8fcdce6f1e 100644 --- a/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -8,15 +8,15 @@ import java.util.ArrayList; import java.util.Random; -@@ -384,26 +385,41 @@ +@@ -384,26 +385,43 @@ return 1; } + /* FORGE: Metadata-sensitive version. + */ -+ public int quantityDropped(int i, Random random) ++ public int quantityDropped(int meta, int fortune, Random random) + { -+ return quantityDropped(random); ++ return func_40162_a(fortune, random); + } + public int idDropped(int i, Random random, int j) @@ -24,6 +24,7 @@ return blockID; } - ++ + /* FORGE: This function isnt called by Minecraft anymore. Use + * blockStrength(EntityPlayer,int) instead. + */ @@ -47,10 +48,11 @@ + /* FORGE: This function returns the complete list of drops for a block. + */ + public ArrayList getBlockDropped(World world, -+ int i, int j, int k, int md) { ++ int i, int j, int k, int md, int fortune) { ++ + ArrayList tr = new ArrayList(); + -+ int q = quantityDropped(md, world.rand); ++ int q = quantityDropped(md, fortune, world.rand); + for(int n = 0; n < q; n++) { + int id = idDropped(md, world.rand, 0); + if (id > 0) { @@ -63,13 +65,13 @@ public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) { dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1); -@@ -415,18 +431,14 @@ +@@ -415,18 +433,14 @@ { return; } - int j1 = func_40162_a(i1, world.rand); - for(int k1 = 0; k1 < j1; k1++) -+ ArrayList ar = getBlockDropped(world,i,j,k,l); ++ ArrayList ar = getBlockDropped(world, i, j, k, l, i1); + for (ItemStack ist : ar) { if(world.rand.nextFloat() > f) @@ -85,7 +87,7 @@ } } -@@ -725,6 +737,99 @@ +@@ -725,6 +739,99 @@ return blockMaterial.getMaterialMobility(); }