Skip to content

Add original parameter to ForgeHooks::onBlockBreakEvent. #6

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
BluSpring merged 1 commit into from
Oct 4, 2025
Merged

Add original parameter to ForgeHooks::onBlockBreakEvent. #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/main/java/net/minecraftforge/common/ForgeHooks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
import java.net.URISyntaxException;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.function.BooleanSupplier;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -457,12 +458,21 @@ public static void dropXpForBlock(BlockState state, ServerLevel level, BlockPos
state.getBlock().popExperience(level, pos, exp);
}

public static int onBlockBreakEvent(Level level, GameType gameType, ServerPlayer entityPlayer, BlockPos pos)
public static int onBlockBreakEvent(Level level, GameType gameType, ServerPlayer entityPlayer, BlockPos pos)
{
return kilt$onBlockBreakEvent(
level, gameType, entityPlayer, pos,
() -> entityPlayer.getMainHandItem().getItem().canAttackBlock(level.getBlockState(pos), level, pos, entityPlayer)
);
}

// Kilt: Call original for better mod compatibility
public static int kilt$onBlockBreakEvent(Level level, GameType gameType, ServerPlayer entityPlayer, BlockPos pos, BooleanSupplier original)
{
// Logic from tryHarvestBlock for pre-canceling the event
boolean preCancelEvent = false;
ItemStack itemstack = entityPlayer.getMainHandItem();
if (!itemstack.isEmpty() && !itemstack.getItem().canAttackBlock(level.getBlockState(pos), level, pos, entityPlayer))
if (!itemstack.isEmpty() && !original.getAsBoolean())
{
preCancelEvent = true;
}
Expand Down