Moved some of Dark Library into Calclavia Core

src/main/java/dark/lib/BlockFluid.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;

src/main/java/dark/lib/ClientRegistryProxy.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,11 +7,11 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.tileentity.TileEntity;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
 
 public class ClientRegistryProxy extends RegistryProxy
 {

src/main/java/dark/lib/CoreRegistry.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import java.io.File;
 import java.util.HashMap;
@@ -13,14 +13,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
-import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 
 import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
+import dark.lib.IExtraInfo.IExtraItemInfo;
 
 /**
  * Handler to make registering all parts of a mod's objects that are loaded into the game by forge

src/main/java/dark/lib/EnumMaterial.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/dark/lib/EnumOrePart.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 public enum EnumOrePart
 {

src/main/java/dark/lib/IExtraInfo.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import java.util.List;
 import java.util.Set;

src/main/java/dark/lib/LaserEntityDamageSource.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.monster.EntityCreeper;

src/main/java/dark/lib/OtherDamageSource.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;

src/main/java/dark/lib/RegistryProxy.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib;
+package dark.lib;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;

src/main/java/dark/lib/helpers/ColorCode.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.helpers;
+package dark.lib.helpers;
 
 import java.awt.Color;
 

src/main/java/dark/lib/interfaces/IControlReceiver.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.interfaces;
+package dark.lib.interfaces;
 
 import net.minecraft.entity.player.EntityPlayer;
 

src/main/java/dark/lib/interfaces/IExtendedStorage.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.interfaces;
+package dark.lib.interfaces;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/dark/lib/interfaces/IExternalInv.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.interfaces;
+package dark.lib.interfaces;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeDirection;

src/main/java/dark/lib/interfaces/IInvBox.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.interfaces;
+package dark.lib.interfaces;
 
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;

src/main/java/dark/lib/interfaces/IPowerLess.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.interfaces;
+package dark.lib.interfaces;
 
 /**
  * Applied to devices that have the option to run without power. Normally this option is only shown

src/main/java/dark/lib/interfaces/IReadOut.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.interfaces;
+package dark.lib.interfaces;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;

src/main/java/dark/lib/interfaces/IRotatableBlock.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.interfaces;
+package dark.lib.interfaces;
 
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;

src/main/java/dark/lib/prefab/invgui/ContainerFake.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;

src/main/java/dark/lib/prefab/invgui/GuiBase.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.OpenGlHelper;

src/main/java/dark/lib/prefab/invgui/GuiButtonImage.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;

src/main/java/dark/lib/prefab/invgui/GuiMachineContainer.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -14,10 +14,10 @@ import org.lwjgl.opengl.GL12;
 
 import resonantinduction.core.Reference;
 import resonantinduction.core.prefab.tile.TileEntityMachine;
-import resonantinduction.old.lib.prefab.invgui.GuiButtonImage.ButtonIcon;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.prefab.invgui.GuiButtonImage.ButtonIcon;
 
 @SideOnly(Side.CLIENT)
 public abstract class GuiMachineContainer extends GuiContainer

src/main/java/dark/lib/prefab/invgui/GuiMessageBox.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.ResourceLocation;

src/main/java/dark/lib/prefab/invgui/IMessageBoxDialog.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 public interface IMessageBoxDialog
 {

src/main/java/dark/lib/prefab/invgui/ISlotPickResult.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

src/main/java/dark/lib/prefab/invgui/ISlotWatcher.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 /** Add this to a container class if using WatchedSlot to trigger the container on slot change */
 public interface ISlotWatcher

src/main/java/dark/lib/prefab/invgui/InvChest.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,8 +7,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.old.lib.interfaces.IExternalInv;
+import dark.lib.interfaces.IExternalInv;
-import resonantinduction.old.lib.interfaces.IInvBox;
+import dark.lib.interfaces.IInvBox;
 
 public class InvChest implements IInvBox
 {

src/main/java/dark/lib/prefab/invgui/SlotCraftingResult.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

src/main/java/dark/lib/prefab/invgui/SlotEnergyItem.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/main/java/dark/lib/prefab/invgui/SlotSpecific.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/main/java/dark/lib/prefab/invgui/WatchedSlot.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.prefab.invgui;
+package dark.lib.prefab.invgui;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/main/java/dark/lib/recipes/MachineRecipeHandler.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.recipes;
+package dark.lib.recipes;
 
 import java.util.Random;
 

src/main/java/dark/lib/recipes/ProcessorRecipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.recipes;
+package dark.lib.recipes;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/dark/lib/recipes/ProcessorType.java

@@ -1,4 +1,4 @@
-package resonantinduction.old.lib.recipes;
+package dark.lib.recipes;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/resonantinduction/archaic/blocks/BlockColored.java

@@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 import resonantinduction.core.Reference;
-import resonantinduction.old.lib.helpers.ColorCode;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.helpers.ColorCode;
 
 /**
  * Prefab class to make any block have 16 separate color instances similar to wool block

src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java

@@ -14,12 +14,12 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.prefab.block.BlockMachine;
-import resonantinduction.old.lib.interfaces.IRotatable;
-import resonantinduction.old.lib.interfaces.IRotatableBlock;
 import resonantinduction.old.transport.ResonantInductionTransport;
 import universalelectricity.api.vector.Vector3;
+import calclavia.lib.prefab.tile.IRotatable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.interfaces.IRotatableBlock;
 
 public class BlockTurntable extends BlockMachine
 {

src/main/java/resonantinduction/archaic/blocks/ItemBlockColored.java

@@ -3,7 +3,7 @@ package resonantinduction.archaic.blocks;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import resonantinduction.old.lib.helpers.ColorCode;
+import dark.lib.helpers.ColorCode;
 
 public class ItemBlockColored extends ItemBlock
 {

src/main/java/resonantinduction/core/debug/BlockDebug.java

@@ -14,13 +14,13 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.prefab.block.BlockMachine;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 import resonantinduction.old.transport.ResonantInductionTransport;
 
 import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
 
 public class BlockDebug extends BlockMachine implements IExtraBlockInfo
 {

src/main/java/resonantinduction/core/prefab/tile/TileEntityEnergyMachine.java

@@ -11,7 +11,6 @@ import net.minecraft.nbt.NBTTagLong;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.oredict.OreDictionary;
-import resonantinduction.old.lib.interfaces.IPowerLess;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.electricity.IVoltageInput;
 import universalelectricity.api.electricity.IVoltageOutput;
@@ -19,6 +18,7 @@ import universalelectricity.api.energy.IEnergyContainer;
 import universalelectricity.api.energy.IEnergyInterface;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorHelper;
+import dark.lib.interfaces.IPowerLess;
 
 /**
  * Basic energy tile that can consume power

src/main/java/resonantinduction/core/prefab/tile/TileEntityFilterable.java

@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.old.api.IFilterable;
-import resonantinduction.old.lib.interfaces.IRotatable;
 import resonantinduction.old.transport.TileEntityAssembly;
 import resonantinduction.old.transport.imprinter.ItemImprinter;
+import calclavia.lib.prefab.tile.IRotatable;
 
 public abstract class TileEntityFilterable extends TileEntityAssembly implements IRotatable, IFilterable
 {

src/main/java/resonantinduction/core/prefab/tile/TileEntityInv.java

@@ -11,9 +11,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities;
-import resonantinduction.old.lib.interfaces.IExternalInv;
-import resonantinduction.old.lib.interfaces.IInvBox;
-import resonantinduction.old.lib.prefab.invgui.InvChest;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.access.AccessGroup;
 import calclavia.lib.access.AccessUser;
@@ -21,6 +18,9 @@ import calclavia.lib.access.GroupRegistry;
 import calclavia.lib.access.ISpecialAccess;
 import calclavia.lib.access.Nodes;
 import calclavia.lib.prefab.tile.TileAdvanced;
+import dark.lib.interfaces.IExternalInv;
+import dark.lib.interfaces.IInvBox;
+import dark.lib.prefab.invgui.InvChest;
 
 /**
  * Prefab for simple object who only need basic inv support and nothing more

src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java

@@ -10,9 +10,6 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.network.ISimplePacketReceiver;
-import resonantinduction.old.lib.IExtraInfo.IExtraTileEntityInfo;
-import resonantinduction.old.lib.interfaces.IExternalInv;
-import resonantinduction.old.lib.interfaces.IInvBox;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.PacketHandler;
 
@@ -20,6 +17,9 @@ import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
+import dark.lib.IExtraInfo.IExtraTileEntityInfo;
+import dark.lib.interfaces.IExternalInv;
+import dark.lib.interfaces.IInvBox;
 
 public abstract class TileEntityMachine extends TileEntityInv implements ISidedInventory, IExternalInv, ISimplePacketReceiver, IExtraTileEntityInfo
 {

src/main/java/resonantinduction/core/resource/BlockOre.java

@@ -17,14 +17,14 @@ import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.lib.EnumMaterial;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 import calclavia.lib.ore.OreGenReplaceStone;
 
 import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.EnumMaterial;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
 
 public class BlockOre extends Block implements IExtraBlockInfo
 {

src/main/java/resonantinduction/core/resource/ItemParts.java

@@ -11,9 +11,9 @@ import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.item.ItemBase;
-import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.IExtraInfo.IExtraItemInfo;
 
 /**
  * A meta data item containing parts of various crafting recipes. These parts do not do anything but

src/main/java/resonantinduction/core/tilenetwork/prefab/NetworkSharedPower.java

@@ -3,7 +3,7 @@ package resonantinduction.core.tilenetwork.prefab;
 import net.minecraft.tileentity.TileEntity;
 import resonantinduction.core.tilenetwork.INetworkEnergyPart;
 import resonantinduction.core.tilenetwork.INetworkPart;
-import resonantinduction.old.lib.interfaces.IPowerLess;
+import dark.lib.interfaces.IPowerLess;
 
 /**
  * Used for tile networks that only need to share power or act like a group battery that doesn't

src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java

@@ -14,13 +14,13 @@ import net.minecraftforge.common.Configuration;
 import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.old.client.render.BlockRenderingHandler;
 import resonantinduction.old.client.render.RenderArmbot;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 import calclavia.lib.multiblock.link.IMultiBlock;
 
 import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
 
 public class BlockArmbot extends BlockMachine implements IExtraBlockInfo
 {

src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java

@@ -12,12 +12,12 @@ import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.old.client.render.BlockRenderingHandler;
 import resonantinduction.old.client.render.RenderBlockSolarPanel;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
 
 public class BlockSolarPanel extends BlockMachine implements IExtraBlockInfo
 {

src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java

@@ -18,8 +18,6 @@ import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
 import resonantinduction.core.prefab.tile.TileGenerator;
-import resonantinduction.old.lib.interfaces.IReadOut;
-import resonantinduction.old.lib.interfaces.IReadOut.EnumTools;
 import universalelectricity.api.electricity.IVoltageInput;
 import universalelectricity.api.electricity.IVoltageOutput;
 import universalelectricity.api.energy.IConductor;
@@ -33,6 +31,8 @@ import calclavia.lib.utility.FluidHelper;
 import cofh.api.energy.IEnergyStorage;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.interfaces.IReadOut;
+import dark.lib.interfaces.IReadOut.EnumTools;
 
 public class ItemReadoutTools extends ItemBase
 {

src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java

@@ -21,12 +21,12 @@ import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.mechanical.belt.TileEntityConveyorBelt.SlantType;
 import resonantinduction.old.client.render.BlockRenderingHandler;
 import resonantinduction.old.client.render.RenderConveyorBelt;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
 
 /** The block for the actual conveyor belt!
  * 

src/main/java/resonantinduction/mechanical/belt/TileEntityConveyorBelt.java

@@ -12,10 +12,10 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.old.api.IBelt;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.lib.interfaces.IRotatable;
 import resonantinduction.old.transport.TileEntityAssembly;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.PacketHandler;
+import calclavia.lib.prefab.tile.IRotatable;
 
 import com.google.common.io.ByteArrayDataInput;
 

src/main/java/resonantinduction/old/api/IProcessable.java

@@ -1,7 +1,7 @@
 package resonantinduction.old.api;
 
 import net.minecraft.item.ItemStack;
-import resonantinduction.old.lib.recipes.ProcessorType;
+import dark.lib.recipes.ProcessorType;
 
 /**
  * Simple interface that allows an item to control how its salvaged, processed, or refined by a

src/main/java/resonantinduction/old/api/fluid/IDrain.java

@@ -4,8 +4,8 @@ import java.util.Set;
 
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.IFluidHandler;
-import resonantinduction.old.lib.interfaces.IRotatable;
 import universalelectricity.api.vector.Vector3;
+import calclavia.lib.prefab.tile.IRotatable;
 
 /**
  * Interface to make or use the TileEntityDrain. This is mostly a dummy interface to help the

src/main/java/resonantinduction/old/client/ClientProxy.java

@@ -38,7 +38,6 @@ import resonantinduction.old.transport.fluid.pipes.TileEntityPipe;
 import resonantinduction.old.transport.fluid.pump.TileEntityConstructionPump;
 import resonantinduction.old.transport.fluid.pump.TileEntityStarterPump;
 import resonantinduction.old.transport.imprinter.TileEntityImprinter;
-import resonantinduction.old.transport.vechicle.EntityTestCar;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;

src/main/java/resonantinduction/old/client/gui/GuiEditTask.java

@@ -11,12 +11,12 @@ import org.lwjgl.opengl.GL11;
 import resonantinduction.core.Reference;
 import resonantinduction.old.api.coding.ITask;
 import resonantinduction.old.api.coding.args.ArgumentData;
-import resonantinduction.old.lib.prefab.invgui.GuiBase;
-import resonantinduction.old.lib.prefab.invgui.GuiMessageBox;
-import resonantinduction.old.lib.prefab.invgui.IMessageBoxDialog;
 import universalelectricity.api.vector.Vector2;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
+import dark.lib.prefab.invgui.GuiBase;
+import dark.lib.prefab.invgui.GuiMessageBox;
+import dark.lib.prefab.invgui.IMessageBoxDialog;
 
 public class GuiEditTask extends GuiBase implements IMessageBoxDialog
 {

src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java

@@ -4,9 +4,9 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import resonantinduction.core.prefab.tile.TileEntityMachine;
 import resonantinduction.mechanical.CommonProxy;
-import resonantinduction.old.lib.prefab.invgui.ContainerFake;
-import resonantinduction.old.lib.prefab.invgui.GuiMachineContainer;
 import resonantinduction.old.transport.ResonantInductionTransport;
+import dark.lib.prefab.invgui.ContainerFake;
+import dark.lib.prefab.invgui.GuiMachineContainer;
 
 public class GuiEncoderBase extends GuiMachineContainer
 {

src/main/java/resonantinduction/old/client/gui/GuiEncoderCoder.java

@@ -6,9 +6,9 @@ import net.minecraft.entity.player.InventoryPlayer;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
-import resonantinduction.old.lib.prefab.invgui.GuiButtonImage;
-import resonantinduction.old.lib.prefab.invgui.GuiButtonImage.ButtonIcon;
 import resonantinduction.old.transport.encoder.TileEntityEncoder;
+import dark.lib.prefab.invgui.GuiButtonImage;
+import dark.lib.prefab.invgui.GuiButtonImage.ButtonIcon;
 
 public class GuiEncoderCoder extends GuiEncoderBase
 {

src/main/java/resonantinduction/old/client/gui/GuiTaskList.java

@@ -12,8 +12,8 @@ import resonantinduction.electrical.armbot.command.TaskStart;
 import resonantinduction.old.api.coding.IProgram;
 import resonantinduction.old.api.coding.IRedirectTask;
 import resonantinduction.old.api.coding.ITask;
-import resonantinduction.old.lib.interfaces.IScroll;
 import resonantinduction.old.transport.encoder.TileEntityEncoder;
+import calclavia.lib.terminal.IScroll;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
 

src/main/java/resonantinduction/old/client/render/RenderTank.java

@@ -9,10 +9,10 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.old.client.model.ModelTankSide;
-import resonantinduction.old.lib.helpers.ColorCode;
 import resonantinduction.old.transport.fluid.TileEntityTank;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.helpers.ColorCode;
 
 @SideOnly(Side.CLIENT)
 public class RenderTank extends TileEntitySpecialRenderer

src/main/java/resonantinduction/old/client/render/RenderTestCar.java

@@ -10,7 +10,6 @@ import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
 import resonantinduction.old.client.model.ModelTestCar;
-import resonantinduction.old.transport.vechicle.EntityAdvanced;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/old/core/ItemOreDirv.java

@@ -15,11 +15,11 @@ import resonantinduction.api.events.LaserEvent;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.item.ItemBase;
-import resonantinduction.old.lib.EnumMaterial;
-import resonantinduction.old.lib.EnumOrePart;
-import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.EnumMaterial;
+import dark.lib.EnumOrePart;
+import dark.lib.IExtraInfo.IExtraItemInfo;
 
 /**
  * A series of items that are derived from a basic material

src/main/java/resonantinduction/old/core/misc/EnumTool.java

@@ -7,9 +7,9 @@ import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.lib.EnumMaterial;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.EnumMaterial;
 
 /**
  * Enum to store tools that can be created from the material sheet.

src/main/java/resonantinduction/old/core/misc/ItemColoredDust.java

@@ -9,9 +9,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
-import resonantinduction.old.lib.helpers.ColorCode;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.helpers.ColorCode;
 
 public class ItemColoredDust extends Item
 {

src/main/java/resonantinduction/old/core/misc/ItemCommonTool.java

@@ -32,13 +32,13 @@ import net.minecraftforge.event.entity.player.UseHoeEvent;
 import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Settings;
-import resonantinduction.old.lib.EnumMaterial;
-import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 
 import com.google.common.collect.Multimap;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.EnumMaterial;
+import dark.lib.IExtraInfo.IExtraItemInfo;
 
 /**
  * Flexible tool class that uses NBT to store damage and effect rather than metadata. Metadata

src/main/java/resonantinduction/old/core/recipe/RecipeLoader.java

@@ -13,16 +13,16 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import resonantinduction.core.resource.ItemParts.Parts;
 import resonantinduction.old.core.ItemOreDirv;
 import resonantinduction.old.core.misc.EnumTool;
-import resonantinduction.old.lib.EnumMaterial;
-import resonantinduction.old.lib.EnumOrePart;
-import resonantinduction.old.lib.helpers.ColorCode;
-import resonantinduction.old.lib.interfaces.IReadOut.EnumTools;
-import resonantinduction.old.lib.recipes.MachineRecipeHandler;
-import resonantinduction.old.lib.recipes.ProcessorType;
 import resonantinduction.old.mechanics.processor.BlockProcessor;
 import resonantinduction.old.transport.crate.BlockCrate;
 import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial;
 import cpw.mods.fml.common.registry.GameRegistry;
+import dark.lib.EnumMaterial;
+import dark.lib.EnumOrePart;
+import dark.lib.helpers.ColorCode;
+import dark.lib.interfaces.IReadOut.EnumTools;
+import dark.lib.recipes.MachineRecipeHandler;
+import dark.lib.recipes.ProcessorType;
 
 public class RecipeLoader
 {

src/main/java/resonantinduction/old/lib/interfaces/IRotatable.java

@@ -1,18 +0,0 @@
-package resonantinduction.old.lib.interfaces;
-
-import net.minecraftforge.common.ForgeDirection;
-
-/**
- * The interface is applied to TileEntities that can rotate.
- * 
- * @author Calclavia
- */
-
-public interface IRotatable
-{
-	/** @return Gets the facing direction. Always returns the front side of the block. */
-	public ForgeDirection getDirection();
-
-	/** @param Sets the facing direction. */
-	public void setDirection(ForgeDirection direection);
-}

src/main/java/resonantinduction/old/lib/interfaces/IScroll.java

@@ -1,14 +0,0 @@
-package resonantinduction.old.lib.interfaces;
-
-public interface IScroll
-{
-	/**
-	 * Scrolls the text field up or down. Client side only. Positive value will scroll the text down
-	 * while a negative value will scroll it up.
-	 */
-	public void scroll(int amount);
-
-	public void setScroll(int length);
-
-	public int getScroll();
-}

src/main/java/resonantinduction/old/lib/interfaces/ITerminal.java

@@ -1,24 +0,0 @@
-package resonantinduction.old.lib.interfaces;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import calclavia.lib.access.ISpecialAccess;
-
-/**
- * Basic methods to make it easier to construct or interact with a terminal based tile. Recommend to
- * be used by tiles that want to mimic computer command line like interfaces. As well to restrict
- * access to the tile in the same way a computer would
- * 
- * @author DarkGuardsmsan
- */
-public interface ITerminal extends ISpecialAccess
-{
-	/** Gets an output of the string stored in the console. */
-	public List<String> getTerminalOuput();
-
-	/** Adds a string to the console. Server side only. */
-	public boolean addToConsole(String msg);
-
-	public boolean canUse(String node, EntityPlayer player);
-}

src/main/java/resonantinduction/old/lib/interfaces/ITerminalCommand.java

@@ -1,38 +0,0 @@
-package resonantinduction.old.lib.interfaces;
-
-import java.util.Set;
-
-import net.minecraft.entity.player.EntityPlayer;
-
-/**
- * Prefab for creating commands that most terminal entities can use
- * 
- * @author DarkGuardsman
- */
-public interface ITerminalCommand
-{
-	/**
-	 * The command has been called by a player in a terminal.
-	 * 
-	 * @return false if the call was not supported rather than failed. Used too allow several
-	 * commands with the same name to exist but each has its own sub calls
-	 */
-	public boolean called(EntityPlayer player, ITerminal terminal, String[] args);
-
-	/**
-	 * Can the machine use the command. Used to prevent commands from being called on machines that
-	 * can't support it
-	 */
-	public boolean canSupport(ITerminal terminal);
-
-	/** What the command starts with like /time */
-	public String getCommandName();
-
-	/**
-	 * Used to restrict sub commands like /time day, or /time night. Will be added to the name of
-	 * the command so a command called time will have a sub comamnd day its node will equal time.day
-	 */
-	public Set<String> getPermissionNodes();
-
-	public String getNode(String[] args);
-}

src/main/java/resonantinduction/old/lib/terminal/CommandRegistry.java

@@ -1,75 +0,0 @@
-package resonantinduction.old.lib.terminal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import resonantinduction.old.lib.interfaces.ITerminal;
-import resonantinduction.old.lib.interfaces.ITerminalCommand;
-import calclavia.lib.access.GroupRegistry;
-
-public class CommandRegistry
-{
-	public static final List<ITerminalCommand> COMMANDS = new ArrayList<ITerminalCommand>();
-
-	/**
-	 * @param prefix - what the command starts with for example /time
-	 * @param cmd - Cmd instance that will execute the command
-	 */
-	public static void register(ITerminalCommand cmd, String group)
-	{
-		if (!COMMANDS.contains(cmd))
-		{
-			COMMANDS.add(cmd);
-			if (group != null)
-			{
-				if (GroupRegistry.groupDefaultNodes.containsKey(group))
-				{
-					List<String> stra = new ArrayList<String>();
-					stra.add(cmd.getCommandName());
-				}
-			}
-		}
-	}
-
-	/**
-	 * When a player uses a command in any CMD machine it pass threw here first
-	 * 
-	 * @param terminal - The terminal, can be cast to TileEntity.
-	 */
-	public static boolean onCommand(EntityPlayer player, ITerminal terminal, String cmd)
-	{
-		if (cmd != null && cmd != "")
-		{
-			String[] args = cmd.split(" ");
-
-			if (args[0] != null)
-			{
-				for (ITerminalCommand command : COMMANDS)
-				{
-					if (command.getCommandName().equalsIgnoreCase(args[0]))
-					{
-						if (command.canSupport(terminal) && command.getNode(args) != null)
-						{
-							if (!terminal.canUse(command.getNode(args), player))
-							{
-								terminal.addToConsole("Access Denied.");
-								return false;
-							}
-							else
-							{
-								if (command.called(player, terminal, args))
-								{
-									return true;
-								}
-							}
-						}
-					}
-				}
-			}
-
-			terminal.addToConsole("Unknown Command.");
-		}
-		return false;
-	}
-}

src/main/java/resonantinduction/old/lib/terminal/CommandUser.java

@@ -1,135 +0,0 @@
-package resonantinduction.old.lib.terminal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import net.minecraft.entity.player.EntityPlayer;
-import resonantinduction.old.lib.interfaces.ITerminal;
-import resonantinduction.old.lib.interfaces.ITerminalCommand;
-import calclavia.lib.access.ISpecialAccess;
-
-public class CommandUser implements ITerminalCommand
-{
-	@Override
-	public String getCommandName()
-	{
-		return "users";
-	}
-
-	@Override
-	public boolean called(EntityPlayer player, ITerminal terminal, String[] args)
-	{
-		if (args[0].equalsIgnoreCase("users") && args.length > 1 && args[1] != null && terminal instanceof ISpecialAccess)
-		{
-			ISpecialAccess turret = terminal;
-
-			// ILockable
-			if (args[1].equalsIgnoreCase("List"))
-			{
-				terminal.addToConsole("");
-				terminal.addToConsole("Listing Users");
-				for (int i = 0; i < turret.getUsers().size(); i++)
-				{
-					terminal.addToConsole(" " + i + ") " + turret.getUsers().get(i).getName());
-				}
-				return true;
-			}
-			if (args[1].equalsIgnoreCase("remove") && args.length > 2)
-			{
-				if (args[2] != null)
-				{
-					if (turret.setUserAccess(args[2], null, false))
-					{
-						terminal.addToConsole("Removed: " + args[2]);
-						return true;
-					}
-					else
-					{
-						terminal.addToConsole(" User not found.");
-						return true;
-					}
-				}
-				else
-				{
-					terminal.addToConsole("Invalid username.");
-					return true;
-				}
-			}
-			if (args[1].equalsIgnoreCase("add") && args.length > 2)
-			{
-				if (args[2] != null && terminal.getGroup(args[2]) != null)
-				{
-					if (args.length > 3)
-					{
-						if (terminal.getGroup(args[2]).isMemeber(args[3]))
-						{
-							terminal.addToConsole("User already exists.");
-							return true;
-						}
-						else if (turret.setUserAccess(args[3], terminal.getGroup(args[2]), true))
-						{
-							terminal.addToConsole("Added: " + args[3] + " to group " + args[2]);
-							return true;
-						}
-						else
-						{
-							terminal.addToConsole("Invalid username.");
-							return true;
-						}
-					}
-				}
-				else
-				{
-					terminal.addToConsole("Invalid group.");
-					return true;
-				}
-			}
-			return false;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canSupport(ITerminal mm)
-	{
-		return mm != null;
-	}
-
-	@Override
-	public Set<String> getPermissionNodes()
-	{
-		Set<String> nodes = new HashSet<String>();
-		nodes.add("add");
-		nodes.add("remove");
-		nodes.add("list");
-		return nodes;
-	}
-
-	@Override
-	public String getNode(String[] args)
-	{
-		if (args != null && args.length >= 1)
-		{
-			if (args[0] != null && args[0].equalsIgnoreCase(this.getCommandName()))
-			{
-				if (args.length >= 2)
-				{
-					if (args[1] != null && args[1].equalsIgnoreCase("add"))
-					{
-						return "users.add";
-					}
-					if (args[1] != null && args[1].equalsIgnoreCase("remove"))
-					{
-						return "users.remove";
-					}
-					if (args[1] != null && args[1].equalsIgnoreCase("list"))
-					{
-						return "users.list";
-					}
-				}
-				return "users";
-			}
-		}
-		return null;
-	}
-}

src/main/java/resonantinduction/old/lib/terminal/TileEntityTerminal.java

@@ -1,190 +0,0 @@
-package resonantinduction.old.lib.terminal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.util.AxisAlignedBB;
-import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
-import resonantinduction.old.lib.interfaces.IScroll;
-import resonantinduction.old.lib.interfaces.ITerminal;
-import calclavia.lib.network.PacketHandler;
-
-import com.google.common.io.ByteArrayDataInput;
-
-import cpw.mods.fml.common.network.PacketDispatcher;
-import cpw.mods.fml.common.network.Player;
-
-/** @author Calclavia, DarkGuardsman */
-public abstract class TileEntityTerminal extends TileEntityEnergyMachine implements ITerminal, IScroll
-{
-
-	/** A list of everything typed inside the terminal */
-	private final List<String> terminalOutput = new ArrayList<String>();
-
-	/** The amount of lines the terminal can store. */
-	public static final int SCROLL_SIZE = 15;
-
-	/** Used on client side to determine the scroll of the terminal. */
-	private int scroll = 0;
-
-	public TileEntityTerminal()
-	{
-		super(0, 0);
-	}
-
-	public TileEntityTerminal(long wattsPerTick)
-	{
-		super(wattsPerTick);
-	}
-
-	public TileEntityTerminal(long wattsPerTick, long maxEnergy)
-	{
-		super(wattsPerTick, maxEnergy);
-	}
-
-	@Override
-	public Packet getGUIPacket()
-	{
-		return this.getDescriptionPacket();
-	}
-
-	/** Sends all NBT data. Server -> Client */
-	@Override
-	public Packet getDescriptionPacket()
-	{
-		NBTTagCompound nbt = new NBTTagCompound();
-		this.writeToNBT(nbt);
-		return PacketHandler.instance().getTilePacket(this.getChannel(), SimplePacketTypes.NBT.name, this, nbt);
-	}
-
-	/** Sends all Terminal data Server -> Client */
-	public void sendTerminalOutputToClients()
-	{
-		List data = new ArrayList();
-		data.add(SimplePacketTypes.TERMINAL_OUTPUT.name);
-		data.add(this.getTerminalOuput().size());
-		data.addAll(this.getTerminalOuput());
-
-		Packet packet = PacketHandler.instance().getTilePacket(this.getChannel(), "TerminalOutput", this, data.toArray());
-
-		for (Object entity : this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord - 10, yCoord - 10, zCoord - 10, xCoord + 10, yCoord + 10, zCoord + 10)))
-		{
-			if (entity instanceof EntityPlayer && ((EntityPlayer) entity).openContainer.getClass().equals(this.getContainer()))
-			{
-				PacketDispatcher.sendPacketToPlayer(packet, (Player) entity);
-			}
-		}
-	}
-
-	/** Send a terminal command Client -> server */
-	public void sendCommandToServer(EntityPlayer entityPlayer, String cmdInput)
-	{
-		if (this.worldObj.isRemote)
-		{
-			Packet packet = PacketHandler.instance().getTilePacket(this.getChannel(), SimplePacketTypes.GUI_COMMAND.name, this, entityPlayer.username, cmdInput);
-			PacketDispatcher.sendPacketToServer(packet);
-		}
-	}
-
-	@Override
-	public boolean simplePacket(String id, ByteArrayDataInput dis, Player player)
-	{
-		try
-		{
-			if (!super.simplePacket(id, dis, player))
-			{
-				if (this.worldObj.isRemote)
-				{
-					if (id.equalsIgnoreCase(SimplePacketTypes.TERMINAL_OUTPUT.name))
-					{
-						int size = dis.readInt();
-
-						List<String> oldTerminalOutput = new ArrayList(this.terminalOutput);
-						this.terminalOutput.clear();
-
-						for (int i = 0; i < size; i++)
-						{
-							this.terminalOutput.add(dis.readUTF());
-						}
-
-						if (!this.terminalOutput.equals(oldTerminalOutput) && this.terminalOutput.size() != oldTerminalOutput.size())
-						{
-							this.setScroll(this.getTerminalOuput().size() - SCROLL_SIZE);
-						}
-						return true;
-					}
-				}
-				else
-				{
-					if (id.equalsIgnoreCase(SimplePacketTypes.GUI_COMMAND.name))
-					{
-						CommandRegistry.onCommand(this.worldObj.getPlayerEntityByName(dis.readUTF()), this, dis.readUTF());
-						this.sendTerminalOutputToClients();
-						return true;
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	@Override
-	public List<String> getTerminalOuput()
-	{
-		return this.terminalOutput;
-	}
-
-	@Override
-	public boolean addToConsole(String msg)
-	{
-		if (!this.worldObj.isRemote)
-		{
-			int usedLines = 0;
-
-			msg.trim();
-			if (msg.length() > 23)
-			{
-				msg = msg.substring(0, 22);
-			}
-
-			this.getTerminalOuput().add(msg);
-			this.sendTerminalOutputToClients();
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	public void scroll(int amount)
-	{
-		this.setScroll(this.scroll + amount);
-	}
-
-	@Override
-	public void setScroll(int length)
-	{
-		this.scroll = Math.max(Math.min(length, this.getTerminalOuput().size()), 0);
-	}
-
-	@Override
-	public int getScroll()
-	{
-		return this.scroll;
-	}
-
-	@Override
-	public boolean canUse(String node, EntityPlayer player)
-	{
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}

src/main/java/resonantinduction/old/mechanics/machine/mining/BlockApertureExcavator.java

@@ -8,10 +8,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.prefab.block.BlockMachine;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
 
+import dark.lib.IExtraInfo.IExtraBlockInfo;
+
 /** @author Archadia */
 public class BlockApertureExcavator extends BlockMachine implements IExtraBlockInfo
 {

src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFracker.java

@@ -9,10 +9,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.prefab.block.BlockMachine;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
 
+import dark.lib.IExtraInfo.IExtraBlockInfo;
+
 /** @author Archadia */
 public class BlockFracker extends BlockMachine implements IExtraBlockInfo
 {

src/main/java/resonantinduction/old/mechanics/machine/mining/BlockFrackingPipe.java

@@ -9,10 +9,11 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.old.client.render.BlockRenderHelper;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 
 import com.builtbroken.common.Pair;
 
+import dark.lib.IExtraInfo.IExtraBlockInfo;
+
 /** @author Archadia */
 public class BlockFrackingPipe extends BlockMachine implements IExtraBlockInfo
 {

src/main/java/resonantinduction/old/mechanics/machine/mining/ItemMiningLaser.java

@@ -24,8 +24,6 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
 import resonantinduction.api.events.LaserEvent;
-import resonantinduction.old.lib.CoreRegistry;
-import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 import resonantinduction.old.transport.ResonantInductionTransport;
 import universalelectricity.api.item.ItemElectric;
 import universalelectricity.api.vector.Vector3;
@@ -35,6 +33,8 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.CoreRegistry;
+import dark.lib.IExtraInfo.IExtraItemInfo;
 
 /**
  * Stream laser mining tool, When held down it will slowly mine away at the block in front of it.

src/main/java/resonantinduction/old/mechanics/processor/BlockProcessor.java

@@ -17,8 +17,6 @@ import resonantinduction.core.prefab.block.BlockMachine;
 import resonantinduction.mechanical.CommonProxy;
 import resonantinduction.old.client.render.BlockRenderingHandler;
 import resonantinduction.old.client.render.RenderProcessor;
-import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
-import resonantinduction.old.lib.recipes.ProcessorType;
 import resonantinduction.old.transport.ResonantInductionTransport;
 
 import com.builtbroken.common.Pair;
@@ -26,6 +24,8 @@ import com.builtbroken.common.Pair;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.IExtraInfo.IExtraBlockInfo;
+import dark.lib.recipes.ProcessorType;
 
 public class BlockProcessor extends BlockMachine implements IExtraBlockInfo
 {

src/main/java/resonantinduction/old/mechanics/processor/ContainerProcessor.java

@@ -7,8 +7,8 @@ import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotFurnace;
 import net.minecraft.item.ItemStack;
-import resonantinduction.old.lib.recipes.MachineRecipeHandler;
 import universalelectricity.api.item.IEnergyItem;
+import dark.lib.recipes.MachineRecipeHandler;
 
 public class ContainerProcessor extends Container
 {

src/main/java/resonantinduction/old/mechanics/processor/TileEntityProcessor.java

@@ -5,10 +5,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
-import resonantinduction.old.lib.interfaces.IInvBox;
-import resonantinduction.old.lib.prefab.invgui.InvChest;
-import resonantinduction.old.lib.recipes.MachineRecipeHandler;
-import resonantinduction.old.lib.recipes.ProcessorType;
 import resonantinduction.old.mechanics.processor.BlockProcessor.ProcessorData;
 import universalelectricity.api.item.IEnergyItem;
 import calclavia.lib.network.PacketHandler;
@@ -16,6 +12,10 @@ import calclavia.lib.network.PacketHandler;
 import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
+import dark.lib.interfaces.IInvBox;
+import dark.lib.prefab.invgui.InvChest;
+import dark.lib.recipes.MachineRecipeHandler;
+import dark.lib.recipes.ProcessorType;
 
 /**
  * Basic A -> B recipe processor machine designed mainly to handle ore blocks

src/main/java/resonantinduction/old/transport/CommonProxy.java

@@ -9,8 +9,6 @@ import java.util.zip.ZipInputStream;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import resonantinduction.old.lib.prefab.invgui.ContainerFake;
-import resonantinduction.old.mechanics.generator.steam.TileEntitySteamGen;
 import resonantinduction.old.mechanics.processor.ContainerProcessor;
 import resonantinduction.old.mechanics.processor.TileEntityProcessor;
 import resonantinduction.old.transport.encoder.ContainerEncoder;
@@ -19,6 +17,7 @@ import resonantinduction.old.transport.imprinter.ContainerImprinter;
 import resonantinduction.old.transport.imprinter.TileEntityImprinter;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.IGuiHandler;
+import dark.lib.prefab.invgui.ContainerFake;
 
 public class CommonProxy implements IGuiHandler
 {

src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java

@@ -63,11 +63,6 @@ import resonantinduction.old.core.misc.ItemColoredDust;
 import resonantinduction.old.core.misc.ItemCommonTool;
 import resonantinduction.old.core.misc.ItemFarmEgg;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.lib.CoreRegistry;
-import resonantinduction.old.lib.EnumMaterial;
-import resonantinduction.old.lib.EnumOrePart;
-import resonantinduction.old.lib.LaserEntityDamageSource;
-import resonantinduction.old.mechanics.generator.steam.BlockSmallSteamGen;
 import resonantinduction.old.mechanics.processor.BlockProcessor;
 import resonantinduction.old.transport.crate.BlockCrate;
 import resonantinduction.old.transport.crate.ItemBlockCrate;
@@ -93,8 +88,6 @@ import resonantinduction.old.transport.levitator.TileEMLevitator;
 import resonantinduction.old.transport.logistic.BlockDetector;
 import resonantinduction.old.transport.logistic.BlockManipulator;
 import resonantinduction.old.transport.logistic.BlockRejector;
-import resonantinduction.old.transport.vechicle.EntityTestCar;
-import resonantinduction.old.transport.vechicle.ItemVehicleSpawn;
 import calclavia.lib.ore.OreGenReplaceStone;
 import calclavia.lib.ore.OreGenerator;
 import calclavia.lib.prefab.item.ItemBlockHolder;
@@ -114,6 +107,10 @@ import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.relauncher.Side;
+import dark.lib.CoreRegistry;
+import dark.lib.EnumMaterial;
+import dark.lib.EnumOrePart;
+import dark.lib.LaserEntityDamageSource;
 
 //@Mod(modid = ResonantInductionTransport.MOD_ID, name = ResonantInductionTransport.MOD_NAME, version = ResonantInductionTransport.VERSION, useMetadata = true)
 //@NetworkMod(channels = { ResonantInductionTransport.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)

src/main/java/resonantinduction/old/transport/crate/InventoryCrate.java

@@ -3,7 +3,7 @@ package resonantinduction.old.transport.crate;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import resonantinduction.old.lib.prefab.invgui.InvChest;
+import dark.lib.prefab.invgui.InvChest;
 
 public class InventoryCrate extends InvChest
 {

src/main/java/resonantinduction/old/transport/crate/TileEntityCrate.java

@@ -6,7 +6,6 @@ import net.minecraft.network.packet.Packet;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.network.ISimplePacketReceiver;
 import resonantinduction.core.prefab.tile.TileEntityInv;
-import resonantinduction.old.lib.interfaces.IExtendedStorage;
 import resonantinduction.old.transport.ResonantInductionTransport;
 import calclavia.lib.network.PacketHandler;
 
@@ -15,6 +14,7 @@ import com.google.common.io.ByteArrayDataInput;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.relauncher.Side;
+import dark.lib.interfaces.IExtendedStorage;
 
 /**
  * Basic single stack inventory

src/main/java/resonantinduction/old/transport/encoder/ContainerEncoder.java

@@ -5,7 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import resonantinduction.old.lib.prefab.invgui.SlotSpecific;
+import dark.lib.prefab.invgui.SlotSpecific;
 
 public class ContainerEncoder extends Container
 {

src/main/java/resonantinduction/old/transport/fluid/BlockSteamPiston.java

@@ -10,7 +10,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.block.BlockMachine;
-import resonantinduction.old.mechanics.generator.steam.TileEntitySteamPiston;
 
 import com.builtbroken.common.Pair;
 

src/main/java/resonantinduction/old/transport/fluid/TileEntityReleaseValve.java

@@ -8,10 +8,10 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.tilenetwork.ITileConnector;
 import resonantinduction.old.api.fluid.INetworkPipe;
-import resonantinduction.old.lib.interfaces.IReadOut;
 import resonantinduction.old.transport.fluid.network.NetworkPipes;
 import resonantinduction.old.transport.fluid.prefab.TileEntityFluidDevice;
 import calclavia.lib.utility.HelperMethods;
+import dark.lib.interfaces.IReadOut;
 
 public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IReadOut
 {

src/main/java/resonantinduction/old/transport/fluid/TileKitchenSink.java

@@ -8,7 +8,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.core.network.ISimplePacketReceiver;
-import resonantinduction.old.lib.helpers.ColorCode;
 import resonantinduction.old.transport.ResonantInductionTransport;
 import resonantinduction.old.transport.fluid.prefab.TileEntityFluidStorage;
 import calclavia.lib.network.PacketHandler;
@@ -16,6 +15,7 @@ import calclavia.lib.network.PacketHandler;
 import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
+import dark.lib.helpers.ColorCode;
 
 public class TileKitchenSink extends TileEntityFluidStorage implements ISimplePacketReceiver
 {

src/main/java/resonantinduction/old/transport/fluid/pipes/BlockPipe.java

@@ -18,8 +18,6 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 import resonantinduction.core.Settings;
 import resonantinduction.core.prefab.block.BlockMachine;
-import resonantinduction.old.lib.helpers.ColorCode;
-import resonantinduction.old.lib.helpers.ColorCode.IColorCoded;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
 
@@ -27,6 +25,8 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import dark.lib.helpers.ColorCode;
+import dark.lib.helpers.ColorCode.IColorCoded;
 
 public class BlockPipe extends BlockMachine
 {

src/main/java/resonantinduction/old/transport/fluid/pipes/EnumPipeType.java

@@ -1,7 +1,7 @@
 package resonantinduction.old.transport.fluid.pipes;
 
-import resonantinduction.old.lib.helpers.ColorCode;
+import dark.lib.helpers.ColorCode;
-import resonantinduction.old.lib.helpers.ColorCode.IColoredId;
+import dark.lib.helpers.ColorCode.IColoredId;
 
 public enum EnumPipeType implements IColoredId
 {

src/main/java/resonantinduction/old/transport/fluid/pipes/EnumTankTypes.java

@@ -1,7 +1,7 @@
 package resonantinduction.old.transport.fluid.pipes;
 
-import resonantinduction.old.lib.helpers.ColorCode;
+import dark.lib.helpers.ColorCode;
-import resonantinduction.old.lib.helpers.ColorCode.IColoredId;
+import dark.lib.helpers.ColorCode.IColoredId;
 
 public enum EnumTankTypes implements IColoredId
 {

src/main/java/resonantinduction/old/transport/fluid/pipes/FluidPartsMaterial.java

@@ -8,8 +8,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.lib.helpers.ColorCode;
 import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile;
+import dark.lib.helpers.ColorCode;
 
 /**
  * Enum to hold info about each pipe material. Values are by default and some can change with pipe

src/main/java/resonantinduction/old/transport/fluid/pipes/IPipeType.java

@@ -1,6 +1,6 @@
 package resonantinduction.old.transport.fluid.pipes;
 
-import resonantinduction.old.lib.helpers.ColorCode.IColoredId;
+import dark.lib.helpers.ColorCode.IColoredId;
 
 public interface IPipeType extends IColoredId
 {

src/main/java/resonantinduction/old/transport/fluid/pipes/TileEntityPipe.java

@@ -8,12 +8,12 @@ import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.tilenetwork.ITileConnector;
 import resonantinduction.core.tilenetwork.ITileNetwork;
 import resonantinduction.old.api.fluid.INetworkPipe;
-import resonantinduction.old.lib.helpers.ColorCode;
-import resonantinduction.old.lib.helpers.ColorCode.IColorCoded;
 import resonantinduction.old.transport.fluid.network.NetworkPipes;
 import resonantinduction.old.transport.fluid.prefab.TileEntityFluidNetworkTile;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
+import dark.lib.helpers.ColorCode;
+import dark.lib.helpers.ColorCode.IColorCoded;
 
 public class TileEntityPipe extends TileEntityFluidNetworkTile implements IColorCoded, INetworkPipe
 {

src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidDevice.java

@@ -6,8 +6,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.tilenetwork.ITileConnector;
 import resonantinduction.core.tilenetwork.prefab.NetworkTileEntities;
-import resonantinduction.old.lib.interfaces.IReadOut;
 import calclavia.lib.prefab.tile.TileAdvanced;
+import dark.lib.interfaces.IReadOut;
 
 public abstract class TileEntityFluidDevice extends TileAdvanced implements IReadOut, ITileConnector
 {

src/main/java/resonantinduction/old/transport/fluid/prefab/TileEntityFluidStorage.java

@@ -10,8 +10,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-import resonantinduction.old.lib.helpers.ColorCode.IColorCoded;
 import calclavia.lib.utility.FluidHelper;
+import dark.lib.helpers.ColorCode.IColorCoded;
 
 public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded
 {

src/main/java/resonantinduction/old/transport/fluid/pump/TileEntityStarterPump.java

@@ -13,12 +13,13 @@ import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.prefab.tile.TileEntityEnergyMachine;
 import resonantinduction.core.tilenetwork.ITileConnector;
 import resonantinduction.old.api.fluid.IDrain;
-import resonantinduction.old.lib.interfaces.IReadOut;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.utility.FluidHelper;
 
 import com.builtbroken.common.Pair;
 
+import dark.lib.interfaces.IReadOut;
+
 public class TileEntityStarterPump extends TileEntityEnergyMachine implements IReadOut, ITileConnector
 {
 	private int currentWorldEdits, MAX_WORLD_EDITS_PER_PROCESS;

src/main/java/resonantinduction/old/transport/imprinter/ContainerImprinter.java

@@ -5,10 +5,10 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import resonantinduction.old.lib.prefab.invgui.ISlotWatcher;
+import dark.lib.prefab.invgui.ISlotWatcher;
-import resonantinduction.old.lib.prefab.invgui.SlotCraftingResult;
+import dark.lib.prefab.invgui.SlotCraftingResult;
-import resonantinduction.old.lib.prefab.invgui.SlotSpecific;
+import dark.lib.prefab.invgui.SlotSpecific;
-import resonantinduction.old.lib.prefab.invgui.WatchedSlot;
+import dark.lib.prefab.invgui.WatchedSlot;
 
 public class ContainerImprinter extends Container implements ISlotWatcher
 {

src/main/java/resonantinduction/old/transport/imprinter/TileEntityImprinter.java

@@ -14,7 +14,6 @@ import resonantinduction.api.events.AutoCraftEvent;
 import resonantinduction.old.api.IArmbot;
 import resonantinduction.old.api.IArmbotUseable;
 import resonantinduction.old.api.coding.args.ArgumentData;
-import resonantinduction.old.lib.prefab.invgui.ISlotPickResult;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.prefab.tile.TileAdvanced;
 import calclavia.lib.utility.AutoCraftingManager;
@@ -23,6 +22,8 @@ import calclavia.lib.utility.LanguageUtility;
 
 import com.builtbroken.common.Pair;
 
+import dark.lib.prefab.invgui.ISlotPickResult;
+
 public class TileEntityImprinter extends TileAdvanced implements ISidedInventory, IArmbotUseable, ISlotPickResult, IAutoCrafter
 {
 	public static final int IMPRINTER_MATRIX_START = 9;

src/main/java/resonantinduction/old/transport/logistic/TileEntityManipulator.java

@@ -10,10 +10,10 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.prefab.tile.TileEntityFilterable;
 import resonantinduction.old.api.IManipulator;
-import resonantinduction.old.lib.interfaces.IRotatable;
 import resonantinduction.old.transport.imprinter.ItemImprinter;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.PacketHandler;
+import calclavia.lib.prefab.tile.IRotatable;
 import calclavia.lib.utility.InvInteractionHelper;
 
 import com.google.common.io.ByteArrayDataInput;