Refactoring API stuff

block/AEBaseBlock.java

@@ -23,8 +23,8 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.IMemoryCard;
+import appeng.api.implementations.items.IMemoryCard;
-import appeng.api.implementations.MemoryCardMessages;
+import appeng.api.implementations.items.MemoryCardMessages;
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
 import appeng.block.networking.BlockCableBus;

block/AEBaseItemBlockChargeable.java

@@ -10,7 +10,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.PowerUnits;
-import appeng.api.implementations.IAEItemPowerStorage;
+import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.core.localization.GuiText;
 import appeng.util.Platform;
 

block/grindstone/BlockCrank.java

@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.ICrankable;
+import appeng.api.implementations.tiles.ICrankable;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RenderBlockCrank;

client/gui/implementations/GuiCellWorkbench.java

@@ -13,7 +13,7 @@ import appeng.api.config.ActionItems;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.Settings;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IUpgradeModule;
+import appeng.api.implementations.items.IUpgradeModule;
 import appeng.client.gui.widgets.GuiImgButton;
 import appeng.container.implementations.ContainerCellWorkbench;
 import appeng.core.localization.GuiText;

client/gui/implementations/GuiMEMonitorable.java

@@ -6,7 +6,8 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.InventoryPlayer;
 import appeng.api.config.Settings;
-import appeng.api.implementations.IMEChest;
+import appeng.api.implementations.guiobjects.IPortableCell;
+import appeng.api.implementations.tiles.IMEChest;
 import appeng.api.storage.IStorageMonitorable;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.AEBaseMEGui;
@@ -18,7 +19,6 @@ import appeng.container.implementations.ContainerMEMonitorable;
 import appeng.container.slot.AppEngSlot;
 import appeng.core.Configuration;
 import appeng.core.localization.GuiText;
-import appeng.helpers.ICellItemViewer;
 import appeng.parts.reporting.PartTerminal;
 import appeng.util.Platform;
 
@@ -39,7 +39,7 @@ public class GuiMEMonitorable extends AEBaseMEGui
 		xSize = 195;
 		ySize = 204;
 
-		if ( te instanceof ICellItemViewer )
+		if ( te instanceof IPortableCell )
 			myName = GuiText.PortableCell;
 		if ( te instanceof IMEChest )
 			myName = GuiText.Chest;

client/gui/implementations/GuiMEPortableCell.java

@@ -1,12 +1,12 @@
 package appeng.client.gui.implementations;
 
 import net.minecraft.entity.player.InventoryPlayer;
