- item != item?

- 尝试改进 IC2 的线程调用。
NovaEngineering-Source · Oct 1, 2024 · 38b8384 · 38b8384
1 parent 7dd6631
commit 38b8384
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -287,6 +287,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:lolasm-460609:5257348"))
     runtimeOnly(rfg.deobf("curse.maven:spark-361579:3245793"))
     compileOnly(rfg.deobf("curse.maven:dme-737252:5043404"))
+    implementation(rfg.deobf("curse.maven:bountifulbaubles-313536:3568240"))
 }
 
 // IDE Settings

diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2_energynet/MixinGridUpdater.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2_energynet/MixinGridUpdater.java
@@ -90,12 +90,12 @@ void startTransferCalc(final CallbackInfo ci) {
         int tasks = grids.size();
         ForkJoinPool.commonPool().submit(() -> {
             int concurrency = Math.min(tasks, Math.max(Runtime.getRuntime().availableProcessors(), 2));
-            IntStream.range(0, concurrency).forEach(i -> ForkJoinPool.commonPool().submit(() -> {
+            IntStream.range(0, concurrency).parallel().forEach(i -> {
                 Grid grid;
                 while ((grid = calculateQueue.poll()) != null) {
                     stellar_core$syncTaskQueue.offer(stellarCalculator.doParallelCalc(grid));
                 }
-            }));
+            });
         });
 
         stellar_core$executeSyncTasks(tasks, stellarCalculator, calculateQueue);

diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/itemstack/MixinItemStack.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/itemstack/MixinItemStack.java
@@ -52,6 +52,9 @@ public abstract class MixinItemStack implements StellarItemStackCapLoader {
     @Shadow
     public abstract int getAnimationsToGo();
 
+    @Shadow
+    public abstract Item getItem();
+
     @Unique
     private ItemStackCapInitTask stellar_core$capInitTask = null;
 
@@ -88,7 +91,7 @@ private void forgeInit() {
     @Override
     @SuppressWarnings("DataFlowIssue")
     public void stellar_core$initCap() {
-        ICapabilityProvider provider = item.initCapabilities((ItemStack) (Object) this, this.capNBT);
+        ICapabilityProvider provider = getItem().initCapabilities((ItemStack) (Object) this, this.capNBT);
         this.stellar_core$capabilities = ForgeEventFactory.gatherCapabilities((ItemStack) (Object) this, provider);
     }