From e6998913e17a275730fa9e0cbec03b3ef6fe5feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salom=C3=A3o?= Date: Mon, 4 Jan 2021 12:34:44 -0300 Subject: [PATCH] remove forced level emitters update remove unneeded itemStack creation. --- .../appeng/fluids/parts/PartFluidLevelEmitter.java | 1 - .../me/cluster/implementations/CraftingCPUCluster.java | 10 ++++------ .../java/appeng/parts/automation/PartLevelEmitter.java | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java b/src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java index a1852a586..21891db8c 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java +++ b/src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java @@ -171,7 +171,6 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc @Override public void postChange( final IBaseMonitor monitor, final Iterable change, final IActionSource actionSource ) { - this.updateReportingValue( (IMEMonitor) monitor ); } @Override diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 91db2d4e8..8be9cd06b 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -504,17 +504,16 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU fuzz = fuzz.copy(); fuzz.setStackSize( g.getStackSize() ); final IAEItemStack ais = this.inventory.extractItems( fuzz, Actionable.SIMULATE, this.machineSrc ); - final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack(); - if( !is.isEmpty() && is.getCount() == g.getStackSize() ) + if (ais != null && ais.getStackSize() == g.getStackSize()) { found = true; break; } - else if( !is.isEmpty() ) + else if( ais != null ) { g = g.copy(); - g.decStackSize( is.getCount() ); + g.decStackSize( ais.getStackSize() ); } } @@ -526,9 +525,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU else { final IAEItemStack ais = this.inventory.extractItems( g.copy(), Actionable.SIMULATE, this.machineSrc ); - final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack(); - if( is.isEmpty() || is.getCount() < g.getStackSize() ) + if (ais == null || ais.getStackSize() < g.getStackSize()) { return false; } diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index a1f46a0e7..528a3739a 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -400,7 +400,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @Override public void postChange( final IBaseMonitor monitor, final Iterable change, final IActionSource actionSource ) { - this.updateReportingValue( (IMEMonitor) monitor ); } @Override