From 3f6b8d7e5565872186b023dc8d44849e49850f98 Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Sat, 6 Sep 2025 14:07:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E4=B8=AD=E7=A9=BA=E7=99=BD=E9=85=8D=E6=96=B9?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=A6=86=E7=9B=96=E6=A0=B7=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/ContainerPatternEncodingTermMenuMixin.java | 11 ++++++----- src/main/resources/extendedae_plus.mixins.json | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/menu/ContainerPatternEncodingTermMenuMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/menu/ContainerPatternEncodingTermMenuMixin.java index c2a5b31..0b09a57 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/menu/ContainerPatternEncodingTermMenuMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/menu/ContainerPatternEncodingTermMenuMixin.java @@ -113,11 +113,12 @@ public abstract class ContainerPatternEncodingTermMenuMixin implements IActionHo } } - // 服务器端：在构造样板返回前插入编码玩家的名称 - @Inject(method = "encodePattern", at = @At("TAIL"), remap = false, cancellable = true) - private void eap$writeEncodePlayerToPattern(CallbackInfoReturnable cir) { + @Inject(method = "encodePattern", at = @At("RETURN"), remap = false, cancellable = true) + private void onEncodePatternReturn(CallbackInfoReturnable cir) { ItemStack itemStack = cir.getReturnValue(); - itemStack.getOrCreateTag().putString("encodePlayer", this.epp$player.getGameProfile().getName()); - cir.setReturnValue(itemStack); + if (itemStack != null && !itemStack.isEmpty()) { + itemStack.getOrCreateTag().putString("encodePlayer", this.epp$player.getGameProfile().getName()); + cir.setReturnValue(itemStack); + } } } diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json index ce2f7a0..6b6f79d 100644 --- a/src/main/resources/extendedae_plus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -31,6 +31,7 @@ "mixins": [ "ae2.AEProcessingPatternMixin", "ae2.CraftingCPUClusterMixin", + "ae2.EncodedPatternItemMixin", "ae2.accessor.MEStorageMenuAccessor", "ae2.accessor.PatternEncodingTermMenuAccessor", "ae2.accessor.PatternProviderLogicAccessor",