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

Fix bound tools working on incorrect materials (#752)

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-05-27 23:03:32 -07:00
parent 6302ce8133
commit 36a5b7f6a1
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import java.util.Set;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLeaves;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
@ -84,11 +85,14 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider
if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos)) if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos))
continue; continue;
if (blockStack.getState().getMaterial() != Material.WOOD && !EFFECTIVE_ON.contains(blockStack.getBlock()))
continue;
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player); BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player);
if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY)
continue; continue;
if (blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1) if (blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1.0F)
{ {
float strengthVsBlock = getStrVsBlock(stack, blockStack.getState()); float strengthVsBlock = getStrVsBlock(stack, blockStack.getState());

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

@ -101,6 +101,9 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider
if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos)) if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos))
continue; continue;
if (blockStack.getState().getMaterial() != Material.ROCK && !EFFECTIVE_ON.contains(blockStack.getBlock()))
continue;
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player); BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player);
if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY)
continue; continue;

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

@ -5,6 +5,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
@ -83,10 +84,15 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider
if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos)) if (blockStack.getBlock().isAir(blockStack.getState(), world, blockPos))
continue; continue;
Material material = blockStack.getState().getMaterial();
if (material != Material.GROUND && material != Material.CLAY && material != Material.GRASS && !EFFECTIVE_ON.contains(blockStack.getBlock()))
continue;
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player); BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockPos, blockStack.getState(), player);
if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY)
continue; continue;
if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1) if (blockStack.getBlock() != null && blockStack.getBlock().getBlockHardness(blockStack.getState(), world, blockPos) != -1)
{ {
float strengthVsBlock = getStrVsBlock(stack, blockStack.getState()); float strengthVsBlock = getStrVsBlock(stack, blockStack.getState());