etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #967 from GirafiStudios/BOP-1.11.x-6.0.x 

Fixed Botania horn of the wild support
This commit is contained in:
Adubbz 2017-03-11 09:14:53 +11:00 committed by GitHub
parent 6b3344a511 38bc788229
commit 28370f7092
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/biomesoplenty/common/block/BlockBOPFlower.java
View File

@ -44,7 +44,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@Optional.Interface(iface = "vazkii.botania.api.item.IHornHarvestable", modid = "Botania") @Optional.Interface(iface = "vazkii.botania.api.item.IHornHarvestable", modid = "botania")
public class BlockBOPFlower extends BlockBOPDecoration implements IShearable, IHornHarvestable public class BlockBOPFlower extends BlockBOPDecoration implements IShearable, IHornHarvestable
{ {
@ -347,7 +347,7 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable, IH
public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { return new ArrayList<ItemStack>(); } public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { return new ArrayList<ItemStack>(); }
@Override @Override
@Optional.Method(modid = "Botania") @Optional.Method(modid = "botania")
public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType)
{ {
if (hornType != EnumHornType.WILD) return false; if (hornType != EnumHornType.WILD) return false;
@ -360,14 +360,14 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable, IH
} }
@Override @Override
@Optional.Method(modid = "Botania") @Optional.Method(modid = "botania")
public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType)
{ {
return false; return false;
} }
@Override @Override
@Optional.Method(modid = "Botania") @Optional.Method(modid = "botania")
public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType)
{ {
} }

8
src/main/java/biomesoplenty/common/block/BlockBOPPlant.java
View File

@ -57,7 +57,7 @@ import java.util.Random;
// TODO: pick block? // TODO: pick block?
@Optional.Interface(iface = "vazkii.botania.api.item.IHornHarvestable", modid = "Botania") @Optional.Interface(iface = "vazkii.botania.api.item.IHornHarvestable", modid = "botania")
public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHornHarvestable public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHornHarvestable
{ {
@ -576,7 +576,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo
} }
@Override @Override
@Optional.Method(modid = "Botania") @Optional.Method(modid = "botania")
public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType)
{ {
if (hornType != EnumHornType.WILD) return false; if (hornType != EnumHornType.WILD) return false;
@ -595,14 +595,14 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo
} }
@Override @Override
@Optional.Method(modid = "Botania") @Optional.Method(modid = "botania")
public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType)
{ {
return false; return false;
} }
@Override @Override
@Optional.Method(modid = "Botania") @Optional.Method(modid = "botania")
public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType)
{ {
} }