From 08c51bf14d8a0bd912e520e56d025f8e33e26152 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Wed, 4 Sep 2013 18:43:26 -0400 Subject: [PATCH] Moved api stuff around --- src/dark/{core/interfaces => api}/IDisableable.java | 2 +- src/dark/{core/interfaces => api}/ISpecialAccess.java | 2 +- src/dark/{core/interfaces => api}/ITerminal.java | 4 +++- src/dark/{core/interfaces => api}/IToolReadOut.java | 4 ++-- src/dark/{core/interfaces => api/energy}/IHeatObject.java | 2 +- src/dark/{core/interfaces => api/energy}/IHeatProducer.java | 2 +- src/dark/{core/interfaces => api/energy}/IPowerLess.java | 2 +- src/dark/{core/interfaces => api/energy}/IPsiReciever.java | 4 +++- src/dark/{core/interfaces => api/energy}/PowerSystems.java | 2 +- .../{core/interfaces => api/parts}/INetworkEnergyPart.java | 2 +- src/dark/{core/interfaces => api/parts}/INetworkPart.java | 2 +- src/dark/core/common/items/ItemTools.java | 4 ++-- src/dark/core/prefab/BlockMachine.java | 2 +- src/dark/core/prefab/TileEntityMachine.java | 6 +++--- src/dark/core/prefab/terminal/CommandHelp.java | 4 ++-- src/dark/core/prefab/terminal/CommandRegistry.java | 2 +- src/dark/core/prefab/terminal/CommandUser.java | 4 ++-- src/dark/core/prefab/terminal/TerminalCommand.java | 4 ++-- src/dark/core/prefab/terminal/TileEntityTerminal.java | 4 ++-- src/dark/core/prefab/tilenetwork/NetworkPathFinder.java | 2 +- src/dark/core/prefab/tilenetwork/NetworkSharedPower.java | 6 +++--- src/dark/core/prefab/tilenetwork/NetworkTileEntities.java | 2 +- 22 files changed, 36 insertions(+), 32 deletions(-) rename src/dark/{core/interfaces => api}/IDisableable.java (94%) rename src/dark/{core/interfaces => api}/ISpecialAccess.java (97%) rename src/dark/{core/interfaces => api}/ITerminal.java (84%) rename src/dark/{core/interfaces => api}/IToolReadOut.java (91%) rename src/dark/{core/interfaces => api/energy}/IHeatObject.java (96%) rename src/dark/{core/interfaces => api/energy}/IHeatProducer.java (91%) rename src/dark/{core/interfaces => api/energy}/IPowerLess.java (86%) rename src/dark/{core/interfaces => api/energy}/IPsiReciever.java (85%) rename src/dark/{core/interfaces => api/energy}/PowerSystems.java (98%) rename src/dark/{core/interfaces => api/parts}/INetworkEnergyPart.java (95%) rename src/dark/{core/interfaces => api/parts}/INetworkPart.java (95%) diff --git a/src/dark/core/interfaces/IDisableable.java b/src/dark/api/IDisableable.java similarity index 94% rename from src/dark/core/interfaces/IDisableable.java rename to src/dark/api/IDisableable.java index 33565a05a..0d9e5278b 100644 --- a/src/dark/core/interfaces/IDisableable.java +++ b/src/dark/api/IDisableable.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api; /** This class should be applied to all tile entities (mainly machines) that can be disabled (by * things like EMP, short circuit etc.). diff --git a/src/dark/core/interfaces/ISpecialAccess.java b/src/dark/api/ISpecialAccess.java similarity index 97% rename from src/dark/core/interfaces/ISpecialAccess.java rename to src/dark/api/ISpecialAccess.java index 56d1f44b2..ee3edd89a 100644 --- a/src/dark/core/interfaces/ISpecialAccess.java +++ b/src/dark/api/ISpecialAccess.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api; import java.util.List; diff --git a/src/dark/core/interfaces/ITerminal.java b/src/dark/api/ITerminal.java similarity index 84% rename from src/dark/core/interfaces/ITerminal.java rename to src/dark/api/ITerminal.java index 3908ddf80..d9259e257 100644 --- a/src/dark/core/interfaces/ITerminal.java +++ b/src/dark/api/ITerminal.java @@ -1,7 +1,9 @@ -package dark.core.interfaces; +package dark.api; import java.util.List; +import dark.core.interfaces.IScroll; + public interface ITerminal extends ISpecialAccess, IScroll { /** Gets an output of the string stored in the console. */ diff --git a/src/dark/core/interfaces/IToolReadOut.java b/src/dark/api/IToolReadOut.java similarity index 91% rename from src/dark/core/interfaces/IToolReadOut.java rename to src/dark/api/IToolReadOut.java index da12a2575..633e1aa68 100644 --- a/src/dark/core/interfaces/IToolReadOut.java +++ b/src/dark/api/IToolReadOut.java @@ -1,6 +1,6 @@ -package dark.core.interfaces; +package dark.api; -import dark.core.interfaces.IToolReadOut.EnumTools; +import dark.api.IToolReadOut.EnumTools; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/core/interfaces/IHeatObject.java b/src/dark/api/energy/IHeatObject.java similarity index 96% rename from src/dark/core/interfaces/IHeatObject.java rename to src/dark/api/energy/IHeatObject.java index d77ee3f06..18d615ec5 100644 --- a/src/dark/core/interfaces/IHeatObject.java +++ b/src/dark/api/energy/IHeatObject.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api.energy; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/core/interfaces/IHeatProducer.java b/src/dark/api/energy/IHeatProducer.java similarity index 91% rename from src/dark/core/interfaces/IHeatProducer.java rename to src/dark/api/energy/IHeatProducer.java index 8b5d24a1e..1cd031e0d 100644 --- a/src/dark/core/interfaces/IHeatProducer.java +++ b/src/dark/api/energy/IHeatProducer.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api.energy; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/core/interfaces/IPowerLess.java b/src/dark/api/energy/IPowerLess.java similarity index 86% rename from src/dark/core/interfaces/IPowerLess.java rename to src/dark/api/energy/IPowerLess.java index 65bca71b9..268338347 100644 --- a/src/dark/core/interfaces/IPowerLess.java +++ b/src/dark/api/energy/IPowerLess.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api.energy; public interface IPowerLess { diff --git a/src/dark/core/interfaces/IPsiReciever.java b/src/dark/api/energy/IPsiReciever.java similarity index 85% rename from src/dark/core/interfaces/IPsiReciever.java rename to src/dark/api/energy/IPsiReciever.java index 1a5f55f4b..c5eed8bbd 100644 --- a/src/dark/core/interfaces/IPsiReciever.java +++ b/src/dark/api/energy/IPsiReciever.java @@ -1,4 +1,6 @@ -package dark.core.interfaces; +package dark.api.energy; + +import dark.api.parts.ITileConnector; /** A tileEntity that receives a pressure driven fluid. Suggested to use some of the class from * net.minecraftforge.liquids too make your machine work with other fluid mods that don't use diff --git a/src/dark/core/interfaces/PowerSystems.java b/src/dark/api/energy/PowerSystems.java similarity index 98% rename from src/dark/core/interfaces/PowerSystems.java rename to src/dark/api/energy/PowerSystems.java index 60b7cd80b..413ce57b4 100644 --- a/src/dark/core/interfaces/PowerSystems.java +++ b/src/dark/api/energy/PowerSystems.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api.energy; import cpw.mods.fml.common.Loader; diff --git a/src/dark/core/interfaces/INetworkEnergyPart.java b/src/dark/api/parts/INetworkEnergyPart.java similarity index 95% rename from src/dark/core/interfaces/INetworkEnergyPart.java rename to src/dark/api/parts/INetworkEnergyPart.java index 0c7b15230..39a0e745d 100644 --- a/src/dark/core/interfaces/INetworkEnergyPart.java +++ b/src/dark/api/parts/INetworkEnergyPart.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api.parts; import universalelectricity.core.block.IElectricalStorage; diff --git a/src/dark/core/interfaces/INetworkPart.java b/src/dark/api/parts/INetworkPart.java similarity index 95% rename from src/dark/core/interfaces/INetworkPart.java rename to src/dark/api/parts/INetworkPart.java index ab8f80bf3..61de4fa82 100644 --- a/src/dark/core/interfaces/INetworkPart.java +++ b/src/dark/api/parts/INetworkPart.java @@ -1,4 +1,4 @@ -package dark.core.interfaces; +package dark.api.parts; import java.util.List; diff --git a/src/dark/core/common/items/ItemTools.java b/src/dark/core/common/items/ItemTools.java index ff5971994..d151c93e7 100644 --- a/src/dark/core/common/items/ItemTools.java +++ b/src/dark/core/common/items/ItemTools.java @@ -20,9 +20,9 @@ import universalelectricity.core.block.IElectrical; import universalelectricity.core.block.IElectricalStorage; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.api.IToolReadOut; +import dark.api.IToolReadOut.EnumTools; import dark.core.common.DarkMain; -import dark.core.interfaces.IToolReadOut; -import dark.core.interfaces.IToolReadOut.EnumTools; import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.items.ItemBasic; diff --git a/src/dark/core/prefab/BlockMachine.java b/src/dark/core/prefab/BlockMachine.java index de7e729e9..f120178ca 100644 --- a/src/dark/core/prefab/BlockMachine.java +++ b/src/dark/core/prefab/BlockMachine.java @@ -10,8 +10,8 @@ import net.minecraftforge.common.Configuration; import universalelectricity.prefab.block.BlockTile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.api.parts.INetworkPart; import dark.core.common.DarkMain; -import dark.core.interfaces.INetworkPart; /** Basic TileEntity Container class designed to be used by generic machines. It is suggested that * each mod using this create there own basic block extending this to reduce need to input config diff --git a/src/dark/core/prefab/TileEntityMachine.java b/src/dark/core/prefab/TileEntityMachine.java index 20df19a25..53ba1f920 100644 --- a/src/dark/core/prefab/TileEntityMachine.java +++ b/src/dark/core/prefab/TileEntityMachine.java @@ -23,11 +23,11 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.interfaces.IDisableable; +import dark.api.IDisableable; +import dark.api.energy.IPowerLess; +import dark.api.energy.PowerSystems; import dark.core.interfaces.IExternalInv; import dark.core.interfaces.IInvBox; -import dark.core.interfaces.IPowerLess; -import dark.core.interfaces.PowerSystems; import dark.core.prefab.invgui.InvChest; /** Prefab for most machines in the CoreMachine set. Provides basic power updates, packet updates, diff --git a/src/dark/core/prefab/terminal/CommandHelp.java b/src/dark/core/prefab/terminal/CommandHelp.java index 2a0328d8d..9cd71b2d3 100644 --- a/src/dark/core/prefab/terminal/CommandHelp.java +++ b/src/dark/core/prefab/terminal/CommandHelp.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.core.interfaces.ISpecialAccess; -import dark.core.interfaces.ITerminal; +import dark.api.ISpecialAccess; +import dark.api.ITerminal; public class CommandHelp extends TerminalCommand { diff --git a/src/dark/core/prefab/terminal/CommandRegistry.java b/src/dark/core/prefab/terminal/CommandRegistry.java index 97e4d0705..6970c715c 100644 --- a/src/dark/core/prefab/terminal/CommandRegistry.java +++ b/src/dark/core/prefab/terminal/CommandRegistry.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.core.interfaces.ITerminal; +import dark.api.ITerminal; /** @author Calclavia, DarkGuardsman */ public class CommandRegistry diff --git a/src/dark/core/prefab/terminal/CommandUser.java b/src/dark/core/prefab/terminal/CommandUser.java index 9d3d33c76..373b3b4bb 100644 --- a/src/dark/core/prefab/terminal/CommandUser.java +++ b/src/dark/core/prefab/terminal/CommandUser.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.core.interfaces.ISpecialAccess; -import dark.core.interfaces.ITerminal; +import dark.api.ISpecialAccess; +import dark.api.ITerminal; import dark.core.prefab.access.AccessLevel; public class CommandUser extends TerminalCommand diff --git a/src/dark/core/prefab/terminal/TerminalCommand.java b/src/dark/core/prefab/terminal/TerminalCommand.java index 9d8e0bbe5..8680c67e8 100644 --- a/src/dark/core/prefab/terminal/TerminalCommand.java +++ b/src/dark/core/prefab/terminal/TerminalCommand.java @@ -3,8 +3,8 @@ package dark.core.prefab.terminal; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.core.interfaces.ISpecialAccess; -import dark.core.interfaces.ITerminal; +import dark.api.ISpecialAccess; +import dark.api.ITerminal; /** @author Calclavia, DarkGuardsman */ public abstract class TerminalCommand diff --git a/src/dark/core/prefab/terminal/TileEntityTerminal.java b/src/dark/core/prefab/terminal/TileEntityTerminal.java index 133b80c7a..8011b649a 100644 --- a/src/dark/core/prefab/terminal/TileEntityTerminal.java +++ b/src/dark/core/prefab/terminal/TileEntityTerminal.java @@ -20,8 +20,8 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; -import dark.core.interfaces.ISpecialAccess; -import dark.core.interfaces.ITerminal; +import dark.api.ISpecialAccess; +import dark.api.ITerminal; import dark.core.prefab.TileEntityMachine; import dark.core.prefab.access.AccessLevel; import dark.core.prefab.access.UserAccess; diff --git a/src/dark/core/prefab/tilenetwork/NetworkPathFinder.java b/src/dark/core/prefab/tilenetwork/NetworkPathFinder.java index 39b8ff660..5c96170b4 100644 --- a/src/dark/core/prefab/tilenetwork/NetworkPathFinder.java +++ b/src/dark/core/prefab/tilenetwork/NetworkPathFinder.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import universalelectricity.core.path.IPathCallBack; import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; -import dark.core.interfaces.INetworkPart; +import dark.api.parts.INetworkPart; /** Check if a conductor connects with another. */ public class NetworkPathFinder extends Pathfinder diff --git a/src/dark/core/prefab/tilenetwork/NetworkSharedPower.java b/src/dark/core/prefab/tilenetwork/NetworkSharedPower.java index aaf57925a..e35efb4ae 100644 --- a/src/dark/core/prefab/tilenetwork/NetworkSharedPower.java +++ b/src/dark/core/prefab/tilenetwork/NetworkSharedPower.java @@ -2,9 +2,9 @@ package dark.core.prefab.tilenetwork; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.block.IElectricalStorage; -import dark.core.interfaces.INetworkEnergyPart; -import dark.core.interfaces.INetworkPart; -import dark.core.interfaces.IPowerLess; +import dark.api.energy.IPowerLess; +import dark.api.parts.INetworkEnergyPart; +import dark.api.parts.INetworkPart; /** Used for tile networks that only need to share power or act like a group battery that doesn't * store power on world save diff --git a/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java b/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java index 7382fa812..114349c56 100644 --- a/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java +++ b/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java @@ -12,7 +12,7 @@ import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; import cpw.mods.fml.common.FMLLog; -import dark.core.interfaces.INetworkPart; +import dark.api.parts.INetworkPart; import dark.core.prefab.helpers.ConnectionHelper; public abstract class NetworkTileEntities