- 更新本地库。

- 细节修复和调整。

Author: KasumiNova

lib/modularmachinery-2.1.0-main.jar

@@ -186,6 +186,7 @@ protected void renderInternal(final WidgetGui gui, final RenderSize renderSize,
                         text = String.format("§b%d§r / §9%d§r", cpus, maxThreads);
                     }
                     fr.drawStringWithShadow(text, 0, 0, 0xFFFFFFFF);
+                    GlStateManager.color(1F, 1F, 1F, 1F);
                 }
                 GlStateManager.popMatrix();
             }

src/main/java/github/kasuminova/novaeng/client/gui/widget/ecalculator/CPUStatusPanel.java

@@ -166,6 +166,7 @@ public void render(final WidgetGui gui, final RenderSize renderSize, final Rende
                 }
                 GlStateManager.popMatrix();
             }
+            GlStateManager.color(1F, 1F, 1F, 1F);
             GlStateManager.popMatrix();
         }
 

src/main/java/github/kasuminova/novaeng/client/gui/widget/ecalculator/MonitorPanel.java

@@ -7,6 +7,7 @@
 import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IItemList;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.tile.inventory.AppEngInternalInventory;
@@ -83,7 +84,7 @@ public class EFabricatorController extends EPartController<EFabricatorPart> {
     protected final List<IFluidHandler> coolantOutputHandlers = new ArrayList<>();
 
     protected final IItemStorageChannel itemChannel = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
-    protected ItemList outputBuffer = new ItemList();
+    protected IItemList<IAEItemStack> outputBuffer = new ItemList();
 
     protected BlockEFabricatorController parentController = null;
     protected double idleDrain = 64;
@@ -441,7 +442,7 @@ public int getAvailableParallelism() {
         return Math.max(0, parallelism - consumedParallelism);
     }
 
-    public ItemList getOutputBuffer() {
+    public IItemList<IAEItemStack> getOutputBuffer() {
         return outputBuffer;
     }
 

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorController.java

@@ -1,7 +1,8 @@
 package github.kasuminova.novaeng.common.tile.ecotech.efabricator;
 
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IItemList;
 import appeng.util.item.AEItemStack;
-import appeng.util.item.ItemList;
 import github.kasuminova.novaeng.NovaEngineeringCore;
 import github.kasuminova.novaeng.common.block.ecotech.efabricator.prop.WorkerStatus;
 import github.kasuminova.novaeng.common.network.PktEFabricatorWorkerStatusUpdate;
@@ -49,7 +50,7 @@ public synchronized int doWork() {
         }
 
         int completed = 0;
-        ItemList outputBuffer = controller.getOutputBuffer();
+        IItemList<IAEItemStack> outputBuffer = controller.getOutputBuffer();
         CraftWork craftWork;
         synchronized (outputBuffer) {
             while ((parallelism > completed) && (craftWork = queue.poll()) != null) {

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorWorker.java

@@ -77,7 +77,9 @@ public abstract class MixinCraftingCPUCluster implements ECPUCluster {
     @Shadow
     public abstract void cancel();
 
-    @Shadow @Final private int[] usedOps;
+    @Final
+    @Shadow
+    private int[] usedOps;
 
     @Inject(method = "submitJob", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingJob;getOutput()Lappeng/api/storage/data/IAEItemStack;"))
     private void injectSubmitJob(final IGrid g, final ICraftingJob job, final IActionSource src, final ICraftingRequester requestingMachine, final CallbackInfoReturnable<ICraftingLink> cir) {
@@ -99,7 +101,7 @@ private void injectCancel(final CallbackInfo ci) {
     }
 
     @Inject(method = "updateCraftingLogic", at = @At("HEAD"), cancellable = true)
-    private void injectUpdateCraftingLogicStoreItems(final IGrid grid, final IEnergyGrid eg, final CraftingGridCache cc, final CallbackInfo ci) {
+    private void injectUpdateCraftingLogicStoreItems(final IGrid grid, final IEnergyGrid eg, final CraftingGridCache cgc, final CallbackInfo ci) {
         if (this.novaeng_ec$core == null) {
             return;
         }
@@ -119,7 +121,7 @@ private void injectUpdateCraftingLogicStoreItems(final IGrid grid, final IEnergy
     }
 
     @Inject(method = "updateCraftingLogic", at = @At("TAIL"))
-    private void injectUpdateCraftingLogicTail(final IGrid grid, final IEnergyGrid eg, final CraftingGridCache cc, final CallbackInfo ci) {
+    private void injectUpdateCraftingLogicTail(final IGrid grid, final IEnergyGrid eg, final CraftingGridCache cgc, final CallbackInfo ci) {
         int currentParallelism = this.usedOps[0];
         novaeng_ec$parallelismRecorder.addUsedTime(currentParallelism);
     }