-import appeng.helpers.ICellItemViewer;
+import appeng.api.implementations.guiobjects.IPortableCell;
 
 public class GuiMEPortableCell extends GuiMEMonitorable
 {
 
-	public GuiMEPortableCell(InventoryPlayer inventoryPlayer, ICellItemViewer te) {
+	public GuiMEPortableCell(InventoryPlayer inventoryPlayer, IPortableCell te) {
 		super( inventoryPlayer, te );
 		maxRows = 3;
 	}

client/gui/implementations/GuiNetworkStatus.java

@@ -9,6 +9,7 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
+import appeng.api.implementations.guiobjects.INetworkTool;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiScrollbar;
@@ -16,7 +17,6 @@ import appeng.client.me.ItemRepo;
 import appeng.client.me.SlotME;
 import appeng.container.implementations.ContainerNetworkStatus;
 import appeng.core.localization.GuiText;
-import appeng.helpers.INetworkTool;
 import appeng.util.Platform;
 
 public class GuiNetworkStatus extends AEBaseGui

client/gui/implementations/GuiNetworkTool.java

@@ -1,10 +1,10 @@
 package appeng.client.gui.implementations;
 
 import net.minecraft.entity.player.InventoryPlayer;
+import appeng.api.implementations.guiobjects.INetworkTool;
 import appeng.client.gui.AEBaseGui;
 import appeng.container.implementations.ContainerNetworkTool;
 import appeng.core.localization.GuiText;
-import appeng.helpers.INetworkTool;
 
 public class GuiNetworkTool extends AEBaseGui
 {

client/gui/implementations/GuiUpgradeable.java

@@ -11,7 +11,7 @@ import appeng.api.config.FuzzyMode;
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Settings;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IBusCommon;
+import appeng.api.implementations.IUpgradeableHost;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiImgButton;
 import appeng.container.implementations.ContainerUpgradeable;
@@ -24,12 +24,12 @@ public class GuiUpgradeable extends AEBaseGui
 {
 
 	ContainerUpgradeable cvb;
-	IBusCommon bc;
+	IUpgradeableHost bc;
 
 	GuiImgButton redstoneMode;
 	GuiImgButton fuzzyMode;
 
-	public GuiUpgradeable(InventoryPlayer inventoryPlayer, IBusCommon te) {
+	public GuiUpgradeable(InventoryPlayer inventoryPlayer, IUpgradeableHost te) {
 		this( new ContainerUpgradeable( inventoryPlayer, te ) );
 	}
 
@@ -37,7 +37,7 @@ public class GuiUpgradeable extends AEBaseGui
 		super( te );
 		cvb = (ContainerUpgradeable) te;
 
-		bc = (IBusCommon) te.getTarget();
+		bc = (IUpgradeableHost) te.getTarget();
 		this.xSize = hasToolbox() ? 246 : 211;
 		this.ySize = 184;
 	}

client/render/blocks/RenderBlockEnergyCube.java

@@ -3,7 +3,7 @@ package appeng.client.render.blocks;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
-import appeng.api.implementations.IAEItemPowerStorage;
+import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 

client/render/blocks/RenderStorageMonitor.java

@@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import appeng.api.implementations.IPartStorageMonitor;
+import appeng.api.implementations.parts.IPartStorageMonitor;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;

container/implementations/ContainerMEMonitorable.java

@@ -8,7 +8,8 @@ import net.minecraft.inventory.ICrafting;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.IMEChest;
+import appeng.api.implementations.guiobjects.IPortableCell;
+import appeng.api.implementations.tiles.IMEChest;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
@@ -22,7 +23,6 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.AEBaseContainer;
 import appeng.core.sync.packets.PacketMEInventoryUpdate;
-import appeng.helpers.ICellItemViewer;
 import appeng.util.Platform;
 import appeng.util.item.ItemList;
 import cpw.mods.fml.common.network.PacketDispatcher;
@@ -44,8 +44,8 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonito
 
 			cellInv = monitor;
 
-			if ( montiorable instanceof ICellItemViewer )
+			if ( montiorable instanceof IPortableCell )
-				powerSrc = (ICellItemViewer) montiorable;
+				powerSrc = (IPortableCell) montiorable;
 			else if ( montiorable instanceof IMEChest )
 				powerSrc = (IMEChest) montiorable;
 			else if ( montiorable instanceof IGridHost )

container/implementations/ContainerMEPortableCell.java

@@ -4,16 +4,16 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
+import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.api.storage.IStorageMonitorable;
-import appeng.helpers.ICellItemViewer;
 import appeng.util.Platform;
 
 public class ContainerMEPortableCell extends ContainerMEMonitorable
 {
 
-	ICellItemViewer civ;
+	IPortableCell civ;
 
-	public ContainerMEPortableCell(InventoryPlayer ip, ICellItemViewer montiorable) {
+	public ContainerMEPortableCell(InventoryPlayer ip, IPortableCell montiorable) {
 		super( ip, (IStorageMonitorable) montiorable, Platform.isServer() );
 		lockPlayerInventorySlot( ip.currentItem );
 		civ = montiorable;

container/implementations/ContainerNetworkStatus.java

@@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.Packet;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
+import appeng.api.implementations.guiobjects.INetworkTool;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridBlock;
 import appeng.api.networking.IGridHost;
@@ -17,7 +18,6 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.AEBaseContainer;
 import appeng.core.sync.packets.PacketMEInventoryUpdate;
-import appeng.helpers.INetworkTool;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 import cpw.mods.fml.common.network.PacketDispatcher;

container/implementations/ContainerNetworkTool.java

@@ -2,10 +2,10 @@ package appeng.container.implementations;
 
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
+import appeng.api.implementations.guiobjects.INetworkTool;
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.SlotRestrictedInput;
 import appeng.container.slot.SlotRestrictedInput.PlaceableItemType;
-import appeng.helpers.INetworkTool;
 import appeng.util.Platform;
 
 public class ContainerNetworkTool extends AEBaseContainer

container/implementations/ContainerUpgradeable.java

@@ -10,7 +10,7 @@ import appeng.api.config.FuzzyMode;
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Settings;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IBusCommon;
+import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.parts.IPart;
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.IOptionalSlotHost;
@@ -19,7 +19,7 @@ import appeng.container.slot.OptionalSlotFakeTypeOnly;
 import appeng.container.slot.SlotFakeTypeOnly;
 import appeng.container.slot.SlotRestrictedInput;
 import appeng.container.slot.SlotRestrictedInput.PlaceableItemType;
-import appeng.helpers.NetworkToolInv;
+import appeng.helpers.NetworkToolViewer;
 import appeng.items.tools.ToolNetworkTool;
 import appeng.util.Platform;
 import cpw.mods.fml.relauncher.Side;
@@ -28,12 +28,12 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSlotHost
 {
 
-	IBusCommon myte;
+	IUpgradeableHost myte;
 
 	int tbslot;
-	NetworkToolInv tbinv;
+	NetworkToolViewer tbinv;
 
-	public ContainerUpgradeable(InventoryPlayer ip, IBusCommon te) {
+	public ContainerUpgradeable(InventoryPlayer ip, IUpgradeableHost te) {
 		super( ip, (TileEntity) (te instanceof TileEntity ? te : null), (IPart) (te instanceof IPart ? te : null) );
 		myte = te;
 
@@ -51,7 +51,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
 
 		if ( te instanceof IPart )
 		{
-			IBusCommon myTile = (IBusCommon) te;
+			IUpgradeableHost myTile = (IUpgradeableHost) te;
 			TileEntity mk = myTile.getTile();
 			w = mk.getWorldObj();
 			xCoor = mk.xCoord;
@@ -67,7 +67,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
 			{
 				lockPlayerInventorySlot( x );
 				tbslot = x;
-				tbinv = (NetworkToolInv) ((ToolNetworkTool) pii.getItem()).getGuiObject( pii, w, xCoor, yCoor, zCoor );
+				tbinv = (NetworkToolViewer) ((ToolNetworkTool) pii.getItem()).getGuiObject( pii, w, xCoor, yCoor, zCoor );
 				break;
 			}
 		}

container/slot/SlotRestrictedInput.java

@@ -9,9 +9,9 @@ import appeng.api.AEApi;
 import appeng.api.IAppEngApi;
 import appeng.api.crafting.ICraftingPatternMAC;
 import appeng.api.implementations.ICraftingPatternItem;
-import appeng.api.implementations.ISpatialStorageCell;
+import appeng.api.implementations.items.ISpatialStorageCell;
-import appeng.api.implementations.IStorageComponent;
+import appeng.api.implementations.items.IStorageComponent;
-import appeng.api.implementations.IUpgradeModule;
+import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.storage.ICellWorkbenchItem;
 import appeng.util.Platform;
 

core/Registration.java

@@ -18,7 +18,7 @@ import appeng.api.definitions.Blocks;
 import appeng.api.definitions.Items;
 import appeng.api.definitions.Materials;
 import appeng.api.definitions.Parts;
-import appeng.api.implementations.ITileStorageMonitorable;
+import appeng.api.implementations.tiles.ITileStorageMonitorable;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.pathing.IPathingGrid;
 import appeng.api.networking.spatial.ISpatialCache;

core/features/registries/entries/BasicCellHandler.java

@@ -3,7 +3,7 @@ package appeng.core.features.registries.entries;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
-import appeng.api.implementations.IChestOrDrive;
+import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IMEInventoryHandler;

core/features/registries/entries/CreativeCellHandler.java

@@ -3,7 +3,7 @@ package appeng.core.features.registries.entries;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
-import appeng.api.implementations.IChestOrDrive;
+import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IMEInventoryHandler;

core/sync/GuiBridge.java

@@ -9,7 +9,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.exceptions.AppEngException;
-import appeng.api.implementations.IBusCommon;
+import appeng.api.implementations.IUpgradeableHost;
+import appeng.api.implementations.guiobjects.IPortableCell;
+import appeng.api.implementations.guiobjects.IGuiItem;
+import appeng.api.implementations.guiobjects.INetworkTool;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartHost;
 import appeng.api.storage.IStorageMonitorable;
@@ -30,10 +33,7 @@ import appeng.container.implementations.ContainerNetworkTool;
 import appeng.container.implementations.ContainerQNB;
 import appeng.container.implementations.ContainerUpgradeable;
 import appeng.container.implementations.ContainerVibrationChamber;
-import appeng.helpers.ICellItemViewer;
-import appeng.helpers.IGuiItem;
 import appeng.helpers.IInterfaceHost;
-import appeng.helpers.INetworkTool;
 import appeng.parts.automation.PartLevelEmitter;
 import appeng.tile.grindstone.TileGrinder;
 import appeng.tile.misc.TileCellWorkbench;
@@ -59,7 +59,7 @@ public enum GuiBridge implements IGuiHandler
 
 	GUI_ME(ContainerMEMonitorable.class, IStorageMonitorable.class, false),
 
-	GUI_PORTABLE_CELL(ContainerMEPortableCell.class, ICellItemViewer.class, true),
+	GUI_PORTABLE_CELL(ContainerMEPortableCell.class, IPortableCell.class, true),
 
 	GUI_NETWORK_STATUS(ContainerNetworkStatus.class, INetworkTool.class, true),
 
@@ -73,7 +73,7 @@ public enum GuiBridge implements IGuiHandler
 
 	GUI_INTERFACE(ContainerInterface.class, IInterfaceHost.class, false),
 
-	GUI_BUS(ContainerUpgradeable.class, IBusCommon.class, false),
+	GUI_BUS(ContainerUpgradeable.class, IUpgradeableHost.class, false),
 
 	GUI_IOPORT(ContainerIOPort.class, TileIOPort.class, false),
 

helpers/DualityInterface.java

@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
-import appeng.api.implementations.ISegmentedInventory;
+import appeng.api.implementations.tiles.ISegmentedInventory;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.BaseActionSource;

helpers/ICellItemViewer.java

@@ -1,14 +0,0 @@
-package appeng.helpers;
-
-import net.minecraft.item.ItemStack;
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IStorageMonitorable;
-import appeng.api.storage.data.IAEItemStack;
-
-public interface ICellItemViewer extends IStorageMonitorable, IMEMonitor<IAEItemStack>, IEnergySource
-{
-
-	public ItemStack getItemStack();
-
-}

helpers/IGuiItem.java

@@ -1,11 +0,0 @@
-package appeng.helpers;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public interface IGuiItem
-{
-
-	Object getGuiObject(ItemStack is, World world, int x, int y, int z);
-
-}

helpers/INetworkTool.java

@@ -1,14 +0,0 @@
-package appeng.helpers;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import appeng.api.networking.IGridHost;
-
-public interface INetworkTool extends IInventory
-{
-
-	IGridHost getGridHost(); // null for most purposes.
-
-	public ItemStack getItemStack();
-
-}

helpers/NetworkToolViewer.java

@@ -2,19 +2,20 @@ package appeng.helpers;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import appeng.api.implementations.IUpgradeModule;
+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 NetworkToolInv implements INetworkTool
+public class NetworkToolViewer implements INetworkTool
 {
 
 	final AppEngInternalInventory inv;
 	final ItemStack is;
 	final IGridHost gh;
 
-	public NetworkToolInv(ItemStack is, IGridHost gHost) {
+	public NetworkToolViewer(ItemStack is, IGridHost gHost) {
 		this.is = is;
 		gh = gHost;
 		inv = new AppEngInternalInventory( null, 9 );

helpers/PortableCellViewer.java

@@ -3,20 +3,21 @@ package appeng.helpers;
 import net.minecraft.item.ItemStack;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
-import appeng.api.implementations.IAEItemPowerStorage;
+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 CellItemViewer extends MEMonitorHandler<IAEItemStack> implements ICellItemViewer
+public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implements IPortableCell
 {
 
 	private ItemStack target;
 	private IAEItemPowerStorage ips;
 
-	public CellItemViewer(ItemStack is) {
+	public PortableCellViewer(ItemStack is) {
 		super( CellInventory.getCell( is ) );
 		ips = (IAEItemPowerStorage) is.getItem();
 		target = is;

items/materials/ItemMaterial.java

@@ -20,9 +20,9 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IItemGroup;
+import appeng.api.implementations.items.IItemGroup;
-import appeng.api.implementations.IStorageComponent;
+import appeng.api.implementations.items.IStorageComponent;
-import appeng.api.implementations.IUpgradeModule;
+import appeng.api.implementations.items.IUpgradeModule;
 import appeng.core.Configuration;
 import appeng.core.features.AEFeature;
 import appeng.core.features.AEFeatureHandler;

items/parts/ItemPart.java

@@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import appeng.api.AEApi;
-import appeng.api.implementations.IItemGroup;
+import appeng.api.implementations.items.IItemGroup;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartItem;
 import appeng.core.Configuration;

items/storage/ItemBasicStorageCell.java

@@ -9,8 +9,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
-import appeng.api.implementations.IItemGroup;
+import appeng.api.implementations.items.IItemGroup;
-import appeng.api.implementations.IStorageCell;
+import appeng.api.implementations.items.IStorageCell;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEItemStack;

items/tools/ToolMemoryCard.java

@@ -8,8 +8,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
-import appeng.api.implementations.IMemoryCard;
+import appeng.api.implementations.items.IMemoryCard;
-import appeng.api.implementations.MemoryCardMessages;
+import appeng.api.implementations.items.MemoryCardMessages;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.PlayerMessages;
 import appeng.items.AEBaseItem;

items/tools/ToolNetworkTool.java

@@ -8,12 +8,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.IAEWrench;
+import appeng.api.implementations.guiobjects.IGuiItem;
+import appeng.api.implementations.items.IAEWrench;
 import appeng.api.networking.IGridHost;
 import appeng.core.features.AEFeature;
 import appeng.core.sync.GuiBridge;
-import appeng.helpers.IGuiItem;
+import appeng.helpers.NetworkToolViewer;
-import appeng.helpers.NetworkToolInv;
 import appeng.items.AEBaseItem;
 import appeng.util.Platform;
 import buildcraft.api.tools.IToolWrench;
@@ -32,7 +32,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench,
 	public Object getGuiObject(ItemStack is, World world, int x, int y, int z)
 	{
 		TileEntity te = world.getBlockTileEntity( x, y, z );
-		return new NetworkToolInv( is, (IGridHost) (te instanceof IGridHost ? te : null) );
+		return new NetworkToolViewer( is, (IGridHost) (te instanceof IGridHost ? te : null) );
 	}
 
 	@Override

items/tools/powered/ToolMassCannon.java

@@ -21,7 +21,7 @@ import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IStorageCell;
+import appeng.api.implementations.items.IStorageCell;
 import appeng.api.networking.security.PlayerSource;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;

items/tools/powered/ToolPortableCell.java

@@ -11,15 +11,15 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
-import appeng.api.implementations.IStorageCell;
+import appeng.api.implementations.guiobjects.IGuiItem;
+import appeng.api.implementations.items.IStorageCell;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.GuiBridge;
-import appeng.helpers.CellItemViewer;
+import appeng.helpers.PortableCellViewer;
-import appeng.helpers.IGuiItem;
 import appeng.items.storage.CellConfig;
 import appeng.items.storage.CellUpgrades;
 import appeng.items.tools.powered.powersink.AEBasePoweredItem;
@@ -149,6 +149,6 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
 	@Override
 	public Object getGuiObject(ItemStack is, World w, int x, int y, int z)
 	{
-		return new CellItemViewer( is );
+		return new PortableCellViewer( is );
 	}
 }

items/tools/powered/powersink/AERootPoweredItem.java

@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.PowerUnits;
-import appeng.api.implementations.IAEItemPowerStorage;
+import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.core.localization.GuiText;
 import appeng.items.AEBaseItem;
 import appeng.util.Platform;

items/tools/quartz/ToolQuartzWrench.java

@@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.IAEWrench;
+import appeng.api.implementations.items.IAEWrench;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseItem;
 import buildcraft.api.tools.IToolWrench;

me/storage/AEExternalHandler.java

@@ -3,7 +3,7 @@ package appeng.me.storage;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.ITileStorageMonitorable;
+import appeng.api.implementations.tiles.ITileStorageMonitorable;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IStorageMonitorable;

me/storage/CellInventory.java

@@ -14,7 +14,7 @@ import net.minecraftforge.oredict.OreDictionary;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
 import appeng.api.exceptions.AppEngException;
-import appeng.api.implementations.IStorageCell;
+import appeng.api.implementations.items.IStorageCell;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IMEInventoryHandler;

me/storage/CellInventoryHandler.java

@@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.IncludeExclude;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IUpgradeModule;
+import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;

me/storage/DriveWatcher.java

@@ -2,7 +2,7 @@ package appeng.me.storage;
 
 import net.minecraft.item.ItemStack;
 import appeng.api.config.Actionable;
-import appeng.api.implementations.IChestOrDrive;
+import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.IMEInventory;

parts/AEBasePart.java

@@ -19,7 +19,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IBusCommon;
+import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.parts.IPart;
@@ -35,7 +35,7 @@ import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.IGridProxyable;
 import appeng.parts.networking.PartCable;
 
-public class AEBasePart implements IPart, IGridProxyable, IGridHost, IBusCommon
+public class AEBasePart implements IPart, IGridProxyable, IGridHost, IUpgradeableHost
 {
 
 	protected AENetworkProxy proxy;

parts/CableBusContainer.java

@@ -23,7 +23,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import powercrystals.minefactoryreloaded.api.rednet.RedNetConnectionType;
 import appeng.api.AEApi;
-import appeng.api.implementations.IPartCable;
+import appeng.api.implementations.parts.IPartCable;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.parts.IFacadeContainer;

parts/automation/PartUpgradeable.java

@@ -4,7 +4,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.ISegmentedInventory;
+import appeng.api.implementations.tiles.ISegmentedInventory;
 import appeng.api.util.IConfigManager;
 import appeng.parts.PartBasicState;
 import appeng.tile.inventory.IAEAppEngInventory;

parts/automation/UpgradeInventory.java

@@ -7,7 +7,7 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IUpgradeModule;
+import appeng.api.implementations.items.IUpgradeModule;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.tile.inventory.IAEAppEngInventory;
 import appeng.tile.inventory.InvOperation;

parts/misc/PartInterface.java

@@ -9,8 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Vec3;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.ISegmentedInventory;
+import appeng.api.implementations.tiles.ISegmentedInventory;
-import appeng.api.implementations.ITileStorageMonitorable;
+import appeng.api.implementations.tiles.ITileStorageMonitorable;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;

parts/networking/PartCable.java

@@ -15,7 +15,7 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 
 import appeng.api.AEApi;
-import appeng.api.implementations.IPartCable;
+import appeng.api.implementations.parts.IPartCable;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridConnection;
 import appeng.api.networking.IGridHost;

parts/p2p/PartP2PTunnel.java

@@ -12,7 +12,7 @@ import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.api.config.PowerUnits;
 import appeng.api.config.TunnelType;
-import appeng.api.implementations.IMemoryCard;
+import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartCollsionHelper;
 import appeng.api.parts.IPartRenderHelper;

parts/reporting/PartMonitor.java

@@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Vec3;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.IPartMonitor;
+import appeng.api.implementations.parts.IPartMonitor;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.events.MENetworkBootingStatusChange;
 import appeng.api.networking.events.MENetworkEventSubscribe;

parts/reporting/PartStorageMonitor.java

@@ -30,7 +30,7 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import appeng.api.implementations.IPartStorageMonitor;
+import appeng.api.implementations.parts.IPartStorageMonitor;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.networking.storage.IStackWatcher;
 import appeng.api.networking.storage.IStackWatcherHost;

tile/grindstone/TileCrank.java

@@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.ICrankable;
+import appeng.api.implementations.tiles.ICrankable;
 import appeng.helpers.ICustomCollision;
 import appeng.tile.AEBaseTile;
 import appeng.tile.events.AETileEventHandler;

tile/grindstone/TileGrinder.java

@@ -9,7 +9,7 @@ import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.features.IGrinderEntry;
-import appeng.api.implementations.ICrankable;
+import appeng.api.implementations.tiles.ICrankable;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.WorldCoord;

tile/misc/TileCellWorkbench.java

@@ -6,7 +6,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IBusCommon;
+import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.storage.ICellWorkbenchItem;
 import appeng.api.util.IConfigManager;
 import appeng.tile.AEBaseTile;
@@ -17,7 +17,7 @@ import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.tile.inventory.IAEAppEngInventory;
 import appeng.tile.inventory.InvOperation;
 
-public class TileCellWorkbench extends AEBaseTile implements IBusCommon, IAEAppEngInventory
+public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory
 {
 
 	AppEngInternalInventory cell = new AppEngInternalInventory( this, 1 );

tile/misc/TileCharger.java

@@ -15,8 +15,8 @@ import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
 import appeng.api.config.PowerUnits;
-import appeng.api.implementations.IAEItemPowerStorage;
+import appeng.api.implementations.items.IAEItemPowerStorage;
-import appeng.api.implementations.ICrankable;
+import appeng.api.implementations.tiles.ICrankable;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.AECableType;
 import appeng.me.GridAccessException;

tile/misc/TileCondenser.java

@@ -13,7 +13,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 import appeng.api.AEApi;
 import appeng.api.config.CondenserOuput;
 import appeng.api.config.Settings;
-import appeng.api.implementations.IStorageComponent;
+import appeng.api.implementations.items.IStorageComponent;
 import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigureableObject;
 import appeng.tile.AEBaseInvTile;

tile/misc/TileInterface.java

@@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import appeng.api.implementations.ISegmentedInventory;
+import appeng.api.implementations.tiles.ISegmentedInventory;
-import appeng.api.implementations.ITileStorageMonitorable;
+import appeng.api.implementations.tiles.ITileStorageMonitorable;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;

tile/storage/TileChest.java

@@ -20,7 +20,7 @@ import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
-import appeng.api.implementations.IMEChest;
+import appeng.api.implementations.tiles.IMEChest;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.events.MENetworkCellArrayUpdate;

tile/storage/TileDrive.java

@@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
-import appeng.api.implementations.IChestOrDrive;
+import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.events.MENetworkCellArrayUpdate;
 import appeng.api.networking.events.MENetworkChannelsChanged;

tile/storage/TileIOPort.java

@@ -13,7 +13,7 @@ import appeng.api.config.OperationMode;
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Settings;
 import appeng.api.config.Upgrades;
-import appeng.api.implementations.IBusCommon;
+import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.BaseActionSource;
@@ -45,7 +45,7 @@ import appeng.util.Platform;
 import appeng.util.inv.WrapperInventoryRange;
 import appeng.util.item.ItemList;
 
-public class TileIOPort extends AENetworkInvTile implements IBusCommon, IConfigManagerHost, IGridTickable
+public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IConfigManagerHost, IGridTickable
 {
 
 	ConfigManager cm = new ConfigManager( this );

util/Platform.java

@@ -50,9 +50,9 @@ import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.PowerMultiplier;
-import appeng.api.implementations.IAEItemPowerStorage;
+import appeng.api.implementations.items.IAEItemPowerStorage;
-import appeng.api.implementations.IAEWrench;
+import appeng.api.implementations.items.IAEWrench;
-import appeng.api.implementations.ITileStorageMonitorable;
+import appeng.api.implementations.tiles.ITileStorageMonitorable;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.networking.storage.IStorageGrid;