diff --git a/src/dark/api/IDrone.java b/src/dark/api/IDrone.java index ac0bc2a7..3bbd20e7 100644 --- a/src/dark/api/IDrone.java +++ b/src/dark/api/IDrone.java @@ -1,7 +1,10 @@ package dark.api; /** Drone does not imply robot it simply means entity by which is controlled by another entity such - * as a player or a hivemind. + * as a player or a hivemind. Though it does imply that the entity still acts on its own but follows + * a set of instructions. + * + * @Extends Entity at all times * * @author DarkGuardsman */ public interface IDrone diff --git a/src/dark/api/IExtendedStorage.java b/src/dark/api/IExtendedStorage.java index 35d2050c..2c5d81fd 100644 --- a/src/dark/api/IExtendedStorage.java +++ b/src/dark/api/IExtendedStorage.java @@ -2,7 +2,7 @@ package dark.api; import net.minecraft.item.ItemStack; -/** Applied to blocks that store items in stacks above 64 +/** Applied to blocks that store items in stacks above 64 and as one large collective of items * * @author DarkGuardsman */ public interface IExtendedStorage diff --git a/src/dark/api/IHelpFrame.java b/src/dark/api/IHelpFrame.java deleted file mode 100644 index a241b48b..00000000 --- a/src/dark/api/IHelpFrame.java +++ /dev/null @@ -1,12 +0,0 @@ -package dark.api; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; - -public interface IHelpFrame -{ - public String getTitle(EntityPlayer player, E item); - - public void getDisplayList(EntityPlayer player, E item, List list); -} diff --git a/src/dark/api/access/AccessProfile.java b/src/dark/api/access/AccessProfile.java index 340db53b..4e0ccd63 100644 --- a/src/dark/api/access/AccessProfile.java +++ b/src/dark/api/access/AccessProfile.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import dark.api.IVirtualObject; +import dark.api.save.IVirtualObject; import dark.api.save.NBTFileHelper; import dark.api.save.SaveManager; diff --git a/src/dark/api/access/GroupRegistry.java b/src/dark/api/access/GroupRegistry.java index 492e3aad..9d79e571 100644 --- a/src/dark/api/access/GroupRegistry.java +++ b/src/dark/api/access/GroupRegistry.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; -import dark.api.ITerminal; /** @author DarkGuardsman */ public class GroupRegistry diff --git a/src/dark/api/ITerminal.java b/src/dark/api/access/ITerminal.java similarity index 92% rename from src/dark/api/ITerminal.java rename to src/dark/api/access/ITerminal.java index 7935b92c..38a2fd38 100644 --- a/src/dark/api/ITerminal.java +++ b/src/dark/api/access/ITerminal.java @@ -1,9 +1,8 @@ -package dark.api; +package dark.api.access; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.api.access.ISpecialAccess; import dark.core.interfaces.IScroll; /** Basic methods to make it easier to construct or interact with a terminal based tile. Recommend to diff --git a/src/dark/api/access/ITerminalCommand.java b/src/dark/api/access/ITerminalCommand.java index c8b010b1..a3dfc781 100644 --- a/src/dark/api/access/ITerminalCommand.java +++ b/src/dark/api/access/ITerminalCommand.java @@ -3,7 +3,6 @@ package dark.api.access; import java.util.Set; import net.minecraft.entity.player.EntityPlayer; -import dark.api.ITerminal; /** Prefab for creating commands that most terminal entities can use * diff --git a/src/dark/api/energy/EnergyPacket.java b/src/dark/api/energy/EnergyPacket.java new file mode 100644 index 00000000..2d649d60 --- /dev/null +++ b/src/dark/api/energy/EnergyPacket.java @@ -0,0 +1,19 @@ +package dark.api.energy; + + +/** Container for energy data + * + * @author DarkGuardsman */ +public class EnergyPacket +{ + protected String energyType; + protected float energyStored; + protected Object[] data; + + public EnergyPacket(String type, float energySum, Object... data) + { + this.energyType = type; + this.energyStored = energySum; + this.data = data; + } +} diff --git a/src/dark/api/energy/IEnergyConsumer.java b/src/dark/api/energy/IEnergyConsumer.java new file mode 100644 index 00000000..a0899b9e --- /dev/null +++ b/src/dark/api/energy/IEnergyConsumer.java @@ -0,0 +1,10 @@ +package dark.api.energy; + +import net.minecraftforge.common.ForgeDirection; + +public interface IEnergyConsumer extends IEnergyDevice +{ + public float receiveEnergy(ForgeDirection from, EnergyPacket receive, boolean doReceive); + + public EnergyPacket getRequest(ForgeDirection direction); +} diff --git a/src/dark/api/energy/IEnergyDevice.java b/src/dark/api/energy/IEnergyDevice.java new file mode 100644 index 00000000..1f0c881b --- /dev/null +++ b/src/dark/api/energy/IEnergyDevice.java @@ -0,0 +1,9 @@ +package dark.api.energy; + +import dark.api.parts.ITileConnector; + +public interface IEnergyDevice extends ITileConnector +{ + + +} diff --git a/src/dark/api/energy/IEnergyProvider.java b/src/dark/api/energy/IEnergyProvider.java new file mode 100644 index 00000000..edcf0bd1 --- /dev/null +++ b/src/dark/api/energy/IEnergyProvider.java @@ -0,0 +1,10 @@ +package dark.api.energy; + +import net.minecraftforge.common.ForgeDirection; + +public interface IEnergyProvider extends IEnergyDevice +{ + public EnergyPacket provideEnergy(ForgeDirection from, EnergyPacket request, boolean doProvide); + + public EnergyPacket getEnergyProduce(ForgeDirection direction); +} diff --git a/src/dark/api/INetworkHost.java b/src/dark/api/parts/INetworkHost.java similarity index 92% rename from src/dark/api/INetworkHost.java rename to src/dark/api/parts/INetworkHost.java index 57d3c83e..6b8f6a79 100644 --- a/src/dark/api/INetworkHost.java +++ b/src/dark/api/parts/INetworkHost.java @@ -1,9 +1,8 @@ -package dark.api; +package dark.api.parts; import java.util.List; import net.minecraft.tileentity.TileEntity; -import dark.api.parts.ITileConnector; import dark.core.prefab.tilenetwork.NetworkTileEntities; public interface INetworkHost extends ITileConnector diff --git a/src/dark/api/IVirtualObject.java b/src/dark/api/save/IVirtualObject.java similarity index 97% rename from src/dark/api/IVirtualObject.java rename to src/dark/api/save/IVirtualObject.java index 4e2e0fe5..3e39101d 100644 --- a/src/dark/api/IVirtualObject.java +++ b/src/dark/api/save/IVirtualObject.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.api.save; import java.io.File; diff --git a/src/dark/api/save/SaveManager.java b/src/dark/api/save/SaveManager.java index faf302ab..cc4930f2 100644 --- a/src/dark/api/save/SaveManager.java +++ b/src/dark/api/save/SaveManager.java @@ -11,7 +11,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.world.WorldEvent; import cpw.mods.fml.common.FMLLog; -import dark.api.IVirtualObject; public class SaveManager { diff --git a/src/dark/core/prefab/terminal/CommandUser.java b/src/dark/core/prefab/terminal/CommandUser.java index 9737f9b7..aa975b95 100644 --- a/src/dark/core/prefab/terminal/CommandUser.java +++ b/src/dark/core/prefab/terminal/CommandUser.java @@ -4,8 +4,8 @@ import java.util.HashSet; import java.util.Set; import net.minecraft.entity.player.EntityPlayer; -import dark.api.ITerminal; import dark.api.access.ISpecialAccess; +import dark.api.access.ITerminal; import dark.api.access.ITerminalCommand; public class CommandUser implements ITerminalCommand diff --git a/src/dark/core/prefab/terminal/TileEntityTerminal.java b/src/dark/core/prefab/terminal/TileEntityTerminal.java index bac50fa4..798a6aa4 100644 --- a/src/dark/core/prefab/terminal/TileEntityTerminal.java +++ b/src/dark/core/prefab/terminal/TileEntityTerminal.java @@ -12,8 +12,8 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; -import dark.api.ITerminal; import dark.api.access.GroupRegistry; +import dark.api.access.ITerminal; import dark.core.network.PacketHandler; import dark.core.prefab.machine.TileEntityEnergyMachine;