From 959669eb1c148775278c942af49db0eaa71abcae Mon Sep 17 00:00:00 2001 From: GaLi <3096147684@qq.com> Date: Thu, 19 Mar 2026 17:13:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E5=90=88=E6=88=90=E6=A0=B8?= =?UTF-8?q?=E5=BF=83=E4=BF=AE=E5=A4=8D=E5=BD=B1=E5=AD=90=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../matrix/CrafterCorePlusBlockEntity.java | 212 ++++-------------- .../TileAssemblerMatrixCrafterAccessor.java | 23 ++ .../matrix/ClusterAssemblerMatrixMixin.java | 15 ++ .../resources/extendedae_plus.mixins.json | 1 + 4 files changed, 82 insertions(+), 169 deletions(-) create mode 100644 src/main/java/com/extendedae_plus/mixin/extendedae/accessor/TileAssemblerMatrixCrafterAccessor.java diff --git a/src/main/java/com/extendedae_plus/content/matrix/CrafterCorePlusBlockEntity.java b/src/main/java/com/extendedae_plus/content/matrix/CrafterCorePlusBlockEntity.java index ba1be3d..412d301 100644 --- a/src/main/java/com/extendedae_plus/content/matrix/CrafterCorePlusBlockEntity.java +++ b/src/main/java/com/extendedae_plus/content/matrix/CrafterCorePlusBlockEntity.java @@ -1,53 +1,66 @@ package com.extendedae_plus.content.matrix; -import appeng.api.crafting.IPatternDetails; import appeng.api.inventories.InternalInventory; -import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionSource; -import appeng.api.networking.ticking.TickRateModulation; -import appeng.api.networking.ticking.TickingRequest; -import appeng.api.stacks.GenericStack; -import appeng.api.stacks.KeyCounter; - import appeng.blockentity.crafting.IMolecularAssemblerSupportedPattern; -import appeng.util.inv.AppEngInternalInventory; import appeng.util.inv.CombinedInternalInventory; -import com.extendedae_plus.ExtendedAEPlus; import com.extendedae_plus.init.ModBlockEntities; +import com.extendedae_plus.mixin.extendedae.accessor.TileAssemblerMatrixCrafterAccessor; +import com.extendedae_plus.mixin.minecraft.accessor.BlockEntityAccessor; import com.glodblock.github.extendedae.common.me.CraftingMatrixThread; import com.glodblock.github.extendedae.common.me.CraftingThread; -import com.glodblock.github.extendedae.common.me.matrix.ClusterAssemblerMatrix; import com.glodblock.github.extendedae.common.tileentities.matrix.TileAssemblerMatrixCrafter; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import org.jetbrains.annotations.NotNull; -import java.util.List; - public class CrafterCorePlusBlockEntity extends TileAssemblerMatrixCrafter { public static final int MAX_THREAD = 32; - // 自己的 32 线程与合并库存，不影响父类原来的 8 线程逻辑 - private final CraftingThread[] plusThreads = new CraftingThread[MAX_THREAD]; - private final InternalInventory plusInternalInv; - private int plusStates = 0; + private int activeThreadMask = 0; public CrafterCorePlusBlockEntity(BlockPos pos, BlockState blockState) { super(pos, blockState); - // 替换为自己的 32 线程实现 + + ((BlockEntityAccessor) (Object) this) + .extendedae_plus$setType(ModBlockEntities.ASSEMBLER_MATRIX_CRAFTER_PLUS_BE.get()); + + var threads = new CraftingThread[MAX_THREAD]; var inventories = new InternalInventory[MAX_THREAD]; for (int x = 0; x < MAX_THREAD; x++) { final int index = x; - this.plusThreads[index] = new CraftingMatrixThread(this, this::getSrc, signal -> this.changeState(index, signal)); - inventories[index] = this.plusThreads[index].getInternalInventory(); + threads[index] = new CraftingMatrixThread(this, this::getSrc, signal -> this.changeState(index, signal)); + inventories[index] = threads[index].getInternalInventory(); + } + + var accessor = (TileAssemblerMatrixCrafterAccessor) (Object) this; + accessor.extendedae_plus$setThreads(threads); + accessor.extendedae_plus$setInternalInv(new CombinedInternalInventory(inventories)); + } + + @Override + public void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.saveAdditional(tag, registries); + + var threads = ((TileAssemblerMatrixCrafterAccessor) (Object) this).extendedae_plus$getThreads(); + for (int x = TileAssemblerMatrixCrafter.MAX_THREAD; x < MAX_THREAD; x++) { + tag.put("#ct" + x, threads[x].writeNBT(registries)); + } + } + + @Override + public void loadTag(CompoundTag tag, HolderLookup.Provider registries) { + super.loadTag(tag, registries); + + var threads = ((TileAssemblerMatrixCrafterAccessor) (Object) this).extendedae_plus$getThreads(); + for (int x = TileAssemblerMatrixCrafter.MAX_THREAD; x < MAX_THREAD; x++) { + if (tag.contains("#ct" + x)) { + threads[x].readNBT(tag.getCompound("#ct" + x), registries); + } } - this.plusInternalInv = new CombinedInternalInventory(inventories); } @Override @@ -60,156 +73,17 @@ public class CrafterCorePlusBlockEntity extends TileAssemblerMatrixCrafter { } private void changeState(int index, boolean state) { - boolean oldState = this.plusStates > 0; + int oldMask = this.activeThreadMask; if (state) { - this.plusStates |= (1 << index); + this.activeThreadMask |= (1 << index); } else { - this.plusStates &= ~(1 << index); + this.activeThreadMask &= ~(1 << index); } - if (state) { - if (!oldState) { - this.getMainNode().ifPresent((grid, node) -> grid.getTickManager().wakeDevice(node)); - } - } else if (oldState && this.plusStates <= 0) { + + if (oldMask == 0 && this.activeThreadMask != 0) { + this.getMainNode().ifPresent((grid, node) -> grid.getTickManager().wakeDevice(node)); + } else if (oldMask != 0 && this.activeThreadMask == 0) { this.getMainNode().ifPresent((grid, node) -> grid.getTickManager().sleepDevice(node)); } } - - @Override - public int usedThread() { - int cnt = 0; - for (var t : this.plusThreads) { - if (t.getCurrentPattern() != null) { - cnt++; - } else if (!t.getInternalInventory().isEmpty()) { - cnt++; - } - } - return cnt; - } - - @Override - public boolean pushJob(IPatternDetails patternDetails, KeyCounter[] inputHolder) { - for (int i = 0; i < this.plusThreads.length; i++) { - var thread = this.plusThreads[i]; - - if (thread.acceptJob(patternDetails, inputHolder, Direction.DOWN)) { - this.getMainNode().ifPresent((grid, node) -> grid.getTickManager().wakeDevice(node)); - - if (this.cluster != null) { - this.cluster.updateCrafter(this); - } - return true; - } - } - return false; - } - - public void stop() { - for (var thread : this.plusThreads) { - thread.stop(); - } - } - - @Override - public void saveAdditional(CompoundTag data, HolderLookup.Provider registries) { - super.saveAdditional(data, registries); - for (int x = 0; x < MAX_THREAD; x++) { - var tag = this.plusThreads[x].writeNBT(registries); - data.put("#ct" + x, tag); - } - final CompoundTag opt = new CompoundTag(); - for (int x = 0; x < this.plusInternalInv.size(); x++) { - var is = this.plusInternalInv.getStackInSlot(x); - opt.put("item" + x, is.saveOptional(registries)); - } - data.put("inv", opt); - } - - @Override - public void loadTag(CompoundTag data, HolderLookup.Provider registries) { - super.loadTag(data, registries); - for (int x = 0; x < MAX_THREAD; x++) { - if (data.contains("#ct" + x)) { - this.plusThreads[x].readNBT(data.getCompound("#ct" + x), registries); - } - } - var opt = data.getCompound("inv"); - for (int x = 0; x < this.plusInternalInv.size(); x++) { - var item = opt.getCompound("item" + x); - this.plusInternalInv.setItemDirect(x, ItemStack.parseOptional(registries, item)); - } - } - - @Override - public void add(ClusterAssemblerMatrix cluster) { - // 保持父类期望的类型：集群内部还是按 TileAssemblerMatrixCrafter 来管理 - cluster.addCrafter(this); - } - - @Override - public TickingRequest getTickingRequest(IGridNode node) { - var isAwake = false; - for (var t : this.plusThreads) { - t.recalculatePlan(); - t.updateSleepiness(); - isAwake |= t.isAwake(); - } - return new TickingRequest(1, 1, !isAwake); - } - - @Override - public TickRateModulation tickingRequest(IGridNode node, int ticksSinceLastCall) { - if (this.cluster == null) { - return TickRateModulation.SLEEP; - } - var rate = TickRateModulation.SLEEP; - for (int i = 0; i < this.plusThreads.length; i++) { - var t = this.plusThreads[i]; - if (t.isAwake()) { - var tr = t.tick(this.cluster.getSpeedCore(), ticksSinceLastCall); - if (tr.ordinal() > rate.ordinal()) { - rate = tr; - } - } - } - this.cluster.updateCrafter(this); - return rate; - } - - @Override - public void saveChangedInventory(AppEngInternalInventory inv) { - for (var t : this.plusThreads) { - if (inv == t.getInternalInventory()) { - t.recalculatePlan(); - break; - } - } - this.saveChanges(); - } - - @Override - public void onChangeInventory(AppEngInternalInventory inv, int slot) { - this.saveChangedInventory(inv); - } - - @Override - public void addAdditionalDrops(Level level, BlockPos pos, List drops) { - super.addAdditionalDrops(level, pos, drops); - for (var stack : this.plusInternalInv) { - var genericStack = GenericStack.unwrapItemStack(stack); - if (genericStack != null) { - genericStack.what().addDrops(genericStack.amount(), drops, level, pos); - } else { - drops.add(stack); - } - } - } - - @Override - public void clearContent() { - super.clearContent(); - this.plusInternalInv.clear(); - } - } diff --git a/src/main/java/com/extendedae_plus/mixin/extendedae/accessor/TileAssemblerMatrixCrafterAccessor.java b/src/main/java/com/extendedae_plus/mixin/extendedae/accessor/TileAssemblerMatrixCrafterAccessor.java new file mode 100644 index 0000000..c229c2e --- /dev/null +++ b/src/main/java/com/extendedae_plus/mixin/extendedae/accessor/TileAssemblerMatrixCrafterAccessor.java @@ -0,0 +1,23 @@ +package com.extendedae_plus.mixin.extendedae.accessor; + +import appeng.api.inventories.InternalInventory; +import com.glodblock.github.extendedae.common.me.CraftingThread; +import com.glodblock.github.extendedae.common.tileentities.matrix.TileAssemblerMatrixCrafter; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(TileAssemblerMatrixCrafter.class) +public interface TileAssemblerMatrixCrafterAccessor { + + @Accessor("threads") + CraftingThread[] extendedae_plus$getThreads(); + + @Accessor("threads") + @Mutable + void extendedae_plus$setThreads(CraftingThread[] threads); + + @Accessor("internalInv") + @Mutable + void extendedae_plus$setInternalInv(InternalInventory inventory); +} diff --git a/src/main/java/com/extendedae_plus/mixin/extendedae/common/matrix/ClusterAssemblerMatrixMixin.java b/src/main/java/com/extendedae_plus/mixin/extendedae/common/matrix/ClusterAssemblerMatrixMixin.java index 376b063..ccfc265 100644 --- a/src/main/java/com/extendedae_plus/mixin/extendedae/common/matrix/ClusterAssemblerMatrixMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/extendedae/common/matrix/ClusterAssemblerMatrixMixin.java @@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(value = ClusterAssemblerMatrix.class, remap = false) public class ClusterAssemblerMatrixMixin { @@ -38,4 +39,18 @@ public class ClusterAssemblerMatrixMixin { } // 其他类型的Crafter走原版逻辑 } + + @Inject(method = "getBusyCrafterAmount", at = @At("HEAD"), cancellable = true) + private void onGetBusyCrafterAmount(CallbackInfoReturnable cir) { + int cnt = 0; + for (var crafter : this.busyCrafters) { + cnt += crafter instanceof CrafterCorePlusBlockEntity + ? CrafterCorePlusBlockEntity.MAX_THREAD + : TileAssemblerMatrixCrafter.MAX_THREAD; + } + for (var crafter : this.availableCrafters) { + cnt += crafter.usedThread(); + } + cir.setReturnValue(cnt); + } } diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json index 0ebd288..45fffd5 100644 --- a/src/main/resources/extendedae_plus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -53,6 +53,7 @@ "ae2.parts.automation.IOBusPartChannelCardMixin", "ae2.parts.storagebus.StorageBusPartChannelCardMixin", "ae2WTlib.ContainerUWirelessExPatternTerminalMixin", + "extendedae.accessor.TileAssemblerMatrixCrafterAccessor", "extendedae.accessor.TileAssemblerMatrixPatternAccessor", "extendedae.common.PartExPatternProviderMixin", "extendedae.common.TileExPatternProviderMixin",