mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
53 lines
2.5 KiB
Diff
53 lines
2.5 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
|
|
@@ -2,6 +2,7 @@
|
|
|
|
import cpw.mods.fml.relauncher.Side;
|
|
import cpw.mods.fml.relauncher.SideOnly;
|
|
+import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Random;
|
|
import net.minecraft.block.material.Material;
|
|
@@ -18,8 +19,9 @@
|
|
import net.minecraft.util.MathHelper;
|
|
import net.minecraft.world.IBlockAccess;
|
|
import net.minecraft.world.World;
|
|
+import net.minecraftforge.common.IShearable;
|
|
|
|
-public class BlockDoublePlant extends BlockBush implements IGrowable
|
|
+public class BlockDoublePlant extends BlockBush implements IGrowable, IShearable
|
|
{
|
|
public static final String[] field_149892_a = new String[] {"sunflower", "syringa", "grass", "fern", "rose", "paeonia"};
|
|
@SideOnly(Side.CLIENT)
|
|
@@ -81,6 +83,7 @@
|
|
|
|
public boolean func_149718_j(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
|
|
{
|
|
+ if (p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_, p_149718_4_) != this) return super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
|
|
int l = p_149718_1_.func_72805_g(p_149718_2_, p_149718_3_, p_149718_4_);
|
|
return func_149887_c(l) ? p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == this : p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ + 1, p_149718_4_) == this && super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_);
|
|
}
|
|
@@ -262,4 +265,22 @@
|
|
int l = this.func_149885_e(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
|
|
this.func_149642_a(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_, new ItemStack(this, 1, l));
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z)
|
|
+ {
|
|
+ int metadata = world.func_72805_g(x, y, z);
|
|
+ int type = func_149890_d(metadata);
|
|
+ return func_149887_c(metadata) && (type == 3 || type == 4);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
|
|
+ {
|
|
+ ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
|
|
+ int type = func_149890_d(world.func_72805_g(x, y, z));
|
|
+ if (type == 3 || type == 2)
|
|
+ ret.add(new ItemStack(Blocks.field_150329_H, 2, type == 3 ? 2 : 1));
|
|
+ return ret;
|
|
+ }
|
|
}
|