Changed main package name

was a bit long for my code editor

src/dark/assembly/ALRecipeLoader.java

@@ -1,4 +1,4 @@
-package dark.assembly.common;
+package dark.assembly;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
-import dark.assembly.common.machine.BlockCrate;
-import dark.assembly.common.machine.processor.BlockProcessor;
+import dark.assembly.machine.BlockCrate;
+import dark.assembly.machine.processor.BlockProcessor;
 import dark.core.common.RecipeLoader;
 
 public class ALRecipeLoader extends RecipeLoader

src/dark/assembly/AssemblyLine.java

@@ -1,4 +1,4 @@
-package dark.assembly.common;
+package dark.assembly;
 
 import java.io.File;
 import java.util.Arrays;
@@ -23,28 +23,28 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
-import dark.assembly.common.armbot.BlockArmbot;
-import dark.assembly.common.armbot.TileEntityArmbot;
-import dark.assembly.common.imprinter.BlockImprinter;
-import dark.assembly.common.imprinter.ItemImprinter;
-import dark.assembly.common.imprinter.TileEntityImprinter;
-import dark.assembly.common.machine.BlockCrate;
-import dark.assembly.common.machine.BlockDetector;
-import dark.assembly.common.machine.BlockManipulator;
-import dark.assembly.common.machine.BlockRejector;
-import dark.assembly.common.machine.BlockTurntable;
-import dark.assembly.common.machine.ItemBlockCrate;
-import dark.assembly.common.machine.TileEntityAssembly;
-import dark.assembly.common.machine.TileEntityCrate;
-import dark.assembly.common.machine.TileEntityDetector;
-import dark.assembly.common.machine.TileEntityManipulator;
-import dark.assembly.common.machine.TileEntityRejector;
-import dark.assembly.common.machine.belt.BlockConveyorBelt;
-import dark.assembly.common.machine.belt.TileEntityConveyorBelt;
-import dark.assembly.common.machine.encoder.BlockEncoder;
-import dark.assembly.common.machine.encoder.ItemDisk;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
-import dark.assembly.common.machine.processor.BlockProcessor;
+import dark.assembly.armbot.BlockArmbot;
+import dark.assembly.armbot.TileEntityArmbot;
+import dark.assembly.imprinter.BlockImprinter;
+import dark.assembly.imprinter.ItemImprinter;
+import dark.assembly.imprinter.TileEntityImprinter;
+import dark.assembly.machine.BlockCrate;
+import dark.assembly.machine.BlockDetector;
+import dark.assembly.machine.BlockManipulator;
+import dark.assembly.machine.BlockRejector;
+import dark.assembly.machine.BlockTurntable;
+import dark.assembly.machine.ItemBlockCrate;
+import dark.assembly.machine.TileEntityAssembly;
+import dark.assembly.machine.TileEntityCrate;
+import dark.assembly.machine.TileEntityDetector;
+import dark.assembly.machine.TileEntityManipulator;
+import dark.assembly.machine.TileEntityRejector;
+import dark.assembly.machine.belt.BlockConveyorBelt;
+import dark.assembly.machine.belt.TileEntityConveyorBelt;
+import dark.assembly.machine.encoder.BlockEncoder;
+import dark.assembly.machine.encoder.ItemDisk;
+import dark.assembly.machine.encoder.TileEntityEncoder;
+import dark.assembly.machine.processor.BlockProcessor;
 import dark.core.common.DMCreativeTab;
 import dark.core.common.DarkMain;
 import dark.core.prefab.ItemBlockHolder;

src/dark/assembly/CommonProxy.java

