mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 20:22:28 +00:00
80 lines
3.5 KiB
Diff
80 lines
3.5 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockStem.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
|
|
@@ -2,6 +2,7 @@
|
|
|
|
import cpw.mods.fml.relauncher.Side;
|
|
import cpw.mods.fml.relauncher.SideOnly;
|
|
+import java.util.ArrayList;
|
|
import java.util.Random;
|
|
import net.minecraft.block.material.Material;
|
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
|
@@ -14,6 +15,7 @@
|
|
import net.minecraft.util.MathHelper;
|
|
import net.minecraft.world.IBlockAccess;
|
|
import net.minecraft.world.World;
|
|
+import static net.minecraftforge.common.util.ForgeDirection.*;
|
|
|
|
public class BlockStem extends BlockBush implements IGrowable
|
|
{
|
|
@@ -101,7 +103,7 @@
|
|
|
|
Block block = p_149674_1_.func_147439_a(j1, p_149674_3_ - 1, k1);
|
|
|
|
- if (p_149674_1_.func_147439_a(j1, p_149674_3_, k1).field_149764_J == Material.field_151579_a && (block == Blocks.field_150458_ak || block == Blocks.field_150346_d || block == Blocks.field_150349_c))
|
|
+ if (p_149674_1_.func_147437_c(j1, p_149674_3_, k1) && (block.canSustainPlant(p_149674_1_, j1, p_149674_3_ - 1, k1, UP, this) || block == Blocks.field_150346_d || block == Blocks.field_150349_c))
|
|
{
|
|
p_149674_1_.func_147449_b(j1, p_149674_3_, k1, this.field_149877_a);
|
|
}
|
|
@@ -144,11 +146,11 @@
|
|
Block block8 = p_149875_1_.func_147439_a(l, p_149875_3_ - 1, i1);
|
|
float f1 = 0.0F;
|
|
|
|
- if (block8 == Blocks.field_150458_ak)
|
|
+ if (block8.canSustainPlant(p_149875_1_, l, p_149875_3_ - 1, i1, UP, this))
|
|
{
|
|
f1 = 1.0F;
|
|
|
|
- if (p_149875_1_.func_72805_g(l, p_149875_3_ - 1, i1) > 0)
|
|
+ if (block8.isFertile(p_149875_1_, l, p_149875_3_ - 1, i1))
|
|
{
|
|
f1 = 3.0F;
|
|
}
|
|
@@ -211,11 +213,12 @@
|
|
return l < 7 ? -1 : (p_149873_1_.func_147439_a(p_149873_2_ - 1, p_149873_3_, p_149873_4_) == this.field_149877_a ? 0 : (p_149873_1_.func_147439_a(p_149873_2_ + 1, p_149873_3_, p_149873_4_) == this.field_149877_a ? 1 : (p_149873_1_.func_147439_a(p_149873_2_, p_149873_3_, p_149873_4_ - 1) == this.field_149877_a ? 2 : (p_149873_1_.func_147439_a(p_149873_2_, p_149873_3_, p_149873_4_ + 1) == this.field_149877_a ? 3 : -1))));
|
|
}
|
|
|
|
+ @SuppressWarnings("unused")
|
|
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_)
|
|
{
|
|
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 (false && !p_149690_1_.field_72995_K)
|
|
{
|
|
Item item = null;
|
|
|
|
@@ -282,4 +285,23 @@
|
|
{
|
|
this.func_149874_m(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
|
|
}
|
|
+
|
|
+
|
|
+ @Override
|
|
+ public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune)
|
|
+ {
|
|
+ ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
|
|
+
|
|
+ Item item = null;
|
|
+ item = field_149877_a == Blocks.field_150423_aK ? Items.field_151080_bb : item;
|
|
+ item = field_149877_a == Blocks.field_150440_ba ? Items.field_151081_bc : item;
|
|
+
|
|
+ for (int i = 0; item != null && i < 3; i++)
|
|
+ {
|
|
+ if (world.field_73012_v.nextInt(15) <= meta)
|
|
+ ret.add(new ItemStack(item));
|
|
+ }
|
|
+
|
|
+ return ret;
|
|
+ }
|
|
}
|