新版智能倍增;添加智能倍增对高级处理样板支持
This commit is contained in:
parent
5ba16c937c
commit
cda8900df7
|
|
@ -166,6 +166,7 @@ dependencies {
|
||||||
runtimeOnly "curse.maven:ex-pattern-provider-892005:6863556"
|
runtimeOnly "curse.maven:ex-pattern-provider-892005:6863556"
|
||||||
|
|
||||||
//aea
|
//aea
|
||||||
|
// compileOnly "curse.maven:advancedae-1084104:6932981"
|
||||||
implementation "curse.maven:advancedae-1084104:6932981"
|
implementation "curse.maven:advancedae-1084104:6932981"
|
||||||
|
|
||||||
//geckolib
|
//geckolib
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,6 @@ public final class ScaledProcessingPatternAdv extends ScaledProcessingPattern im
|
||||||
this.dirMap = ((AdvProcessingPattern) original).getDirectionMap();
|
this.dirMap = ((AdvProcessingPattern) original).getDirectionMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public @NotNull AdvProcessingPattern getOriginal() {return (AdvProcessingPattern) this.original;}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void pushInputsToExternalInventory(KeyCounter[] inputHolder, PatternInputSink sink) {
|
public void pushInputsToExternalInventory(KeyCounter[] inputHolder, PatternInputSink sink) {
|
||||||
// 如果 sparseInputs 与 inputs 一一对应,则无需 reorder
|
// 如果 sparseInputs 与 inputs 一一对应,则无需 reorder
|
||||||
|
|
|
||||||
|
|
@ -25,14 +25,14 @@ public class AdvPatternProviderLogicContainsRedirectMixin {
|
||||||
try {
|
try {
|
||||||
if (o instanceof ScaledProcessingPattern scaled) {
|
if (o instanceof ScaledProcessingPattern scaled) {
|
||||||
IPatternDetails base = scaled.getOriginal();
|
IPatternDetails base = scaled.getOriginal();
|
||||||
if (list.indexOf(base) != -1) {
|
if (list.contains(base)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归)
|
// 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归)
|
||||||
return list.indexOf(o) != -1;
|
return list.contains(o);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
return list.indexOf(o) != -1;
|
return list.contains(o);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -25,14 +25,14 @@ public class PatternProviderLogicContainsRedirectMixin {
|
||||||
try {
|
try {
|
||||||
if (o instanceof ScaledProcessingPattern scaled) {
|
if (o instanceof ScaledProcessingPattern scaled) {
|
||||||
IPatternDetails base = scaled.getOriginal();
|
IPatternDetails base = scaled.getOriginal();
|
||||||
if (list.indexOf(base) != -1) {
|
if (list.contains(base)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归)
|
// 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归)
|
||||||
return list.indexOf(o) != -1;
|
return list.contains(o);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
return list.indexOf(o) != -1;
|
return list.contains(o);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user