Inline CommonHooks call

neoforged · Nov 9, 2024 · 7f22bcc · 7f22bcc
1 parent 4e951ca
commit 7f22bcc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/net/neoforged/neoforge/common/CommonHooks.java b/src/main/java/net/neoforged/neoforge/common/CommonHooks.java
@@ -738,15 +738,6 @@ public static Player getCraftingPlayer() {
         return craftingPlayer.get();
     }
 
-    public static ItemStack getCraftingRemainder(ItemStack stack) {
-        stack = stack.getItem().getCraftingRemainder(stack);
-        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;

diff --git a/src/main/java/net/neoforged/neoforge/common/extensions/IItemStackExtension.java b/src/main/java/net/neoforged/neoforge/common/extensions/IItemStackExtension.java
@@ -61,7 +61,12 @@ private ItemStack self() {
      * @return The resulting ItemStack
      */
     default ItemStack getCraftingRemainder() {
-        return CommonHooks.getCraftingRemainder(self());
+        ItemStack stack = self().getItem().getCraftingRemainder(self());
+        if (!stack.isEmpty() && stack.isDamageableItem() && stack.getDamageValue() > stack.getMaxDamage()) {
+            EventHooks.onPlayerDestroyItem(craftingPlayer.get(), stack, null);
+            return ItemStack.EMPTY;
+        }
+        return stack;
     }
 
     /**