@@ -1,4 +1,4 @@
-package dark.assembly.common;
+package dark.assembly;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -11,12 +11,12 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.IGuiHandler;
-import dark.assembly.common.imprinter.ContainerImprinter;
-import dark.assembly.common.imprinter.TileEntityImprinter;
-import dark.assembly.common.machine.encoder.ContainerEncoder;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
-import dark.assembly.common.machine.processor.ContainerProcessor;
-import dark.assembly.common.machine.processor.TileEntityProcessor;
+import dark.assembly.imprinter.ContainerImprinter;
+import dark.assembly.imprinter.TileEntityImprinter;
+import dark.assembly.machine.encoder.ContainerEncoder;
+import dark.assembly.machine.encoder.TileEntityEncoder;
+import dark.assembly.machine.processor.ContainerProcessor;
+import dark.assembly.machine.processor.TileEntityProcessor;
 
 public class CommonProxy implements IGuiHandler
 {

src/dark/assembly/armbot/BlockArmbot.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot;
+package dark.assembly.armbot;
 
 import java.util.Random;
 
@@ -11,7 +11,7 @@ import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.assembly.client.render.BlockRenderingHandler;
-import dark.assembly.common.machine.BlockAssembly;
+import dark.assembly.machine.BlockAssembly;
 import dark.core.interfaces.IMultiBlock;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 

src/dark/assembly/armbot/Program.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot;
+package dark.assembly.armbot;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/dark/assembly/armbot/TaskBase.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot;
+package dark.assembly.armbot;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/dark/assembly/armbot/TaskBaseArmbot.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot;
+package dark.assembly.armbot;
 
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.IProgrammableMachine;

src/dark/assembly/armbot/TaskBaseLogic.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot;
+package dark.assembly.armbot;
 
 import dark.api.al.coding.ILogicTask;
 

src/dark/assembly/armbot/TaskBaseProcess.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot;
+package dark.assembly.armbot;
 
 import net.minecraft.item.ItemStack;
 

src/dark/assembly/armbot/TileEntityArmbot.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot;
+package dark.assembly.armbot;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,9 +30,9 @@ import dan200.computer.api.IPeripheral;
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.IProgram;
 import dark.api.al.coding.ProgramHelper;
-import dark.assembly.common.ALRecipeLoader;
-import dark.assembly.common.machine.TileEntityAssembly;
-import dark.assembly.common.machine.encoder.ItemDisk;
+import dark.assembly.ALRecipeLoader;
+import dark.assembly.machine.TileEntityAssembly;
+import dark.assembly.machine.encoder.ItemDisk;
 import dark.core.common.DarkMain;
 import dark.core.helpers.ItemWorldHelper;
 import dark.core.helpers.MathHelper;

src/dark/assembly/armbot/command/TaskBreak.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.ArrayList;
 
@@ -13,8 +13,8 @@ import com.builtbroken.common.Pair;
 
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.ITask;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 import dark.core.helpers.ItemWorldHelper;
 
 /** Used by arms to break a specific block in a position.

src/dark/assembly/armbot/command/TaskDrop.java

@@ -1,8 +1,8 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import dark.api.al.coding.IArmbot;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 
 public class TaskDrop extends TaskBaseArmbot
 {

src/dark/assembly/armbot/command/TaskEnd.java

@@ -1,6 +1,6 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
-import dark.assembly.common.armbot.TaskBase;
+import dark.assembly.armbot.TaskBase;
 
 /** @author DarkGuardsman */
 public class TaskEnd extends TaskBase

src/dark/assembly/armbot/command/TaskFire.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.Random;
 
@@ -16,8 +16,8 @@ import com.builtbroken.common.science.units.UnitHelper;
 
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.args.ArgumentFloatData;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 
 public class TaskFire extends TaskBaseArmbot
 {

src/dark/assembly/armbot/command/TaskGOTO.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import universalelectricity.core.vector.Vector2;
 import dark.api.al.coding.IRedirectTask;
 import dark.api.al.coding.ITask;
-import dark.assembly.common.armbot.TaskBase;
+import dark.assembly.armbot.TaskBase;
 
 /** @author DarkGuardsman */
 public class TaskGOTO extends TaskBase implements IRedirectTask

src/dark/assembly/armbot/command/TaskGive.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,8 +15,8 @@ import com.builtbroken.common.science.units.UnitHelper;
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.IProgrammableMachine;
 import dark.api.al.coding.args.ArgumentIntData;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 import dark.core.helpers.InvInteractionHelper;
 import dark.core.helpers.MathHelper;
 

src/dark/assembly/armbot/command/TaskGrabEntity.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import net.minecraft.util.AxisAlignedBB;
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.args.ArgumentData;
 import dark.api.al.coding.args.ArgumentListData;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseProcess;
 import dark.core.helpers.EntityDictionary;
 
 public class TaskGrabEntity extends TaskGrabPrefab

src/dark/assembly/armbot/command/TaskGrabItem.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import com.builtbroken.common.science.units.UnitHelper;
 
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.args.ArgumentIntData;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseProcess;
 
 public class TaskGrabItem extends TaskGrabPrefab
 {

src/dark/assembly/armbot/command/TaskGrabPrefab.java

@@ -1,11 +1,11 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.vector.Vector3;
 import dark.api.al.IBelt;
 import dark.api.al.coding.IArmbot;
-import dark.assembly.common.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseArmbot;
 
 /** Prefab for grab based commands
  * 

src/dark/assembly/armbot/command/TaskHarvest.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 /** Used by arms to break a specific block in a position.
  * 

src/dark/assembly/armbot/command/TaskIF.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ import universalelectricity.core.vector.Vector2;
 import dark.api.al.coding.IProgrammableMachine;
 import dark.api.al.coding.ITask;
 import dark.api.al.coding.args.ArgumentData;
-import dark.assembly.common.armbot.TaskBaseLogic;
+import dark.assembly.armbot.TaskBaseLogic;
 
 /** @author DarkGuardsman */
 public class TaskIF extends TaskBaseLogic

src/dark/assembly/armbot/command/TaskIdle.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -6,7 +6,7 @@ import com.builtbroken.common.science.units.UnitHelper;
 
 import dark.api.al.coding.IProgrammableMachine;
 import dark.api.al.coding.args.ArgumentData;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseProcess;
 
 public class TaskIdle extends TaskBaseProcess
 {

src/dark/assembly/armbot/command/TaskPlace.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.item.EntityItem;
@@ -8,8 +8,8 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.IPlantable;
 import universalelectricity.core.vector.Vector3;
 import dark.api.al.coding.IArmbot;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 
 /** Used by arms to break a specific block in a position.
  * 

src/dark/assembly/armbot/command/TaskReturn.java

@@ -1,7 +1,7 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 
 public class TaskReturn extends TaskBaseArmbot
 {

src/dark/assembly/armbot/command/TaskRotateBy.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -6,8 +6,8 @@ import com.builtbroken.common.science.units.UnitHelper;
 
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.args.ArgumentIntData;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 import dark.core.helpers.MathHelper;
 
 /** Rotates an armbot by a set amount

src/dark/assembly/armbot/command/TaskRotateTo.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -6,8 +6,8 @@ import com.builtbroken.common.science.units.UnitHelper;
 
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.args.ArgumentIntData;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 import dark.core.helpers.MathHelper;
 
 /** Rotates the armbot to a specific direction. If not specified, it will turn right.

src/dark/assembly/armbot/command/TaskStart.java

@@ -1,6 +1,6 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
-import dark.assembly.common.armbot.TaskBase;
+import dark.assembly.armbot.TaskBase;
 
 /** Fake task as the player can not create, edit, or do anything with this task. Its only used to
  * allow the gui to render the task as an actual task instance

src/dark/assembly/armbot/command/TaskTake.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,8 +14,8 @@ import com.builtbroken.common.science.units.UnitHelper;
 
 import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.args.ArgumentIntData;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 import dark.core.helpers.InvInteractionHelper;
 import dark.core.helpers.MathHelper;
 

src/dark/assembly/armbot/command/TaskUse.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.armbot.command;
+package dark.assembly.armbot.command;
 
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
@@ -10,8 +10,8 @@ import dark.api.al.coding.IArmbot;
 import dark.api.al.coding.IArmbotUseable;
 import dark.api.al.coding.IProcessTask;
 import dark.api.al.coding.args.ArgumentIntData;
-import dark.assembly.common.armbot.TaskBaseArmbot;
-import dark.assembly.common.armbot.TaskBaseProcess;
+import dark.assembly.armbot.TaskBaseArmbot;
+import dark.assembly.armbot.TaskBaseProcess;
 
 public class TaskUse extends TaskBaseArmbot
 {

src/dark/assembly/client/ClientProxy.java

@@ -9,6 +9,8 @@ import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.CommonProxy;
+import dark.assembly.armbot.TileEntityArmbot;
 import dark.assembly.client.gui.GuiEncoderCoder;
 import dark.assembly.client.gui.GuiEncoderHelp;
 import dark.assembly.client.gui.GuiEncoderInventory;
@@ -22,16 +24,14 @@ import dark.assembly.client.render.RenderDetector;
 import dark.assembly.client.render.RenderManipulator;
 import dark.assembly.client.render.RenderProcessor;
 import dark.assembly.client.render.RenderRejector;
-import dark.assembly.common.CommonProxy;
-import dark.assembly.common.armbot.TileEntityArmbot;
-import dark.assembly.common.imprinter.TileEntityImprinter;
-import dark.assembly.common.machine.TileEntityCrate;
-import dark.assembly.common.machine.TileEntityDetector;
-import dark.assembly.common.machine.TileEntityManipulator;
-import dark.assembly.common.machine.TileEntityRejector;
-import dark.assembly.common.machine.belt.TileEntityConveyorBelt;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
-import dark.assembly.common.machine.processor.TileEntityProcessor;
+import dark.assembly.imprinter.TileEntityImprinter;
+import dark.assembly.machine.TileEntityCrate;
+import dark.assembly.machine.TileEntityDetector;
+import dark.assembly.machine.TileEntityManipulator;
+import dark.assembly.machine.TileEntityRejector;
+import dark.assembly.machine.belt.TileEntityConveyorBelt;
+import dark.assembly.machine.encoder.TileEntityEncoder;
+import dark.assembly.machine.processor.TileEntityProcessor;
 
 @SideOnly(Side.CLIENT)
 public class ClientProxy extends CommonProxy

src/dark/assembly/client/SoundHandler.java

@@ -4,7 +4,7 @@ import net.minecraftforge.client.event.sound.SoundLoadEvent;
 import net.minecraftforge.event.ForgeSubscribe;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
+import dark.assembly.AssemblyLine;
 
 @SideOnly(Side.CLIENT)
 public class SoundHandler

src/dark/assembly/client/gui/GuiEncoderBase.java

@@ -11,9 +11,9 @@ import org.lwjgl.opengl.GL12;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.CommonProxy;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
+import dark.assembly.AssemblyLine;
+import dark.assembly.CommonProxy;
+import dark.assembly.machine.encoder.TileEntityEncoder;
 import dark.core.prefab.invgui.GuiBase;
 import dark.core.prefab.invgui.GuiButtonImage;
 

src/dark/assembly/client/gui/GuiEncoderCoder.java

@@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.FMLClientHandler;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
+import dark.assembly.AssemblyLine;
+import dark.assembly.machine.encoder.TileEntityEncoder;
 
 public class GuiEncoderCoder extends GuiEncoderBase
 {

src/dark/assembly/client/gui/GuiEncoderContainer.java

@@ -13,10 +13,10 @@ import org.lwjgl.opengl.GL12;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.CommonProxy;
-import dark.assembly.common.machine.encoder.ContainerEncoder;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
+import dark.assembly.AssemblyLine;
+import dark.assembly.CommonProxy;
+import dark.assembly.machine.encoder.ContainerEncoder;
+import dark.assembly.machine.encoder.TileEntityEncoder;
 import dark.core.prefab.invgui.GuiButtonImage;
 
 @SideOnly(Side.CLIENT)

src/dark/assembly/client/gui/GuiEncoderHelp.java

@@ -2,8 +2,8 @@ package dark.assembly.client.gui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
+import dark.assembly.AssemblyLine;
+import dark.assembly.machine.encoder.TileEntityEncoder;
 
 public class GuiEncoderHelp extends GuiEncoderBase
 {

src/dark/assembly/client/gui/GuiEncoderInventory.java

@@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.encoder.TileEntityEncoder;
+import dark.assembly.AssemblyLine;
+import dark.assembly.machine.encoder.TileEntityEncoder;
 
 @SideOnly(Side.CLIENT)
 public class GuiEncoderInventory extends GuiEncoderContainer

src/dark/assembly/client/gui/GuiImprinter.java

@@ -9,9 +9,9 @@ import org.lwjgl.opengl.GL11;
 import universalelectricity.prefab.TranslationHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.imprinter.ContainerImprinter;
-import dark.assembly.common.imprinter.TileEntityImprinter;
+import dark.assembly.AssemblyLine;
+import dark.assembly.imprinter.ContainerImprinter;
+import dark.assembly.imprinter.TileEntityImprinter;
 import dark.core.prefab.ModPrefab;
 
 @SideOnly(Side.CLIENT)

src/dark/assembly/client/gui/GuiProcessor.java

@@ -9,9 +9,9 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.processor.ContainerProcessor;
-import dark.assembly.common.machine.processor.TileEntityProcessor;
+import dark.assembly.AssemblyLine;
+import dark.assembly.machine.processor.ContainerProcessor;
+import dark.assembly.machine.processor.TileEntityProcessor;
 
 @SideOnly(Side.CLIENT)
 public class GuiProcessor extends GuiContainer

src/dark/assembly/client/gui/GuiTaskList.java

@@ -15,13 +15,13 @@ import dark.api.al.coding.ILogicTask;
 import dark.api.al.coding.IProgram;
 import dark.api.al.coding.IRedirectTask;
 import dark.api.al.coding.ITask;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.armbot.Program;
-import dark.assembly.common.armbot.command.TaskEnd;
-import dark.assembly.common.armbot.command.TaskGOTO;
-import dark.assembly.common.armbot.command.TaskGive;
-import dark.assembly.common.armbot.command.TaskIF;
-import dark.assembly.common.armbot.command.TaskStart;
+import dark.assembly.AssemblyLine;
+import dark.assembly.armbot.Program;
+import dark.assembly.armbot.command.TaskEnd;
+import dark.assembly.armbot.command.TaskGOTO;
+import dark.assembly.armbot.command.TaskGive;
+import dark.assembly.armbot.command.TaskIF;
+import dark.assembly.armbot.command.TaskStart;
 import dark.core.interfaces.IScroll;
 
 /** Not a gui itself but a component used to display task as a box inside of a gui

src/dark/assembly/client/render/BlockRenderingHandler.java

@@ -12,13 +12,13 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.ALRecipeLoader;
+import dark.assembly.AssemblyLine;
 import dark.assembly.client.model.ModelConveyorBelt;
 import dark.assembly.client.model.ModelCrusher;
 import dark.assembly.client.model.ModelGrinder;
 import dark.assembly.client.model.ModelManipulator;
 import dark.assembly.client.model.ModelRejectorPiston;
-import dark.assembly.common.ALRecipeLoader;
-import dark.assembly.common.AssemblyLine;
 import dark.core.prefab.ModPrefab;
 
 @SideOnly(Side.CLIENT)

src/dark/assembly/client/render/RenderArmbot.java

@@ -17,9 +17,9 @@ import org.lwjgl.opengl.GL11;
 import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.AssemblyLine;
+import dark.assembly.armbot.TileEntityArmbot;
 import dark.assembly.client.model.ModelArmbot;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.armbot.TileEntityArmbot;
 import dark.core.prefab.ModPrefab;
 
 @SideOnly(Side.CLIENT)

src/dark/assembly/client/render/RenderConveyorBelt.java

@@ -8,11 +8,11 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.AssemblyLine;
 import dark.assembly.client.model.ModelAngledBelt;
 import dark.assembly.client.model.ModelConveyorBelt;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.belt.TileEntityConveyorBelt;
-import dark.assembly.common.machine.belt.TileEntityConveyorBelt.SlantType;
+import dark.assembly.machine.belt.TileEntityConveyorBelt;
+import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
 import dark.core.prefab.ModPrefab;
 
 @SideOnly(Side.CLIENT)

src/dark/assembly/client/render/RenderCrate.java

@@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11;
 import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.machine.TileEntityCrate;
+import dark.assembly.machine.TileEntityCrate;
 
 @SideOnly(Side.CLIENT)
 public class RenderCrate extends TileEntitySpecialRenderer

src/dark/assembly/client/render/RenderImprintable.java

@@ -10,8 +10,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.imprinter.ItemImprinter;
-import dark.assembly.common.imprinter.prefab.TileEntityFilterable;
+import dark.assembly.imprinter.ItemImprinter;
+import dark.assembly.imprinter.prefab.TileEntityFilterable;
 
 /** @author Briman0094 */
 @SideOnly(Side.CLIENT)

src/dark/assembly/client/render/RenderManipulator.java

@@ -7,9 +7,9 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.AssemblyLine;
 import dark.assembly.client.model.ModelManipulator;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.TileEntityManipulator;
+import dark.assembly.machine.TileEntityManipulator;
 import dark.core.prefab.ModPrefab;
 
 @SideOnly(Side.CLIENT)

src/dark/assembly/client/render/RenderProcessor.java

@@ -8,10 +8,10 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.AssemblyLine;
 import dark.assembly.client.model.ModelCrusher;
 import dark.assembly.client.model.ModelGrinder;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.processor.TileEntityProcessor;
+import dark.assembly.machine.processor.TileEntityProcessor;
 import dark.core.client.renders.RenderTileMachine;
 import dark.core.prefab.ModPrefab;
 

src/dark/assembly/client/render/RenderRejector.java

@@ -7,9 +7,9 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.AssemblyLine;
 import dark.assembly.client.model.ModelRejectorPiston;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.machine.TileEntityRejector;
+import dark.assembly.machine.TileEntityRejector;
 import dark.core.prefab.ModPrefab;
 
 @SideOnly(Side.CLIENT)

src/dark/assembly/imprinter/BlockImprinter.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.imprinter;
+package dark.assembly.imprinter;
 
 import java.util.Random;
 
@@ -14,9 +14,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.CommonProxy;
-import dark.assembly.common.machine.BlockAssembly;
+import dark.assembly.AssemblyLine;
+import dark.assembly.CommonProxy;
+import dark.assembly.machine.BlockAssembly;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 public class BlockImprinter extends BlockAssembly

src/dark/assembly/imprinter/ContainerImprinter.java

@@ -1,11 +1,11 @@
-package dark.assembly.common.imprinter;
+package dark.assembly.imprinter;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import dark.assembly.common.ALRecipeLoader;
+import dark.assembly.ALRecipeLoader;
 import dark.core.prefab.invgui.ISlotWatcher;
 import dark.core.prefab.invgui.SlotCraftingResult;
 import dark.core.prefab.invgui.SlotRestricted;

src/dark/assembly/imprinter/ItemImprinter.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.imprinter;
+package dark.assembly.imprinter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
+import dark.assembly.AssemblyLine;
 import dark.core.common.DMCreativeTab;
 
 public class ItemImprinter extends Item

src/dark/assembly/imprinter/TileEntityImprinter.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.imprinter;
+package dark.assembly.imprinter;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/dark/assembly/imprinter/prefab/BlockImprintable.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.imprinter.prefab;
+package dark.assembly.imprinter.prefab;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
@@ -8,8 +8,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import dark.api.al.IFilterable;
-import dark.assembly.common.imprinter.ItemImprinter;
-import dark.assembly.common.machine.BlockAssembly;
+import dark.assembly.imprinter.ItemImprinter;
+import dark.assembly.machine.BlockAssembly;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 /** Extend this block class if a filter is allowed to be placed inside of this block.

src/dark/assembly/imprinter/prefab/TileEntityFilterable.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.imprinter.prefab;
+package dark.assembly.imprinter.prefab;
 
 import java.util.ArrayList;
 
@@ -7,8 +7,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.prefab.tile.IRotatable;
 import dark.api.al.IFilterable;
-import dark.assembly.common.imprinter.ItemImprinter;
-import dark.assembly.common.machine.TileEntityAssembly;
+import dark.assembly.imprinter.ItemImprinter;
+import dark.assembly.machine.TileEntityAssembly;
 
 public abstract class TileEntityFilterable extends TileEntityAssembly implements IRotatable, IFilterable
 {

src/dark/assembly/machine/BlockAssembly.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -6,7 +6,7 @@ import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
-import dark.assembly.common.AssemblyLine;
+import dark.assembly.AssemblyLine;
 import dark.core.common.DMCreativeTab;
 import dark.core.prefab.machine.BlockMachine;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;

src/dark/assembly/machine/BlockCrate.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.List;
 
@@ -16,7 +16,7 @@ import net.minecraft.world.World;
 import universalelectricity.core.UniversalElectricity;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
+import dark.assembly.AssemblyLine;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 /** A block that allows the placement of mass amount of a specific item within it. It will be allowed

src/dark/assembly/machine/BlockDetector.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.EntityLivingBase;
@@ -13,8 +13,8 @@ import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.UniversalElectricity;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.imprinter.prefab.BlockImprintable;
+import dark.assembly.AssemblyLine;
+import dark.assembly.imprinter.prefab.BlockImprintable;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 /** @author Briman0094 */

src/dark/assembly/machine/BlockManipulator.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
@@ -9,7 +9,7 @@ import universalelectricity.core.UniversalElectricity;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.assembly.client.render.BlockRenderingHandler;
-import dark.assembly.common.imprinter.prefab.BlockImprintable;
+import dark.assembly.imprinter.prefab.BlockImprintable;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 /** A block that manipulates item movement between inventories.

src/dark/assembly/machine/BlockRejector.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.tileentity.TileEntity;
@@ -7,9 +7,9 @@ import net.minecraft.world.World;
 import universalelectricity.core.UniversalElectricity;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.assembly.AssemblyLine;
 import dark.assembly.client.render.BlockRenderingHandler;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.imprinter.prefab.BlockImprintable;
+import dark.assembly.imprinter.prefab.BlockImprintable;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 public class BlockRejector extends BlockImprintable

src/dark/assembly/machine/BlockTurntable.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.Random;
 
@@ -18,7 +18,7 @@ import universalelectricity.prefab.block.IRotatableBlock;
 import universalelectricity.prefab.tile.IRotatable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
+import dark.assembly.AssemblyLine;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 public class BlockTurntable extends BlockAssembly

src/dark/assembly/machine/InventoryCrate.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

src/dark/assembly/machine/ItemBlockCrate.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.List;
 

src/dark/assembly/machine/NetworkAssembly.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.Date;
 import java.util.HashSet;

src/dark/assembly/machine/PathfinderCrate.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.ArrayList;
 import java.util.List;

src/dark/assembly/machine/TileEntityAssembly.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,7 +11,7 @@ import universalelectricity.core.electricity.ElectricityPack;
 import universalelectricity.core.vector.Vector3;
 import dark.api.parts.INetworkEnergyPart;
 import dark.api.parts.ITileNetwork;
-import dark.assembly.common.AssemblyLine;
+import dark.assembly.AssemblyLine;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
 import dark.core.prefab.tilenetwork.NetworkSharedPower;
 import dark.core.prefab.tilenetwork.NetworkTileEntities;

src/dark/assembly/machine/TileEntityCrate.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

src/dark/assembly/machine/TileEntityDetector.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.ArrayList;
 
@@ -13,8 +13,8 @@ import net.minecraftforge.common.ForgeDirection;
 import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
-import dark.assembly.common.ALRecipeLoader;
-import dark.assembly.common.imprinter.prefab.TileEntityFilterable;
+import dark.assembly.ALRecipeLoader;
+import dark.assembly.imprinter.prefab.TileEntityFilterable;
 import dark.core.network.PacketHandler;
 
 public class TileEntityDetector extends TileEntityFilterable

src/dark/assembly/machine/TileEntityManipulator.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.List;
 
@@ -15,8 +15,8 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
 import dark.api.al.IManipulator;
-import dark.assembly.common.imprinter.ItemImprinter;
-import dark.assembly.common.imprinter.prefab.TileEntityFilterable;
+import dark.assembly.imprinter.ItemImprinter;
+import dark.assembly.imprinter.prefab.TileEntityFilterable;
 import dark.core.helpers.InvInteractionHelper;
 import dark.core.network.PacketHandler;
 

src/dark/assembly/machine/TileEntityRejector.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine;
+package dark.assembly.machine;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
 import dark.api.al.IBelt;
-import dark.assembly.common.imprinter.prefab.TileEntityFilterable;
+import dark.assembly.imprinter.prefab.TileEntityFilterable;
 import dark.core.network.PacketHandler;
 
 /** @author Darkguardsman */

src/dark/assembly/machine/belt/BlockConveyor.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.belt;
+package dark.assembly.machine.belt;
 
 import java.util.List;
 
@@ -15,8 +15,8 @@ import net.minecraftforge.common.ForgeDirection;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.assembly.client.render.BlockRenderingHandler;
-import dark.assembly.common.machine.BlockAssembly;
-import dark.assembly.common.machine.belt.TileEntityConveyorBelt.SlantType;
+import dark.assembly.machine.BlockAssembly;
+import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
 import dark.core.common.DarkMain;
 import dark.core.prefab.tilenetwork.NetworkItemSupply;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;

src/dark/assembly/machine/belt/BlockConveyorBelt.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.belt;
+package dark.assembly.machine.belt;
 
 import java.util.List;
 
@@ -18,8 +18,8 @@ import universalelectricity.core.UniversalElectricity;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.assembly.client.render.BlockRenderingHandler;
-import dark.assembly.common.machine.BlockAssembly;
-import dark.assembly.common.machine.belt.TileEntityConveyorBelt.SlantType;
+import dark.assembly.machine.BlockAssembly;
+import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
 import dark.core.common.DarkMain;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 

src/dark/assembly/machine/belt/TileEntityConveyor.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.belt;
+package dark.assembly.machine.belt;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,8 +15,8 @@ import dark.api.parts.IMotionPath;
 import dark.api.parts.INetworkPart;
 import dark.api.parts.ITileNetwork;
 import dark.api.parts.ITileConnector.Connection;
-import dark.assembly.common.machine.TileEntityAssembly;
-import dark.assembly.common.machine.belt.TileEntityConveyorBelt.SlantType;
+import dark.assembly.machine.TileEntityAssembly;
+import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
 import dark.core.prefab.tilenetwork.NetworkItemSupply;
 

src/dark/assembly/machine/belt/TileEntityConveyorBelt.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.belt;
+package dark.assembly.machine.belt;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -17,8 +17,8 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
 import dark.api.al.IBelt;
-import dark.assembly.common.ALRecipeLoader;
-import dark.assembly.common.machine.TileEntityAssembly;
+import dark.assembly.ALRecipeLoader;
+import dark.assembly.machine.TileEntityAssembly;
 import dark.core.common.DarkMain;
 import dark.core.network.PacketHandler;
 

src/dark/assembly/machine/belt/TileEntityElevatorBelt.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.belt;
+package dark.assembly.machine.belt;
 
 import java.util.ArrayList;
 import java.util.List;

src/dark/assembly/machine/encoder/BlockEncoder.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.encoder;
+package dark.assembly.machine.encoder;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -9,9 +9,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.CommonProxy;
-import dark.assembly.common.machine.BlockAssembly;
+import dark.assembly.AssemblyLine;
+import dark.assembly.CommonProxy;
+import dark.assembly.machine.BlockAssembly;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 
 public class BlockEncoder extends BlockAssembly

src/dark/assembly/machine/encoder/ContainerEncoder.java

@@ -1,11 +1,11 @@
-package dark.assembly.common.machine.encoder;
+package dark.assembly.machine.encoder;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import dark.assembly.common.ALRecipeLoader;
+import dark.assembly.ALRecipeLoader;
 import dark.core.prefab.invgui.SlotRestricted;
 
 public class ContainerEncoder extends Container

src/dark/assembly/machine/encoder/IInventoryWatcher.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.encoder;
+package dark.assembly.machine.encoder;
 
 public interface IInventoryWatcher
 {

src/dark/assembly/machine/encoder/ItemDisk.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.encoder;
+package dark.assembly.machine.encoder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.assembly.common.AssemblyLine;
+import dark.assembly.AssemblyLine;
 import dark.core.common.DMCreativeTab;
 
 public class ItemDisk extends Item

src/dark/assembly/machine/encoder/SlotDisk.java

@@ -1,9 +1,9 @@
-package dark.assembly.common.machine.encoder;
+package dark.assembly.machine.encoder;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import dark.assembly.common.ALRecipeLoader;
+import dark.assembly.ALRecipeLoader;
 
 public class SlotDisk extends Slot
 {

src/dark/assembly/machine/encoder/SlotDiskResult.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.encoder;
+package dark.assembly.machine.encoder;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

src/dark/assembly/machine/encoder/TileEntityEncoder.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.encoder;
+package dark.assembly.machine.encoder;
 
 import java.io.IOException;
 
@@ -16,7 +16,7 @@ import cpw.mods.fml.common.network.Player;
 import dark.api.al.coding.IProcessTask;
 import dark.api.al.coding.IProgram;
 import dark.api.al.coding.TaskRegistry;
-import dark.assembly.common.armbot.Program;
+import dark.assembly.armbot.Program;
 import dark.core.common.DarkMain;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.machine.TileEntityMachine;

src/dark/assembly/machine/processor/BlockProcessor.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.processor;
+package dark.assembly.machine.processor;
 
 import java.util.List;
 import java.util.Set;
@@ -20,9 +20,9 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.api.reciepes.ProcessorType;
+import dark.assembly.AssemblyLine;
+import dark.assembly.CommonProxy;
 import dark.assembly.client.render.BlockRenderingHandler;
-import dark.assembly.common.AssemblyLine;
-import dark.assembly.common.CommonProxy;
 import dark.core.common.DMCreativeTab;
 import dark.core.prefab.machine.BlockMachine;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;

src/dark/assembly/machine/processor/ContainerProcessor.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.processor;
+package dark.assembly.machine.processor;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/dark/assembly/machine/processor/TileEntityProcessor.java

@@ -1,4 +1,4 @@
-package dark.assembly.common.machine.processor;
+package dark.assembly.machine.processor;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -11,7 +11,7 @@ import com.google.common.io.ByteArrayDataInput;
 import cpw.mods.fml.common.network.Player;
 import dark.api.reciepes.MachineRecipeHandler;
 import dark.api.reciepes.ProcessorType;
-import dark.assembly.common.machine.processor.BlockProcessor.ProcessorData;
+import dark.assembly.machine.processor.BlockProcessor.ProcessorData;
 import dark.core.interfaces.IInvBox;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.invgui.InvChest;