Change storage/conversion monitor interaction. (#3613)

Fixes #1480

src/main/java/appeng/parts/CableBusContainer.java

@@ -818,11 +818,35 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
 		final SelectedPart p = this.selectPart( pos );
 		if( p != null && p.part != null )
 		{
+			// forge sends activate even when sneaking in some cases (eg emtpy hand)
+			// if sneaking try shift activate first.
+			if( player.isSneaking() && p.part.onShiftActivate( player, hand, pos ) )
+			{
+				return true;
+			}
 			return p.part.onActivate( player, hand, pos );
 		}
 		return false;
 	}
 
+	@Override
+	public boolean clicked( EntityPlayer player, EnumHand hand, Vec3d hitVec )
+	{
+		final SelectedPart p = this.selectPart( hitVec );
+		if( p != null && p.part != null )
+		{
+			if( player.isSneaking() )
+			{
+				return p.part.onShiftClicked( player, hand, hitVec );
+			}
+			else
+			{
+				return p.part.onClicked( player, hand, hitVec );
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
 	{

src/main/java/appeng/parts/ICableBusContainer.java

@@ -52,6 +52,8 @@ public interface ICableBusContainer
 
 	boolean activate( EntityPlayer player, EnumHand hand, Vec3d vecFromPool );
 
+	boolean clicked( EntityPlayer player, EnumHand hand, Vec3d hitVec );
+
 	void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor );
 
 	boolean isSolidOnSide( EnumFacing side );

src/main/java/appeng/parts/NullCableBusContainer.java

@@ -124,4 +124,10 @@ public class NullCableBusContainer implements ICableBusContainer
 		return new CableBusRenderState();
 	}
 
+	@Override
+	public boolean clicked( EntityPlayer player, EnumHand hand, Vec3d hitVec )
+	{
+		return false;
+	}
+
 }

src/main/java/appeng/parts/PartPlacement.java

@@ -196,7 +196,7 @@ public class PartPlacement
 			}
 		}
 
