From a41e3c02b109a8e4f9862dffc8c2f0f6e3745b22 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Tue, 3 Sep 2013 01:26:15 -0400 Subject: [PATCH] Package change from dark-> dark.core Makes it easier for the build script to ID the core files when all the CoreMachine mods are combined together --- src/dark/{ => core}/client/ClientProxy.java | 12 +++---- src/dark/{ => core}/client/FXBeam.java | 4 +-- .../client/models/ModelCopperWire.java | 2 +- .../client/renders/FluidBlockRenderer.java | 4 +-- .../client/renders/RenderCopperWire.java | 6 ++-- .../client/renders/RenderFakeBlock.java | 6 ++-- .../client/renders/RenderMachine.java | 2 +- src/dark/{ => core}/common/BlockRegistry.java | 6 ++-- src/dark/{ => core}/common/CommonProxy.java | 2 +- .../{ => core}/common/CoreRecipeLoader.java | 10 +++--- src/dark/{ => core}/common/DarkMain.java | 34 +++++++++---------- src/dark/{ => core}/common/RecipeLoader.java | 6 ++-- .../{ => core}/common/blocks/BlockOre.java | 10 +++--- .../common/blocks/OreGenSettings.java | 2 +- .../common/blocks/OreGenerator.java | 2 +- .../{ => core}/common/debug/BlockDebug.java | 10 +++--- .../common/debug/TileEntityInfFluid.java | 2 +- .../common/debug/TileEntityInfLoad.java | 2 +- .../common/debug/TileEntityInfSupply.java | 2 +- .../common/debug/TileEntityVoid.java | 2 +- .../common/items/EnumMeterials.java | 4 +-- .../{ => core}/common/items/EnumOreParts.java | 2 +- .../{ => core}/common/items/ItemBattery.java | 4 +-- .../{ => core}/common/items/ItemBlockOre.java | 4 +-- .../{ => core}/common/items/ItemOreDirv.java | 6 ++-- .../{ => core}/common/items/ItemParts.java | 4 +-- .../{ => core}/common/items/ItemTools.java | 12 +++---- .../{ => core}/common/items/ItemWrench.java | 6 ++-- .../common/transmit/BlockLaserEmitter.java | 2 +- .../{ => core}/common/transmit/BlockWire.java | 10 +++--- .../transmit/ItemBlockLaserEmitter.java | 2 +- .../transmit/TileEntityLaserEmitter.java | 6 ++-- .../common/transmit/TileEntityWire.java | 2 +- src/dark/{ => core}/interfaces/ColorCode.java | 2 +- .../{ => core}/interfaces/IBlockActivate.java | 2 +- .../{ => core}/interfaces/IDisableable.java | 2 +- .../{ => core}/interfaces/IExternalInv.java | 2 +- .../{ => core}/interfaces/IHeatObject.java | 2 +- .../{ => core}/interfaces/IHeatProducer.java | 2 +- src/dark/{ => core}/interfaces/IInvBox.java | 2 +- .../interfaces/INetworkEnergyPart.java | 2 +- .../{ => core}/interfaces/INetworkPart.java | 4 +-- .../{ => core}/interfaces/IPowerLess.java | 2 +- .../{ => core}/interfaces/IPsiReciever.java | 2 +- src/dark/{ => core}/interfaces/IScroll.java | 2 +- .../{ => core}/interfaces/ISpecialAccess.java | 6 ++-- src/dark/{ => core}/interfaces/ITerminal.java | 2 +- .../{ => core}/interfaces/ITileConnector.java | 2 +- .../{ => core}/interfaces/IToolReadOut.java | 4 +-- .../{ => core}/interfaces/PowerSystems.java | 2 +- src/dark/{ => core}/prefab/BlockMachine.java | 6 ++-- src/dark/{ => core}/prefab/BlockMulti.java | 2 +- .../{ => core}/prefab/IExtraObjectInfo.java | 4 +-- src/dark/{ => core}/prefab/IMultiBlock.java | 4 +-- src/dark/{ => core}/prefab/ModPrefab.java | 6 ++-- src/dark/{ => core}/prefab/TileEntityInv.java | 8 ++--- .../{ => core}/prefab/TileEntityMachine.java | 14 ++++---- .../{ => core}/prefab/TileEntityMulti.java | 2 +- .../{ => core}/prefab/access/AccessLevel.java | 2 +- .../prefab/access/GlobalAccess.java | 2 +- .../prefab/access/GlobalAccessLoader.java | 2 +- .../prefab/access/GlobalAccessManager.java | 4 +-- .../{ => core}/prefab/access/UserAccess.java | 2 +- .../prefab/damage/EntityTileDamage.java | 2 +- .../{ => core}/prefab/damage/IHpTile.java | 2 +- .../prefab/damage/TileDamageSource.java | 2 +- .../prefab/helpers/AutoCraftingManager.java | 2 +- .../prefab/helpers/BlockRenderInfo.java | 2 +- .../prefab/helpers/ConnectionHelper.java | 2 +- .../{ => core}/prefab/helpers/Direction.java | 2 +- .../prefab/helpers/EntityFakeBlock.java | 2 +- .../prefab/helpers/FluidHelper.java | 4 +-- .../prefab/helpers/ItemWorldHelper.java | 2 +- .../{ => core}/prefab/helpers/MathHelper.java | 2 +- .../{ => core}/prefab/helpers/MetaGroup.java | 2 +- .../prefab/helpers/NBTFileLoader.java | 2 +- src/dark/{ => core}/prefab/helpers/Pair.java | 2 +- .../prefab/helpers/PlayerMsgHelper.java | 2 +- .../{ => core}/prefab/helpers/Quaternion.java | 2 +- src/dark/{ => core}/prefab/helpers/Time.java | 2 +- .../{ => core}/prefab/helpers/Triple.java | 2 +- .../prefab/invgui/ContainerFake.java | 2 +- .../prefab/invgui/GuiButtonArrow.java | 4 +-- .../prefab/invgui/GuiGlobalList.java | 8 ++--- .../prefab/invgui/ISlotPickResult.java | 2 +- .../prefab/invgui/ISlotWatcher.java | 2 +- .../{ => core}/prefab/invgui/InvChest.java | 6 ++-- .../prefab/invgui/SlotCraftingResult.java | 2 +- .../prefab/invgui/SlotRestricted.java | 2 +- .../{ => core}/prefab/invgui/WatchedSlot.java | 2 +- .../{ => core}/prefab/items/ItemBasic.java | 4 +-- .../prefab/items/ItemBlockHolder.java | 2 +- .../prefab/terminal/CommandHelp.java | 6 ++-- .../prefab/terminal/CommandRegistry.java | 4 +-- .../prefab/terminal/CommandUser.java | 8 ++--- .../prefab/terminal/ContainerTerminal.java | 2 +- .../prefab/terminal/TerminalCommand.java | 6 ++-- .../prefab/terminal/TileEntityTerminal.java | 12 +++---- .../prefab/tilenetwork/NetworkPathFinder.java | 4 +-- .../prefab/tilenetwork/NetworkPowerWires.java | 2 +- .../tilenetwork/NetworkSharedPower.java | 8 ++--- .../tilenetwork/NetworkTileEntities.java | 6 ++-- 102 files changed, 211 insertions(+), 211 deletions(-) rename src/dark/{ => core}/client/ClientProxy.java (84%) rename src/dark/{ => core}/client/FXBeam.java (99%) rename src/dark/{ => core}/client/models/ModelCopperWire.java (99%) rename src/dark/{ => core}/client/renders/FluidBlockRenderer.java (97%) rename src/dark/{ => core}/client/renders/RenderCopperWire.java (96%) rename src/dark/{ => core}/client/renders/RenderFakeBlock.java (97%) rename src/dark/{ => core}/client/renders/RenderMachine.java (96%) rename src/dark/{ => core}/common/BlockRegistry.java (98%) rename src/dark/{ => core}/common/CommonProxy.java (96%) rename src/dark/{ => core}/common/CoreRecipeLoader.java (95%) rename src/dark/{ => core}/common/DarkMain.java (92%) rename src/dark/{ => core}/common/RecipeLoader.java (98%) rename src/dark/{ => core}/common/blocks/BlockOre.java (93%) rename src/dark/{ => core}/common/blocks/OreGenSettings.java (99%) rename src/dark/{ => core}/common/blocks/OreGenerator.java (97%) rename src/dark/{ => core}/common/debug/BlockDebug.java (95%) rename src/dark/{ => core}/common/debug/TileEntityInfFluid.java (76%) rename src/dark/{ => core}/common/debug/TileEntityInfLoad.java (97%) rename src/dark/{ => core}/common/debug/TileEntityInfSupply.java (97%) rename src/dark/{ => core}/common/debug/TileEntityVoid.java (98%) rename src/dark/{ => core}/common/items/EnumMeterials.java (97%) rename src/dark/{ => core}/common/items/EnumOreParts.java (96%) rename src/dark/{ => core}/common/items/ItemBattery.java (94%) rename src/dark/{ => core}/common/items/ItemBlockOre.java (89%) rename src/dark/{ => core}/common/items/ItemOreDirv.java (95%) rename src/dark/{ => core}/common/items/ItemParts.java (95%) rename src/dark/{ => core}/common/items/ItemTools.java (96%) rename src/dark/{ => core}/common/items/ItemWrench.java (96%) rename src/dark/{ => core}/common/transmit/BlockLaserEmitter.java (87%) rename src/dark/{ => core}/common/transmit/BlockWire.java (97%) rename src/dark/{ => core}/common/transmit/ItemBlockLaserEmitter.java (83%) rename src/dark/{ => core}/common/transmit/TileEntityLaserEmitter.java (89%) rename src/dark/{ => core}/common/transmit/TileEntityWire.java (95%) rename src/dark/{ => core}/interfaces/ColorCode.java (98%) rename src/dark/{ => core}/interfaces/IBlockActivate.java (90%) rename src/dark/{ => core}/interfaces/IDisableable.java (94%) rename src/dark/{ => core}/interfaces/IExternalInv.java (92%) rename src/dark/{ => core}/interfaces/IHeatObject.java (96%) rename src/dark/{ => core}/interfaces/IHeatProducer.java (91%) rename src/dark/{ => core}/interfaces/IInvBox.java (97%) rename src/dark/{ => core}/interfaces/INetworkEnergyPart.java (95%) rename src/dark/{ => core}/interfaces/INetworkPart.java (87%) rename src/dark/{ => core}/interfaces/IPowerLess.java (86%) rename src/dark/{ => core}/interfaces/IPsiReciever.java (92%) rename src/dark/{ => core}/interfaces/IScroll.java (90%) rename src/dark/{ => core}/interfaces/ISpecialAccess.java (90%) rename src/dark/{ => core}/interfaces/ITerminal.java (90%) rename src/dark/{ => core}/interfaces/ITileConnector.java (89%) rename src/dark/{ => core}/interfaces/IToolReadOut.java (91%) rename src/dark/{ => core}/interfaces/PowerSystems.java (98%) rename src/dark/{ => core}/prefab/BlockMachine.java (96%) rename src/dark/{ => core}/prefab/BlockMulti.java (99%) rename src/dark/{ => core}/prefab/IExtraObjectInfo.java (95%) rename src/dark/{ => core}/prefab/IMultiBlock.java (90%) rename src/dark/{ => core}/prefab/ModPrefab.java (95%) rename src/dark/{ => core}/prefab/TileEntityInv.java (95%) rename src/dark/{ => core}/prefab/TileEntityMachine.java (97%) rename src/dark/{ => core}/prefab/TileEntityMulti.java (99%) rename src/dark/{ => core}/prefab/access/AccessLevel.java (96%) rename src/dark/{ => core}/prefab/access/GlobalAccess.java (71%) rename src/dark/{ => core}/prefab/access/GlobalAccessLoader.java (96%) rename src/dark/{ => core}/prefab/access/GlobalAccessManager.java (98%) rename src/dark/{ => core}/prefab/access/UserAccess.java (98%) rename src/dark/{ => core}/prefab/damage/EntityTileDamage.java (99%) rename src/dark/{ => core}/prefab/damage/IHpTile.java (97%) rename src/dark/{ => core}/prefab/damage/TileDamageSource.java (97%) rename src/dark/{ => core}/prefab/helpers/AutoCraftingManager.java (99%) rename src/dark/{ => core}/prefab/helpers/BlockRenderInfo.java (98%) rename src/dark/{ => core}/prefab/helpers/ConnectionHelper.java (98%) rename src/dark/{ => core}/prefab/helpers/Direction.java (97%) rename src/dark/{ => core}/prefab/helpers/EntityFakeBlock.java (98%) rename src/dark/{ => core}/prefab/helpers/FluidHelper.java (99%) rename src/dark/{ => core}/prefab/helpers/ItemWorldHelper.java (99%) rename src/dark/{ => core}/prefab/helpers/MathHelper.java (98%) rename src/dark/{ => core}/prefab/helpers/MetaGroup.java (96%) rename src/dark/{ => core}/prefab/helpers/NBTFileLoader.java (98%) rename src/dark/{ => core}/prefab/helpers/Pair.java (95%) rename src/dark/{ => core}/prefab/helpers/PlayerMsgHelper.java (97%) rename src/dark/{ => core}/prefab/helpers/Quaternion.java (99%) rename src/dark/{ => core}/prefab/helpers/Time.java (97%) rename src/dark/{ => core}/prefab/helpers/Triple.java (96%) rename src/dark/{ => core}/prefab/invgui/ContainerFake.java (95%) rename src/dark/{ => core}/prefab/invgui/GuiButtonArrow.java (95%) rename src/dark/{ => core}/prefab/invgui/GuiGlobalList.java (97%) rename src/dark/{ => core}/prefab/invgui/ISlotPickResult.java (94%) rename src/dark/{ => core}/prefab/invgui/ISlotWatcher.java (87%) rename src/dark/{ => core}/prefab/invgui/InvChest.java (98%) rename src/dark/{ => core}/prefab/invgui/SlotCraftingResult.java (96%) rename src/dark/{ => core}/prefab/invgui/SlotRestricted.java (96%) rename src/dark/{ => core}/prefab/invgui/WatchedSlot.java (94%) rename src/dark/{ => core}/prefab/items/ItemBasic.java (92%) rename src/dark/{ => core}/prefab/items/ItemBlockHolder.java (95%) rename src/dark/{ => core}/prefab/terminal/CommandHelp.java (95%) rename src/dark/{ => core}/prefab/terminal/CommandRegistry.java (96%) rename src/dark/{ => core}/prefab/terminal/CommandUser.java (95%) rename src/dark/{ => core}/prefab/terminal/ContainerTerminal.java (96%) rename src/dark/{ => core}/prefab/terminal/TerminalCommand.java (92%) rename src/dark/{ => core}/prefab/terminal/TileEntityTerminal.java (97%) rename src/dark/{ => core}/prefab/tilenetwork/NetworkPathFinder.java (95%) rename src/dark/{ => core}/prefab/tilenetwork/NetworkPowerWires.java (91%) rename src/dark/{ => core}/prefab/tilenetwork/NetworkSharedPower.java (96%) rename src/dark/{ => core}/prefab/tilenetwork/NetworkTileEntities.java (98%) diff --git a/src/dark/client/ClientProxy.java b/src/dark/core/client/ClientProxy.java similarity index 84% rename from src/dark/client/ClientProxy.java rename to src/dark/core/client/ClientProxy.java index 355cecdd7..b5e50c6be 100644 --- a/src/dark/client/ClientProxy.java +++ b/src/dark/core/client/ClientProxy.java @@ -1,4 +1,4 @@ -package dark.client; +package dark.core.client; import java.awt.Color; @@ -8,11 +8,11 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -import dark.client.renders.RenderCopperWire; -import dark.common.CommonProxy; -import dark.common.CoreRecipeLoader; -import dark.common.DarkMain; -import dark.common.transmit.TileEntityWire; +import dark.core.client.renders.RenderCopperWire; +import dark.core.common.CommonProxy; +import dark.core.common.CoreRecipeLoader; +import dark.core.common.DarkMain; +import dark.core.common.transmit.TileEntityWire; public class ClientProxy extends CommonProxy { diff --git a/src/dark/client/FXBeam.java b/src/dark/core/client/FXBeam.java similarity index 99% rename from src/dark/client/FXBeam.java rename to src/dark/core/client/FXBeam.java index 66de3262d..bf805ee65 100644 --- a/src/dark/client/FXBeam.java +++ b/src/dark/core/client/FXBeam.java @@ -1,4 +1,4 @@ -package dark.client; +package dark.core.client; import java.awt.Color; @@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11; import universalelectricity.core.vector.Vector3; import cpw.mods.fml.client.FMLClientHandler; -import dark.common.DarkMain; +import dark.core.common.DarkMain; /** Based off Thaumcraft's Beam Renderer. * diff --git a/src/dark/client/models/ModelCopperWire.java b/src/dark/core/client/models/ModelCopperWire.java similarity index 99% rename from src/dark/client/models/ModelCopperWire.java rename to src/dark/core/client/models/ModelCopperWire.java index a9d67c4e1..90a7f2c76 100644 --- a/src/dark/client/models/ModelCopperWire.java +++ b/src/dark/core/client/models/ModelCopperWire.java @@ -1,4 +1,4 @@ -package dark.client.models; +package dark.core.client.models; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/dark/client/renders/FluidBlockRenderer.java b/src/dark/core/client/renders/FluidBlockRenderer.java similarity index 97% rename from src/dark/client/renders/FluidBlockRenderer.java rename to src/dark/core/client/renders/FluidBlockRenderer.java index 557ca4365..f42744c02 100644 --- a/src/dark/client/renders/FluidBlockRenderer.java +++ b/src/dark/core/client/renders/FluidBlockRenderer.java @@ -1,4 +1,4 @@ -package dark.client.renders; +package dark.core.client.renders; import java.util.HashMap; import java.util.Map; @@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import dark.prefab.helpers.BlockRenderInfo; +import dark.core.prefab.helpers.BlockRenderInfo; import universalelectricity.core.vector.Vector3; diff --git a/src/dark/client/renders/RenderCopperWire.java b/src/dark/core/client/renders/RenderCopperWire.java similarity index 96% rename from src/dark/client/renders/RenderCopperWire.java rename to src/dark/core/client/renders/RenderCopperWire.java index 2cfd54ecc..abe6acfeb 100644 --- a/src/dark/client/renders/RenderCopperWire.java +++ b/src/dark/core/client/renders/RenderCopperWire.java @@ -1,4 +1,4 @@ -package dark.client.renders; +package dark.core.client.renders; import ic2.api.energy.tile.IEnergyAcceptor; import ic2.api.energy.tile.IEnergyTile; @@ -15,8 +15,8 @@ import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerReceptor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.client.models.ModelCopperWire; -import dark.common.DarkMain; +import dark.core.client.models.ModelCopperWire; +import dark.core.common.DarkMain; @SideOnly(Side.CLIENT) public class RenderCopperWire extends RenderMachine diff --git a/src/dark/client/renders/RenderFakeBlock.java b/src/dark/core/client/renders/RenderFakeBlock.java similarity index 97% rename from src/dark/client/renders/RenderFakeBlock.java rename to src/dark/core/client/renders/RenderFakeBlock.java index 70742761f..8783ddbd0 100644 --- a/src/dark/client/renders/RenderFakeBlock.java +++ b/src/dark/core/client/renders/RenderFakeBlock.java @@ -5,7 +5,7 @@ * 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package dark.client.renders; +package dark.core.client.renders; import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; @@ -18,8 +18,8 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import dark.prefab.helpers.BlockRenderInfo; -import dark.prefab.helpers.EntityFakeBlock; +import dark.core.prefab.helpers.BlockRenderInfo; +import dark.core.prefab.helpers.EntityFakeBlock; import universalelectricity.core.vector.Vector3; diff --git a/src/dark/client/renders/RenderMachine.java b/src/dark/core/client/renders/RenderMachine.java similarity index 96% rename from src/dark/client/renders/RenderMachine.java rename to src/dark/core/client/renders/RenderMachine.java index b835c4bd4..95542ae30 100644 --- a/src/dark/client/renders/RenderMachine.java +++ b/src/dark/core/client/renders/RenderMachine.java @@ -1,4 +1,4 @@ -package dark.client.renders; +package dark.core.client.renders; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/dark/common/BlockRegistry.java b/src/dark/core/common/BlockRegistry.java similarity index 98% rename from src/dark/common/BlockRegistry.java rename to src/dark/core/common/BlockRegistry.java index 782d6d807..13ad6b1e2 100644 --- a/src/dark/common/BlockRegistry.java +++ b/src/dark/core/common/BlockRegistry.java @@ -1,4 +1,4 @@ -package dark.common; +package dark.core.common; import java.io.File; import java.util.HashMap; @@ -13,8 +13,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.Configuration; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import dark.prefab.IExtraObjectInfo; -import dark.prefab.helpers.Pair; +import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.helpers.Pair; /** Handler to make registering all parts of a block a bit easier * diff --git a/src/dark/common/CommonProxy.java b/src/dark/core/common/CommonProxy.java similarity index 96% rename from src/dark/common/CommonProxy.java rename to src/dark/core/common/CommonProxy.java index 49bbf4734..57fdc1717 100644 --- a/src/dark/common/CommonProxy.java +++ b/src/dark/core/common/CommonProxy.java @@ -1,4 +1,4 @@ -package dark.common; +package dark.core.common; import java.awt.Color; diff --git a/src/dark/common/CoreRecipeLoader.java b/src/dark/core/common/CoreRecipeLoader.java similarity index 95% rename from src/dark/common/CoreRecipeLoader.java rename to src/dark/core/common/CoreRecipeLoader.java index a839c7737..4afad88e3 100644 --- a/src/dark/common/CoreRecipeLoader.java +++ b/src/dark/core/common/CoreRecipeLoader.java @@ -1,13 +1,13 @@ -package dark.common; +package dark.core.common; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import dark.common.items.EnumMeterials; -import dark.common.items.EnumOreParts; -import dark.common.items.ItemWrench; -import dark.common.items.ItemParts.Parts; +import dark.core.common.items.EnumMeterials; +import dark.core.common.items.EnumOreParts; +import dark.core.common.items.ItemWrench; +import dark.core.common.items.ItemParts.Parts; public class CoreRecipeLoader extends RecipeLoader { diff --git a/src/dark/common/DarkMain.java b/src/dark/core/common/DarkMain.java similarity index 92% rename from src/dark/common/DarkMain.java rename to src/dark/core/common/DarkMain.java index d22e144bf..053582c8f 100644 --- a/src/dark/common/DarkMain.java +++ b/src/dark/core/common/DarkMain.java @@ -1,4 +1,4 @@ -package dark.common; +package dark.core.common; import java.io.File; import java.util.ArrayList; @@ -28,22 +28,22 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.network.NetworkMod; -import dark.common.BlockRegistry.BlockData; -import dark.common.blocks.BlockOre; -import dark.common.debug.BlockDebug; -import dark.common.items.EnumMeterials; -import dark.common.items.ItemBattery; -import dark.common.items.ItemBlockOre; -import dark.common.items.ItemOreDirv; -import dark.common.items.ItemParts; -import dark.common.items.ItemParts.Parts; -import dark.common.items.ItemTools; -import dark.common.items.ItemWrench; -import dark.common.transmit.BlockWire; -import dark.prefab.BlockMulti; -import dark.prefab.ModPrefab; -import dark.prefab.TileEntityMulti; -import dark.prefab.helpers.FluidHelper; +import dark.core.common.BlockRegistry.BlockData; +import dark.core.common.blocks.BlockOre; +import dark.core.common.debug.BlockDebug; +import dark.core.common.items.EnumMeterials; +import dark.core.common.items.ItemBattery; +import dark.core.common.items.ItemBlockOre; +import dark.core.common.items.ItemOreDirv; +import dark.core.common.items.ItemParts; +import dark.core.common.items.ItemTools; +import dark.core.common.items.ItemWrench; +import dark.core.common.items.ItemParts.Parts; +import dark.core.common.transmit.BlockWire; +import dark.core.prefab.BlockMulti; +import dark.core.prefab.ModPrefab; +import dark.core.prefab.TileEntityMulti; +import dark.core.prefab.helpers.FluidHelper; /** @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/common/RecipeLoader.java b/src/dark/core/common/RecipeLoader.java similarity index 98% rename from src/dark/common/RecipeLoader.java rename to src/dark/core/common/RecipeLoader.java index 83535375e..235b4f52f 100644 --- a/src/dark/common/RecipeLoader.java +++ b/src/dark/core/common/RecipeLoader.java @@ -1,4 +1,4 @@ -package dark.common; +package dark.core.common; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; -import dark.prefab.helpers.Pair; -import dark.prefab.helpers.Triple; +import dark.core.prefab.helpers.Pair; +import dark.core.prefab.helpers.Triple; public abstract class RecipeLoader { diff --git a/src/dark/common/blocks/BlockOre.java b/src/dark/core/common/blocks/BlockOre.java similarity index 93% rename from src/dark/common/blocks/BlockOre.java rename to src/dark/core/common/blocks/BlockOre.java index 438f38ef9..6203271d8 100644 --- a/src/dark/common/blocks/BlockOre.java +++ b/src/dark/core/common/blocks/BlockOre.java @@ -1,4 +1,4 @@ -package dark.common.blocks; +package dark.core.common.blocks; import java.util.HashMap; import java.util.List; @@ -13,10 +13,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; -import dark.common.DarkMain; -import dark.common.items.EnumMeterials; -import dark.prefab.IExtraObjectInfo; -import dark.prefab.helpers.Pair; +import dark.core.common.DarkMain; +import dark.core.common.items.EnumMeterials; +import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.helpers.Pair; public class BlockOre extends Block implements IExtraObjectInfo { diff --git a/src/dark/common/blocks/OreGenSettings.java b/src/dark/core/common/blocks/OreGenSettings.java similarity index 99% rename from src/dark/common/blocks/OreGenSettings.java rename to src/dark/core/common/blocks/OreGenSettings.java index 0bee64a57..e151eb4f5 100644 --- a/src/dark/common/blocks/OreGenSettings.java +++ b/src/dark/core/common/blocks/OreGenSettings.java @@ -1,4 +1,4 @@ -package dark.common.blocks; +package dark.core.common.blocks; import java.util.Random; diff --git a/src/dark/common/blocks/OreGenerator.java b/src/dark/core/common/blocks/OreGenerator.java similarity index 97% rename from src/dark/common/blocks/OreGenerator.java rename to src/dark/core/common/blocks/OreGenerator.java index ca1249515..a1574dab9 100644 --- a/src/dark/common/blocks/OreGenerator.java +++ b/src/dark/core/common/blocks/OreGenerator.java @@ -1,4 +1,4 @@ -package dark.common.blocks; +package dark.core.common.blocks; import java.util.ArrayList; import java.util.List; diff --git a/src/dark/common/debug/BlockDebug.java b/src/dark/core/common/debug/BlockDebug.java similarity index 95% rename from src/dark/common/debug/BlockDebug.java rename to src/dark/core/common/debug/BlockDebug.java index 3655510d8..ffa8b69d7 100644 --- a/src/dark/common/debug/BlockDebug.java +++ b/src/dark/core/common/debug/BlockDebug.java @@ -1,4 +1,4 @@ -package dark.common.debug; +package dark.core.common.debug; import java.util.List; import java.util.Set; @@ -15,10 +15,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; -import dark.common.DarkMain; -import dark.prefab.BlockMachine; -import dark.prefab.IExtraObjectInfo; -import dark.prefab.helpers.Pair; +import dark.core.common.DarkMain; +import dark.core.prefab.BlockMachine; +import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.helpers.Pair; public class BlockDebug extends BlockMachine implements IExtraObjectInfo { diff --git a/src/dark/common/debug/TileEntityInfFluid.java b/src/dark/core/common/debug/TileEntityInfFluid.java similarity index 76% rename from src/dark/common/debug/TileEntityInfFluid.java rename to src/dark/core/common/debug/TileEntityInfFluid.java index db2397ef8..ce5c79b41 100644 --- a/src/dark/common/debug/TileEntityInfFluid.java +++ b/src/dark/core/common/debug/TileEntityInfFluid.java @@ -1,4 +1,4 @@ -package dark.common.debug; +package dark.core.common.debug; import net.minecraft.tileentity.TileEntity; diff --git a/src/dark/common/debug/TileEntityInfLoad.java b/src/dark/core/common/debug/TileEntityInfLoad.java similarity index 97% rename from src/dark/common/debug/TileEntityInfLoad.java rename to src/dark/core/common/debug/TileEntityInfLoad.java index b3706c2cd..7894e24d3 100644 --- a/src/dark/common/debug/TileEntityInfLoad.java +++ b/src/dark/core/common/debug/TileEntityInfLoad.java @@ -1,4 +1,4 @@ -package dark.common.debug; +package dark.core.common.debug; import net.minecraftforge.common.ForgeDirection; import universalelectricity.compatibility.TileEntityUniversalElectrical; diff --git a/src/dark/common/debug/TileEntityInfSupply.java b/src/dark/core/common/debug/TileEntityInfSupply.java similarity index 97% rename from src/dark/common/debug/TileEntityInfSupply.java rename to src/dark/core/common/debug/TileEntityInfSupply.java index 2113c1233..645d7aed2 100644 --- a/src/dark/common/debug/TileEntityInfSupply.java +++ b/src/dark/core/common/debug/TileEntityInfSupply.java @@ -1,4 +1,4 @@ -package dark.common.debug; +package dark.core.common.debug; import java.util.EnumSet; diff --git a/src/dark/common/debug/TileEntityVoid.java b/src/dark/core/common/debug/TileEntityVoid.java similarity index 98% rename from src/dark/common/debug/TileEntityVoid.java rename to src/dark/core/common/debug/TileEntityVoid.java index 43d729ff0..89359843c 100644 --- a/src/dark/common/debug/TileEntityVoid.java +++ b/src/dark/core/common/debug/TileEntityVoid.java @@ -1,4 +1,4 @@ -package dark.common.debug; +package dark.core.common.debug; import java.util.HashMap; diff --git a/src/dark/common/items/EnumMeterials.java b/src/dark/core/common/items/EnumMeterials.java similarity index 97% rename from src/dark/common/items/EnumMeterials.java rename to src/dark/core/common/items/EnumMeterials.java index d0b0eb59f..6bf7c6d4b 100644 --- a/src/dark/common/items/EnumMeterials.java +++ b/src/dark/core/common/items/EnumMeterials.java @@ -1,11 +1,11 @@ -package dark.common.items; +package dark.core.common.items; import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; import universalelectricity.prefab.ore.OreGenReplaceStone; -import dark.common.DarkMain; +import dark.core.common.DarkMain; /** Class for storing materials, there icon names, sub items to be made from them or there sub ores * diff --git a/src/dark/common/items/EnumOreParts.java b/src/dark/core/common/items/EnumOreParts.java similarity index 96% rename from src/dark/common/items/EnumOreParts.java rename to src/dark/core/common/items/EnumOreParts.java index 30b476b2f..a621a7d59 100644 --- a/src/dark/common/items/EnumOreParts.java +++ b/src/dark/core/common/items/EnumOreParts.java @@ -1,4 +1,4 @@ -package dark.common.items; +package dark.core.common.items; public enum EnumOreParts { diff --git a/src/dark/common/items/ItemBattery.java b/src/dark/core/common/items/ItemBattery.java similarity index 94% rename from src/dark/common/items/ItemBattery.java rename to src/dark/core/common/items/ItemBattery.java index fcbccc80f..a4cfd5904 100644 --- a/src/dark/common/items/ItemBattery.java +++ b/src/dark/core/common/items/ItemBattery.java @@ -1,4 +1,4 @@ -package dark.common.items; +package dark.core.common.items; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import universalelectricity.core.item.ItemElectric; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.common.DarkMain; +import dark.core.common.DarkMain; public class ItemBattery extends ItemElectric { diff --git a/src/dark/common/items/ItemBlockOre.java b/src/dark/core/common/items/ItemBlockOre.java similarity index 89% rename from src/dark/common/items/ItemBlockOre.java rename to src/dark/core/common/items/ItemBlockOre.java index f6dea39e5..8a4724eea 100644 --- a/src/dark/common/items/ItemBlockOre.java +++ b/src/dark/core/common/items/ItemBlockOre.java @@ -1,8 +1,8 @@ -package dark.common.items; +package dark.core.common.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import dark.common.DarkMain; +import dark.core.common.DarkMain; public class ItemBlockOre extends ItemBlock { diff --git a/src/dark/common/items/ItemOreDirv.java b/src/dark/core/common/items/ItemOreDirv.java similarity index 95% rename from src/dark/common/items/ItemOreDirv.java rename to src/dark/core/common/items/ItemOreDirv.java index c836cde33..e3bc80b34 100644 --- a/src/dark/common/items/ItemOreDirv.java +++ b/src/dark/core/common/items/ItemOreDirv.java @@ -1,4 +1,4 @@ -package dark.common.items; +package dark.core.common.items; import java.util.List; @@ -9,8 +9,8 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.Configuration; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.common.DarkMain; -import dark.prefab.items.ItemBasic; +import dark.core.common.DarkMain; +import dark.core.prefab.items.ItemBasic; /** A series of items that are derived from a basic ore block * diff --git a/src/dark/common/items/ItemParts.java b/src/dark/core/common/items/ItemParts.java similarity index 95% rename from src/dark/common/items/ItemParts.java rename to src/dark/core/common/items/ItemParts.java index 55ac188de..4cf5972b5 100644 --- a/src/dark/common/items/ItemParts.java +++ b/src/dark/core/common/items/ItemParts.java @@ -1,8 +1,8 @@ -package dark.common.items; +package dark.core.common.items; import java.util.List; -import dark.prefab.items.ItemBasic; +import dark.core.prefab.items.ItemBasic; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/src/dark/common/items/ItemTools.java b/src/dark/core/common/items/ItemTools.java similarity index 96% rename from src/dark/common/items/ItemTools.java rename to src/dark/core/common/items/ItemTools.java index f400918cd..ff5971994 100644 --- a/src/dark/common/items/ItemTools.java +++ b/src/dark/core/common/items/ItemTools.java @@ -1,4 +1,4 @@ -package dark.common.items; +package dark.core.common.items; import java.util.List; @@ -20,11 +20,11 @@ import universalelectricity.core.block.IElectrical; import universalelectricity.core.block.IElectricalStorage; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.common.DarkMain; -import dark.interfaces.IToolReadOut; -import dark.interfaces.IToolReadOut.EnumTools; -import dark.prefab.helpers.FluidHelper; -import dark.prefab.items.ItemBasic; +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; public class ItemTools extends ItemBasic { diff --git a/src/dark/common/items/ItemWrench.java b/src/dark/core/common/items/ItemWrench.java similarity index 96% rename from src/dark/common/items/ItemWrench.java rename to src/dark/core/common/items/ItemWrench.java index 9435510c2..e7ddc4bfb 100644 --- a/src/dark/common/items/ItemWrench.java +++ b/src/dark/core/common/items/ItemWrench.java @@ -1,4 +1,4 @@ -package dark.common.items; +package dark.core.common.items; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -8,8 +8,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; import buildcraft.api.tools.IToolWrench; -import dark.common.DarkMain; -import dark.prefab.items.ItemBasic; +import dark.core.common.DarkMain; +import dark.core.prefab.items.ItemBasic; public class ItemWrench extends ItemBasic implements IToolWrench { diff --git a/src/dark/common/transmit/BlockLaserEmitter.java b/src/dark/core/common/transmit/BlockLaserEmitter.java similarity index 87% rename from src/dark/common/transmit/BlockLaserEmitter.java rename to src/dark/core/common/transmit/BlockLaserEmitter.java index 30ead5e4f..fe5c5374d 100644 --- a/src/dark/common/transmit/BlockLaserEmitter.java +++ b/src/dark/core/common/transmit/BlockLaserEmitter.java @@ -1,4 +1,4 @@ -package dark.common.transmit; +package dark.core.common.transmit; import net.minecraft.block.material.Material; import universalelectricity.prefab.block.BlockAdvanced; diff --git a/src/dark/common/transmit/BlockWire.java b/src/dark/core/common/transmit/BlockWire.java similarity index 97% rename from src/dark/common/transmit/BlockWire.java rename to src/dark/core/common/transmit/BlockWire.java index 330d6d263..07961ee92 100644 --- a/src/dark/common/transmit/BlockWire.java +++ b/src/dark/core/common/transmit/BlockWire.java @@ -1,4 +1,4 @@ -package dark.common.transmit; +package dark.core.common.transmit; import java.util.List; import java.util.Map.Entry; @@ -17,10 +17,10 @@ import net.minecraftforge.common.Configuration; import universalelectricity.core.block.IConductor; import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.tile.TileEntityConductor; -import dark.common.DarkMain; -import dark.prefab.BlockMachine; -import dark.prefab.IExtraObjectInfo; -import dark.prefab.helpers.Pair; +import dark.core.common.DarkMain; +import dark.core.prefab.BlockMachine; +import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.helpers.Pair; public class BlockWire extends BlockMachine implements IExtraObjectInfo { diff --git a/src/dark/common/transmit/ItemBlockLaserEmitter.java b/src/dark/core/common/transmit/ItemBlockLaserEmitter.java similarity index 83% rename from src/dark/common/transmit/ItemBlockLaserEmitter.java rename to src/dark/core/common/transmit/ItemBlockLaserEmitter.java index 4634590f2..80183c9de 100644 --- a/src/dark/common/transmit/ItemBlockLaserEmitter.java +++ b/src/dark/core/common/transmit/ItemBlockLaserEmitter.java @@ -1,4 +1,4 @@ -package dark.common.transmit; +package dark.core.common.transmit; import net.minecraft.item.ItemBlock; diff --git a/src/dark/common/transmit/TileEntityLaserEmitter.java b/src/dark/core/common/transmit/TileEntityLaserEmitter.java similarity index 89% rename from src/dark/common/transmit/TileEntityLaserEmitter.java rename to src/dark/core/common/transmit/TileEntityLaserEmitter.java index 3ed26fe17..cd7f9fc22 100644 --- a/src/dark/common/transmit/TileEntityLaserEmitter.java +++ b/src/dark/core/common/transmit/TileEntityLaserEmitter.java @@ -1,8 +1,8 @@ -package dark.common.transmit; +package dark.core.common.transmit; import net.minecraftforge.common.ForgeDirection; -import dark.common.DarkMain; -import dark.prefab.TileEntityMachine; +import dark.core.common.DarkMain; +import dark.core.prefab.TileEntityMachine; public class TileEntityLaserEmitter extends TileEntityMachine { diff --git a/src/dark/common/transmit/TileEntityWire.java b/src/dark/core/common/transmit/TileEntityWire.java similarity index 95% rename from src/dark/common/transmit/TileEntityWire.java rename to src/dark/core/common/transmit/TileEntityWire.java index e8cb4ec0b..3de21de55 100644 --- a/src/dark/common/transmit/TileEntityWire.java +++ b/src/dark/core/common/transmit/TileEntityWire.java @@ -1,4 +1,4 @@ -package dark.common.transmit; +package dark.core.common.transmit; import universalelectricity.compatibility.TileEntityUniversalConductor; diff --git a/src/dark/interfaces/ColorCode.java b/src/dark/core/interfaces/ColorCode.java similarity index 98% rename from src/dark/interfaces/ColorCode.java rename to src/dark/core/interfaces/ColorCode.java index 6b36c2109..4161d86da 100644 --- a/src/dark/interfaces/ColorCode.java +++ b/src/dark/core/interfaces/ColorCode.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; public enum ColorCode { diff --git a/src/dark/interfaces/IBlockActivate.java b/src/dark/core/interfaces/IBlockActivate.java similarity index 90% rename from src/dark/interfaces/IBlockActivate.java rename to src/dark/core/interfaces/IBlockActivate.java index 0ca30e153..d2408d717 100644 --- a/src/dark/interfaces/IBlockActivate.java +++ b/src/dark/core/interfaces/IBlockActivate.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/dark/interfaces/IDisableable.java b/src/dark/core/interfaces/IDisableable.java similarity index 94% rename from src/dark/interfaces/IDisableable.java rename to src/dark/core/interfaces/IDisableable.java index eaefaa37c..33565a05a 100644 --- a/src/dark/interfaces/IDisableable.java +++ b/src/dark/core/interfaces/IDisableable.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.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/interfaces/IExternalInv.java b/src/dark/core/interfaces/IExternalInv.java similarity index 92% rename from src/dark/interfaces/IExternalInv.java rename to src/dark/core/interfaces/IExternalInv.java index c3b1bb5e1..62551b492 100644 --- a/src/dark/interfaces/IExternalInv.java +++ b/src/dark/core/interfaces/IExternalInv.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/dark/interfaces/IHeatObject.java b/src/dark/core/interfaces/IHeatObject.java similarity index 96% rename from src/dark/interfaces/IHeatObject.java rename to src/dark/core/interfaces/IHeatObject.java index 0a35d215f..d77ee3f06 100644 --- a/src/dark/interfaces/IHeatObject.java +++ b/src/dark/core/interfaces/IHeatObject.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/interfaces/IHeatProducer.java b/src/dark/core/interfaces/IHeatProducer.java similarity index 91% rename from src/dark/interfaces/IHeatProducer.java rename to src/dark/core/interfaces/IHeatProducer.java index 5c0ea44dd..8b5d24a1e 100644 --- a/src/dark/interfaces/IHeatProducer.java +++ b/src/dark/core/interfaces/IHeatProducer.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/interfaces/IInvBox.java b/src/dark/core/interfaces/IInvBox.java similarity index 97% rename from src/dark/interfaces/IInvBox.java rename to src/dark/core/interfaces/IInvBox.java index b5fdf025d..ea5c7359d 100644 --- a/src/dark/interfaces/IInvBox.java +++ b/src/dark/core/interfaces/IInvBox.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/dark/interfaces/INetworkEnergyPart.java b/src/dark/core/interfaces/INetworkEnergyPart.java similarity index 95% rename from src/dark/interfaces/INetworkEnergyPart.java rename to src/dark/core/interfaces/INetworkEnergyPart.java index 0d8e55d34..0c7b15230 100644 --- a/src/dark/interfaces/INetworkEnergyPart.java +++ b/src/dark/core/interfaces/INetworkEnergyPart.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import universalelectricity.core.block.IElectricalStorage; diff --git a/src/dark/interfaces/INetworkPart.java b/src/dark/core/interfaces/INetworkPart.java similarity index 87% rename from src/dark/interfaces/INetworkPart.java rename to src/dark/core/interfaces/INetworkPart.java index 07cb870a0..ab8f80bf3 100644 --- a/src/dark/interfaces/INetworkPart.java +++ b/src/dark/core/interfaces/INetworkPart.java @@ -1,9 +1,9 @@ -package dark.interfaces; +package dark.core.interfaces; import java.util.List; import net.minecraft.tileentity.TileEntity; -import dark.prefab.tilenetwork.NetworkTileEntities; +import dark.core.prefab.tilenetwork.NetworkTileEntities; public interface INetworkPart extends ITileConnector { diff --git a/src/dark/interfaces/IPowerLess.java b/src/dark/core/interfaces/IPowerLess.java similarity index 86% rename from src/dark/interfaces/IPowerLess.java rename to src/dark/core/interfaces/IPowerLess.java index 014506898..65bca71b9 100644 --- a/src/dark/interfaces/IPowerLess.java +++ b/src/dark/core/interfaces/IPowerLess.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; public interface IPowerLess { diff --git a/src/dark/interfaces/IPsiReciever.java b/src/dark/core/interfaces/IPsiReciever.java similarity index 92% rename from src/dark/interfaces/IPsiReciever.java rename to src/dark/core/interfaces/IPsiReciever.java index 4d7b6bc94..1a5f55f4b 100644 --- a/src/dark/interfaces/IPsiReciever.java +++ b/src/dark/core/interfaces/IPsiReciever.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.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/interfaces/IScroll.java b/src/dark/core/interfaces/IScroll.java similarity index 90% rename from src/dark/interfaces/IScroll.java rename to src/dark/core/interfaces/IScroll.java index 71d6b31da..8c29b5e3c 100644 --- a/src/dark/interfaces/IScroll.java +++ b/src/dark/core/interfaces/IScroll.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; public interface IScroll { diff --git a/src/dark/interfaces/ISpecialAccess.java b/src/dark/core/interfaces/ISpecialAccess.java similarity index 90% rename from src/dark/interfaces/ISpecialAccess.java rename to src/dark/core/interfaces/ISpecialAccess.java index f2e2133c9..56d1f44b2 100644 --- a/src/dark/interfaces/ISpecialAccess.java +++ b/src/dark/core/interfaces/ISpecialAccess.java @@ -1,9 +1,9 @@ -package dark.interfaces; +package dark.core.interfaces; import java.util.List; -import dark.prefab.access.AccessLevel; -import dark.prefab.access.UserAccess; +import dark.core.prefab.access.AccessLevel; +import dark.core.prefab.access.UserAccess; /** Used by any object that needs to restrict access to it by a set of usernames * diff --git a/src/dark/interfaces/ITerminal.java b/src/dark/core/interfaces/ITerminal.java similarity index 90% rename from src/dark/interfaces/ITerminal.java rename to src/dark/core/interfaces/ITerminal.java index 7173ce9fa..3908ddf80 100644 --- a/src/dark/interfaces/ITerminal.java +++ b/src/dark/core/interfaces/ITerminal.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import java.util.List; diff --git a/src/dark/interfaces/ITileConnector.java b/src/dark/core/interfaces/ITileConnector.java similarity index 89% rename from src/dark/interfaces/ITileConnector.java rename to src/dark/core/interfaces/ITileConnector.java index 06de67131..e5e368b7e 100644 --- a/src/dark/interfaces/ITileConnector.java +++ b/src/dark/core/interfaces/ITileConnector.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/interfaces/IToolReadOut.java b/src/dark/core/interfaces/IToolReadOut.java similarity index 91% rename from src/dark/interfaces/IToolReadOut.java rename to src/dark/core/interfaces/IToolReadOut.java index 63765051a..da12a2575 100644 --- a/src/dark/interfaces/IToolReadOut.java +++ b/src/dark/core/interfaces/IToolReadOut.java @@ -1,6 +1,6 @@ -package dark.interfaces; +package dark.core.interfaces; -import dark.interfaces.IToolReadOut.EnumTools; +import dark.core.interfaces.IToolReadOut.EnumTools; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; diff --git a/src/dark/interfaces/PowerSystems.java b/src/dark/core/interfaces/PowerSystems.java similarity index 98% rename from src/dark/interfaces/PowerSystems.java rename to src/dark/core/interfaces/PowerSystems.java index c3c583187..60b7cd80b 100644 --- a/src/dark/interfaces/PowerSystems.java +++ b/src/dark/core/interfaces/PowerSystems.java @@ -1,4 +1,4 @@ -package dark.interfaces; +package dark.core.interfaces; import cpw.mods.fml.common.Loader; diff --git a/src/dark/prefab/BlockMachine.java b/src/dark/core/prefab/BlockMachine.java similarity index 96% rename from src/dark/prefab/BlockMachine.java rename to src/dark/core/prefab/BlockMachine.java index 1ebcee84b..de7e729e9 100644 --- a/src/dark/prefab/BlockMachine.java +++ b/src/dark/core/prefab/BlockMachine.java @@ -1,4 +1,4 @@ -package dark.prefab; +package dark.core.prefab; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -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.common.DarkMain; -import dark.interfaces.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/prefab/BlockMulti.java b/src/dark/core/prefab/BlockMulti.java similarity index 99% rename from src/dark/prefab/BlockMulti.java rename to src/dark/core/prefab/BlockMulti.java index 8bf3e57db..70c9ad062 100644 --- a/src/dark/prefab/BlockMulti.java +++ b/src/dark/core/prefab/BlockMulti.java @@ -1,4 +1,4 @@ -package dark.prefab; +package dark.core.prefab; import java.util.Random; diff --git a/src/dark/prefab/IExtraObjectInfo.java b/src/dark/core/prefab/IExtraObjectInfo.java similarity index 95% rename from src/dark/prefab/IExtraObjectInfo.java rename to src/dark/core/prefab/IExtraObjectInfo.java index 6ff70f822..0045f1e64 100644 --- a/src/dark/prefab/IExtraObjectInfo.java +++ b/src/dark/core/prefab/IExtraObjectInfo.java @@ -1,10 +1,10 @@ -package dark.prefab; +package dark.core.prefab; import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.Configuration; -import dark.prefab.helpers.Pair; +import dark.core.prefab.helpers.Pair; /** Used to handle info about the block that would normally be handled by the mod main class. Use the * BlockRegistry in order for these methods to be called on load of the mod. diff --git a/src/dark/prefab/IMultiBlock.java b/src/dark/core/prefab/IMultiBlock.java similarity index 90% rename from src/dark/prefab/IMultiBlock.java rename to src/dark/core/prefab/IMultiBlock.java index fdeba6018..b2f92d2a3 100644 --- a/src/dark/prefab/IMultiBlock.java +++ b/src/dark/core/prefab/IMultiBlock.java @@ -1,8 +1,8 @@ -package dark.prefab; +package dark.core.prefab; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.vector.Vector3; -import dark.interfaces.IBlockActivate; +import dark.core.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/prefab/ModPrefab.java b/src/dark/core/prefab/ModPrefab.java similarity index 95% rename from src/dark/prefab/ModPrefab.java rename to src/dark/core/prefab/ModPrefab.java index 4c996dccc..ce50a272d 100644 --- a/src/dark/prefab/ModPrefab.java +++ b/src/dark/core/prefab/ModPrefab.java @@ -1,4 +1,4 @@ -package dark.prefab; +package dark.core.prefab; import java.util.List; @@ -12,8 +12,8 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.relauncher.Side; -import dark.common.BlockRegistry; -import dark.common.BlockRegistry.BlockData; +import dark.core.common.BlockRegistry; +import dark.core.common.BlockRegistry.BlockData; public abstract class ModPrefab { diff --git a/src/dark/prefab/TileEntityInv.java b/src/dark/core/prefab/TileEntityInv.java similarity index 95% rename from src/dark/prefab/TileEntityInv.java rename to src/dark/core/prefab/TileEntityInv.java index 3ccdb9a40..7b2985551 100644 --- a/src/dark/prefab/TileEntityInv.java +++ b/src/dark/core/prefab/TileEntityInv.java @@ -1,4 +1,4 @@ -package dark.prefab; +package dark.core.prefab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; import universalelectricity.prefab.tile.TileEntityAdvanced; -import dark.interfaces.IExternalInv; -import dark.interfaces.IInvBox; -import dark.prefab.invgui.InvChest; +import dark.core.interfaces.IExternalInv; +import dark.core.interfaces.IInvBox; +import dark.core.prefab.invgui.InvChest; /** Prefab for simple object who only need basic inv support and nothing more * diff --git a/src/dark/prefab/TileEntityMachine.java b/src/dark/core/prefab/TileEntityMachine.java similarity index 97% rename from src/dark/prefab/TileEntityMachine.java rename to src/dark/core/prefab/TileEntityMachine.java index c0b2ccaef..20df19a25 100644 --- a/src/dark/prefab/TileEntityMachine.java +++ b/src/dark/core/prefab/TileEntityMachine.java @@ -1,4 +1,4 @@ -package dark.prefab; +package dark.core.prefab; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -23,12 +23,12 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.interfaces.IDisableable; -import dark.interfaces.IExternalInv; -import dark.interfaces.IInvBox; -import dark.interfaces.IPowerLess; -import dark.interfaces.PowerSystems; -import dark.prefab.invgui.InvChest; +import dark.core.interfaces.IDisableable; +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, * inventory handling, and other handy methods. diff --git a/src/dark/prefab/TileEntityMulti.java b/src/dark/core/prefab/TileEntityMulti.java similarity index 99% rename from src/dark/prefab/TileEntityMulti.java rename to src/dark/core/prefab/TileEntityMulti.java index 4c49173d0..d1a3ce1d2 100644 --- a/src/dark/prefab/TileEntityMulti.java +++ b/src/dark/core/prefab/TileEntityMulti.java @@ -1,4 +1,4 @@ -package dark.prefab; +package dark.core.prefab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/dark/prefab/access/AccessLevel.java b/src/dark/core/prefab/access/AccessLevel.java similarity index 96% rename from src/dark/prefab/access/AccessLevel.java rename to src/dark/core/prefab/access/AccessLevel.java index 5d5077574..c50d3d745 100644 --- a/src/dark/prefab/access/AccessLevel.java +++ b/src/dark/core/prefab/access/AccessLevel.java @@ -1,4 +1,4 @@ -package dark.prefab.access; +package dark.core.prefab.access; public enum AccessLevel { diff --git a/src/dark/prefab/access/GlobalAccess.java b/src/dark/core/prefab/access/GlobalAccess.java similarity index 71% rename from src/dark/prefab/access/GlobalAccess.java rename to src/dark/core/prefab/access/GlobalAccess.java index d2ed4a71b..ecbdeb93c 100644 --- a/src/dark/prefab/access/GlobalAccess.java +++ b/src/dark/core/prefab/access/GlobalAccess.java @@ -1,4 +1,4 @@ -package dark.prefab.access; +package dark.core.prefab.access; public class GlobalAccess { diff --git a/src/dark/prefab/access/GlobalAccessLoader.java b/src/dark/core/prefab/access/GlobalAccessLoader.java similarity index 96% rename from src/dark/prefab/access/GlobalAccessLoader.java rename to src/dark/core/prefab/access/GlobalAccessLoader.java index e382f017d..98478a12c 100644 --- a/src/dark/prefab/access/GlobalAccessLoader.java +++ b/src/dark/core/prefab/access/GlobalAccessLoader.java @@ -1,4 +1,4 @@ -package dark.prefab.access; +package dark.core.prefab.access; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.Mod.ServerStarting; diff --git a/src/dark/prefab/access/GlobalAccessManager.java b/src/dark/core/prefab/access/GlobalAccessManager.java similarity index 98% rename from src/dark/prefab/access/GlobalAccessManager.java rename to src/dark/core/prefab/access/GlobalAccessManager.java index 3933154ff..05d15d16d 100644 --- a/src/dark/prefab/access/GlobalAccessManager.java +++ b/src/dark/core/prefab/access/GlobalAccessManager.java @@ -1,4 +1,4 @@ -package dark.prefab.access; +package dark.core.prefab.access; import java.util.ArrayList; import java.util.HashMap; @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Map.Entry; import net.minecraft.nbt.NBTTagCompound; -import dark.prefab.helpers.NBTFileLoader; +import dark.core.prefab.helpers.NBTFileLoader; public class GlobalAccessManager { diff --git a/src/dark/prefab/access/UserAccess.java b/src/dark/core/prefab/access/UserAccess.java similarity index 98% rename from src/dark/prefab/access/UserAccess.java rename to src/dark/core/prefab/access/UserAccess.java index cf65da9f7..779c9b7e2 100644 --- a/src/dark/prefab/access/UserAccess.java +++ b/src/dark/core/prefab/access/UserAccess.java @@ -1,4 +1,4 @@ -package dark.prefab.access; +package dark.core.prefab.access; import java.util.ArrayList; import java.util.List; diff --git a/src/dark/prefab/damage/EntityTileDamage.java b/src/dark/core/prefab/damage/EntityTileDamage.java similarity index 99% rename from src/dark/prefab/damage/EntityTileDamage.java rename to src/dark/core/prefab/damage/EntityTileDamage.java index ceff2f418..6325e4084 100644 --- a/src/dark/prefab/damage/EntityTileDamage.java +++ b/src/dark/core/prefab/damage/EntityTileDamage.java @@ -1,4 +1,4 @@ -package dark.prefab.damage; +package dark.core.prefab.damage; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/dark/prefab/damage/IHpTile.java b/src/dark/core/prefab/damage/IHpTile.java similarity index 97% rename from src/dark/prefab/damage/IHpTile.java rename to src/dark/core/prefab/damage/IHpTile.java index acf5c0ea1..e66b21a44 100644 --- a/src/dark/prefab/damage/IHpTile.java +++ b/src/dark/core/prefab/damage/IHpTile.java @@ -1,4 +1,4 @@ -package dark.prefab.damage; +package dark.core.prefab.damage; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; diff --git a/src/dark/prefab/damage/TileDamageSource.java b/src/dark/core/prefab/damage/TileDamageSource.java similarity index 97% rename from src/dark/prefab/damage/TileDamageSource.java rename to src/dark/core/prefab/damage/TileDamageSource.java index 0a1037464..c3f2d06b8 100644 --- a/src/dark/prefab/damage/TileDamageSource.java +++ b/src/dark/core/prefab/damage/TileDamageSource.java @@ -1,4 +1,4 @@ -package dark.prefab.damage; +package dark.core.prefab.damage; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; diff --git a/src/dark/prefab/helpers/AutoCraftingManager.java b/src/dark/core/prefab/helpers/AutoCraftingManager.java similarity index 99% rename from src/dark/prefab/helpers/AutoCraftingManager.java rename to src/dark/core/prefab/helpers/AutoCraftingManager.java index fee62766a..56248a16f 100644 --- a/src/dark/prefab/helpers/AutoCraftingManager.java +++ b/src/dark/core/prefab/helpers/AutoCraftingManager.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import java.util.ArrayList; import java.util.List; diff --git a/src/dark/prefab/helpers/BlockRenderInfo.java b/src/dark/core/prefab/helpers/BlockRenderInfo.java similarity index 98% rename from src/dark/prefab/helpers/BlockRenderInfo.java rename to src/dark/core/prefab/helpers/BlockRenderInfo.java index b564dac66..b216e30b3 100644 --- a/src/dark/prefab/helpers/BlockRenderInfo.java +++ b/src/dark/core/prefab/helpers/BlockRenderInfo.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/dark/prefab/helpers/ConnectionHelper.java b/src/dark/core/prefab/helpers/ConnectionHelper.java similarity index 98% rename from src/dark/prefab/helpers/ConnectionHelper.java rename to src/dark/core/prefab/helpers/ConnectionHelper.java index 6c2909195..b7cb7d5ac 100644 --- a/src/dark/prefab/helpers/ConnectionHelper.java +++ b/src/dark/core/prefab/helpers/ConnectionHelper.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/dark/prefab/helpers/Direction.java b/src/dark/core/prefab/helpers/Direction.java similarity index 97% rename from src/dark/prefab/helpers/Direction.java rename to src/dark/core/prefab/helpers/Direction.java index 9b37f6882..19c5e5cfe 100644 --- a/src/dark/prefab/helpers/Direction.java +++ b/src/dark/core/prefab/helpers/Direction.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import universalelectricity.core.vector.Vector3; diff --git a/src/dark/prefab/helpers/EntityFakeBlock.java b/src/dark/core/prefab/helpers/EntityFakeBlock.java similarity index 98% rename from src/dark/prefab/helpers/EntityFakeBlock.java rename to src/dark/core/prefab/helpers/EntityFakeBlock.java index 649e94c90..914758d28 100644 --- a/src/dark/prefab/helpers/EntityFakeBlock.java +++ b/src/dark/core/prefab/helpers/EntityFakeBlock.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/dark/prefab/helpers/FluidHelper.java b/src/dark/core/prefab/helpers/FluidHelper.java similarity index 99% rename from src/dark/prefab/helpers/FluidHelper.java rename to src/dark/core/prefab/helpers/FluidHelper.java index 261b29fa9..f0bf6c9da 100644 --- a/src/dark/prefab/helpers/FluidHelper.java +++ b/src/dark/core/prefab/helpers/FluidHelper.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import java.util.ArrayList; import java.util.HashMap; @@ -9,7 +9,7 @@ import java.util.Map.Entry; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import dark.interfaces.ColorCode; +import dark.core.interfaces.ColorCode; import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; diff --git a/src/dark/prefab/helpers/ItemWorldHelper.java b/src/dark/core/prefab/helpers/ItemWorldHelper.java similarity index 99% rename from src/dark/prefab/helpers/ItemWorldHelper.java rename to src/dark/core/prefab/helpers/ItemWorldHelper.java index 33d8e60cb..752722a82 100644 --- a/src/dark/prefab/helpers/ItemWorldHelper.java +++ b/src/dark/core/prefab/helpers/ItemWorldHelper.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import java.util.ArrayList; import java.util.List; diff --git a/src/dark/prefab/helpers/MathHelper.java b/src/dark/core/prefab/helpers/MathHelper.java similarity index 98% rename from src/dark/prefab/helpers/MathHelper.java rename to src/dark/core/prefab/helpers/MathHelper.java index 5b70ce1ee..dd08bdbb8 100644 --- a/src/dark/prefab/helpers/MathHelper.java +++ b/src/dark/core/prefab/helpers/MathHelper.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import java.util.Random; diff --git a/src/dark/prefab/helpers/MetaGroup.java b/src/dark/core/prefab/helpers/MetaGroup.java similarity index 96% rename from src/dark/prefab/helpers/MetaGroup.java rename to src/dark/core/prefab/helpers/MetaGroup.java index 68b005587..de51fd5aa 100644 --- a/src/dark/prefab/helpers/MetaGroup.java +++ b/src/dark/core/prefab/helpers/MetaGroup.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; /** Used by machines that only rotate to 4 directions * diff --git a/src/dark/prefab/helpers/NBTFileLoader.java b/src/dark/core/prefab/helpers/NBTFileLoader.java similarity index 98% rename from src/dark/prefab/helpers/NBTFileLoader.java rename to src/dark/core/prefab/helpers/NBTFileLoader.java index 5cbe0c441..de09672ab 100644 --- a/src/dark/prefab/helpers/NBTFileLoader.java +++ b/src/dark/core/prefab/helpers/NBTFileLoader.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import java.io.File; import java.io.FileInputStream; diff --git a/src/dark/prefab/helpers/Pair.java b/src/dark/core/prefab/helpers/Pair.java similarity index 95% rename from src/dark/prefab/helpers/Pair.java rename to src/dark/core/prefab/helpers/Pair.java index a55b6e14a..d3b75656d 100644 --- a/src/dark/prefab/helpers/Pair.java +++ b/src/dark/core/prefab/helpers/Pair.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; public class Pair { diff --git a/src/dark/prefab/helpers/PlayerMsgHelper.java b/src/dark/core/prefab/helpers/PlayerMsgHelper.java similarity index 97% rename from src/dark/prefab/helpers/PlayerMsgHelper.java rename to src/dark/core/prefab/helpers/PlayerMsgHelper.java index f0257d5a7..b9682204a 100644 --- a/src/dark/prefab/helpers/PlayerMsgHelper.java +++ b/src/dark/core/prefab/helpers/PlayerMsgHelper.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import java.util.Iterator; import java.util.List; diff --git a/src/dark/prefab/helpers/Quaternion.java b/src/dark/core/prefab/helpers/Quaternion.java similarity index 99% rename from src/dark/prefab/helpers/Quaternion.java rename to src/dark/core/prefab/helpers/Quaternion.java index 08fa68158..9521d4713 100644 --- a/src/dark/prefab/helpers/Quaternion.java +++ b/src/dark/core/prefab/helpers/Quaternion.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import universalelectricity.core.vector.Vector3; diff --git a/src/dark/prefab/helpers/Time.java b/src/dark/core/prefab/helpers/Time.java similarity index 97% rename from src/dark/prefab/helpers/Time.java rename to src/dark/core/prefab/helpers/Time.java index 58d6e551c..3281e0563 100644 --- a/src/dark/prefab/helpers/Time.java +++ b/src/dark/core/prefab/helpers/Time.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/dark/prefab/helpers/Triple.java b/src/dark/core/prefab/helpers/Triple.java similarity index 96% rename from src/dark/prefab/helpers/Triple.java rename to src/dark/core/prefab/helpers/Triple.java index 603952932..d158f8abc 100644 --- a/src/dark/prefab/helpers/Triple.java +++ b/src/dark/core/prefab/helpers/Triple.java @@ -1,4 +1,4 @@ -package dark.prefab.helpers; +package dark.core.prefab.helpers; public class Triple { diff --git a/src/dark/prefab/invgui/ContainerFake.java b/src/dark/core/prefab/invgui/ContainerFake.java similarity index 95% rename from src/dark/prefab/invgui/ContainerFake.java rename to src/dark/core/prefab/invgui/ContainerFake.java index 54c96698b..606e18602 100644 --- a/src/dark/prefab/invgui/ContainerFake.java +++ b/src/dark/core/prefab/invgui/ContainerFake.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/dark/prefab/invgui/GuiButtonArrow.java b/src/dark/core/prefab/invgui/GuiButtonArrow.java similarity index 95% rename from src/dark/prefab/invgui/GuiButtonArrow.java rename to src/dark/core/prefab/invgui/GuiButtonArrow.java index 26fb86ea4..e927687aa 100644 --- a/src/dark/prefab/invgui/GuiButtonArrow.java +++ b/src/dark/core/prefab/invgui/GuiButtonArrow.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.common.DarkMain; +import dark.core.common.DarkMain; @SideOnly(Side.CLIENT) public class GuiButtonArrow extends GuiButton diff --git a/src/dark/prefab/invgui/GuiGlobalList.java b/src/dark/core/prefab/invgui/GuiGlobalList.java similarity index 97% rename from src/dark/prefab/invgui/GuiGlobalList.java rename to src/dark/core/prefab/invgui/GuiGlobalList.java index 1a1011524..e97a4c5cc 100644 --- a/src/dark/prefab/invgui/GuiGlobalList.java +++ b/src/dark/core/prefab/invgui/GuiGlobalList.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; import java.util.ArrayList; import java.util.HashMap; @@ -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.common.DarkMain; -import dark.interfaces.IScroll; -import dark.prefab.access.UserAccess; +import dark.core.common.DarkMain; +import dark.core.interfaces.IScroll; +import dark.core.prefab.access.UserAccess; @SideOnly(Side.CLIENT) public class GuiGlobalList extends GuiContainer implements IScroll diff --git a/src/dark/prefab/invgui/ISlotPickResult.java b/src/dark/core/prefab/invgui/ISlotPickResult.java similarity index 94% rename from src/dark/prefab/invgui/ISlotPickResult.java rename to src/dark/core/prefab/invgui/ISlotPickResult.java index 074a7e0d2..b76827fb9 100644 --- a/src/dark/prefab/invgui/ISlotPickResult.java +++ b/src/dark/core/prefab/invgui/ISlotPickResult.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/dark/prefab/invgui/ISlotWatcher.java b/src/dark/core/prefab/invgui/ISlotWatcher.java similarity index 87% rename from src/dark/prefab/invgui/ISlotWatcher.java rename to src/dark/core/prefab/invgui/ISlotWatcher.java index 00c890309..97c4b5d21 100644 --- a/src/dark/prefab/invgui/ISlotWatcher.java +++ b/src/dark/core/prefab/invgui/ISlotWatcher.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; /** Add this to a container class if using WatchedSlot to trigger the container on slot change */ public interface ISlotWatcher diff --git a/src/dark/prefab/invgui/InvChest.java b/src/dark/core/prefab/invgui/InvChest.java similarity index 98% rename from src/dark/prefab/invgui/InvChest.java rename to src/dark/core/prefab/invgui/InvChest.java index 9035cb9ea..166fa9b2e 100644 --- a/src/dark/prefab/invgui/InvChest.java +++ b/src/dark/core/prefab/invgui/InvChest.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; 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.interfaces.IExternalInv; -import dark.interfaces.IInvBox; +import dark.core.interfaces.IExternalInv; +import dark.core.interfaces.IInvBox; public class InvChest implements IInvBox { diff --git a/src/dark/prefab/invgui/SlotCraftingResult.java b/src/dark/core/prefab/invgui/SlotCraftingResult.java similarity index 96% rename from src/dark/prefab/invgui/SlotCraftingResult.java rename to src/dark/core/prefab/invgui/SlotCraftingResult.java index 271442977..cab2e8e68 100644 --- a/src/dark/prefab/invgui/SlotCraftingResult.java +++ b/src/dark/core/prefab/invgui/SlotCraftingResult.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/dark/prefab/invgui/SlotRestricted.java b/src/dark/core/prefab/invgui/SlotRestricted.java similarity index 96% rename from src/dark/prefab/invgui/SlotRestricted.java rename to src/dark/core/prefab/invgui/SlotRestricted.java index a771d2173..f0cc23f42 100644 --- a/src/dark/prefab/invgui/SlotRestricted.java +++ b/src/dark/core/prefab/invgui/SlotRestricted.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/dark/prefab/invgui/WatchedSlot.java b/src/dark/core/prefab/invgui/WatchedSlot.java similarity index 94% rename from src/dark/prefab/invgui/WatchedSlot.java rename to src/dark/core/prefab/invgui/WatchedSlot.java index f294794be..8d6758c43 100644 --- a/src/dark/prefab/invgui/WatchedSlot.java +++ b/src/dark/core/prefab/invgui/WatchedSlot.java @@ -1,4 +1,4 @@ -package dark.prefab.invgui; +package dark.core.prefab.invgui; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/dark/prefab/items/ItemBasic.java b/src/dark/core/prefab/items/ItemBasic.java similarity index 92% rename from src/dark/prefab/items/ItemBasic.java rename to src/dark/core/prefab/items/ItemBasic.java index 754dc9cd2..998acc8c8 100644 --- a/src/dark/prefab/items/ItemBasic.java +++ b/src/dark/core/prefab/items/ItemBasic.java @@ -1,4 +1,4 @@ -package dark.prefab.items; +package dark.core.prefab.items; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; @@ -6,7 +6,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.Configuration; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.common.DarkMain; +import dark.core.common.DarkMain; public class ItemBasic extends Item { diff --git a/src/dark/prefab/items/ItemBlockHolder.java b/src/dark/core/prefab/items/ItemBlockHolder.java similarity index 95% rename from src/dark/prefab/items/ItemBlockHolder.java rename to src/dark/core/prefab/items/ItemBlockHolder.java index a0fc01a90..c3818c5c7 100644 --- a/src/dark/prefab/items/ItemBlockHolder.java +++ b/src/dark/core/prefab/items/ItemBlockHolder.java @@ -1,4 +1,4 @@ -package dark.prefab.items; +package dark.core.prefab.items; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/dark/prefab/terminal/CommandHelp.java b/src/dark/core/prefab/terminal/CommandHelp.java similarity index 95% rename from src/dark/prefab/terminal/CommandHelp.java rename to src/dark/core/prefab/terminal/CommandHelp.java index d1b1dc1c7..2a0328d8d 100644 --- a/src/dark/prefab/terminal/CommandHelp.java +++ b/src/dark/core/prefab/terminal/CommandHelp.java @@ -1,11 +1,11 @@ -package dark.prefab.terminal; +package dark.core.prefab.terminal; import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.interfaces.ISpecialAccess; -import dark.interfaces.ITerminal; +import dark.core.interfaces.ISpecialAccess; +import dark.core.interfaces.ITerminal; public class CommandHelp extends TerminalCommand { diff --git a/src/dark/prefab/terminal/CommandRegistry.java b/src/dark/core/prefab/terminal/CommandRegistry.java similarity index 96% rename from src/dark/prefab/terminal/CommandRegistry.java rename to src/dark/core/prefab/terminal/CommandRegistry.java index 825f95c2b..97e4d0705 100644 --- a/src/dark/prefab/terminal/CommandRegistry.java +++ b/src/dark/core/prefab/terminal/CommandRegistry.java @@ -1,10 +1,10 @@ -package dark.prefab.terminal; +package dark.core.prefab.terminal; import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.interfaces.ITerminal; +import dark.core.interfaces.ITerminal; /** @author Calclavia, DarkGuardsman */ public class CommandRegistry diff --git a/src/dark/prefab/terminal/CommandUser.java b/src/dark/core/prefab/terminal/CommandUser.java similarity index 95% rename from src/dark/prefab/terminal/CommandUser.java rename to src/dark/core/prefab/terminal/CommandUser.java index 3e80f479d..9d3d33c76 100644 --- a/src/dark/prefab/terminal/CommandUser.java +++ b/src/dark/core/prefab/terminal/CommandUser.java @@ -1,12 +1,12 @@ -package dark.prefab.terminal; +package dark.core.prefab.terminal; import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.interfaces.ISpecialAccess; -import dark.interfaces.ITerminal; -import dark.prefab.access.AccessLevel; +import dark.core.interfaces.ISpecialAccess; +import dark.core.interfaces.ITerminal; +import dark.core.prefab.access.AccessLevel; public class CommandUser extends TerminalCommand { diff --git a/src/dark/prefab/terminal/ContainerTerminal.java b/src/dark/core/prefab/terminal/ContainerTerminal.java similarity index 96% rename from src/dark/prefab/terminal/ContainerTerminal.java rename to src/dark/core/prefab/terminal/ContainerTerminal.java index 392aeda7d..83a03d253 100644 --- a/src/dark/prefab/terminal/ContainerTerminal.java +++ b/src/dark/core/prefab/terminal/ContainerTerminal.java @@ -1,4 +1,4 @@ -package dark.prefab.terminal; +package dark.core.prefab.terminal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/dark/prefab/terminal/TerminalCommand.java b/src/dark/core/prefab/terminal/TerminalCommand.java similarity index 92% rename from src/dark/prefab/terminal/TerminalCommand.java rename to src/dark/core/prefab/terminal/TerminalCommand.java index a629d76d1..9d8e0bbe5 100644 --- a/src/dark/prefab/terminal/TerminalCommand.java +++ b/src/dark/core/prefab/terminal/TerminalCommand.java @@ -1,10 +1,10 @@ -package dark.prefab.terminal; +package dark.core.prefab.terminal; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.interfaces.ISpecialAccess; -import dark.interfaces.ITerminal; +import dark.core.interfaces.ISpecialAccess; +import dark.core.interfaces.ITerminal; /** @author Calclavia, DarkGuardsman */ public abstract class TerminalCommand diff --git a/src/dark/prefab/terminal/TileEntityTerminal.java b/src/dark/core/prefab/terminal/TileEntityTerminal.java similarity index 97% rename from src/dark/prefab/terminal/TileEntityTerminal.java rename to src/dark/core/prefab/terminal/TileEntityTerminal.java index ac3c1387b..133b80c7a 100644 --- a/src/dark/prefab/terminal/TileEntityTerminal.java +++ b/src/dark/core/prefab/terminal/TileEntityTerminal.java @@ -1,4 +1,4 @@ -package dark.prefab.terminal; +package dark.core.prefab.terminal; import java.util.ArrayList; import java.util.HashSet; @@ -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.interfaces.ISpecialAccess; -import dark.interfaces.ITerminal; -import dark.prefab.TileEntityMachine; -import dark.prefab.access.AccessLevel; -import dark.prefab.access.UserAccess; +import dark.core.interfaces.ISpecialAccess; +import dark.core.interfaces.ITerminal; +import dark.core.prefab.TileEntityMachine; +import dark.core.prefab.access.AccessLevel; +import dark.core.prefab.access.UserAccess; /** @author Calclavia, DarkGuardsman */ public abstract class TileEntityTerminal extends TileEntityMachine implements ISpecialAccess, IPacketReceiver, ITerminal diff --git a/src/dark/prefab/tilenetwork/NetworkPathFinder.java b/src/dark/core/prefab/tilenetwork/NetworkPathFinder.java similarity index 95% rename from src/dark/prefab/tilenetwork/NetworkPathFinder.java rename to src/dark/core/prefab/tilenetwork/NetworkPathFinder.java index e5c3fafc2..39b8ff660 100644 --- a/src/dark/prefab/tilenetwork/NetworkPathFinder.java +++ b/src/dark/core/prefab/tilenetwork/NetworkPathFinder.java @@ -1,4 +1,4 @@ -package dark.prefab.tilenetwork; +package dark.core.prefab.tilenetwork; import java.util.HashSet; import java.util.Set; @@ -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.interfaces.INetworkPart; +import dark.core.interfaces.INetworkPart; /** Check if a conductor connects with another. */ public class NetworkPathFinder extends Pathfinder diff --git a/src/dark/prefab/tilenetwork/NetworkPowerWires.java b/src/dark/core/prefab/tilenetwork/NetworkPowerWires.java similarity index 91% rename from src/dark/prefab/tilenetwork/NetworkPowerWires.java rename to src/dark/core/prefab/tilenetwork/NetworkPowerWires.java index 8b509e1c0..6d3d25286 100644 --- a/src/dark/prefab/tilenetwork/NetworkPowerWires.java +++ b/src/dark/core/prefab/tilenetwork/NetworkPowerWires.java @@ -1,4 +1,4 @@ -package dark.prefab.tilenetwork; +package dark.core.prefab.tilenetwork; public class NetworkPowerWires { diff --git a/src/dark/prefab/tilenetwork/NetworkSharedPower.java b/src/dark/core/prefab/tilenetwork/NetworkSharedPower.java similarity index 96% rename from src/dark/prefab/tilenetwork/NetworkSharedPower.java rename to src/dark/core/prefab/tilenetwork/NetworkSharedPower.java index 24a3ff4b4..aaf57925a 100644 --- a/src/dark/prefab/tilenetwork/NetworkSharedPower.java +++ b/src/dark/core/prefab/tilenetwork/NetworkSharedPower.java @@ -1,10 +1,10 @@ -package dark.prefab.tilenetwork; +package dark.core.prefab.tilenetwork; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.block.IElectricalStorage; -import dark.interfaces.INetworkEnergyPart; -import dark.interfaces.INetworkPart; -import dark.interfaces.IPowerLess; +import dark.core.interfaces.INetworkEnergyPart; +import dark.core.interfaces.INetworkPart; +import dark.core.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/prefab/tilenetwork/NetworkTileEntities.java b/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java similarity index 98% rename from src/dark/prefab/tilenetwork/NetworkTileEntities.java rename to src/dark/core/prefab/tilenetwork/NetworkTileEntities.java index c0d87a2e6..7382fa812 100644 --- a/src/dark/prefab/tilenetwork/NetworkTileEntities.java +++ b/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java @@ -1,4 +1,4 @@ -package dark.prefab.tilenetwork; +package dark.core.prefab.tilenetwork; import java.util.ArrayList; import java.util.Arrays; @@ -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.interfaces.INetworkPart; -import dark.prefab.helpers.ConnectionHelper; +import dark.core.interfaces.INetworkPart; +import dark.core.prefab.helpers.ConnectionHelper; public abstract class NetworkTileEntities {