删除调试日志
This commit is contained in:
parent
0fc9959ee7
commit
09d1bf195c
|
|
@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
|
||||||
loom.platform = forge
|
loom.platform = forge
|
||||||
|
|
||||||
# Mod properties
|
# Mod properties
|
||||||
mod_version = 1.3.4-beta
|
mod_version = 1.4.0
|
||||||
maven_group = com.extendedae_plus
|
maven_group = com.extendedae_plus
|
||||||
archives_name = extendedae_plus
|
archives_name = extendedae_plus
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@ public abstract class CraftingTreeProcessMixin {
|
||||||
if (details instanceof ScaledProcessingPattern sp) {
|
if (details instanceof ScaledProcessingPattern sp) {
|
||||||
var proc0 = sp.getOriginal();
|
var proc0 = sp.getOriginal();
|
||||||
if (proc0 instanceof SmartDoublingAwarePattern aware0 && !aware0.eap$allowScaling()) {
|
if (proc0 instanceof SmartDoublingAwarePattern aware0 && !aware0.eap$allowScaling()) {
|
||||||
LOGGER.info("[extendedae_plus] 传入已缩放样板但已禁用,解包为原始样板并跳过缩放: requested={}", RequestedAmountHolder.get());
|
|
||||||
return proc0;
|
return proc0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -49,7 +48,6 @@ public abstract class CraftingTreeProcessMixin {
|
||||||
|
|
||||||
// 若样板标记为不允许缩放,则直接跳过
|
// 若样板标记为不允许缩放,则直接跳过
|
||||||
if (proc instanceof SmartDoublingAwarePattern aware && !aware.eap$allowScaling()) {
|
if (proc instanceof SmartDoublingAwarePattern aware && !aware.eap$allowScaling()) {
|
||||||
LOGGER.info("[extendedae_plus] 智能翻倍已禁用,跳过缩放: pattern={} target={} requested={}", proc, craftingTreeNode, RequestedAmountHolder.get());
|
|
||||||
return original;
|
return original;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -57,15 +55,10 @@ public abstract class CraftingTreeProcessMixin {
|
||||||
AEKey parentTarget = parentAcc.extendedae_plus$getWhat();
|
AEKey parentTarget = parentAcc.extendedae_plus$getWhat();
|
||||||
long requested = RequestedAmountHolder.get();
|
long requested = RequestedAmountHolder.get();
|
||||||
// 使用当前线程栈顶的值进行缩放,不在此处清理;构造完成后应该由调用方的 pop 恢复状态
|
// 使用当前线程栈顶的值进行缩放,不在此处清理;构造完成后应该由调用方的 pop 恢复状态
|
||||||
LOGGER.info("[extendedae_plus] 执行缩放: allowScaling={} target={} requested={}",
|
|
||||||
(proc instanceof SmartDoublingAwarePattern aware2 ? aware2.eap$allowScaling() : null),
|
|
||||||
parentTarget,
|
|
||||||
requested);
|
|
||||||
var scaled = PatternScaler.scale(proc, parentTarget, requested);
|
var scaled = PatternScaler.scale(proc, parentTarget, requested);
|
||||||
return scaled != null ? scaled : original;
|
return scaled != null ? scaled : original;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.warn("构建倍增样板出错", e);
|
LOGGER.warn("构建倍增样板出错", e);
|
||||||
e.printStackTrace();
|
|
||||||
return original;
|
return original;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ public class PatternProviderLogicContainsRedirectMixin {
|
||||||
// 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归)
|
// 使用 indexOf 避免再次触发对 List.contains 的 redirect(防止递归)
|
||||||
return list.indexOf(o) != -1;
|
return list.indexOf(o) != -1;
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
t.printStackTrace();
|
|
||||||
return list.indexOf(o) != -1;
|
return list.indexOf(o) != -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ import appeng.crafting.pattern.AEProcessingPattern;
|
||||||
import com.extendedae_plus.content.ScaledProcessingPattern;
|
import com.extendedae_plus.content.ScaledProcessingPattern;
|
||||||
import com.extendedae_plus.api.SmartDoublingAwarePattern;
|
import com.extendedae_plus.api.SmartDoublingAwarePattern;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
import static com.extendedae_plus.util.ExtendedAELogger.LOGGER;
|
import static com.extendedae_plus.util.ExtendedAELogger.LOGGER;
|
||||||
|
|
||||||
|
|
@ -21,7 +20,6 @@ public final class PatternScaler {
|
||||||
|
|
||||||
// 双保险:若样板标记为不允许缩放,直接放弃缩放(返回 null 表示调用方应保持原样板)
|
// 双保险:若样板标记为不允许缩放,直接放弃缩放(返回 null 表示调用方应保持原样板)
|
||||||
if (base instanceof SmartDoublingAwarePattern aware && !aware.eap$allowScaling()) {
|
if (base instanceof SmartDoublingAwarePattern aware && !aware.eap$allowScaling()) {
|
||||||
LOGGER.info("[extendedae_plus] PatternScaler: 智能翻倍禁用,跳过缩放 target={} requested={}", target, requestedAmount);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -100,17 +98,6 @@ public final class PatternScaler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Debug 输出 */
|
|
||||||
LOGGER.info("[extendedae_plus] 正在缩放样板: 目标物品: {} 请求数量: {} 缩放后输入: {} 缩放后输出: {} 缩放后稀疏输入: {} 缩放后稀疏输出: {}",
|
|
||||||
target,
|
|
||||||
requestedAmount,
|
|
||||||
Arrays.toString(scaledInputs),
|
|
||||||
Arrays.toString(scaledCondensedOutputs),
|
|
||||||
Arrays.toString(scaledSparseInputs),
|
|
||||||
Arrays.toString(scaledSparseOutputs));
|
|
||||||
|
|
||||||
|
|
||||||
return new ScaledProcessingPattern(base,
|
return new ScaledProcessingPattern(base,
|
||||||
base.getDefinition(),
|
base.getDefinition(),
|
||||||
scaledSparseInputs,
|
scaledSparseInputs,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user