-		// if ( held == null )
+		if( held.isEmpty() )
 		{
 			final Block block = world.getBlockState( pos ).getBlock();
 			if( host != null && player.isSneaking() && block != null )
@@ -261,8 +261,9 @@ public class PartPlacement
 			final boolean multiPartPresent = maybeMultiPartBlock.isPresent() && maybeMultiPartStack.isPresent() && maybeMultiPartItemBlock.isPresent();
 			final boolean canMultiPartBePlaced = maybeMultiPartBlock.get().canPlaceBlockAt( world, te_pos );
 
-			if( hostIsNotPresent && multiPartPresent && canMultiPartBePlaced && maybeMultiPartItemBlock.get().placeBlockAt( maybeMultiPartStack.get(), player,
-					world, te_pos, side, 0.5f, 0.5f, 0.5f, maybeMultiPartBlock.get().getDefaultState() ) )
+			if( hostIsNotPresent && multiPartPresent && canMultiPartBePlaced && maybeMultiPartItemBlock.get()
+					.placeBlockAt( maybeMultiPartStack.get(), player,
+							world, te_pos, side, 0.5f, 0.5f, 0.5f, maybeMultiPartBlock.get().getDefaultState() ) )
 			{
 				if( !world.isRemote )
 				{

src/main/java/appeng/parts/automation/PartExportBus.java

@@ -130,8 +130,10 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 		try
 		{
 			final InventoryAdaptor destination = this.getHandler();
-			final IMEMonitor<IAEItemStack> inv = this.getProxy().getStorage().getInventory(
-					AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+			final IMEMonitor<IAEItemStack> inv = this.getProxy()
+					.getStorage()
+					.getInventory(
+							AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 			final IEnergyGrid energy = this.getProxy().getEnergy();
 			final ICraftingGrid cg = this.getProxy().getCrafting();
 			final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
@@ -215,18 +217,11 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 	@Override
 	public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
 	{
-		if( !player.isSneaking() )
+		if( Platform.isServer() )
 		{
-			if( Platform.isClient() )
-			{
-				return true;
-			}
-
 			Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_BUS );
-			return true;
 		}
-
-		return false;
+		return true;
 	}
 
 	@Override

src/main/java/appeng/parts/automation/PartFormationPlane.java

@@ -196,18 +196,11 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
 	@Override
 	public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
 	{
-		if( !player.isSneaking() )
+		if( Platform.isServer() )
 		{
-			if( Platform.isClient() )
-			{
-				return true;
-			}
-
 			Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_FORMATION_PLANE );
-			return true;
 		}
-
-		return false;
+		return true;
 	}
 
 	@Override

src/main/java/appeng/parts/automation/PartImportBus.java

@@ -93,8 +93,10 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 
 		try
 		{
-			final IMEMonitor<IAEItemStack> inv = this.getProxy().getStorage().getInventory(
-					AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+			final IMEMonitor<IAEItemStack> inv = this.getProxy()
+					.getStorage()
+					.getInventory(
+							AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 
 			final IAEItemStack out = inv.injectItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ),
 					Actionable.SIMULATE,
@@ -128,18 +130,11 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 	@Override
 	public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
 	{
-		if( !player.isSneaking() )
+		if( Platform.isServer() )
 		{
-			if( Platform.isClient() )
-			{
-				return true;
-			}
-
 			Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_BUS );
-			return true;
 		}
-
-		return false;
+		return true;
 	}
 
 	@Override
@@ -173,8 +168,10 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 			{
 				this.itemsToSend = this.calculateItemsToSend();
 
-				final IMEMonitor<IAEItemStack> inv = this.getProxy().getStorage().getInventory(
-						AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+				final IMEMonitor<IAEItemStack> inv = this.getProxy()
+						.getStorage()
+						.getInventory(
+								AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 				final IEnergyGrid energy = this.getProxy().getEnergy();
 
 				boolean Configured = false;

src/main/java/appeng/parts/automation/PartLevelEmitter.java

@@ -465,18 +465,11 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	@Override
 	public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
 	{
-		if( !player.isSneaking() )
+		if( Platform.isServer() )
 		{
-			if( Platform.isClient() )
-			{
-				return true;
-			}
-
 			Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_LEVEL_EMITTER );
-			return true;
 		}
-
-		return false;
+		return true;
 	}
 
 	@Override

src/main/java/appeng/parts/misc/PartInterface.java

@@ -174,16 +174,10 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
 	@Override
 	public boolean onPartActivate( final EntityPlayer p, final EnumHand hand, final Vec3d pos )
 	{
-		if( p.isSneaking() )
-		{
-			return false;
-		}
-
 		if( Platform.isServer() )
 		{
 			Platform.openGUI( p, this.getTileEntity(), this.getSide(), GuiBridge.GUI_INTERFACE );
 		}
-
 		return true;
 	}
 
@@ -311,7 +305,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
 	{
 		return this.duality.getCapability( capabilityClass, this.getSide().getFacing() );
 	}
-	
+
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -256,8 +256,10 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		{
 			if( this.getProxy().isActive() )
 			{
-				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change,
-						this.mySrc );
+				this.getProxy()
+						.getStorage()
+						.postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change,
+								this.mySrc );
 			}
 		}
 		catch( final GridAccessException e )
@@ -298,18 +300,11 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	@Override
 	public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
 	{
-		if( !player.isSneaking() )
+		if( Platform.isServer() )
 		{
-			if( Platform.isClient() )
-			{
-				return true;
-			}
-
 			Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_STORAGEBUS );
-			return true;
 		}
-
-		return false;
+		return true;
 	}
 
 	@Override
@@ -625,7 +620,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			return MODELS_OFF;
 		}
 	}
-	
+
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{

src/main/java/appeng/parts/p2p/PartP2PTunnel.java

@@ -160,6 +160,11 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 	@Override
 	public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
 	{
+		if( Platform.isClient() )
+		{
+			return true;
+		}
+
 		if( hand == EnumHand.OFF_HAND )
 		{
 			return false;
@@ -305,6 +310,11 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 		final ItemStack is = player.inventory.getCurrentItem();
 		if( !is.isEmpty() && is.getItem() instanceof IMemoryCard )
 		{
+			if( Platform.isClient() )
+			{
+				return true;
+			}
+
 			final IMemoryCard mc = (IMemoryCard) is.getItem();
 			final NBTTagCompound data = new NBTTagCompound();
 

src/main/java/appeng/parts/reporting/AbstractPartMonitor.java

@@ -27,7 +27,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.RayTraceResult;
@@ -163,24 +162,46 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 			return false;
 		}
 
-		final TileEntity te = this.getTile();
-		final ItemStack eq = player.getHeldItem( hand );
-
-		if( Platform.isWrench( player, eq, te.getPos() ) )
-		{
-			this.isLocked = !this.isLocked;
-			player.sendMessage( ( this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked ).get() );
-			this.getHost().markForUpdate();
-		}
-		else if( !this.isLocked )
+		if( !this.isLocked )
 		{
+			final ItemStack eq = player.getHeldItem( hand );
 			this.configuredItem = AEItemStack.fromItemStack( eq );
 			this.configureWatchers();
+			this.getHost().markForSave();
 			this.getHost().markForUpdate();
 		}
 		else
 		{
-			this.extractItem( player );
+			return super.onPartActivate( player, hand, pos );
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean onPartShiftActivate( EntityPlayer player, EnumHand hand, Vec3d pos )
+	{
+		if( Platform.isClient() )
+		{
+			return true;
+		}
+
+		if( !this.getProxy().isActive() )
+		{
+			return false;
+		}
+
+		if( !Platform.hasPermissions( this.getLocation(), player ) )
+		{
+			return false;
+		}
+
+		if( player.getHeldItem( hand ).isEmpty() )
+		{
+			this.isLocked = !this.isLocked;
+			player.sendMessage( ( this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked ).get() );
+			this.getHost().markForSave();
+			this.getHost().markForUpdate();
 		}
 
 		return true;
@@ -213,11 +234,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		}
 	}
 
-	protected void extractItem( final EntityPlayer player )
-	{
-
-	}
-
 	private void updateReportingValue( final IMEMonitor<IAEItemStack> itemInventory )
 	{
 		if( this.configuredItem != null )
@@ -271,7 +287,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 	}
 
 	@Override
-	public IAEStack<?> getDisplayed()
+	public IAEItemStack getDisplayed()
 	{
 		return this.configuredItem;
 	}

src/main/java/appeng/parts/reporting/AbstractPartReporting.java

@@ -199,7 +199,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
 	{
 		final TileEntity te = this.getTile();
 
-		if( !player.isSneaking() && Platform.isWrench( player, player.inventory.getCurrentItem(), te.getPos() ) )
+		if( Platform.isWrench( player, player.inventory.getCurrentItem(), te.getPos() ) )
 		{
 			if( Platform.isServer() )
 			{

src/main/java/appeng/parts/reporting/AbstractPartTerminal.java

@@ -115,19 +115,12 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
 	{
 		if( !super.onPartActivate( player, hand, pos ) )
 		{
-			if( !player.isSneaking() )
+			if( Platform.isServer() )
 			{
-				if( Platform.isClient() )
-				{
-					return true;
-				}
-
 				Platform.openGUI( player, this.getHost().getTile(), this.getSide(), this.getGui( player ) );
-
-				return true;
 			}
 		}
-		return false;
+		return true;
 	}
 
 	public GuiBridge getGui( final EntityPlayer player )

src/main/java/appeng/parts/reporting/PartConversionMonitor.java

@@ -28,6 +28,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.wrapper.PlayerMainInvWrapper;
 
 import appeng.api.AEApi;
 import appeng.api.networking.energy.IEnergySource;
@@ -72,7 +74,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 	}
 
 	@Override
-	public boolean onPartShiftActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
+	public boolean onPartActivate( EntityPlayer player, EnumHand hand, Vec3d pos )
 	{
 		if( Platform.isClient() )
 		{
@@ -89,62 +91,133 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			return false;
 		}
 
-		boolean ModeB = false;
-
-		ItemStack item = player.getHeldItem( hand );
-		if( item.isEmpty() && this.getDisplayed() != null )
+		final ItemStack eq = player.getHeldItem( hand );
+		if( this.isLocked() )
 		{
-			ModeB = true;
-			item = ( (IAEItemStack) this.getDisplayed() ).createItemStack();
-		}
-
-		if( !item.isEmpty() )
-		{
-			try
+			if( eq.isEmpty() )
 			{
-				if( !this.getProxy().isActive() )
-				{
-					return false;
-				}
-
-				final IEnergySource energy = this.getProxy().getEnergy();
-				final IMEMonitor<IAEItemStack> cell = this.getProxy().getStorage().getInventory(
-						AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
-				final IAEItemStack input = AEItemStack.fromItemStack( item );
-
-				if( ModeB )
-				{
-					for( int x = 0; x < player.inventory.getSizeInventory(); x++ )
-					{
-						final ItemStack targetStack = player.inventory.getStackInSlot( x );
-						if( input.equals( targetStack ) )
-						{
-							final IAEItemStack insertItem = input.copy();
-							insertItem.setStackSize( targetStack.getCount() );
-							final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, insertItem, new PlayerSource( player, this ) );
-							player.inventory.setInventorySlotContents( x, failedToInsert == null ? ItemStack.EMPTY : failedToInsert.createItemStack() );
-						}
-					}
-				}
-				else
-				{
-					final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, input, new PlayerSource( player, this ) );
-					player.inventory.setInventorySlotContents( player.inventory.currentItem,
-							failedToInsert == null ? ItemStack.EMPTY : failedToInsert.createItemStack() );
-				}
+				this.insertItem( player, hand, true );
 			}
-			catch( final GridAccessException e )
+			else if( Platform.isWrench( player, eq, this.getLocation().getPos() ) && ( this.getDisplayed() == null || !this.getDisplayed().equals( eq ) ) )
 			{
-				// :P
+				// wrench it
+				return super.onPartActivate( player, hand, pos );
+			}
+			else
+			{
+				this.insertItem( player, hand, false );
 			}
 		}
+		else if( this.getDisplayed() != null && this.getDisplayed().equals( eq ) )
+		{
+			this.insertItem( player, hand, false );
+		}
+		else
+		{
+			return super.onPartActivate( player, hand, pos );
+		}
+
 		return true;
 	}
 
 	@Override
-	protected void extractItem( final EntityPlayer player )
+	public boolean onClicked( EntityPlayer player, EnumHand hand, Vec3d pos )
 	{
-		final IAEItemStack input = (IAEItemStack) this.getDisplayed();
+		if( Platform.isClient() )
+		{
+			return true;
+		}
+
+		if( !this.getProxy().isActive() )
+		{
+			return false;
+		}
+
+		if( !Platform.hasPermissions( this.getLocation(), player ) )
+		{
+			return false;
+		}
+
+		if( this.getDisplayed() != null )
+		{
+			this.extractItem( player, this.getDisplayed().getDefinition().getMaxStackSize() );
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean onShiftClicked( EntityPlayer player, EnumHand hand, Vec3d pos )
+	{
+		if( Platform.isClient() )
+		{
+			return true;
+		}
+
+		if( !this.getProxy().isActive() )
+		{
+			return false;
+		}
+
+		if( !Platform.hasPermissions( this.getLocation(), player ) )
+		{
+			return false;
+		}
+
+		if( this.getDisplayed() != null )
+		{
+			this.extractItem( player, 1 );
+		}
+
+		return true;
+	}
+
+	private void insertItem( final EntityPlayer player, final EnumHand hand, final boolean allItems )
+	{
+		try
+		{
+			final IEnergySource energy = this.getProxy().getEnergy();
+			final IMEMonitor<IAEItemStack> cell = this.getProxy()
+					.getStorage()
+					.getInventory(
+							AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+			if( allItems )
+			{
+				final IAEItemStack input = this.getDisplayed().copy();
+				IItemHandler inv = new PlayerMainInvWrapper( player.inventory );
+
+				for( int x = 0; x < inv.getSlots(); x++ )
+				{
+					final ItemStack targetStack = inv.getStackInSlot( x );
+					if( input.equals( targetStack ) )
+					{
+						final ItemStack canExtract = inv.extractItem( x, targetStack.getCount(), true );
+						if( !canExtract.isEmpty() )
+						{
+							input.setStackSize( canExtract.getCount() );
+							final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, input, new PlayerSource( player, this ) );
+							inv.extractItem( x, failedToInsert == null ? canExtract.getCount() : canExtract.getCount() - (int) failedToInsert.getStackSize(),
+									false );
+						}
+					}
+				}
+			}
+			else
+			{
+				final IAEItemStack input = AEItemStack.fromItemStack( player.getHeldItem( hand ) );
+				final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, input, new PlayerSource( player, this ) );
+				player.setHeldItem( hand, failedToInsert == null ? ItemStack.EMPTY : failedToInsert.createItemStack() );
+			}
+		}
+		catch( final GridAccessException e )
+		{
+			// :P
+		}
+	}
+
+	private void extractItem( final EntityPlayer player, int count )
+	{
+		final IAEItemStack input = this.getDisplayed();
 		if( input != null )
 		{
 			try
@@ -155,11 +228,12 @@ public class PartConversionMonitor extends AbstractPartMonitor
 				}
 
 				final IEnergySource energy = this.getProxy().getEnergy();
-				final IMEMonitor<IAEItemStack> cell = this.getProxy().getStorage().getInventory(
-						AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+				final IMEMonitor<IAEItemStack> cell = this.getProxy()
+						.getStorage()
+						.getInventory(
+								AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 
-				final ItemStack is = input.createItemStack();
-				input.setStackSize( is.getMaxStackSize() );
+				input.setStackSize( count );
 
 				final IAEItemStack retrieved = Platform.poweredExtraction( energy, cell, input, new PlayerSource( player, this ) );
 				if( retrieved != null )

src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java

@@ -55,20 +55,12 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
 	{
 		if( !super.onPartActivate( player, hand, pos ) )
 		{
-			if( !player.isSneaking() )
+			if( Platform.isServer() )
 			{
-				if( Platform.isClient() )
-				{
-					return true;
-				}
-
 				Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_INTERFACE_TERMINAL );
-
-				return true;
 			}
 		}
-
-		return false;
+		return true;
 	}
 
 	@Override