fix #49. you can now actually clear storage and conversion monitors
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@ aechannel=stable
|
|||||||
aebuild=7
|
aebuild=7
|
||||||
aegroup=appeng
|
aegroup=appeng
|
||||||
aebasename=appliedenergistics2
|
aebasename=appliedenergistics2
|
||||||
trousers=omni-fixes-v46i
|
trousers=omni-fixes-v46j
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Versions #
|
# Versions #
|
||||||
|
|||||||
@@ -212,8 +212,15 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
|
|||||||
if( fluidInTank == null )
|
if( fluidInTank == null )
|
||||||
{
|
{
|
||||||
this.configuredFluid = null;
|
this.configuredFluid = null;
|
||||||
|
if( !eq.isEmpty() )
|
||||||
|
{
|
||||||
this.configuredItem = AEItemStack.fromItemStack( eq ).setStackSize( 0 );
|
this.configuredItem = AEItemStack.fromItemStack( eq ).setStackSize( 0 );
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.configuredItem = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
else if( fluidInTank.amount > 0 )
|
else if( fluidInTank.amount > 0 )
|
||||||
{
|
{
|
||||||
this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank ).setStackSize( 0 );
|
this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank ).setStackSize( 0 );
|
||||||
|
|||||||
@@ -160,12 +160,8 @@ public class PartConversionMonitor extends AbstractPartMonitor
|
|||||||
{
|
{
|
||||||
this.insertItem( player, hand, false );
|
this.insertItem( player, hand, false );
|
||||||
}
|
}
|
||||||
else if( !player.getHeldItem( hand ).isEmpty() )
|
|
||||||
{
|
|
||||||
return super.onPartActivate( player, hand, pos );
|
return super.onPartActivate( player, hand, pos );
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onClicked( EntityPlayer player, EnumHand hand, Vec3d pos )
|
public boolean onClicked( EntityPlayer player, EnumHand hand, Vec3d pos )
|
||||||
|
|||||||
Reference in New Issue
Block a user