From 049a3fc18207626ecc97974e76ec18ab2e4caf81 Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Fri, 10 Oct 2025 12:15:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=89=8D=E7=BD=AE=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=99=A8=E7=BA=A7=E9=99=90=E5=88=B6=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=90=88=E6=88=90=E6=A0=91=E6=97=B6=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=80=8D=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ISmartDoublingAwarePattern.java | 4 +- .../gui/AdvPatternProviderScreenMixin.java | 2 +- .../SmallAdvPatternProviderScreenMixin.java | 2 +- .../AdvPatternProviderLogicDoublingMixin.java | 19 ++--- .../mixin/ae2/AEProcessingPatternMixin.java | 10 +-- .../gui/PatternProviderScreenMixin.java | 2 +- .../PatternProviderLogicDoublingMixin.java | 22 +++--- .../util/smartDoubling/PatternScaler.java | 70 ++++++++++++------- 8 files changed, 69 insertions(+), 62 deletions(-) diff --git a/src/main/java/com/extendedae_plus/api/smartDoubling/ISmartDoublingAwarePattern.java b/src/main/java/com/extendedae_plus/api/smartDoubling/ISmartDoublingAwarePattern.java index 4a3027a..ff491d1 100644 --- a/src/main/java/com/extendedae_plus/api/smartDoubling/ISmartDoublingAwarePattern.java +++ b/src/main/java/com/extendedae_plus/api/smartDoubling/ISmartDoublingAwarePattern.java @@ -5,6 +5,6 @@ public interface ISmartDoublingAwarePattern { void eap$setAllowScaling(boolean allow); // 翻倍限制：0 表示无限制 - int eap$getScalingLimit(); - void eap$setScalingLimit(int limit); + int eap$getMultiplierLimit(); + void eap$setMultiplierLimit(int limit); } diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java index bd91cd0..e24594e 100644 --- a/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java @@ -188,7 +188,7 @@ public abstract class AdvPatternProviderScreenMixin extends AEBaseScreen // 设置 tooltip String cur = this.eap$PerProviderLimitInput.getValue(); if (cur.isBlank()) cur = "0"; - this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.literal("样板输入物品数量上限: " + cur))); + this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.literal("单样物品发配数量上限: " + cur))); // 失焦时提交最新值 boolean focusedNow = this.eap$PerProviderLimitInput.isFocused(); diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java index c1ee2af..83a5b1c 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java @@ -15,6 +15,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import static com.extendedae_plus.util.smartDoubling.PatternScaler.getComputedMul; + @Mixin(value = PatternProviderLogic.class, remap = false) public class PatternProviderLogicDoublingMixin implements ISmartDoublingHolder { @Unique private static final String EAP_SMART_DOUBLING_KEY = "eap_smart_doubling"; @@ -51,18 +53,11 @@ public class PatternProviderLogicDoublingMixin implements ISmartDoublingHolder { @Override public void eap$setProviderSmartDoublingLimit(int limit) { - // 更新供应器级别上限并去抖保存 - var list = ((PatternProviderLogicAccessor) this).eap$patterns(); - this.eap$providerScalingLimit = Math.max(0, limit); - // 现在把防抖移到客户端屏幕端来处理，服务器端直接立即应用并保存 - for (IPatternDetails d : list) { - if (d instanceof AEProcessingPattern proc && proc instanceof ISmartDoublingAwarePattern a) { - try { a.eap$setScalingLimit(this.eap$providerScalingLimit); } catch (Throwable ignored) {} - } - } try { ((PatternProviderLogic) (Object) this).updatePatterns(); } catch (Throwable ignored) {} + // 更新供应器级别上限，用于 UI 显示 + this.eap$providerScalingLimit = Math.max(0, limit); } @Inject(method = "writeToNBT", at = @At("TAIL")) @@ -90,13 +85,12 @@ public class PatternProviderLogicDoublingMixin implements ISmartDoublingHolder { boolean allow = this.eap$smartDoubling; int limit = this.eap$providerScalingLimit; for (IPatternDetails details : list) { - if (details instanceof AEProcessingPattern proc && proc instanceof ISmartDoublingAwarePattern aware) { - aware.eap$setAllowScaling(allow); - aware.eap$setScalingLimit(limit); + if (details instanceof AEProcessingPattern proc && proc instanceof ISmartDoublingAwarePattern pattern) { + pattern.eap$setAllowScaling(allow); + pattern.eap$setMultiplierLimit(getComputedMul(proc, limit)); } } - } catch (Throwable ignored) { - } + } catch (Throwable ignored) {} } @Shadow diff --git a/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java b/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java index 77d5565..6b5d2be 100644 --- a/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java +++ b/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java @@ -50,40 +50,36 @@ public final class PatternScaler { if (amt > 0) perOperationTarget = amt; } - // 使用最小整数倍（ceil）策略：直接选择满足请求的最小倍数 - long multiplier = 1L; - if (requestedAmount > 0) { - long needed = requestedAmount / perOperationTarget + ((requestedAmount % perOperationTarget) == 0 ? 0 : 1); - multiplier = needed <= 1L ? 1L : needed; + long multiplier = 1L; // 默认倍数 + + // ---------------------- 优先模式限制 ---------------------- + boolean patternHasLimit = false; + if (base instanceof ISmartDoublingAwarePattern aware) { + int patternMulLimit = aware.eap$getMultiplierLimit(); + if (patternMulLimit > 0) { + multiplier = patternMulLimit; // 直接使用模式限制作为倍数 + patternHasLimit = true; + } } - // 优先应用模式级别的限制（若 base 支持），然后是全局配置 - try { - int patternLimit = 0; - if (base instanceof ISmartDoublingAwarePattern aware) { - patternLimit = aware.eap$getScalingLimit(); - } - if (patternLimit > 0 && multiplier > patternLimit) { - multiplier = patternLimit; - } else { - // 应用配置的最大倍数上限（0 表示不限制） - int maxMul = ModConfig.INSTANCE.smartScalingMaxMultiplier; - if (maxMul > 0 && multiplier > maxMul) { - multiplier = maxMul; - } - } - } catch (Throwable ignore) { - // ignore config read errors + // ---------------------- 全局逻辑（仅在没有模式限制时生效） ---------------------- + if (!patternHasLimit && requestedAmount > 0) { + // 计算满足请求量的最小倍数 + long needed = requestedAmount / perOperationTarget + ((requestedAmount % perOperationTarget) == 0 ? 0 : 1); + multiplier = Math.max(needed, 1L); + + // 应用全局上限 + int maxMul = ModConfig.INSTANCE.smartScalingMaxMultiplier; + if (maxMul > 0 && multiplier > maxMul) multiplier = maxMul; } - // 小请求绕过：若请求量小且不会带来收益，则不启用缩放（返回 null） + + // ---------------------- 小请求绕过 ---------------------- try { int minBenefit = ModConfig.INSTANCE.smartScalingMinBenefitFactor; if (minBenefit > 1 && requestedAmount > 0 && requestedAmount < perOperationTarget * (long) minBenefit) { return null; } - } catch (Throwable ignore) { - // 配置读取异常时保持默认行为（不绕过） - } + } catch (Throwable ignore) {} if (ModList.get().isLoaded("advanced_ae")) { // 如果加载了 Advanced AE 且 base 实现了 AdvPatternDetails，返回兼容版 @@ -101,4 +97,26 @@ public final class PatternScaler { // 仅使用 multiplier 构建轻量化 ScaledProcessingPattern（具体视图按需计算） return new ScaledProcessingPattern(base, base.getDefinition(), multiplier); } + + public static int getComputedMul(AEProcessingPattern proc, int limit) { + int computedMul = 0; // 默认 0 表示不限制 + + if (limit > 0) { + long minMul = Long.MAX_VALUE; + + for (var input : proc.getInputs()) { + long amt = input.getMultiplier(); + if (amt > 0) { + // 保证翻倍限制至少为 1 + long allowedMul = Math.max(1, limit / amt); + minMul = Math.min(minMul, allowedMul); + } + } + + if (minMul != Long.MAX_VALUE) { + computedMul = (int) minMul; + } + } + return computedMul; + } }