From cda8900df7d278b6617e944dbe3c8c559280d3eb Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Tue, 25 Nov 2025 08:53:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=99=BA=E8=83=BD=E5=80=8D?= =?UTF-8?q?=E5=A2=9E=EF=BC=9B=E6=B7=BB=E5=8A=A0=E6=99=BA=E8=83=BD=E5=80=8D?= =?UTF-8?q?=E5=A2=9E=E5=AF=B9=E9=AB=98=E7=BA=A7=E5=A4=84=E7=90=86=E6=A0=B7?= =?UTF-8?q?=E6=9D=BF=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + .../api/crafting/ScaledProcessingPatternAdv.java | 3 --- .../AdvPatternProviderLogicContainsRedirectMixin.java | 6 +++--- .../PatternProviderLogicContainsRedirectMixin.java | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 5045457..869790c 100644 --- a/build.gradle +++ b/build.gradle @@ -166,6 +166,7 @@ dependencies { runtimeOnly "curse.maven:ex-pattern-provider-892005:6863556" //aea +// compileOnly "curse.maven:advancedae-1084104:6932981" implementation "curse.maven:advancedae-1084104:6932981" //geckolib diff --git a/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPatternAdv.java b/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPatternAdv.java index efd5f0c..7c404a0 100644 --- a/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPatternAdv.java +++ b/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPatternAdv.java @@ -25,9 +25,6 @@ public final class ScaledProcessingPatternAdv extends ScaledProcessingPattern im this.dirMap = ((AdvProcessingPattern) original).getDirectionMap(); } - @Override - public @NotNull AdvProcessingPattern getOriginal() {return (AdvProcessingPattern) this.original;} - @Override public void pushInputsToExternalInventory(KeyCounter[] inputHolder, PatternInputSink sink) { // 如果 sparseInputs 与 inputs 一一对应,则无需 reorder diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java index 0a6b6f4..f16323c 100644 --- a/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java @@ -25,14 +25,14 @@ public class AdvPatternProviderLogicContainsRedirectMixin { try { if (o instanceof ScaledProcessingPattern scaled) { IPatternDetails base = scaled.getOriginal(); - if (list.indexOf(base) != -1) { + if (list.contains(base)) { return true; } } // 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归) - return list.indexOf(o) != -1; + return list.contains(o); } catch (Throwable t) { - return list.indexOf(o) != -1; + return list.contains(o); } } } \ No newline at end of file diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java index 0a3e911..198c176 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java @@ -25,14 +25,14 @@ public class PatternProviderLogicContainsRedirectMixin { try { if (o instanceof ScaledProcessingPattern scaled) { IPatternDetails base = scaled.getOriginal(); - if (list.indexOf(base) != -1) { + if (list.contains(base)) { return true; } } // 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归) - return list.indexOf(o) != -1; + return list.contains(o); } catch (Throwable t) { - return list.indexOf(o) != -1; + return list.contains(o); } } } \ No newline at end of file