From e8bbe5796f078467feecd28a7c40a62443d7325b Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Wed, 28 Aug 2013 16:07:15 -0400 Subject: [PATCH] Moved files around The ammount of files in this project are getting out of hand tbh. I will need to sit down later and sort them all out and remove any that are not needed. --- src/dark/common/debug/BlockDebug.java | 2 +- src/dark/common/transmit/BlockWire.java | 2 +- src/dark/common/transmit/TileEntityLaserEmitter.java | 2 +- src/dark/core/DarkMain.java | 2 ++ src/dark/core/access/GlobalAccessLoader.java | 4 ++-- src/dark/core/access/GlobalAccessManager.java | 2 +- src/dark/core/blocks/IMultiBlock.java | 2 +- src/dark/core/gui/GuiGlobalList.java | 2 +- src/dark/core/helpers/FluidRestrictionHandler.java | 2 +- src/dark/core/{ => helpers}/INbtSave.java | 2 +- src/dark/core/{ => helpers}/NBTFileLoader.java | 2 +- src/dark/core/{ => helpers}/SaveManager.java | 3 ++- src/dark/core/items/ItemTools.java | 4 ++-- src/dark/core/terminal/CommandHelp.java | 4 ++-- src/dark/core/terminal/CommandRegistry.java | 2 +- src/dark/core/terminal/CommandUser.java | 4 ++-- src/dark/core/terminal/TerminalCommand.java | 4 ++-- src/dark/core/terminal/TileEntityTerminal.java | 6 +++--- src/dark/core/tile/network/NetworkPathFinder.java | 2 +- src/dark/core/tile/network/NetworkSharedPower.java | 6 +++--- src/dark/core/tile/network/NetworkTileEntities.java | 2 +- src/dark/{api => interfaces}/ColorCode.java | 2 +- src/dark/{api => interfaces}/IBlockActivate.java | 2 +- src/dark/{api => interfaces}/IColorCoded.java | 2 +- src/dark/{api => interfaces}/IDisableable.java | 2 +- src/dark/{api => interfaces}/IExternalInv.java | 2 +- src/dark/{api => interfaces}/IHeatObject.java | 2 +- src/dark/{api => interfaces}/IHeatProducer.java | 2 +- src/dark/{api => interfaces}/IInvBox.java | 2 +- src/dark/{api => interfaces}/INetworkEnergyPart.java | 2 +- src/dark/{api => interfaces}/INetworkPart.java | 2 +- src/dark/{api => interfaces}/IPowerLess.java | 2 +- src/dark/{api => interfaces}/IPsiReciever.java | 2 +- src/dark/{api => interfaces}/IScroll.java | 2 +- src/dark/{api => interfaces}/ISpecialAccess.java | 2 +- src/dark/{api => interfaces}/ITerminal.java | 2 +- src/dark/{api => interfaces}/ITileConnector.java | 2 +- src/dark/{api => interfaces}/IToolReadOut.java | 4 ++-- src/dark/{api => interfaces}/PowerSystems.java | 2 +- src/dark/{core/blocks => prefab}/BlockMachine.java | 4 ++-- src/dark/{core/blocks => prefab}/InvChest.java | 6 +++--- src/dark/{core => prefab}/ModPrefab.java | 2 +- src/dark/{core/blocks => prefab}/TileEntityInv.java | 6 +++--- .../{core/blocks => prefab}/TileEntityMachine.java | 12 ++++++------ 44 files changed, 66 insertions(+), 63 deletions(-) rename src/dark/core/{ => helpers}/INbtSave.java (94%) rename src/dark/core/{ => helpers}/NBTFileLoader.java (99%) rename src/dark/core/{ => helpers}/SaveManager.java (97%) rename src/dark/{api => interfaces}/ColorCode.java (98%) rename src/dark/{api => interfaces}/IBlockActivate.java (91%) rename src/dark/{api => interfaces}/IColorCoded.java (88%) rename src/dark/{api => interfaces}/IDisableable.java (95%) rename src/dark/{api => interfaces}/IExternalInv.java (93%) rename src/dark/{api => interfaces}/IHeatObject.java (96%) rename src/dark/{api => interfaces}/IHeatProducer.java (92%) rename src/dark/{api => interfaces}/IInvBox.java (95%) rename src/dark/{api => interfaces}/INetworkEnergyPart.java (96%) rename src/dark/{api => interfaces}/INetworkPart.java (96%) rename src/dark/{api => interfaces}/IPowerLess.java (88%) rename src/dark/{api => interfaces}/IPsiReciever.java (93%) rename src/dark/{api => interfaces}/IScroll.java (92%) rename src/dark/{api => interfaces}/ISpecialAccess.java (97%) rename src/dark/{api => interfaces}/ITerminal.java (92%) rename src/dark/{api => interfaces}/ITileConnector.java (91%) rename src/dark/{api => interfaces}/IToolReadOut.java (92%) rename src/dark/{api => interfaces}/PowerSystems.java (98%) rename src/dark/{core/blocks => prefab}/BlockMachine.java (98%) rename src/dark/{core/blocks => prefab}/InvChest.java (98%) rename src/dark/{core => prefab}/ModPrefab.java (99%) rename src/dark/{core/blocks => prefab}/TileEntityInv.java (97%) rename src/dark/{core/blocks => prefab}/TileEntityMachine.java (98%) diff --git a/src/dark/common/debug/BlockDebug.java b/src/dark/common/debug/BlockDebug.java index 43e74ce54..2f02be125 100644 --- a/src/dark/common/debug/BlockDebug.java +++ b/src/dark/common/debug/BlockDebug.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import dark.core.DarkMain; -import dark.core.blocks.BlockMachine; +import dark.prefab.BlockMachine; public class BlockDebug extends BlockMachine { diff --git a/src/dark/common/transmit/BlockWire.java b/src/dark/common/transmit/BlockWire.java index 52892712a..2a7e13225 100644 --- a/src/dark/common/transmit/BlockWire.java +++ b/src/dark/common/transmit/BlockWire.java @@ -16,7 +16,7 @@ import universalelectricity.core.block.IConductor; import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.tile.TileEntityConductor; import dark.core.DarkMain; -import dark.core.blocks.BlockMachine; +import dark.prefab.BlockMachine; public class BlockWire extends BlockMachine { diff --git a/src/dark/common/transmit/TileEntityLaserEmitter.java b/src/dark/common/transmit/TileEntityLaserEmitter.java index 525f2fb38..7ed3bf2b3 100644 --- a/src/dark/common/transmit/TileEntityLaserEmitter.java +++ b/src/dark/common/transmit/TileEntityLaserEmitter.java @@ -2,7 +2,7 @@ package dark.common.transmit; import net.minecraftforge.common.ForgeDirection; import dark.core.DarkMain; -import dark.core.blocks.TileEntityMachine; +import dark.prefab.TileEntityMachine; public class TileEntityLaserEmitter extends TileEntityMachine { diff --git a/src/dark/core/DarkMain.java b/src/dark/core/DarkMain.java index 5faebff20..c94d847f1 100644 --- a/src/dark/core/DarkMain.java +++ b/src/dark/core/DarkMain.java @@ -33,6 +33,7 @@ import dark.core.blocks.BlockMulti; import dark.core.blocks.BlockOre; import dark.core.blocks.TileEntityMulti; import dark.core.helpers.FluidRestrictionHandler; +import dark.core.helpers.SaveManager; import dark.core.items.EnumMeterials; import dark.core.items.ItemBattery; import dark.core.items.ItemBlockHolder; @@ -42,6 +43,7 @@ import dark.core.items.ItemParts; import dark.core.items.ItemParts.Parts; import dark.core.items.ItemTools; import dark.core.items.ItemWrench; +import dark.prefab.ModPrefab; /** @author HangCow, DarkGuardsman */ @Mod(modid = DarkMain.MOD_ID, name = DarkMain.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true) diff --git a/src/dark/core/access/GlobalAccessLoader.java b/src/dark/core/access/GlobalAccessLoader.java index 6ea4a0728..b5a624247 100644 --- a/src/dark/core/access/GlobalAccessLoader.java +++ b/src/dark/core/access/GlobalAccessLoader.java @@ -4,8 +4,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.Mod.ServerStarting; import cpw.mods.fml.common.event.FMLServerStartingEvent; -import dark.core.INbtSave; -import dark.core.SaveManager; +import dark.core.helpers.INbtSave; +import dark.core.helpers.SaveManager; public class GlobalAccessLoader implements INbtSave { diff --git a/src/dark/core/access/GlobalAccessManager.java b/src/dark/core/access/GlobalAccessManager.java index 167a8cad7..851a6d664 100644 --- a/src/dark/core/access/GlobalAccessManager.java +++ b/src/dark/core/access/GlobalAccessManager.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Map.Entry; import net.minecraft.nbt.NBTTagCompound; -import dark.core.NBTFileLoader; +import dark.core.helpers.NBTFileLoader; public class GlobalAccessManager { diff --git a/src/dark/core/blocks/IMultiBlock.java b/src/dark/core/blocks/IMultiBlock.java index 38c03a116..d75b4d84d 100644 --- a/src/dark/core/blocks/IMultiBlock.java +++ b/src/dark/core/blocks/IMultiBlock.java @@ -2,7 +2,7 @@ package dark.core.blocks; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.vector.Vector3; -import dark.api.IBlockActivate; +import dark.interfaces.IBlockActivate; /** Interface to be applied to tile entity blocks that occupies more than one block space. Useful for * large machines. diff --git a/src/dark/core/gui/GuiGlobalList.java b/src/dark/core/gui/GuiGlobalList.java index dc49bb969..83ae89c8a 100644 --- a/src/dark/core/gui/GuiGlobalList.java +++ b/src/dark/core/gui/GuiGlobalList.java @@ -19,9 +19,9 @@ import universalelectricity.core.vector.Vector2; import universalelectricity.prefab.vector.Region2; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.api.IScroll; import dark.core.DarkMain; import dark.core.access.UserAccess; +import dark.interfaces.IScroll; @SideOnly(Side.CLIENT) public class GuiGlobalList extends GuiContainer implements IScroll diff --git a/src/dark/core/helpers/FluidRestrictionHandler.java b/src/dark/core/helpers/FluidRestrictionHandler.java index 63b023c97..1fed81a14 100644 --- a/src/dark/core/helpers/FluidRestrictionHandler.java +++ b/src/dark/core/helpers/FluidRestrictionHandler.java @@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidRegistry.FluidRegisterEvent; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import dark.api.ColorCode; +import dark.interfaces.ColorCode; public class FluidRestrictionHandler { diff --git a/src/dark/core/INbtSave.java b/src/dark/core/helpers/INbtSave.java similarity index 94% rename from src/dark/core/INbtSave.java rename to src/dark/core/helpers/INbtSave.java index 3b00041b1..698811c62 100644 --- a/src/dark/core/INbtSave.java +++ b/src/dark/core/helpers/INbtSave.java @@ -1,4 +1,4 @@ -package dark.core; +package dark.core.helpers; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/dark/core/NBTFileLoader.java b/src/dark/core/helpers/NBTFileLoader.java similarity index 99% rename from src/dark/core/NBTFileLoader.java rename to src/dark/core/helpers/NBTFileLoader.java index 42089f5c1..00a57eb1a 100644 --- a/src/dark/core/NBTFileLoader.java +++ b/src/dark/core/helpers/NBTFileLoader.java @@ -1,4 +1,4 @@ -package dark.core; +package dark.core.helpers; import java.io.File; import java.io.FileInputStream; diff --git a/src/dark/core/SaveManager.java b/src/dark/core/helpers/SaveManager.java similarity index 97% rename from src/dark/core/SaveManager.java rename to src/dark/core/helpers/SaveManager.java index 7735b84ab..900ceaea7 100644 --- a/src/dark/core/SaveManager.java +++ b/src/dark/core/helpers/SaveManager.java @@ -1,8 +1,9 @@ -package dark.core; +package dark.core.helpers; import java.util.ArrayList; import java.util.List; + import net.minecraftforge.common.MinecraftForge; public class SaveManager diff --git a/src/dark/core/items/ItemTools.java b/src/dark/core/items/ItemTools.java index c2e24d245..2fdccb5d9 100644 --- a/src/dark/core/items/ItemTools.java +++ b/src/dark/core/items/ItemTools.java @@ -20,10 +20,10 @@ 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.DarkMain; import dark.core.helpers.FluidHelper; +import dark.interfaces.IToolReadOut; +import dark.interfaces.IToolReadOut.EnumTools; public class ItemTools extends ItemBasic { diff --git a/src/dark/core/terminal/CommandHelp.java b/src/dark/core/terminal/CommandHelp.java index eebe8d25b..4d77169e8 100644 --- a/src/dark/core/terminal/CommandHelp.java +++ b/src/dark/core/terminal/CommandHelp.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.api.ISpecialAccess; -import dark.api.ITerminal; +import dark.interfaces.ISpecialAccess; +import dark.interfaces.ITerminal; public class CommandHelp extends TerminalCommand { diff --git a/src/dark/core/terminal/CommandRegistry.java b/src/dark/core/terminal/CommandRegistry.java index 38e456746..37d12cb99 100644 --- a/src/dark/core/terminal/CommandRegistry.java +++ b/src/dark/core/terminal/CommandRegistry.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.api.ITerminal; +import dark.interfaces.ITerminal; /** @author Calclavia, DarkGuardsman */ public class CommandRegistry diff --git a/src/dark/core/terminal/CommandUser.java b/src/dark/core/terminal/CommandUser.java index ade3e8421..e1b9a8abf 100644 --- a/src/dark/core/terminal/CommandUser.java +++ b/src/dark/core/terminal/CommandUser.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.api.ISpecialAccess; -import dark.api.ITerminal; import dark.core.access.AccessLevel; +import dark.interfaces.ISpecialAccess; +import dark.interfaces.ITerminal; public class CommandUser extends TerminalCommand { diff --git a/src/dark/core/terminal/TerminalCommand.java b/src/dark/core/terminal/TerminalCommand.java index 2d6484b8a..77be7e1e0 100644 --- a/src/dark/core/terminal/TerminalCommand.java +++ b/src/dark/core/terminal/TerminalCommand.java @@ -3,8 +3,8 @@ package dark.core.terminal; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.api.ISpecialAccess; -import dark.api.ITerminal; +import dark.interfaces.ISpecialAccess; +import dark.interfaces.ITerminal; /** @author Calclavia, DarkGuardsman */ public abstract class TerminalCommand diff --git a/src/dark/core/terminal/TileEntityTerminal.java b/src/dark/core/terminal/TileEntityTerminal.java index 051adf817..e41dd49f9 100644 --- a/src/dark/core/terminal/TileEntityTerminal.java +++ b/src/dark/core/terminal/TileEntityTerminal.java @@ -20,11 +20,11 @@ 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.api.ISpecialAccess; -import dark.api.ITerminal; import dark.core.access.AccessLevel; import dark.core.access.UserAccess; -import dark.core.blocks.TileEntityMachine; +import dark.interfaces.ISpecialAccess; +import dark.interfaces.ITerminal; +import dark.prefab.TileEntityMachine; /** @author Calclavia, DarkGuardsman */ public abstract class TileEntityTerminal extends TileEntityMachine implements ISpecialAccess, IPacketReceiver, ITerminal diff --git a/src/dark/core/tile/network/NetworkPathFinder.java b/src/dark/core/tile/network/NetworkPathFinder.java index 4cd44bdb4..e7a3ad1a4 100644 --- a/src/dark/core/tile/network/NetworkPathFinder.java +++ b/src/dark/core/tile/network/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.api.INetworkPart; +import dark.interfaces.INetworkPart; /** Check if a conductor connects with another. */ public class NetworkPathFinder extends Pathfinder diff --git a/src/dark/core/tile/network/NetworkSharedPower.java b/src/dark/core/tile/network/NetworkSharedPower.java index 60570ce7b..b71213e28 100644 --- a/src/dark/core/tile/network/NetworkSharedPower.java +++ b/src/dark/core/tile/network/NetworkSharedPower.java @@ -2,9 +2,9 @@ package dark.core.tile.network; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.block.IElectricalStorage; -import dark.api.INetworkEnergyPart; -import dark.api.INetworkPart; -import dark.api.IPowerLess; +import dark.interfaces.INetworkEnergyPart; +import dark.interfaces.INetworkPart; +import dark.interfaces.IPowerLess; /** 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/tile/network/NetworkTileEntities.java b/src/dark/core/tile/network/NetworkTileEntities.java index 35f653a6e..4d6dd2380 100644 --- a/src/dark/core/tile/network/NetworkTileEntities.java +++ b/src/dark/core/tile/network/NetworkTileEntities.java @@ -12,8 +12,8 @@ import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; import cpw.mods.fml.common.FMLLog; -import dark.api.INetworkPart; import dark.core.helpers.ConnectionHelper; +import dark.interfaces.INetworkPart; public abstract class NetworkTileEntities { diff --git a/src/dark/api/ColorCode.java b/src/dark/interfaces/ColorCode.java similarity index 98% rename from src/dark/api/ColorCode.java rename to src/dark/interfaces/ColorCode.java index 138286b5a..2cd63f329 100644 --- a/src/dark/api/ColorCode.java +++ b/src/dark/interfaces/ColorCode.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; public enum ColorCode { diff --git a/src/dark/api/IBlockActivate.java b/src/dark/interfaces/IBlockActivate.java similarity index 91% rename from src/dark/api/IBlockActivate.java rename to src/dark/interfaces/IBlockActivate.java index e18f3d88d..0ca30e153 100644 --- a/src/dark/api/IBlockActivate.java +++ b/src/dark/interfaces/IBlockActivate.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/dark/api/IColorCoded.java b/src/dark/interfaces/IColorCoded.java similarity index 88% rename from src/dark/api/IColorCoded.java rename to src/dark/interfaces/IColorCoded.java index 357b9a923..603ffaba2 100644 --- a/src/dark/api/IColorCoded.java +++ b/src/dark/interfaces/IColorCoded.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; public interface IColorCoded { diff --git a/src/dark/api/IDisableable.java b/src/dark/interfaces/IDisableable.java similarity index 95% rename from src/dark/api/IDisableable.java rename to src/dark/interfaces/IDisableable.java index 0d9e5278b..eaefaa37c 100644 --- a/src/dark/api/IDisableable.java +++ b/src/dark/interfaces/IDisableable.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; /** 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/api/IExternalInv.java b/src/dark/interfaces/IExternalInv.java similarity index 93% rename from src/dark/api/IExternalInv.java rename to src/dark/interfaces/IExternalInv.java index 3eb376432..c3b1bb5e1 100644 --- a/src/dark/api/IExternalInv.java +++ b/src/dark/interfaces/IExternalInv.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/dark/api/IHeatObject.java b/src/dark/interfaces/IHeatObject.java similarity index 96% rename from src/dark/api/IHeatObject.java rename to src/dark/interfaces/IHeatObject.java index a916b5738..0a35d215f 100644 --- a/src/dark/api/IHeatObject.java +++ b/src/dark/interfaces/IHeatObject.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/api/IHeatProducer.java b/src/dark/interfaces/IHeatProducer.java similarity index 92% rename from src/dark/api/IHeatProducer.java rename to src/dark/interfaces/IHeatProducer.java index 412198b61..5c0ea44dd 100644 --- a/src/dark/api/IHeatProducer.java +++ b/src/dark/interfaces/IHeatProducer.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/api/IInvBox.java b/src/dark/interfaces/IInvBox.java similarity index 95% rename from src/dark/api/IInvBox.java rename to src/dark/interfaces/IInvBox.java index 17632c858..97745a6e8 100644 --- a/src/dark/api/IInvBox.java +++ b/src/dark/interfaces/IInvBox.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/dark/api/INetworkEnergyPart.java b/src/dark/interfaces/INetworkEnergyPart.java similarity index 96% rename from src/dark/api/INetworkEnergyPart.java rename to src/dark/interfaces/INetworkEnergyPart.java index 6d85c55cc..0d8e55d34 100644 --- a/src/dark/api/INetworkEnergyPart.java +++ b/src/dark/interfaces/INetworkEnergyPart.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import universalelectricity.core.block.IElectricalStorage; diff --git a/src/dark/api/INetworkPart.java b/src/dark/interfaces/INetworkPart.java similarity index 96% rename from src/dark/api/INetworkPart.java rename to src/dark/interfaces/INetworkPart.java index f319ed422..e208fcade 100644 --- a/src/dark/api/INetworkPart.java +++ b/src/dark/interfaces/INetworkPart.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import java.util.List; diff --git a/src/dark/api/IPowerLess.java b/src/dark/interfaces/IPowerLess.java similarity index 88% rename from src/dark/api/IPowerLess.java rename to src/dark/interfaces/IPowerLess.java index 57c391ece..014506898 100644 --- a/src/dark/api/IPowerLess.java +++ b/src/dark/interfaces/IPowerLess.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; public interface IPowerLess { diff --git a/src/dark/api/IPsiReciever.java b/src/dark/interfaces/IPsiReciever.java similarity index 93% rename from src/dark/api/IPsiReciever.java rename to src/dark/interfaces/IPsiReciever.java index 0fc218854..4d7b6bc94 100644 --- a/src/dark/api/IPsiReciever.java +++ b/src/dark/interfaces/IPsiReciever.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; /** 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/api/IScroll.java b/src/dark/interfaces/IScroll.java similarity index 92% rename from src/dark/api/IScroll.java rename to src/dark/interfaces/IScroll.java index 07ea35f9c..71d6b31da 100644 --- a/src/dark/api/IScroll.java +++ b/src/dark/interfaces/IScroll.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; public interface IScroll { diff --git a/src/dark/api/ISpecialAccess.java b/src/dark/interfaces/ISpecialAccess.java similarity index 97% rename from src/dark/api/ISpecialAccess.java rename to src/dark/interfaces/ISpecialAccess.java index 0b71fa68b..f8b53efa7 100644 --- a/src/dark/api/ISpecialAccess.java +++ b/src/dark/interfaces/ISpecialAccess.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import java.util.List; diff --git a/src/dark/api/ITerminal.java b/src/dark/interfaces/ITerminal.java similarity index 92% rename from src/dark/api/ITerminal.java rename to src/dark/interfaces/ITerminal.java index fe9ef6620..7173ce9fa 100644 --- a/src/dark/api/ITerminal.java +++ b/src/dark/interfaces/ITerminal.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import java.util.List; diff --git a/src/dark/api/ITileConnector.java b/src/dark/interfaces/ITileConnector.java similarity index 91% rename from src/dark/api/ITileConnector.java rename to src/dark/interfaces/ITileConnector.java index 48d436616..06de67131 100644 --- a/src/dark/api/ITileConnector.java +++ b/src/dark/interfaces/ITileConnector.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/api/IToolReadOut.java b/src/dark/interfaces/IToolReadOut.java similarity index 92% rename from src/dark/api/IToolReadOut.java rename to src/dark/interfaces/IToolReadOut.java index 633e1aa68..63765051a 100644 --- a/src/dark/api/IToolReadOut.java +++ b/src/dark/interfaces/IToolReadOut.java @@ -1,6 +1,6 @@ -package dark.api; +package dark.interfaces; -import dark.api.IToolReadOut.EnumTools; +import dark.interfaces.IToolReadOut.EnumTools; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/api/PowerSystems.java b/src/dark/interfaces/PowerSystems.java similarity index 98% rename from src/dark/api/PowerSystems.java rename to src/dark/interfaces/PowerSystems.java index 7dde75c8b..c3c583187 100644 --- a/src/dark/api/PowerSystems.java +++ b/src/dark/interfaces/PowerSystems.java @@ -1,4 +1,4 @@ -package dark.api; +package dark.interfaces; import cpw.mods.fml.common.Loader; diff --git a/src/dark/core/blocks/BlockMachine.java b/src/dark/prefab/BlockMachine.java similarity index 98% rename from src/dark/core/blocks/BlockMachine.java rename to src/dark/prefab/BlockMachine.java index 7bb80ab12..66c48e33f 100644 --- a/src/dark/core/blocks/BlockMachine.java +++ b/src/dark/prefab/BlockMachine.java @@ -1,4 +1,4 @@ -package dark.core.blocks; +package dark.prefab; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -15,8 +15,8 @@ import net.minecraftforge.common.Configuration; import universalelectricity.prefab.block.BlockAdvanced; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.api.INetworkPart; import dark.core.DarkMain; +import dark.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/blocks/InvChest.java b/src/dark/prefab/InvChest.java similarity index 98% rename from src/dark/core/blocks/InvChest.java rename to src/dark/prefab/InvChest.java index 015a9ec9e..7832e14e5 100644 --- a/src/dark/core/blocks/InvChest.java +++ b/src/dark/prefab/InvChest.java @@ -1,4 +1,4 @@ -package dark.core.blocks; +package dark.prefab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import dark.api.IExternalInv; -import dark.api.IInvBox; +import dark.interfaces.IExternalInv; +import dark.interfaces.IInvBox; public class InvChest implements IInvBox { diff --git a/src/dark/core/ModPrefab.java b/src/dark/prefab/ModPrefab.java similarity index 99% rename from src/dark/core/ModPrefab.java rename to src/dark/prefab/ModPrefab.java index ae993662e..cb4e4d65e 100644 --- a/src/dark/core/ModPrefab.java +++ b/src/dark/prefab/ModPrefab.java @@ -1,4 +1,4 @@ -package dark.core; +package dark.prefab; import net.minecraft.block.Block; diff --git a/src/dark/core/blocks/TileEntityInv.java b/src/dark/prefab/TileEntityInv.java similarity index 97% rename from src/dark/core/blocks/TileEntityInv.java rename to src/dark/prefab/TileEntityInv.java index 7b793b141..e7ed5c3de 100644 --- a/src/dark/core/blocks/TileEntityInv.java +++ b/src/dark/prefab/TileEntityInv.java @@ -1,4 +1,4 @@ -package dark.core.blocks; +package dark.prefab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; import universalelectricity.prefab.tile.TileEntityAdvanced; -import dark.api.IExternalInv; -import dark.api.IInvBox; +import dark.interfaces.IExternalInv; +import dark.interfaces.IInvBox; public class TileEntityInv extends TileEntityAdvanced implements IExternalInv, ISidedInventory { diff --git a/src/dark/core/blocks/TileEntityMachine.java b/src/dark/prefab/TileEntityMachine.java similarity index 98% rename from src/dark/core/blocks/TileEntityMachine.java rename to src/dark/prefab/TileEntityMachine.java index eb68dc526..c50f91d09 100644 --- a/src/dark/core/blocks/TileEntityMachine.java +++ b/src/dark/prefab/TileEntityMachine.java @@ -1,4 +1,4 @@ -package dark.core.blocks; +package dark.prefab; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -23,11 +23,11 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.api.IDisableable; -import dark.api.IExternalInv; -import dark.api.IInvBox; -import dark.api.IPowerLess; -import dark.api.PowerSystems; +import dark.interfaces.IDisableable; +import dark.interfaces.IExternalInv; +import dark.interfaces.IInvBox; +import dark.interfaces.IPowerLess; +import dark.interfaces.PowerSystems; public abstract class TileEntityMachine extends TileEntityUniversalElectrical implements ISidedInventory, IExternalInv, IDisableable, IPacketReceiver, IPowerLess {