From 8f2a06e457ede3396ca943655fea60a460efefe8 Mon Sep 17 00:00:00 2001
From: PrototypeTrousers <salomaoo@gmail.com>
Date: Fri, 20 Aug 2021 23:26:33 -0300
Subject: [PATCH] fix #49. you can now actually clear storage and conversion
 monitors

---
 gradle.properties                                     |  2 +-
 .../appeng/parts/reporting/AbstractPartMonitor.java   | 11 +++++++++--
 .../appeng/parts/reporting/PartConversionMonitor.java |  6 +-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a67184cc3..b2b198cd2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v46i
+trousers=omni-fixes-v46j
 
 #########################################################
 # Versions                                              #
diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
index b49bd01f2..84a211afb 100644
--- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
@@ -209,10 +209,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 ).setStackSize( 0 );
+				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 cdcc8ffdd..e6ea896da 100644
--- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java
+++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java
@@ -160,11 +160,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 		{
 			this.insertItem( player, hand, false );
 		}
-		else if( !player.getHeldItem( hand ).isEmpty() )
-		{
-			return super.onPartActivate( player, hand, pos );
-		}
-		return true;
+		return super.onPartActivate( player, hand, pos );
 	}
 
 	@Override