diff --git a/block/AEBaseBlock.java b/block/AEBaseBlock.java index 9a3dcb66a..5b507178b 100644 --- a/block/AEBaseBlock.java +++ b/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.MemoryCardMessages; +import appeng.api.implementations.items.IMemoryCard; +import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; import appeng.block.networking.BlockCableBus; diff --git a/block/AEBaseItemBlockChargeable.java b/block/AEBaseItemBlockChargeable.java index 7c0c800c0..2e680c6dd 100644 --- a/block/AEBaseItemBlockChargeable.java +++ b/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; diff --git a/block/grindstone/BlockCrank.java b/block/grindstone/BlockCrank.java index 8f3790e8d..7208349c5 100644 --- a/block/grindstone/BlockCrank.java +++ b/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; diff --git a/client/gui/implementations/GuiCellWorkbench.java b/client/gui/implementations/GuiCellWorkbench.java index 734e24e9c..bb2ef5bc3 100644 --- a/client/gui/implementations/GuiCellWorkbench.java +++ b/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; diff --git a/client/gui/implementations/GuiMEMonitorable.java b/client/gui/implementations/GuiMEMonitorable.java index 7788e99e8..b5679c73f 100644 --- a/client/gui/implementations/GuiMEMonitorable.java +++ b/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; diff --git a/client/gui/implementations/GuiMEPortableCell.java b/client/gui/implementations/GuiMEPortableCell.java index 3da7bb3d4..835b89903 100644 --- a/client/gui/implementations/GuiMEPortableCell.java +++ b/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; } diff --git a/client/gui/implementations/GuiNetworkStatus.java b/client/gui/implementations/GuiNetworkStatus.java index 8f258c1de..139097cb2 100644 --- a/client/gui/implementations/GuiNetworkStatus.java +++ b/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 diff --git a/client/gui/implementations/GuiNetworkTool.java b/client/gui/implementations/GuiNetworkTool.java index 238fb5b2c..3de51db47 100644 --- a/client/gui/implementations/GuiNetworkTool.java +++ b/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 { diff --git a/client/gui/implementations/GuiUpgradeable.java b/client/gui/implementations/GuiUpgradeable.java index c6d368bbf..478effbdd 100644 --- a/client/gui/implementations/GuiUpgradeable.java +++ b/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; } diff --git a/client/render/blocks/RenderBlockEnergyCube.java b/client/render/blocks/RenderBlockEnergyCube.java index f56e0b5f6..c15896d5d 100644 --- a/client/render/blocks/RenderBlockEnergyCube.java +++ b/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; diff --git a/client/render/blocks/RenderStorageMonitor.java b/client/render/blocks/RenderStorageMonitor.java index 907453cb2..e4d54e9ed 100644 --- a/client/render/blocks/RenderStorageMonitor.java +++ b/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; diff --git a/container/implementations/ContainerMEMonitorable.java b/container/implementations/ContainerMEMonitorable.java index e5254df21..bf13ac3fe 100644 --- a/container/implementations/ContainerMEMonitorable.java +++ b/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 ) - powerSrc = (ICellItemViewer) montiorable; + if ( montiorable instanceof IPortableCell ) + powerSrc = (IPortableCell) montiorable; else if ( montiorable instanceof IMEChest ) powerSrc = (IMEChest) montiorable; else if ( montiorable instanceof IGridHost ) diff --git a/container/implementations/ContainerMEPortableCell.java b/container/implementations/ContainerMEPortableCell.java index 70fe88216..af2e30583 100644 --- a/container/implementations/ContainerMEPortableCell.java +++ b/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; diff --git a/container/implementations/ContainerNetworkStatus.java b/container/implementations/ContainerNetworkStatus.java index d590aa0ed..d5d5d6266 100644 --- a/container/implementations/ContainerNetworkStatus.java +++ b/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; diff --git a/container/implementations/ContainerNetworkTool.java b/container/implementations/ContainerNetworkTool.java index 10081cf15..d468ce721 100644 --- a/container/implementations/ContainerNetworkTool.java +++ b/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 diff --git a/container/implementations/ContainerUpgradeable.java b/container/implementations/ContainerUpgradeable.java index 2f1597430..2738d2f84 100644 --- a/container/implementations/ContainerUpgradeable.java +++ b/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; } } diff --git a/container/slot/SlotRestrictedInput.java b/container/slot/SlotRestrictedInput.java index 2ebdb55b5..3e63a1bac 100644 --- a/container/slot/SlotRestrictedInput.java +++ b/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.IStorageComponent; -import appeng.api.implementations.IUpgradeModule; +import appeng.api.implementations.items.ISpatialStorageCell; +import appeng.api.implementations.items.IStorageComponent; +import appeng.api.implementations.items.IUpgradeModule; import appeng.api.storage.ICellWorkbenchItem; import appeng.util.Platform; diff --git a/core/Registration.java b/core/Registration.java index 41d576e7f..dd6ea80fd 100644 --- a/core/Registration.java +++ b/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; diff --git a/core/features/registries/entries/BasicCellHandler.java b/core/features/registries/entries/BasicCellHandler.java index 90dc2b474..90f65331a 100644 --- a/core/features/registries/entries/BasicCellHandler.java +++ b/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; diff --git a/core/features/registries/entries/CreativeCellHandler.java b/core/features/registries/entries/CreativeCellHandler.java index 677e24206..42f269a36 100644 --- a/core/features/registries/entries/CreativeCellHandler.java +++ b/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; diff --git a/core/sync/GuiBridge.java b/core/sync/GuiBridge.java index a0b44c5e5..21c90c476 100644 --- a/core/sync/GuiBridge.java +++ b/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), diff --git a/helpers/DualityInterface.java b/helpers/DualityInterface.java index f99833926..4100db0d0 100644 --- a/helpers/DualityInterface.java +++ b/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; diff --git a/helpers/ICellItemViewer.java b/helpers/ICellItemViewer.java deleted file mode 100644 index e3c8e3df2..000000000 --- a/helpers/ICellItemViewer.java +++ /dev/null @@ -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, IEnergySource -{ - - public ItemStack getItemStack(); - -} diff --git a/helpers/IGuiItem.java b/helpers/IGuiItem.java deleted file mode 100644 index aa6df16eb..000000000 --- a/helpers/IGuiItem.java +++ /dev/null @@ -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); - -} diff --git a/helpers/INetworkTool.java b/helpers/INetworkTool.java deleted file mode 100644 index 6848360d8..000000000 --- a/helpers/INetworkTool.java +++ /dev/null @@ -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(); - -} diff --git a/helpers/NetworkToolInv.java b/helpers/NetworkToolViewer.java similarity index 85% rename from helpers/NetworkToolInv.java rename to helpers/NetworkToolViewer.java index 71353290c..2a6a7d8d9 100644 --- a/helpers/NetworkToolInv.java +++ b/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 ); diff --git a/helpers/CellItemViewer.java b/helpers/PortableCellViewer.java similarity index 78% rename from helpers/CellItemViewer.java rename to helpers/PortableCellViewer.java index 009b90ec7..49d4b540c 100644 --- a/helpers/CellItemViewer.java +++ b/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 implements ICellItemViewer +public class PortableCellViewer extends MEMonitorHandler 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; diff --git a/items/materials/ItemMaterial.java b/items/materials/ItemMaterial.java index 70c6b8a1c..bab3f84a9 100644 --- a/items/materials/ItemMaterial.java +++ b/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.IStorageComponent; -import appeng.api.implementations.IUpgradeModule; +import appeng.api.implementations.items.IItemGroup; +import appeng.api.implementations.items.IStorageComponent; +import appeng.api.implementations.items.IUpgradeModule; import appeng.core.Configuration; import appeng.core.features.AEFeature; import appeng.core.features.AEFeatureHandler; diff --git a/items/parts/ItemPart.java b/items/parts/ItemPart.java index 3f39e06a9..462837aa4 100644 --- a/items/parts/ItemPart.java +++ b/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; diff --git a/items/storage/ItemBasicStorageCell.java b/items/storage/ItemBasicStorageCell.java index 35bc86022..488cc58e3 100644 --- a/items/storage/ItemBasicStorageCell.java +++ b/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.IStorageCell; +import appeng.api.implementations.items.IItemGroup; +import appeng.api.implementations.items.IStorageCell; import appeng.api.storage.IMEInventory; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; diff --git a/items/tools/ToolMemoryCard.java b/items/tools/ToolMemoryCard.java index 4f8319d8c..bd58219ca 100644 --- a/items/tools/ToolMemoryCard.java +++ b/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.MemoryCardMessages; +import appeng.api.implementations.items.IMemoryCard; +import appeng.api.implementations.items.MemoryCardMessages; import appeng.core.features.AEFeature; import appeng.core.localization.PlayerMessages; import appeng.items.AEBaseItem; diff --git a/items/tools/ToolNetworkTool.java b/items/tools/ToolNetworkTool.java index 5d9766652..ffb657626 100644 --- a/items/tools/ToolNetworkTool.java +++ b/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.NetworkToolInv; +import appeng.helpers.NetworkToolViewer; 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 diff --git a/items/tools/powered/ToolMassCannon.java b/items/tools/powered/ToolMassCannon.java index 490ce7f30..0631eea9f 100644 --- a/items/tools/powered/ToolMassCannon.java +++ b/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; diff --git a/items/tools/powered/ToolPortableCell.java b/items/tools/powered/ToolPortableCell.java index 205307673..986334155 100644 --- a/items/tools/powered/ToolPortableCell.java +++ b/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.IGuiItem; +import appeng.helpers.PortableCellViewer; 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 ); } } diff --git a/items/tools/powered/powersink/AERootPoweredItem.java b/items/tools/powered/powersink/AERootPoweredItem.java index 0ea631f8f..b9a93f159 100644 --- a/items/tools/powered/powersink/AERootPoweredItem.java +++ b/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; diff --git a/items/tools/quartz/ToolQuartzWrench.java b/items/tools/quartz/ToolQuartzWrench.java index 00913e5c5..b3a29e75b 100644 --- a/items/tools/quartz/ToolQuartzWrench.java +++ b/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; diff --git a/me/storage/AEExternalHandler.java b/me/storage/AEExternalHandler.java index d6ca6b06c..f9bae2181 100644 --- a/me/storage/AEExternalHandler.java +++ b/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; diff --git a/me/storage/CellInventory.java b/me/storage/CellInventory.java index e612418ba..6d90fdaa7 100644 --- a/me/storage/CellInventory.java +++ b/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; diff --git a/me/storage/CellInventoryHandler.java b/me/storage/CellInventoryHandler.java index 13839bf08..01314691b 100644 --- a/me/storage/CellInventoryHandler.java +++ b/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; diff --git a/me/storage/DriveWatcher.java b/me/storage/DriveWatcher.java index e6dbf77b1..38437e292 100644 --- a/me/storage/DriveWatcher.java +++ b/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; diff --git a/parts/AEBasePart.java b/parts/AEBasePart.java index 89c7651b8..49ac5868d 100644 --- a/parts/AEBasePart.java +++ b/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; diff --git a/parts/CableBusContainer.java b/parts/CableBusContainer.java index 93938bbec..d065e70df 100644 --- a/parts/CableBusContainer.java +++ b/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; diff --git a/parts/automation/PartUpgradeable.java b/parts/automation/PartUpgradeable.java index 90186d605..2640b7a1d 100644 --- a/parts/automation/PartUpgradeable.java +++ b/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; diff --git a/parts/automation/UpgradeInventory.java b/parts/automation/UpgradeInventory.java index ee0beef92..6afa2f766 100644 --- a/parts/automation/UpgradeInventory.java +++ b/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; diff --git a/parts/misc/PartInterface.java b/parts/misc/PartInterface.java index 9d75428f9..c4ce6b163 100644 --- a/parts/misc/PartInterface.java +++ b/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.ITileStorageMonitorable; +import appeng.api.implementations.tiles.ISegmentedInventory; +import appeng.api.implementations.tiles.ITileStorageMonitorable; import appeng.api.networking.IGridNode; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 3cddf4073..134851230 100644 --- a/parts/networking/PartCable.java +++ b/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; diff --git a/parts/p2p/PartP2PTunnel.java b/parts/p2p/PartP2PTunnel.java index e7c915945..f0056fe8a 100644 --- a/parts/p2p/PartP2PTunnel.java +++ b/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; diff --git a/parts/reporting/PartMonitor.java b/parts/reporting/PartMonitor.java index 38f349b44..3ef97c9c2 100644 --- a/parts/reporting/PartMonitor.java +++ b/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; diff --git a/parts/reporting/PartStorageMonitor.java b/parts/reporting/PartStorageMonitor.java index e3aa9f068..bd9ea65d2 100644 --- a/parts/reporting/PartStorageMonitor.java +++ b/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; diff --git a/tile/grindstone/TileCrank.java b/tile/grindstone/TileCrank.java index 537b4f425..0db0118c9 100644 --- a/tile/grindstone/TileCrank.java +++ b/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; diff --git a/tile/grindstone/TileGrinder.java b/tile/grindstone/TileGrinder.java index 0dabf92ba..765e1b77a 100644 --- a/tile/grindstone/TileGrinder.java +++ b/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; diff --git a/tile/misc/TileCellWorkbench.java b/tile/misc/TileCellWorkbench.java index 5af61af88..d24ba7ed8 100644 --- a/tile/misc/TileCellWorkbench.java +++ b/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 ); diff --git a/tile/misc/TileCharger.java b/tile/misc/TileCharger.java index c4e0d90b9..e8ae36488 100644 --- a/tile/misc/TileCharger.java +++ b/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.ICrankable; +import appeng.api.implementations.items.IAEItemPowerStorage; +import appeng.api.implementations.tiles.ICrankable; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.me.GridAccessException; diff --git a/tile/misc/TileCondenser.java b/tile/misc/TileCondenser.java index 13121a1a2..e963b39ed 100644 --- a/tile/misc/TileCondenser.java +++ b/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; diff --git a/tile/misc/TileInterface.java b/tile/misc/TileInterface.java index 53944b8e3..bf16fbe57 100644 --- a/tile/misc/TileInterface.java +++ b/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.ITileStorageMonitorable; +import appeng.api.implementations.tiles.ISegmentedInventory; +import appeng.api.implementations.tiles.ITileStorageMonitorable; import appeng.api.networking.IGridNode; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; diff --git a/tile/storage/TileChest.java b/tile/storage/TileChest.java index 2d2f75396..87faa4c6c 100644 --- a/tile/storage/TileChest.java +++ b/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; diff --git a/tile/storage/TileDrive.java b/tile/storage/TileDrive.java index f21a66eb7..802c83afd 100644 --- a/tile/storage/TileDrive.java +++ b/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; diff --git a/tile/storage/TileIOPort.java b/tile/storage/TileIOPort.java index 093b10e8f..c0eab0654 100644 --- a/tile/storage/TileIOPort.java +++ b/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 ); diff --git a/util/Platform.java b/util/Platform.java index 83b4e4f36..84ff827f7 100644 --- a/util/Platform.java +++ b/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.IAEWrench; -import appeng.api.implementations.ITileStorageMonitorable; +import appeng.api.implementations.items.IAEItemPowerStorage; +import appeng.api.implementations.items.IAEWrench; +import appeng.api.implementations.tiles.ITileStorageMonitorable; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.storage.IStorageGrid;