Skip to content

Fix bugs of batch craft and frost grindstone 修复批量合成器与浮霜砂轮的漏洞 #3314

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
Gu-ZT merged 2 commits into from
Feb 27, 2026
+6 −12
Merged

Fix bugs of batch craft and frost grindstone 修复批量合成器与浮霜砂轮的漏洞 #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ef2e10
fix(block): fix massive lag caused by batch crafter
YocyCraft Feb 27, 2026
295a37e
fix(block): fix frost grindstone make repair cost increase massively
YocyCraft Feb 27, 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
8 changes: 1 addition & 7 deletions src/main/java/dev/dubhe/anvilcraft/api/itemhandler/PollableFilteredItemStackHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package dev.dubhe.anvilcraft.api.itemhandler;

import dev.dubhe.anvilcraft.util.Util;
import net.minecraft.world.item.ItemStack;

import java.util.List;
Expand All @@ -12,12 +11,7 @@ public PollableFilteredItemStackHandler(int size) {

@Override
public boolean isItemValid(int slot, ItemStack stack) {
// 临时解决方案
if (Util.findCaller("doClick")) {
return super.isItemValid(slot, stack);
} else {
return getEmptyOrSmallerSlot(stack) == slot && super.isItemValid(slot, stack);
}
return getEmptyOrSmallerSlot(stack) == slot && super.isItemValid(slot, stack);
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/dev/dubhe/anvilcraft/api/itemhandler/SlotItemHandlerWithFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,9 @@ public boolean isSlotDisabled(int slot) {
}
return false;
}

@Override
public int getMaxStackSize(ItemStack stack) {
return Math.min(this.getMaxStackSize(), stack.getMaxStackSize());
}
}
5 changes: 0 additions & 5 deletions src/main/java/dev/dubhe/anvilcraft/inventory/FrostGrindstoneMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.AnvilMenu;
import net.minecraft.world.inventory.ContainerLevelAccess;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.inventory.ResultContainer;
Expand Down Expand Up @@ -162,7 +161,6 @@ private ItemStack createResult() {
ItemStack inputItem = this.input.getItem(0).copy();

Map<DataComponentType<ItemEnchantments>, ItemEnchantments.Mutable> mutableMap = new HashMap<>();
int cost = 0;
for (int i = 0; i < this.enchantments.size(); i++) {
EnchantmentData data = ListUtil.safelyGet(this.enchantments, i).orElse(null);
if (data == null) continue;
Expand All @@ -173,14 +171,11 @@ private ItemStack createResult() {
);
if (this.selectedIndexes.contains(i)) continue;
newMut.set(data.enchantment(), data.level());

cost = AnvilMenu.calculateIncreasedRepairCost(cost);
}

for (Map.Entry<DataComponentType<ItemEnchantments>, ItemEnchantments.Mutable> entry : mutableMap.entrySet()) {
inputItem.set(entry.getKey(), entry.getValue().toImmutable());
}
inputItem.set(DataComponents.REPAIR_COST, cost);

ItemEnchantments.Mutable stored = mutableMap.get(DataComponents.STORED_ENCHANTMENTS);
if (inputItem.is(Items.ENCHANTED_BOOK) && stored != null && stored.keySet().isEmpty()) {
Expand Down