R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

并行处理单元mixin调整

Browse Source
This commit is contained in:
GaLicn 2025-10-03 13:59:54 +08:00
parent 7c0bf38f06
commit e0cc1fc9cf
1 changed files with 61 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/main/java/com/extendedae_plus/mixin/ae2/CraftingCPUClusterMixin.java
View File

@ -1,36 +1,74 @@
package com.extendedae_plus.mixin.ae2;
import appeng.blockentity.crafting.CraftingBlockEntity;
import appeng.blockentity.crafting.CraftingMonitorBlockEntity;
import appeng.me.cluster.implementations.CraftingCPUCluster;
import appeng.me.helpers.MachineSource;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.List;
@Mixin(value = CraftingCPUCluster.class, remap = false, priority = 2000)
public abstract class CraftingCPUClusterMixin {
// 1) 提升“单方块线程上限”的常量，避免抛出 IAE 的 IllegalArgumentException
@ModifyConstant(
@Shadow(remap = false)
private MachineSource machineSrc;
@Shadow(remap = false)
@Final
private List<CraftingBlockEntity> blockEntities;
@Shadow(remap = false)
@Final
private List<CraftingMonitorBlockEntity> status;
@Shadow(remap = false)
private long storage;
@Shadow(remap = false)
private int accelerator;
/**
* 完全替换 addBlockEntity 方法，移除 16 线程限制
* 在方法开始时注入，检查线程数，如果超过 16 就手动处理并取消原方法
*/
@Inject(
method = "addBlockEntity(Lappeng/blockentity/crafting/CraftingBlockEntity;)V",
constant = @Constant(intValue = 16)
at = @At("HEAD"),
cancellable = true,
require = 0 // 设置为 0，即使注入失败也不会崩溃
)
private int extendedae_plus$raisePerUnitLimit(int original) {
// 放宽到极大值，完全取消单方块 16 线程的硬限制
return Integer.MAX_VALUE;
}
// 2) 保持统计使用原始线程值（若存在多处调用），不再返回固定 16
@Redirect(
method = "addBlockEntity(Lappeng/blockentity/crafting/CraftingBlockEntity;)V",
at = @At(
value = "INVOKE",
target = "Lappeng/blockentity/crafting/CraftingBlockEntity;getAcceleratorThreads()I",
ordinal = 1
)
)
private int extendedae_plus$onGetThreadsForLimitCheck(CraftingBlockEntity te) {
// 返回原始线程数，确保总并行单元不被错误下限
return te.getAcceleratorThreads();
private void extendedae_plus$removeThreadLimit(CraftingBlockEntity te, CallbackInfo ci) {
// 只有当线程数超过 16 时才接管处理
if (te.getAcceleratorThreads() > 16) {
// 手动实现 addBlockEntity 的逻辑，但不检查 16 的限制
if (this.machineSrc == null || te.isCoreBlock()) {
this.machineSrc = new MachineSource(te);
}
te.setCoreBlock(false);
te.saveChanges();
this.blockEntities.add(0, te);
if (te instanceof CraftingMonitorBlockEntity) {
this.status.add((CraftingMonitorBlockEntity) te);
}
if (te.getStorageBytes() > 0) {
this.storage += te.getStorageBytes();
}
if (te.getAcceleratorThreads() > 0) {
// 这里不检查 <= 16 的限制，直接添加
this.accelerator += te.getAcceleratorThreads();
}
// 取消原方法执行
ci.cancel();
}
// 如果 <= 16，让原方法正常执行
}
}