Skip to content

Commit e944873

Browse files
committed
simplify ToolItemStackHandler
1 parent 182fdd3 commit e944873

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package gregtech.common.inventory.handlers;
22

3-
import gregtech.api.items.toolitem.IGTTool;
4-
import gregtech.api.unification.OreDictUnifier;
3+
import gregtech.api.items.toolitem.ToolHelper;
54

65
import net.minecraft.item.ItemStack;
76

@@ -13,19 +12,18 @@ public ToolItemStackHandler(int size) {
1312
super(size);
1413
}
1514

15+
@Override
16+
public boolean isItemValid(int slot, ItemStack stack) {
17+
return ToolHelper.isTool(stack);
18+
}
19+
1620
@Override
1721
@NotNull
1822
public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
19-
if (stack.getItem().getToolClasses(stack).isEmpty()) return stack;
20-
if (stack.getItem() instanceof IGTTool &&
21-
((IGTTool) stack.getItem()).getToolStats().isSuitableForCrafting(stack)) {
23+
if (isItemValid(slot, stack)) {
2224
return super.insertItem(slot, stack, simulate);
2325
}
2426

25-
if (stack.isItemStackDamageable() && OreDictUnifier.getOreDictionaryNames(stack).stream()
26-
.anyMatch(s -> s.startsWith("craftingTool"))) {
27-
return super.insertItem(slot, stack, simulate);
28-
}
2927
return stack;
3028
}
3129
}

0 commit comments

Comments
 (0)