Skip to content
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

Use CommonHooks.getCraftingRemainder #1585 #1672

Open
wants to merge 5 commits into
base: 1.21.x
Choose a base branch
from
+6 −10
Open

Use CommonHooks.getCraftingRemainder #1585 #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b02552
Destroys items if damaged enough in crafting #1585
ewoudje Nov 8, 2024
31e82c3
Use CommonHooks.getCraftingRemaining instead of IItemStackExtension
ewoudje Nov 8, 2024
4e951ca
Revert "Use CommonHooks.getCraftingRemaining instead of IItemStackExt…
ewoudje Nov 8, 2024
7f22bcc
Inline CommonHooks call
ewoudje Nov 9, 2024
95dd711
Small fix
ewoudje Nov 9, 2024
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
9 changes: 0 additions & 9 deletions src/main/java/net/neoforged/neoforge/common/CommonHooks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,15 +738,6 @@ public static Player getCraftingPlayer() {
return craftingPlayer.get();
}

public static ItemStack getCraftingRemainder(ItemStack stack) {
stack = stack.getCraftingRemainder();
if (!stack.isEmpty() && stack.isDamageableItem() && stack.getDamageValue() > stack.getMaxDamage()) {
EventHooks.onPlayerDestroyItem(craftingPlayer.get(), stack, null);
return ItemStack.EMPTY;
}
return stack;
}

public static boolean onPlayerAttackTarget(Player player, Entity target) {
if (NeoForge.EVENT_BUS.post(new AttackEntityEvent(player, target)).isCanceled())
return false;
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/net/neoforged/neoforge/common/extensions/IItemStackExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ private ItemStack self() {
* @return The resulting ItemStack
*/
default ItemStack getCraftingRemainder() {
return self().getItem().getCraftingRemainder(self());
ItemStack stack = self().getItem().getCraftingRemainder(self());
if (!stack.isEmpty() && stack.isDamageableItem() && stack.getDamageValue() > stack.getMaxDamage()) {
EventHooks.onPlayerDestroyItem(CommonHooks.getCraftingPlayer(), stack, null);
return ItemStack.EMPTY;
}
return stack;
}

/**
Expand Down