R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检测无线终端改为检测无线合成终端

Browse Source
This commit is contained in:
GaLicn 2025-08-14 15:52:10 +08:00
parent d12e11342a
commit f571790d5e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java
View File

@ -20,7 +20,7 @@ import appeng.api.storage.StorageHelper;
import appeng.api.stacks.AEItemKey;
import appeng.api.networking.energy.IEnergyService;
import appeng.me.helpers.PlayerSource;
import appeng.items.tools.powered.WirelessTerminalItem;
import appeng.items.tools.powered.WirelessCraftingTerminalItem;
import com.extendedae_plus.util.WirelessTerminalLocator;
import com.extendedae_plus.util.WirelessTerminalLocator.LocatedTerminal;
@ -68,7 +68,7 @@ public class PickFromWirelessC2SPacket {
// 服务端权威：定位玩家任意槽位的无线终端（含 Curios）
LocatedTerminal located = WirelessTerminalLocator.find(player);
ItemStack terminal = located.stack;
WirelessTerminalItem wt = terminal.getItem() instanceof WirelessTerminalItem w ? w : null;
WirelessCraftingTerminalItem wt = terminal.getItem() instanceof WirelessCraftingTerminalItem w ? w : null;
if (wt == null || terminal.isEmpty()) {
return;
}

10
src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java
View File

@ -8,7 +8,7 @@ import net.minecraft.world.item.ItemStack;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.common.util.LazyOptional;
import appeng.items.tools.powered.WirelessTerminalItem;
import appeng.items.tools.powered.WirelessCraftingTerminalItem;
// Curios API (软依赖)
import top.theillusivec4.curios.api.CuriosApi;
@ -75,11 +75,11 @@ public final class WirelessTerminalLocator {
// 1) 先检查主手/副手
var main = player.getMainHandItem();
if (!main.isEmpty() && main.getItem() instanceof WirelessTerminalItem) {
if (!main.isEmpty() && main.getItem() instanceof WirelessCraftingTerminalItem) {
return new LocatedTerminal(main, (ns) -> player.setItemInHand(net.minecraft.world.InteractionHand.MAIN_HAND, ns), -1, net.minecraft.world.InteractionHand.MAIN_HAND);
}
var off = player.getOffhandItem();
if (!off.isEmpty() && off.getItem() instanceof WirelessTerminalItem) {
if (!off.isEmpty() && off.getItem() instanceof WirelessCraftingTerminalItem) {
return new LocatedTerminal(off, (ns) -> player.setItemInHand(net.minecraft.world.InteractionHand.OFF_HAND, ns), -1, net.minecraft.world.InteractionHand.OFF_HAND);
}
@ -88,7 +88,7 @@ public final class WirelessTerminalLocator {
int size = inv.getContainerSize();
for (int i = 0; i < size; i++) {
ItemStack st = inv.getItem(i);
if (!st.isEmpty() && st.getItem() instanceof WirelessTerminalItem) {
if (!st.isEmpty() && st.getItem() instanceof WirelessCraftingTerminalItem) {
final int slot = i;
return new LocatedTerminal(st, (ns) -> inv.setItem(slot, ns), slot);
}
@ -108,7 +108,7 @@ public final class WirelessTerminalLocator {
int slots = stacks.getSlots();
for (int i = 0; i < slots; i++) {
ItemStack st = stacks.getStackInSlot(i);
if (!st.isEmpty() && st.getItem() instanceof WirelessTerminalItem) {
if (!st.isEmpty() && st.getItem() instanceof WirelessCraftingTerminalItem) {
final int slot = i;
// 记录 Curios 槽位标识与索引，供应后续使用自定义 MenuLocator 打开菜单
return new LocatedTerminal(st, (ns) -> stacks.setStackInSlot(slot, ns), -1, null, slotId, slot);