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