From 2d71b7501925d48a6df5bd7f6bfda375b6c32e04 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Tue, 17 Aug 2021 07:46:47 -0300 Subject: [PATCH] actually fix it --- gradle.properties | 2 +- .../java/appeng/parts/reporting/AbstractPartMonitor.java | 3 ++- .../appeng/parts/reporting/PartConversionMonitor.java | 9 ++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8a8e4ffb6..a67184cc3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ aechannel=stable aebuild=7 aegroup=appeng aebasename=appliedenergistics2 -trousers=omni-fixes-v46h +trousers=omni-fixes-v46i ######################################################### # Versions # diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 3ff742844..b49bd01f2 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -300,7 +300,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements private > void updateReportingValue ( final IMEMonitor monitor ) { - if( this.configuredItem != null) { final IAEItemStack result = (IAEItemStack) monitor.getStorageList().findPrecise( (T) this.configuredItem ); @@ -312,6 +311,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements { this.configuredAmount = result.getStackSize(); } + this.configuredItem.setStackSize( this.configuredAmount ); } else if( this.configuredFluid != null) { @@ -324,6 +324,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements { this.configuredAmount = result.getStackSize(); } + this.configuredFluid.setStackSize( this.configuredAmount ); } } diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index 1bf38a76d..cdcc8ffdd 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -141,11 +141,6 @@ public class PartConversionMonitor extends AbstractPartMonitor //If its a fluid container, grab its fluidstack. if its empty pass its itemstack; - if( eq.isEmpty() ) - { - return super.onPartActivate( player, hand, pos ); - } - if( fluidInTank != null && fluidInTank.amount > 0 ) { if( getDisplayed() instanceof IAEItemStack || getDisplayed() == null ) @@ -161,11 +156,11 @@ public class PartConversionMonitor extends AbstractPartMonitor return super.onPartActivate( player, hand, pos ); } } - else if( this.getDisplayed() != null && this.getDisplayed().equals( eq ) ) + else if( this.getDisplayed() != null && this.getDisplayed().equals( player.getHeldItem( hand ) ) ) { this.insertItem( player, hand, false ); } - else + else if( !player.getHeldItem( hand ).isEmpty() ) { return super.onPartActivate( player, hand, pos ); }