Gui/Priority Tab/Storage work.

helpers/NetworkToolViewer.java

@@ -1,117 +0,0 @@
-package appeng.helpers;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import appeng.api.implementations.guiobjects.INetworkTool;
-import appeng.api.implementations.items.IUpgradeModule;
-import appeng.api.networking.IGridHost;
-import appeng.tile.inventory.AppEngInternalInventory;
-import appeng.util.Platform;
-
-public class NetworkToolViewer implements INetworkTool
-{
-
-	final AppEngInternalInventory inv;
-	final ItemStack is;
-	final IGridHost gh;
-
-	public NetworkToolViewer(ItemStack is, IGridHost gHost) {
-		this.is = is;
-		gh = gHost;
-		inv = new AppEngInternalInventory( null, 9 );
-		inv.readFromNBT( Platform.openNbtData( is ), "inv" );
-	}
-
-	@Override
-	public int getSizeInventory()
-	{
-		return inv.getSizeInventory();
-	}
-
-	@Override
-	public ItemStack getStackInSlot(int i)
-	{
-		return inv.getStackInSlot( i );
-	}
-
-	@Override
-	public ItemStack decrStackSize(int i, int j)
-	{
-		return inv.decrStackSize( i, j );
-	}
-
-	@Override
-	public ItemStack getStackInSlotOnClosing(int i)
-	{
-		return inv.getStackInSlotOnClosing( i );
-	}
-
-	@Override
-	public void setInventorySlotContents(int i, ItemStack itemstack)
-	{
-		inv.setInventorySlotContents( i, itemstack );
-	}
-
-	@Override
-	public String getInvName()
-	{
-		return inv.getInvName();
-	}
-
-	@Override
-	public boolean isInvNameLocalized()
-	{
-		return inv.isInvNameLocalized();
-	}
-
-	@Override
-	public int getInventoryStackLimit()
-	{
-		return inv.getInventoryStackLimit();
-	}
-
-	@Override
-	public void onInventoryChanged()
-	{
-		inv.onInventoryChanged();
-		inv.writeToNBT( Platform.openNbtData( is ), "inv" );
-	}
-
-	@Override
-	public boolean isUseableByPlayer(EntityPlayer entityplayer)
-	{
-		return inv.isUseableByPlayer( entityplayer );
-	}
-
-	@Override
-	public void openChest()
-	{
-		inv.openChest();
-	}
-
-	@Override
-	public void closeChest()
-	{
-		inv.closeChest();
-	}
-
-	@Override
-	public boolean isItemValidForSlot(int i, ItemStack itemstack)
-	{
-		return inv.isItemValidForSlot( i, itemstack ) && itemstack.getItem() instanceof IUpgradeModule
-				&& ((IUpgradeModule) itemstack.getItem()).getType( itemstack ) != null;
-	}
-
-	@Override
-	public ItemStack getItemStack()
-	{
-		return is;
-	}
-
-	@Override
-	public IGridHost getGridHost()
-	{
-		return gh;
-	}
-
-}

helpers/PartPlacement.java

@@ -100,6 +100,7 @@ public class PartPlacement
 						{
 							is.add( sp.facade.getItemStack() );
 							host.getFacadeContainer().removeFacade( host, sp.side );
+							world.notifyBlocksOfNeighborChange( x, y, z, 0 );
 						}
 
 						if ( host.isEmpty() )
@@ -272,7 +273,7 @@ public class PartPlacement
 					return true;
 				}
 			}
-			else
+			else if ( host != null && !host.canAddPart( held, side ) )
 				return false;
 		}
 

helpers/PortableCellViewer.java

@@ -1,54 +0,0 @@
-package appeng.helpers;
-
-import net.minecraft.item.ItemStack;
-import appeng.api.config.Actionable;
-import appeng.api.config.PowerMultiplier;
-import appeng.api.implementations.guiobjects.IPortableCell;
-import appeng.api.implementations.items.IAEItemPowerStorage;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.MEMonitorHandler;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.me.storage.CellInventory;
-
-public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implements IPortableCell
-{
-
-	private ItemStack target;
-	private IAEItemPowerStorage ips;
-
-	public PortableCellViewer(ItemStack is) {
-		super( CellInventory.getCell( is ) );
-		ips = (IAEItemPowerStorage) is.getItem();
-		target = is;
-	}
-
-	public ItemStack getItemStack()
-	{
-		return target;
-	}
-
-	@Override
-	public double extractAEPower(double amt, Actionable mode, PowerMultiplier usePowerMultiplier)
-	{
-		amt = usePowerMultiplier.multiply( amt );
-
-		if ( mode == Actionable.SIMULATE )
-			return usePowerMultiplier.divide( Math.min( amt, ips.getAECurrentPower( getItemStack() ) ) );
-
-		return usePowerMultiplier.divide( ips.extractAEPower( getItemStack(), amt ) );
-	}
-
-	@Override
-	public IMEMonitor<IAEItemStack> getItemInventory()
-	{
-		return this;
-	}
-
-	@Override
-	public IMEMonitor<IAEFluidStack> getFluidInventory()
-	{
-		return null;
-	}
-
-}