From f571790d5e7e3fadb7adb24ee4e8e9756c13dd17 Mon Sep 17 00:00:00 2001 From: GaLicn <3096147684@qq.com> Date: Thu, 14 Aug 2025 15:52:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=97=A0=E7=BA=BF=E7=BB=88?= =?UTF-8?q?=E7=AB=AF=E6=94=B9=E4=B8=BA=E6=A3=80=E6=B5=8B=E6=97=A0=E7=BA=BF?= =?UTF-8?q?=E5=90=88=E6=88=90=E7=BB=88=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/PickFromWirelessC2SPacket.java | 4 ++-- .../extendedae_plus/util/WirelessTerminalLocator.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java b/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java index 7c5d599..9e9ccea 100644 --- a/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java +++ b/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java @@ -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; } diff --git a/src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java b/src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java index 697a8e9..b88c91d 100644 --- a/src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java +++ b/src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java @@ -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);