fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actually fix it

Browse Source
This commit is contained in:
PrototypeTrousers
2021-08-17 07:46:47 -03:00
parent 9f09cd04d4
commit 2d71b75019
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -3,7 +3,7 @@ aechannel=stable
aebuild=7 aebuild=7
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2
trousers=omni-fixes-v46h trousers=omni-fixes-v46i
######################################################### #########################################################
# Versions # # Versions #
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+2 -1
View File
@@ -300,7 +300,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
private <T extends IAEStack<T>> void updateReportingValue ( final IMEMonitor<T> monitor ) private <T extends IAEStack<T>> void updateReportingValue ( final IMEMonitor<T> monitor )
{ {
if( this.configuredItem != null) if( this.configuredItem != null)
{ {
final IAEItemStack result = (IAEItemStack) monitor.getStorageList().findPrecise( (T) this.configuredItem ); 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.configuredAmount = result.getStackSize();
} }
this.configuredItem.setStackSize( this.configuredAmount );
} }
else if( this.configuredFluid != null) else if( this.configuredFluid != null)
{ {
@@ -324,6 +324,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
{ {
this.configuredAmount = result.getStackSize(); this.configuredAmount = result.getStackSize();
} }
this.configuredFluid.setStackSize( this.configuredAmount );
} }
} }
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
+2 -7
View File
@@ -141,11 +141,6 @@ public class PartConversionMonitor extends AbstractPartMonitor
//If its a fluid container, grab its fluidstack. if its empty pass its itemstack; //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( fluidInTank != null && fluidInTank.amount > 0 )
{ {
if( getDisplayed() instanceof IAEItemStack || getDisplayed() == null ) if( getDisplayed() instanceof IAEItemStack || getDisplayed() == null )
@@ -161,11 +156,11 @@ public class PartConversionMonitor extends AbstractPartMonitor
return super.onPartActivate( player, hand, pos ); 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 ); this.insertItem( player, hand, false );
} }
else else if( !player.getHeldItem( hand ).isEmpty() )
{ {
return super.onPartActivate( player, hand, pos ); return super.onPartActivate( player, hand, pos );
} }