upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

BlockCrops is now the parent class of multiple types of crops, Wheat, Potatoes, and Carrots, updated getBlockDropped patch to reflect.

Browse Source
This commit is contained in:
LexManos committed 2012-10-21 10:22:56 -07:00
1 parent 067458bdc0
commit 3f03cc8c87
1 file changed
+40 -27
Download Patch File Download Diff File Expand all files Collapse all files
patches/common/net/minecraft/src/BlockCrops.java.patch
+40 -27
View File
@@ -12,7 +12,7 @@
public class BlockCrops extends BlockFlower
{
@@ -84,11 +88,11 @@
@@ -88,11 +92,11 @@
int var19 = par1World.getBlockId(var17, par3 - 1, var18);
float var20 = 0.0F;
@@ -26,42 +26,55 @@
{
var20 = 3.0F;
}
@@ -138,25 +142,27 @@
@@ -152,22 +156,37 @@
public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7)
{
super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, 0);
-
- if (!par1World.isRemote)
- {
- if (par5 >= 7)
- {
- int var8 = 3 + par7;
-
- for (int var9 = 0; var9 < var8; ++var9)
- {
- if (par1World.rand.nextInt(15) <= par5)
- {
- this.dropBlockAsItem_do(par1World, par2, par3, par4, new ItemStack(this.func_82532_h(), 1, 0));
- }
- }
- }
- }
+ }
+
+
+ @Override
+ public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
+ {
+ ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
+ if (metadata == 7)
+ {
+ ret.add(new ItemStack(Item.wheat));
+ {
+ int count = quantityDropped(metadata, fortune, world.rand);
+ for(int i = 0; i < count; i++)
+ {
+ int id = idDropped(metadata, world.rand, 0);
+ if (id > 0)
+ {
+ ret.add(new ItemStack(id, 1, damageDropped(metadata)));
+ }
+ }
+ }
+
+ if (metadata >= 7)
+ {
+ for (int n = 0; n < 3 + fortune; n++)
+ {
+ if (world.rand.nextInt(15) <= metadata)
+ {
+ ret.add(new ItemStack(this.func_82532_h(), 1, 0));
+ }
+ }
+ }
- if (!par1World.isRemote)
+ for (int n = 0; n < 3 + fortune; n++)
{
- int var8 = 3 + par7;
- for (int var9 = 0; var9 < var8; ++var9)
+ if (world.rand.nextInt(15) <= metadata)
{
- if (par1World.rand.nextInt(15) <= par5)
- {
- float var10 = 0.7F;
- float var11 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F;
- float var12 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F;
- float var13 = par1World.rand.nextFloat() * var10 + (1.0F - var10) * 0.5F;
- EntityItem var14 = new EntityItem(par1World, (double)((float)par2 + var11), (double)((float)par3 + var12), (double)((float)par4 + var13), new ItemStack(Item.seeds));
- var14.delayBeforeCanPickup = 10;
- par1World.spawnEntityInWorld(var14);
- }
+ ret.add(new ItemStack(Item.seeds));
}
}
+
+ return ret;
}