Skip to content

Fix Bound Pickaxe ignoring claims and bound tools not checking if they can act on modded block #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dream-Master merged 6 commits into from
Jul 12, 2026
Merged

Fix Bound Pickaxe ignoring claims and bound tools not checking if they can act on modded block #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1e7bd9
Fix Bound Pickaxe ignoring claims
Algent Jun 28, 2026
936e501
Make bound tools work with modded blocks
Algent Jul 1, 2026
c8cc000
Add a fix against a NPE risk, rename function to clarify.
Algent Jul 5, 2026
83bb4aa
Merge branch 'master' into algent/fix-pickaxe
Dream-Master Jul 7, 2026
ba42e02
Remove duplicate check
koolkrafter5 Jul 12, 2026
ff47216
Merge branch 'master' into algent/fix-pickaxe
koolkrafter5 Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer play
}

// getStrVsBlock
if ((func_150893_a(item, block) <= 1f && !(block instanceof BlockLeavesBase))
|| BoundPickaxe.checkPermissions(world, x, y, z, block, meta, player)) {
if ((!ForgeHooks.isToolEffective(item, block, meta) && func_150893_a(item, block) <= 1f
&& !(block instanceof BlockLeavesBase))
|| BoundPickaxe.isBreakDenied(world, x, y, z, player)) {
continue;
}
if (silkTouch && block.canSilkHarvest(world, player, x, y, z, meta)) {
Expand Down
20 changes: 13 additions & 7 deletions src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.BlockEvent;

import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
Expand Down Expand Up @@ -118,7 +117,8 @@ public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer play
}

// getStrVsBlock
if (func_150893_a(item, block) <= 1f || checkPermissions(world, x, y, z, block, meta, player)) {
if ((!ForgeHooks.isToolEffective(item, block, meta) && func_150893_a(item, block) <= 1f)
|| isBreakDenied(world, x, y, z, player)) {
continue;
}
if (silkTouch && block.canSilkHarvest(world, player, x, y, z, meta)) {
Expand Down Expand Up @@ -147,10 +147,16 @@ public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer play
return item;
}

public static boolean checkPermissions(World world, int x, int y, int z, Block block, int meta,
EntityPlayer player) {
final BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(x, y, z, world, block, meta, player);
return MinecraftForge.EVENT_BUS.post(event);
/**
* Fires the block break event so protection mods can veto the break. Returns true if the break was denied.
*/
public static boolean isBreakDenied(World world, int x, int y, int z, EntityPlayer player) {
if (!(player instanceof EntityPlayerMP mpPlayer) || mpPlayer.playerNetServerHandler == null) {
return false;
}

return ForgeHooks.onBlockBreakEvent(world, mpPlayer.theItemInWorldManager.getGameType(), mpPlayer, x, y, z)
.isCanceled();
}

public static void dropMultisetStacks(Multiset<ItemType> dropMultiset, World world, double x, double y, double z) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer play
}

// getStrVsBlock
if (func_150893_a(item, block) <= 1f
|| BoundPickaxe.checkPermissions(world, x, y, z, block, meta, player)) {
if ((!ForgeHooks.isToolEffective(item, block, meta) && func_150893_a(item, block) <= 1f)
|| BoundPickaxe.isBreakDenied(world, x, y, z, player)) {
continue;
}
if (silkTouch && block.canSilkHarvest(world, player, x, y, z, meta)) {
Expand Down
2 changes: 1 addition & 1 deletion ...Time/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaEffect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void breakBlock(ItemStack container, World world, EntityPlayer player, fl
float localHardness = block.getBlockHardness(world, x, y, z);

if (localHardness < 0 || localHardness - this.getHardnessDifference() > blockHardness
|| BoundPickaxe.checkPermissions(world, x, y, z, block, meta, player)) {
|| BoundPickaxe.isBreakDenied(world, x, y, z, player)) {
return;
}

Expand Down