From d9e0a720e1dafcffdea52f1b096eace120c20882 Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Tue, 2 Sep 2025 23:46:14 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=BB=98=E8=AE=A4=E6=A0=B7?= =?UTF-8?q?=E6=9D=BF=E4=B8=8D=E7=BF=BB=E5=80=8D=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9C=AA=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=9A=84=E4=BE=9B=E5=BA=94=E5=99=A8=E6=97=A0=E6=B3=95=E5=8F=91?= =?UTF-8?q?=E9=85=8D=E6=9D=90=E6=96=99=E3=80=82=E5=8E=BB=E6=8E=89=E5=AF=B9?= =?UTF-8?q?=E9=AB=98=E7=BA=A7ae=E7=9A=84=E6=A0=B7=E6=9D=BF=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=99=A8=E7=BF=BB=E5=80=8D=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mixin/ae2/AEProcessingPatternMixin.java | 2 +- ...ernProviderLogicContainsRedirectMixin.java | 39 ------------------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 src/main/java/com/extendedae_plus/mixin/ae2/autopattern/adaptation/AdvPatternProviderLogicContainsRedirectMixin.java diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/AEProcessingPatternMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/AEProcessingPatternMixin.java index 4381601..28030b2 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/AEProcessingPatternMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/AEProcessingPatternMixin.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Unique; @Mixin(value = AEProcessingPattern.class, remap = false) public class AEProcessingPatternMixin implements SmartDoublingAwarePattern { @Unique - private boolean eap$allowScaling = true; // 默认允许缩放 + private boolean eap$allowScaling = false; // 默认不允许缩放 @Override public boolean eap$allowScaling() { diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/adaptation/AdvPatternProviderLogicContainsRedirectMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/adaptation/AdvPatternProviderLogicContainsRedirectMixin.java deleted file mode 100644 index 1ff3e78..0000000 --- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/adaptation/AdvPatternProviderLogicContainsRedirectMixin.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.extendedae_plus.mixin.ae2.autopattern.adaptation; - -import appeng.api.crafting.IPatternDetails; -import com.extendedae_plus.content.ScaledProcessingPattern; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Pseudo; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import java.util.List; - -/**适配 - * Redirect PatternProviderLogic.pushPattern 中对 List.contains 的调用, - * 在遇到缩放样板时回退匹配到原始样板实例。 - */ -@Pseudo -@Mixin(targets = "net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic", remap = false) -public class AdvPatternProviderLogicContainsRedirectMixin { - - @Redirect(method = "pushPattern", - at = @At( - value = "INVOKE", - target = "Ljava/util/List;contains(Ljava/lang/Object;)Z") - ) - private boolean eap$patternsContains(List list, Object o) { - try { - if (o instanceof ScaledProcessingPattern scaled) { - IPatternDetails base = scaled.getOriginal(); - if (base != null && list.indexOf(base) != -1) { - return true; - } - } - // 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归) - return list.indexOf(o) != -1; - } catch (Throwable t) { - return list.indexOf(o) != -1; - } - } -} \ No newline at end of file