From e6ccc24ae069c2bd8a417dbda4b4eb475cee27e2 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Sat, 18 Sep 2021 21:41:57 -0300 Subject: [PATCH] fix #49. you can now actually clear storage and conversion monitors --- .../appeng/parts/reporting/AbstractPartMonitor.java | 11 +++++++++-- .../appeng/parts/reporting/PartConversionMonitor.java | 3 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 5c332f41d..031e1087c 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -206,10 +206,17 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements fluidInTank = fluidHandlerItem.drain( Integer.MAX_VALUE, false ); } - if (fluidInTank == null) + if( fluidInTank == null ) { this.configuredFluid = null; - this.configuredItem = AEItemStack.fromItemStack( eq ); + if( !eq.isEmpty() ) + { + this.configuredItem = AEItemStack.fromItemStack( eq ).setStackSize( 0 ); + } + else + { + this.configuredItem = null; + } } else if( fluidInTank.amount > 0 ) { diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index 121324d0f..47ec3bcec 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -170,8 +170,7 @@ public class PartConversionMonitor extends AbstractPartMonitor this.insertItem( player, hand, false ); } } - - return true; + return super.onPartActivate( player, hand, pos ); } @Override