lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Bound tools now use BlockStack

Browse source 
Clean code is happy code
This commit is contained in:
Nick 2016-01-09 17:42:48 -08:00
parent cdc045f7be
commit 9eee22affc
3 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item; package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.ItemStackWrapper;
import com.google.common.collect.HashMultiset; import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
@ -38,9 +39,7 @@ public class ItemBoundAxe extends ItemBoundTool
protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge)
{ {
if (world.isRemote) if (world.isRemote)
{
return; return;
}
boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(player); boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(player);
int fortuneLvl = EnchantmentHelper.getFortuneModifier(player); int fortuneLvl = EnchantmentHelper.getFortuneModifier(player);
@ -57,20 +56,19 @@ public class ItemBoundAxe extends ItemBoundTool
for (int k = -range; k <= range; k++) for (int k = -range; k <= range; k++)
{ {
BlockPos blockPos = playerPos.add(i, j, k); BlockPos blockPos = playerPos.add(i, j, k);
Block block = world.getBlockState(blockPos).getBlock(); BlockStack blockStack = BlockStack.getStackFromPos(world, blockPos);
int blockMeta = block.getMetaFromState(world.getBlockState(blockPos));
if (block != null && block.getBlockHardness(world, blockPos) != -1) if (blockStack.getBlock().getBlockHardness(world, blockPos) != -1)
{ {
float strengthVsBlock = getStrVsBlock(stack, block); float strengthVsBlock = getStrVsBlock(stack, blockStack.getBlock());
if (strengthVsBlock > 1.1F || block instanceof BlockLeavesBase && world.canMineBlockBody(player, blockPos)) if (strengthVsBlock > 1.1F || blockStack.getBlock() instanceof BlockLeavesBase && world.canMineBlockBody(player, blockPos))
{ {
if (silkTouch && block.canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player))
drops.add(new ItemStackWrapper(block, 1, blockMeta)); drops.add(new ItemStackWrapper(blockStack));
else else
{ {
List<ItemStack> itemDrops = block.getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); List<ItemStack> itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl);
if (itemDrops != null) if (itemDrops != null)
for (ItemStack stacks : itemDrops) for (ItemStack stacks : itemDrops)

16
src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java
View file

@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import WayofTime.bloodmagic.api.BlockStack;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
@ -44,9 +45,7 @@ public class ItemBoundPickaxe extends ItemBoundTool
protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge)
{ {
if (world.isRemote) if (world.isRemote)
{
return; return;
}
boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(player); boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(player);
int fortuneLvl = EnchantmentHelper.getFortuneModifier(player); int fortuneLvl = EnchantmentHelper.getFortuneModifier(player);
@ -63,20 +62,19 @@ public class ItemBoundPickaxe extends ItemBoundTool
for (int k = -range; k <= range; k++) for (int k = -range; k <= range; k++)
{ {
BlockPos blockPos = playerPos.add(i, j, k); BlockPos blockPos = playerPos.add(i, j, k);
Block block = world.getBlockState(blockPos).getBlock(); BlockStack blockStack = BlockStack.getStackFromPos(world, blockPos);
int blockMeta = block.getMetaFromState(world.getBlockState(blockPos));
if (block != null && block.getBlockHardness(world, blockPos) != -1) if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(world, blockPos) != -1)
{ {
float strengthVsBlock = getStrVsBlock(stack, block); float strengthVsBlock = getStrVsBlock(stack, blockStack.getBlock());
if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos))
{ {
if (silkTouch && block.canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player))
drops.add(new ItemStackWrapper(block, 1, blockMeta)); drops.add(new ItemStackWrapper(blockStack));
else else
{ {
List<ItemStack> itemDrops = block.getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); List<ItemStack> itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl);
if (itemDrops != null) if (itemDrops != null)
for (ItemStack stacks : itemDrops) for (ItemStack stacks : itemDrops)

16
src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.item; package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.ItemStackWrapper;
import com.google.common.collect.HashMultiset; import com.google.common.collect.HashMultiset;
@ -38,9 +39,7 @@ public class ItemBoundShovel extends ItemBoundTool
protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge) protected void onBoundRelease(ItemStack stack, World world, EntityPlayer player, int charge)
{ {
if (world.isRemote) if (world.isRemote)
{
return; return;
}
boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(player); boolean silkTouch = EnchantmentHelper.getSilkTouchModifier(player);
int fortuneLvl = EnchantmentHelper.getFortuneModifier(player); int fortuneLvl = EnchantmentHelper.getFortuneModifier(player);
@ -57,20 +56,19 @@ public class ItemBoundShovel extends ItemBoundTool
for (int k = -range; k <= range; k++) for (int k = -range; k <= range; k++)
{ {
BlockPos blockPos = playerPos.add(i, j, k); BlockPos blockPos = playerPos.add(i, j, k);
Block block = world.getBlockState(blockPos).getBlock(); BlockStack blockStack = BlockStack.getStackFromPos(world, blockPos);
int blockMeta = block.getMetaFromState(world.getBlockState(blockPos));
if (block != null && block.getBlockHardness(world, blockPos) != -1) if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(world, blockPos) != -1)
{ {
float strengthVsBlock = getStrVsBlock(stack, block); float strengthVsBlock = getStrVsBlock(stack, blockStack.getBlock());
if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos)) if (strengthVsBlock > 1.1F && world.canMineBlockBody(player, blockPos))
{ {
if (silkTouch && block.canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player)) if (silkTouch && blockStack.getBlock().canSilkHarvest(world, blockPos, world.getBlockState(blockPos), player))
drops.add(new ItemStackWrapper(block, 1, blockMeta)); drops.add(new ItemStackWrapper(blockStack));
else else
{ {
List<ItemStack> itemDrops = block.getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl); List<ItemStack> itemDrops = blockStack.getBlock().getDrops(world, blockPos, world.getBlockState(blockPos), fortuneLvl);
if (itemDrops != null) if (itemDrops != null)
for (ItemStack stacks : itemDrops) for (ItemStack stacks : itemDrops)