Optimize asynchronous queue commit performance; Fix issue where addBlock() method of BlockArrayBuilder was not getting meta values from IItemStack correctly; Fix issue where FluidPerTickOutput was not working correctly; Reduce an interval for mechanical controller to update redstone signals (may have side effects); Add performance consumption display for controllers (experimental).

KasumiNova · KasumiNova · commit c132e5c02877 · 2023-04-22T17:40:50.000+08:00
diff --git a/src/main/java/github/kasuminova/mmce/common/concurrent/ActionExecutor.java b/src/main/java/github/kasuminova/mmce/common/concurrent/ActionExecutor.java
@@ -2,8 +2,8 @@
 
 public class ActionExecutor implements Runnable, Comparable<ActionExecutor> {
     public final Action action;
-    public int usedTime = 0;
     public final int priority;
+    public int usedTime = 0;
 
     public ActionExecutor(Action action) {
         this(action, 0);
diff --git a/src/main/java/github/kasuminova/mmce/common/concurrent/TaskExecutor.java b/src/main/java/github/kasuminova/mmce/common/concurrent/TaskExecutor.java
@@ -3,13 +3,13 @@
 import hellfirepvp.modularmachinery.ModularMachinery;
 import hellfirepvp.modularmachinery.common.tiles.base.TileEntitySynchronized;
 import io.netty.util.internal.ThrowableUtil;
+import io.netty.util.internal.shaded.org.jctools.queues.atomic.MpscLinkedAtomicQueue;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.relauncher.Side;
 
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -22,16 +22,16 @@
 public class TaskExecutor {
     public static final int THREAD_COUNT = Math.max(Math.max(Runtime.getRuntime().availableProcessors() / 4, 8), 4);
     public static final ThreadPoolExecutor THREAD_POOL = new ThreadPoolExecutor(
-            THREAD_COUNT / 2, THREAD_COUNT, 5000, TimeUnit.MILLISECONDS,
+            THREAD_COUNT / 4, THREAD_COUNT, 5000, TimeUnit.MILLISECONDS,
             new PriorityBlockingQueue<>(),
             new CustomThreadFactory("MMCE-TaskExecutor-%s"));
     public static long totalExecuted = 0;
     public static long taskUsedTime = 0;
     public static long totalUsedTime = 0;
     public static long executedCount = 0;
     private final ArrayList<ActionExecutor> submitted = new ArrayList<>();
-    private final ConcurrentLinkedQueue<ActionExecutor> executors = new ConcurrentLinkedQueue<>();
-    private final ConcurrentLinkedQueue<Action> mainThreadActions = new ConcurrentLinkedQueue<>();
+    private final MpscLinkedAtomicQueue<ActionExecutor> executors = new MpscLinkedAtomicQueue<>();
+    private final MpscLinkedAtomicQueue<Action> mainThreadActions = new MpscLinkedAtomicQueue<>();
     private final HashSet<TileEntitySynchronized> requireUpdateTEList = new HashSet<>();
     private final TaskSubmitter submitter = new TaskSubmitter();
     private volatile boolean inTick = false;
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementFluid.java b/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementFluid.java
@@ -267,7 +267,7 @@ private Optional<CraftCheck> checkStartCraftingWithMekanism(ProcessingComponent<
     @Override
     public boolean startCrafting(ProcessingComponent<?> component, RecipeCraftingContext context, ResultChance chance) {
         HybridTank handler = (HybridTank) component.providedComponent;
-        if (Objects.requireNonNull(actionType) == IOType.INPUT) {
+        if (actionType == IOType.INPUT) {
             if (Mods.MEKANISM.isPresent()) {
                 return startCraftingWithMekanismHandling(handler, chance);
             }
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementFluidPerTick.java b/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementFluidPerTick.java
@@ -9,7 +9,6 @@
 import hellfirepvp.modularmachinery.common.machine.IOType;
 import hellfirepvp.modularmachinery.common.machine.MachineComponent;
 import hellfirepvp.modularmachinery.common.modifier.RecipeModifier;
-import hellfirepvp.modularmachinery.common.util.CopyHandlerHelper;
 import hellfirepvp.modularmachinery.common.util.HybridTank;
 import hellfirepvp.modularmachinery.common.util.ResultChance;
 import hellfirepvp.modularmachinery.common.util.nbt.NBTMatchingHelper;
@@ -74,21 +73,9 @@ public CraftCheck doFluidIO(ProcessingComponent<?> component, RecipeCraftingCont
                 }
                 return CraftCheck.failure("craftcheck.failure.fluid.input");
             case OUTPUT:
-                handler = CopyHandlerHelper.copyTank(handler);
-
-                for (ComponentOutputRestrictor restrictor : restrictions) {
-                    if (restrictor instanceof ComponentOutputRestrictor.RestrictionTank) {
-                        ComponentOutputRestrictor.RestrictionTank tank = (ComponentOutputRestrictor.RestrictionTank) restrictor;
-
-                        if (tank.exactComponent.equals(component)) {
-                            handler.fillInternal(tank.inserted == null ? null : tank.inserted.copy().asFluidStack(), true);
-                        }
-                    }
-                }
-                int filled = handler.fillInternal(this.requirementCheck.copy().asFluidStack(), doFillOrDrain); //True or false doesn't really matter tbh
+                int filled = handler.fillInternal(this.requirementCheck.copy().asFluidStack(), doFillOrDrain);
                 boolean didFill = filled >= this.requirementCheck.getAmount();
                 if (didFill) {
-                    context.addRestriction(new ComponentOutputRestrictor.RestrictionTank(this.requirementCheck.copy(), component));
                     return CraftCheck.success();
                 }
                 return CraftCheck.failure("craftcheck.failure.fluid.output.space");
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/integration/crafttweaker/BlockArrayBuilder.java b/src/main/java/hellfirepvp/modularmachinery/common/integration/crafttweaker/BlockArrayBuilder.java
@@ -14,6 +14,7 @@
 import hellfirepvp.modularmachinery.common.util.IBlockStateDescriptor;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
@@ -119,6 +120,7 @@ public BlockArrayBuilder addBlock(int[] xList, int[] yList, int[] zList, IBlockS
      * @param z            Z
      * @param ctItemStacks 物品
      */
+    @SuppressWarnings("deprecation")
     @ZenMethod
     public BlockArrayBuilder addBlock(int x, int y, int z, IItemStack... ctItemStacks) {
         List<ItemStack> stackList = new ArrayList<>();
@@ -127,9 +129,18 @@ public BlockArrayBuilder addBlock(int x, int y, int z, IItemStack... ctItemStack
         }
         List<IBlockStateDescriptor> stateDescriptorList = new ArrayList<>();
         for (ItemStack stack : stackList) {
-            Block block = Block.getBlockFromItem(stack.getItem());
+            Item item = stack.getItem();
+            int meta = stack.getMetadata();
+            Block block = Block.getBlockFromItem(item);
             if (block != Blocks.AIR) {
-                stateDescriptorList.add(new IBlockStateDescriptor(block));
+                try {
+                    net.minecraft.block.state.IBlockState state = block.getStateFromMeta(meta);
+                    stateDescriptorList.add(new IBlockStateDescriptor(state));
+                } catch (Exception e) {
+                    CraftTweakerAPI.logError(String.format("[ModularMachinery] Failed to get BlockState from <%s>!",
+                            stack.getItem().getRegistryName() + ":" + meta
+                    ));
+                }
             } else {
                 CraftTweakerAPI.logError("[ModularMachinery] " + stack.getDisplayName() + " cannot convert to Block!");
             }
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/tiles/TileMachineController.java b/src/main/java/hellfirepvp/modularmachinery/common/tiles/TileMachineController.java
@@ -145,7 +145,7 @@ private void doRecipeTick() {
         }
         if (this.getCraftingStatus().isCrafting()) {
             onTick();
-            if (this.activeRecipe.isCompleted()) {
+            if (activeRecipe != null && activeRecipe.isCompleted()) {
                 if (ModularMachinery.pluginServerCompatibleMode) {
                     ModularMachinery.EXECUTE_MANAGER.addSyncTask(this::onFinished);
                 } else {
@@ -244,7 +244,14 @@ public void onTick() {
      * <p>机械完成一个配方。</p>
      */
     public void onFinished() {
-        List<IEventHandler<RecipeEvent>> handlerList = this.activeRecipe.getRecipe().getRecipeEventHandlers(RecipeFinishEvent.class);
+        if (this.activeRecipe == null) {
+            ModularMachinery.log.warn("Machine " + MiscUtils.posToString(getPos()) + " Try to finish a null recipe! ignored.");
+            this.context = null;
+            this.activeRecipe = null;
+            return;
+        }
+        MachineRecipe recipe = this.activeRecipe.getRecipe();
+        List<IEventHandler<RecipeEvent>> handlerList = recipe.getRecipeEventHandlers(RecipeFinishEvent.class);
         if (handlerList != null && !handlerList.isEmpty()) {
             for (IEventHandler<RecipeEvent> handler : handlerList) {
                 RecipeFinishEvent event = new RecipeFinishEvent(this);
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileEntitySynchronized.java b/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileEntitySynchronized.java
@@ -77,13 +77,10 @@ public final void onDataPacket(@Nonnull NetworkManager manager, @Nonnull SPacket
         readNetNBT(packet.getNbtCompound());
     }
 
-    @SuppressWarnings("deprecation")
     public void markForUpdate() {
         IBlockState state = world.getBlockState(pos);
         world.notifyBlockUpdate(pos, state, state, 3);
-        if (state.getBlock().hasComparatorInputOverride(state)) {
-            markDirty();
-        }
+        markDirty();
     }
 
     /**
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileFluidTank.java b/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileFluidTank.java
@@ -40,6 +40,7 @@
         @Optional.Interface(modid = "mekanism", iface = "mekanism.api.gas.IGasHandler"),
         @Optional.Interface(modid = "mekanism", iface = "mekanism.api.gas.ITubeConnection")
 })
+@SuppressWarnings("deprecation")
 public abstract class TileFluidTank extends TileColorableMachineComponent implements MachineComponentTile, IGasHandler, ITubeConnection, SelectiveUpdateTileEntity {
 
     private HybridTank tank;
@@ -56,14 +57,14 @@ public TileFluidTank(FluidHatchSize size, IOType type) {
     }
 
     @Optional.Method(modid = "mekanism")
-    private static boolean checkMekanismGasCapabilitiesPresence(Capability<?> capability, @Nullable EnumFacing facing) {
-        return checkMekanismGasCapabilities(capability, facing);
+    private static boolean checkMekanismGasCapabilitiesPresence(Capability<?> capability) {
+        return checkMekanismGasCapabilities(capability);
     }
 
     @Optional.Method(modid = "mekanism")
-    private static boolean checkMekanismGasCapabilities(Capability<?> capability, @Nullable EnumFacing facing) {
-        String gasType = IGasHandler.class.getName().intern();
-        String tubeConnectionName = ITubeConnection.class.getName().intern();
+    private static boolean checkMekanismGasCapabilities(Capability<?> capability) {
+        String gasType = IGasHandler.class.getName();
+        String tubeConnectionName = ITubeConnection.class.getName();
         return capability != null && (capability.getName().equals(gasType) || capability.getName().equals(tubeConnectionName));
     }
 
@@ -77,7 +78,7 @@ public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing faci
             return true;
         }
         if (Mods.MEKANISM.isPresent()) {
-            if (checkMekanismGasCapabilitiesPresence(capability, facing)) {
+            if (checkMekanismGasCapabilitiesPresence(capability)) {
                 return true;
             }
         }
@@ -86,12 +87,13 @@ public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing faci
 
     @Nullable
     @Override
+    @SuppressWarnings("unchecked")
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
             return (T) tank;
         }
         if (Mods.MEKANISM.isPresent()) {
-            if (checkMekanismGasCapabilities(capability, facing)) {
+            if (checkMekanismGasCapabilities(capability)) {
                 return (T) this;
             }
         }
@@ -139,7 +141,7 @@ public void writeCustomNBT(NBTTagCompound compound) {
 
     @Nullable
     @Override
-    public MachineComponent provideComponent() {
+    public MachineComponent<?> provideComponent() {
         return new MachineComponent.FluidHatch(ioType) {
             @Override
             public HybridTank getContainerProvider() {
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java b/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java
@@ -76,6 +76,7 @@ public abstract class TileMultiblockMachineController extends TileEntityRestrict
     protected TaggedPositionBlockArray foundPattern = null;
     protected ActionExecutor tickExecutor = null;
     protected LinkedList<Integer> usedTimeList = new LinkedList<>();
+    protected int usedTimeCache = 0;
     protected int structureCheckCounter = 0;
     protected int recipeResearchRetryCounter = 0;
 
@@ -115,11 +116,13 @@ public final void doRestrictedTick() {
             return;
         }
         updateUsedTime();
+
         long tickStart = System.nanoTime();
 
+        // Controller Tick
         doControllerTick();
 
-        addUsedTime((int) TimeUnit.MICROSECONDS.convert(System.nanoTime() - tickStart, TimeUnit.NANOSECONDS));
+        incrementUsedTime((int) TimeUnit.MICROSECONDS.convert(System.nanoTime() - tickStart, TimeUnit.NANOSECONDS));
     }
 
     public abstract void doControllerTick();
@@ -132,6 +135,13 @@ protected void updateUsedTime() {
         addUsedTime(tickExecutor == null ? 0 : tickExecutor.usedTime);
     }
 
+    protected void incrementUsedTime(int add) {
+        Integer first = usedTimeList.getFirst();
+        if (first != null) {
+            usedTimeList.set(0, first + add);
+        }
+    }
+
     protected void addUsedTime(int time) {
         usedTimeList.addFirst(time);
         if (usedTimeList.size() > 100) {
@@ -140,11 +150,9 @@ protected void addUsedTime(int time) {
     }
 
     public int usedTimeAvg() {
-        int sum = 0;
-        for (Integer time : usedTimeList) {
-            sum += time;
-        }
-        return sum / usedTimeList.size();
+        ModularMachinery.EXECUTE_MANAGER.addParallelAsyncTask(() ->
+                usedTimeCache = usedTimeList.stream().mapToInt(time -> time).sum() / usedTimeList.size());
+        return usedTimeCache;
     }
 
     public int getMaxParallelism() {
@@ -826,6 +834,15 @@ public int getTicksExisted() {
         return ticksExisted;
     }
 
+    @Override
+    public void markForUpdate() {
+        IBlockState state = world.getBlockState(pos);
+        world.notifyBlockUpdate(pos, state, state, 3);
+        if (ticksExisted % 10 == 0) {
+            markDirty();
+        }
+    }
+
     public enum Type {
         MISSING_STRUCTURE,
         CHUNK_UNLOADED,

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ private Optional<CraftCheck> checkStartCraftingWithMekanism(ProcessingComponent<`
`267`	`267`	`@Override`
`268`	`268`	`public boolean startCrafting(ProcessingComponent<?> component, RecipeCraftingContext context, ResultChance chance) {`
`269`	`269`	`HybridTank handler = (HybridTank) component.providedComponent;`
`270`		`- if (Objects.requireNonNull(actionType) == IOType.INPUT) {`
	`270`	`+ if (actionType == IOType.INPUT) {`
`271`	`271`	`if (Mods.MEKANISM.isPresent()) {`
`272`	`272`	`return startCraftingWithMekanismHandling(handler, chance);`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,10 @@ public final void onDataPacket(@Nonnull NetworkManager manager, @Nonnull SPacket`
`77`	`77`	`readNetNBT(packet.getNbtCompound());`
`78`	`78`	`}`
`79`	`79`
`80`		`- @SuppressWarnings("deprecation")`
`81`	`80`	`public void markForUpdate() {`
`82`	`81`	`IBlockState state = world.getBlockState(pos);`
`83`	`82`	`world.notifyBlockUpdate(pos, state, state, 3);`
`84`		`- if (state.getBlock().hasComparatorInputOverride(state)) {`
`85`		`- markDirty();`
`86`		`- }`
	`83`	`+ markDirty();`
`87`	`84`	`}`
`88`	`85`
`89`	`86`	`/**`