Update for new RE, no longer requires UE-Core

src/main/scala/resonantinduction/archaic/blocks/TileFilterable.scala

@@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.api.{IFilterable, IRotatable}
 import resonant.lib.content.prefab.java.TileInventory
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 object TileFilterable
 {

src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala

@@ -26,7 +26,7 @@ import resonant.lib.network.handle.IPacketReceiver
 import resonant.lib.render.RenderItemOverlayUtility
 import resonant.lib.utility.inventory.InventoryUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.{Vector2, Vector3}
+import resonant.lib.transform.vector.{Vector2, Vector3}
 
 import scala.collection.JavaConversions._
 

src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala

@@ -12,7 +12,7 @@ import resonant.api.IRotatable
 import resonant.content.spatial.block.SpatialBlock
 import resonant.lib.content.prefab.TRotatable
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 object TileTurntable
 {

src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.scala

@@ -4,7 +4,7 @@ import java.util.{ArrayList, List}
 
 import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.common.util.ForgeDirection
-import universalelectricity.core.transform.vector.VectorWorld
+import resonant.lib.transform.vector.VectorWorld
 
 /**
  * A class that allows flexible path finding in Minecraft Blocks. Back Ported from UE 1.3.0.

src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala

@@ -37,8 +37,8 @@ import resonant.lib.utility.inventory.AutoCraftingManager.IAutoCrafter
 import resonant.lib.utility.inventory.{AutoCraftingManager, InventoryUtility}
 import resonantinduction.archaic.blocks.ItemImprint
 import resonantinduction.core.{Reference, ResonantInduction}
-import universalelectricity.core.transform.region.Cuboid
+import resonant.lib.transform.region.Cuboid
-import universalelectricity.core.transform.vector.{Vector2, Vector3}
+import resonant.lib.transform.vector.{Vector2, Vector3}
 import scala.collection.JavaConversions._
 
 /**

src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala

@@ -28,7 +28,7 @@ import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.IPacketReceiver
 import resonant.lib.utility.FluidUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 import java.util.List
 import resonant.lib.wrapper.WrapList._
 

src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala

@@ -18,8 +18,8 @@ import resonant.lib.content.prefab.java.TileInventory
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.region.Cuboid
+import resonant.lib.transform.region.Cuboid
-import universalelectricity.core.transform.vector.{Vector2, Vector3}
+import resonant.lib.transform.vector.{Vector2, Vector3}
 
 /**
  * For smelting items.

src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala

@@ -17,7 +17,7 @@ import resonant.lib.utility.FluidUtility
 import resonantinduction.archaic.fluid.grate.TileGrate._
 import resonantinduction.core.Reference
 import resonantinduction.core.prefab.node.TilePressureNode
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 object TileGrate
 {

src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala

@@ -22,8 +22,8 @@ import resonant.lib.utility.inventory.InventoryUtility
 import resonant.lib.wrapper.BitmaskWrapper._
 import resonantinduction.core.Reference
 import resonantinduction.core.prefab.node.TilePressureNode
-import universalelectricity.core.transform.region.Cuboid
+import resonant.lib.transform.region.Cuboid
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 object TileGutter
 {

src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.scala

@@ -9,10 +9,10 @@ import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.tileentity.TileEntity
 import net.minecraft.world.World
 import net.minecraftforge.fluids.{FluidStack, IFluidContainerItem}
+import resonant.lib.science.UnitDisplay
 import resonant.lib.utility.LanguageUtility
 import resonant.lib.wrapper.WrapList._
-import universalelectricity.api.UnitDisplay
+import UnitDisplay.Unit
-import universalelectricity.api.UnitDisplay.Unit
 
 /**
  * @author Darkguardsman

src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala

@@ -20,7 +20,7 @@ import resonant.lib.utility.render.RenderBlockUtility
 import resonantinduction.archaic.ArchaicContent
 import resonantinduction.core.Reference
 import resonantinduction.core.prefab.node.TileTankNode
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Tile/Block class for basic Dynamic tanks

src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala

@@ -18,7 +18,7 @@ import resonant.lib.network.handle.IPacketReceiver
 import resonant.lib.utility.FluidUtility
 import resonant.lib.utility.inventory.InventoryUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Turns molten fuilds into ingots.

src/main/scala/resonantinduction/archaic/process/TileMillstone.scala

@@ -19,7 +19,7 @@ import resonant.lib.network.handle.IPacketReceiver
 import resonant.lib.utility.inventory.InventoryUtility
 import resonantinduction.core.Reference
 import resonantinduction.mechanical.mech.gear.ItemHandCrank
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 class TileMillstone extends TileInventory(Material.rock) with IPacketReceiver
 {

src/main/scala/resonantinduction/atomic/AtomicContent.scala

@@ -45,7 +45,7 @@ import resonantinduction.atomic.machine.reactor.{TileControlRod, TileReactorCell
 import resonantinduction.atomic.machine.thermometer.TileThermometer
 import resonantinduction.atomic.schematic.{SchematicAccelerator, SchematicBreedingReactor, SchematicFissionReactor, SchematicFusionReactor}
 import resonantinduction.core.{Reference, ResonantInduction, RICreativeTab, Settings}
-import universalelectricity.core.transform.vector.VectorWorld
+import resonant.lib.transform.vector.VectorWorld
 
 import scala.collection.JavaConversions._
 

src/main/scala/resonantinduction/atomic/blocks/BlockRadioactive.scala

@@ -13,7 +13,7 @@ import net.minecraft.init.Blocks
 import net.minecraft.util.{AxisAlignedBB, IIcon}
 import net.minecraft.world.World
 import resonant.lib.prefab.poison.PoisonRadiation
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 import scala.collection.JavaConversions._
 
 class BlockRadioactive(material: Material) extends Block(material)

src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.scala

@@ -9,7 +9,7 @@ import net.minecraft.world.World
 import net.minecraftforge.fluids.BlockFluidClassic
 import resonant.lib.prefab.poison.PoisonRadiation
 import resonantinduction.atomic.AtomicContent
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 class BlockToxicWaste extends BlockFluidClassic(AtomicContent.getFluidToxicWaste, Material.water)
 {

src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala

@@ -18,7 +18,7 @@ import resonant.lib.render.RenderUtility
 import resonant.lib.utility.WorldUtility
 import resonant.lib.utility.render.RenderBlockUtility
 import resonant.lib.wrapper.WrapList._
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Electromagnet block

src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala

@@ -6,7 +6,7 @@ import net.minecraft.world.World
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.content.spatial.block.SpatialBlock
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Siren block

src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.scala

@@ -16,7 +16,7 @@ import net.minecraft.util.{ChatComponentText, MovingObjectPosition}
 import resonant.api.blocks.IBlockFrequency
 import resonant.api.mffs.fortron.FrequencyGridRegistry
 import resonantinduction.electrical.ElectricalContent
-import universalelectricity.core.transform.vector.VectorWorld
+import resonant.lib.transform.vector.VectorWorld
 
 import scala.collection.JavaConversions._
 

src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java

@@ -7,7 +7,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.Teleporter;
 import net.minecraft.world.WorldServer;
-import universalelectricity.core.transform.vector.VectorWorld;
+import resonant.lib.transform.vector.VectorWorld;
 
 import java.util.HashMap;
 

src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala

@@ -14,7 +14,7 @@ import resonant.lib.wrapper.WrapList._
 import resonantinduction.atomic.AtomicContent
 import resonantinduction.atomic.machine.reactor.TileReactorCell
 import resonantinduction.core.{Reference, RICreativeTab, Settings}
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Fissile fuel rod

src/main/scala/resonantinduction/atomic/items/ItemRadioactive.scala

@@ -6,7 +6,7 @@ import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.world.World
 import resonant.lib.prefab.poison.PoisonRadiation
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Radioactive Items

src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala

@@ -16,7 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.api.IElectromagnet
 import resonant.lib.prefab.poison.PoisonRadiation
 import resonantinduction.core.{ResonantInduction, Reference}
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 import scala.collection.JavaConversions._
 
 /**

src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala

@@ -2,9 +2,9 @@ package resonantinduction.atomic.machine.accelerator
 
 import net.minecraft.entity.player.EntityPlayer
 import resonant.lib.gui.GuiContainerBase
+import resonant.lib.science.UnitDisplay
 import resonantinduction.core.Settings
-import universalelectricity.api.UnitDisplay
+import resonant.lib.transform.vector.Vector3
-import universalelectricity.core.transform.vector.Vector3
 
 class GuiAccelerator(player: EntityPlayer, tileEntity: TileAccelerator) extends GuiContainerBase(new ContainerAccelerator(player, tileEntity))
 {

src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala

@@ -17,7 +17,7 @@ import resonant.lib.utility.BlockUtility
 import resonantinduction.atomic.AtomicContent
 import resonantinduction.atomic.items.ItemAntimatter
 import resonantinduction.core.{Reference, ResonantInduction, Settings}
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 import scala.collection.JavaConversions._
 

src/main/scala/resonantinduction/atomic/machine/boiler/GuiNuclearBoiler.scala

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.util.StatCollector
 import resonant.lib.gui.GuiContainerBase
 import resonant.lib.gui.GuiContainerBase.SlotType
-import universalelectricity.api.UnitDisplay
+import resonant.lib.science.UnitDisplay
 
 class GuiNuclearBoiler(player: EntityPlayer, tileEntity: TileNuclearBoiler) extends GuiContainerBase(new ContainerNuclearBoiler(player, tileEntity))
 {

src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala

@@ -16,7 +16,7 @@ import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
 import resonantinduction.atomic.AtomicContent
 import resonantinduction.core.Settings
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Nuclear boiler TileEntity

src/main/scala/resonantinduction/atomic/machine/centrifuge/GuiCentrifuge.scala

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer
 import net.minecraft.util.StatCollector
 import resonant.lib.gui.GuiContainerBase
 import resonant.lib.gui.GuiContainerBase.SlotType
-import universalelectricity.api.UnitDisplay
+import resonant.lib.science.UnitDisplay
 
 class GuiCentrifuge(par1InventoryPlayer: InventoryPlayer, tileEntity: TileCentrifuge) extends GuiContainerBase(new ContainerCentrifuge(par1InventoryPlayer, tileEntity))
 {

src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala

@@ -10,12 +10,12 @@ import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids._
 import resonant.lib.content.prefab.java.TileElectricInventory
+import resonant.lib.grid.Compatibility
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
 import resonantinduction.atomic.AtomicContent
 import resonantinduction.core.Settings
-import universalelectricity.compatibility.Compatibility
+import resonant.lib.transform.vector.Vector3
-import universalelectricity.core.transform.vector.Vector3
 
 /**
  * Centrifuge TileEntity

src/main/scala/resonantinduction/atomic/machine/extractor/GuiChemicalExtractor.scala

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer
 import net.minecraft.util.StatCollector
 import resonant.lib.gui.GuiContainerBase
 import resonant.lib.gui.GuiContainerBase.SlotType
-import universalelectricity.api.UnitDisplay
+import resonant.lib.science.UnitDisplay
 
 class GuiChemicalExtractor(par1InventoryPlayer: InventoryPlayer, tileEntity: TileChemicalExtractor) extends GuiContainerBase(new ContainerChemicalExtractor(par1InventoryPlayer, tileEntity))
 {

src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.scala

@@ -8,12 +8,12 @@ import net.minecraft.network.Packet
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids._
 import resonant.engine.ResonantEngine
+import resonant.lib.grid.Compatibility
 import resonant.lib.network.Synced
 import resonant.lib.network.discriminator.PacketAnnotation
 import resonantinduction.atomic.AtomicContent
 import resonantinduction.core.Settings
-import universalelectricity.compatibility.Compatibility
+import resonant.lib.transform.vector.Vector3
-import universalelectricity.core.transform.vector.Vector3
 
 /**
  * Chemical extractor TileEntity

src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala

@@ -6,7 +6,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent
 import net.minecraft.util.Vec3
 import resonant.api.explosion.ExplosionEvent
 import resonantinduction.atomic.AtomicContent
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Atomic Science Event Handling.

src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala

@@ -15,7 +15,7 @@ import resonant.api.event.PlasmaEvent
 import resonant.content.prefab.java.TileAdvanced
 import resonant.engine.grid.thermal.ThermalGrid
 import resonant.lib.config.Config
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 object TilePlasma
 {

src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala

@@ -16,10 +16,10 @@ import resonant.lib.config.Config
 import resonant.lib.content.prefab.java.TileElectric
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
+import resonant.lib.science.UnitDisplay
 import resonant.lib.utility.{FluidUtility, LanguageUtility}
 import resonantinduction.atomic.AtomicContent
-import universalelectricity.api.UnitDisplay
+import resonant.lib.transform.vector.Vector3
-import universalelectricity.core.transform.vector.Vector3
 
 object TilePlasmaHeater
 {

src/main/scala/resonantinduction/atomic/machine/quantum/GuiQuantumAssembler.scala

@@ -4,8 +4,8 @@ import net.minecraft.entity.player.InventoryPlayer
 import net.minecraft.util.ResourceLocation
 import org.lwjgl.opengl.GL11
 import resonant.lib.gui.GuiContainerBase
+import resonant.lib.science.UnitDisplay
 import resonantinduction.core.Reference
-import universalelectricity.api.UnitDisplay
 
 object GuiQuantumAssembler
 {

src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala

@@ -12,7 +12,7 @@ import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
 import resonantinduction.atomic.AtomicContent
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Atomic assembler of items *

src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.scala

@@ -2,7 +2,7 @@ package resonantinduction.atomic.machine.reactor
 
 import net.minecraft.block.material.Material
 import resonant.content.spatial.block.SpatialBlock
-import universalelectricity.core.transform.region.Cuboid
+import resonant.lib.transform.region.Cuboid
 
 /**
  * Control rod block

src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala

@@ -29,7 +29,7 @@ import resonant.lib.utility.inventory.InventoryUtility
 import resonantinduction.atomic.machine.plasma.TilePlasma
 import resonantinduction.atomic.AtomicContent
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
+import resonant.lib.transform.vector.{Vector3, VectorWorld}
 
 import scala.collection.convert.wrapAll._
 

src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala

@@ -16,7 +16,7 @@ import net.minecraftforge.fluids._
 import resonant.content.prefab.java.TileAdvanced
 import resonant.content.spatial.block.SpatialBlock
 import resonant.lib.path.{IPathCallBack, Pathfinder}
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Reactor Drain

src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.scala

@@ -12,7 +12,7 @@ import resonant.content.prefab.itemblock.ItemBlockSaved
 import resonant.lib.utility.LanguageUtility
 import resonant.lib.utility.nbt.NBTUtility
 import resonant.lib.wrapper.WrapList._
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /** Handheld thermometer */
 object ItemBlockThermometer

src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala

@@ -20,7 +20,7 @@ import resonant.lib.network.Synced
 import resonant.lib.network.discriminator.PacketAnnotation
 import resonant.lib.utility.inventory.InventoryUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
+import resonant.lib.transform.vector.{Vector3, VectorWorld}
 
 /**
  * Thermometer TileEntity

src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.scala

@@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.`type`.Pair
 import resonant.lib.schematic.Schematic
 import resonantinduction.atomic.AtomicContent
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 class SchematicAccelerator extends Schematic
 {

src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.scala

@@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.`type`.Pair
 import resonant.lib.schematic.Schematic
 import resonantinduction.atomic.AtomicContent
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 class SchematicBreedingReactor extends Schematic
 {

src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.scala

@@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.`type`.Pair
 import resonant.lib.schematic.Schematic
 import resonantinduction.atomic.AtomicContent
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 class SchematicFissionReactor extends Schematic
 {

src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.scala

@@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.`type`.Pair
 import resonant.lib.schematic.Schematic
 import resonantinduction.atomic.AtomicContent
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 class SchematicFusionReactor extends Schematic
 {

src/main/scala/resonantinduction/core/ClientProxy.scala

@@ -41,7 +41,7 @@ import resonantinduction.mechanical.mech.gearshaft.RenderGearShaft
 import resonantinduction.mechanical.mech.process.crusher.{RenderMechanicalPiston, TileMechanicalPiston}
 import resonantinduction.mechanical.mech.process.grinder.{RenderGrindingWheel, TileGrindingWheel}
 import resonantinduction.mechanical.mech.turbine._
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /** @author Calclavia */
 @SideOnly(Side.CLIENT) class ClientProxy extends CommonProxy

src/main/scala/resonantinduction/core/CommonProxy.scala

@@ -15,7 +15,7 @@ import resonantinduction.atomic.machine.extractor.{ContainerChemicalExtractor, T
 import resonantinduction.atomic.machine.quantum.{ContainerQuantumAssembler, TileQuantumAssembler}
 import resonantinduction.atomic.machine.reactor.{ContainerReactorCell, TileReactorCell}
 import resonantinduction.electrical.multimeter.{ContainerMultimeter, PartMultimeter}
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * @author Calclavia

src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.scala

@@ -1,8 +1,8 @@
 package resonantinduction.core.interfaces
 
 import net.minecraftforge.common.util.ForgeDirection
-import universalelectricity.api.core.grid.INode
+import resonant.api.grid.INode
-import universalelectricity.core.transform.vector.IVectorWorld
+import resonant.lib.transform.vector.IVectorWorld
 
 /**
  * Applied to any node that will act as a mechanical object

src/main/scala/resonantinduction/core/prefab/node/NodePressure.scala

@@ -2,7 +2,7 @@ package resonantinduction.core.prefab.node
 
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids.{FluidStack, IFluidHandler}
-import universalelectricity.api.core.grid.{INodeProvider, IUpdate}
+import resonant.api.grid.{IUpdate, INodeProvider}
 
 /**
  * Created by robert on 8/15/2014.

src/main/scala/resonantinduction/core/prefab/node/NodeTank.scala

@@ -3,9 +3,10 @@ package resonantinduction.core.prefab.node
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids._
+import resonant.api.ISave
 import resonant.lib.prefab.fluid.{LimitedTank, NodeFluidHandler}
 import resonant.lib.utility.WorldUtility
-import universalelectricity.api.core.grid.{INode, INodeProvider, ISave}
+import resonant.api.grid.{INodeProvider, INode}
 
 /**
  * Simple tank node designed to be implemented by any machine that can connect to other fluid based machines.

src/main/scala/resonantinduction/core/prefab/node/TMultipartNode.scala

@@ -3,8 +3,8 @@ package resonantinduction.core.prefab.node
 import codechicken.multipart.TMultiPart
 import net.minecraft.tileentity.TileEntity
 import net.minecraft.world.World
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
-import universalelectricity.core.grid.node.NodeConnector
+import resonant.lib.grid.node.NodeConnector
 
 /**
  * A trait that allows nodes to works with Forge Multipart. This trait MUST be mixed in.

src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala

@@ -10,7 +10,7 @@ import net.minecraftforge.fluids._
 import resonant.content.prefab.java.TileAdvanced
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.TPacketIDReceiver
-import universalelectricity.api.core.grid.{INode, INodeProvider}
+import resonant.api.grid.{INodeProvider, INode}
 
 /**
  * A prefab class for tiles that use the fluid network.

src/main/scala/resonantinduction/core/prefab/part/ChickenBonesWrapper.scala

@@ -1,7 +1,7 @@
 package resonantinduction.core.prefab.part
 
 import codechicken.lib.vec.Cuboid6
-import universalelectricity.core.transform.region.Cuboid
+import resonant.lib.transform.region.Cuboid
 
 /**
  * Wraps ChickenBone's Vector3 with UE's Vector3.
@@ -9,11 +9,11 @@ import universalelectricity.core.transform.region.Cuboid
  */
 object ChickenBonesWrapper
 {
-  implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): universalelectricity.core.transform.vector.Vector3 = new universalelectricity.core.transform.vector.Vector3(vec.x, vec.y, vec.z)
+  implicit def asUEVector3(vec: codechicken.lib.vec.Vector3): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z)
 
-  implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): universalelectricity.core.transform.vector.Vector3 = new universalelectricity.core.transform.vector.Vector3(vec.x, vec.y, vec.z)
+  implicit def asUEVector3(vec: codechicken.lib.vec.BlockCoord): resonant.lib.transform.vector.Vector3 = new resonant.lib.transform.vector.Vector3(vec.x, vec.y, vec.z)
 
-  implicit def asCBVector3(vec: universalelectricity.core.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z)
+  implicit def asCBVector3(vec: resonant.lib.transform.vector.Vector3): codechicken.lib.vec.Vector3 = new codechicken.lib.vec.Vector3(vec.x, vec.y, vec.z)
 
   implicit def asCuboid(cuboid: Cuboid6): Cuboid = new Cuboid(cuboid.min, cuboid.max)
 

src/main/scala/resonantinduction/core/prefab/part/PacketMultiPart.scala

@@ -6,7 +6,7 @@ import io.netty.channel.ChannelHandlerContext
 import net.minecraft.entity.player.EntityPlayer
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.TPacketReceiver
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Packet handler for blocks and tile entities.

src/main/scala/resonantinduction/core/prefab/part/connector/TNodePartConnector.scala

@@ -3,7 +3,8 @@ package resonantinduction.core.prefab.part.connector
 import codechicken.multipart.TMultiPart
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
-import universalelectricity.api.core.grid.{INode, INodeProvider, ISave}
+import resonant.api.ISave
+import resonant.api.grid.{INodeProvider, INode}
 
 /**
  * A node trait that can be mixed into any multipart nodes. Mixing this trait will cause nodes to reconstruct/deconstruct when needed.

src/main/scala/resonantinduction/core/prefab/pass/TNodeProvider.java

@@ -4,8 +4,8 @@ import codechicken.multipart.PartMap;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
 import net.minecraftforge.common.util.ForgeDirection;
-import universalelectricity.api.core.grid.INode;
+import resonant.api.grid.INode;
-import universalelectricity.api.core.grid.INodeProvider;
+import resonant.api.grid.INodeProvider;
 
 /**
  * TNodeProvider Trait.

src/main/scala/resonantinduction/core/util/MultipartUtil.scala

@@ -6,7 +6,7 @@ import net.minecraft.init.Blocks
 import net.minecraft.tileentity.TileEntity
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.util.ForgeDirection
-import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
+import resonant.lib.transform.vector.{Vector3, VectorWorld}
 
 /**
  * Multipart Utilities

src/main/scala/resonantinduction/electrical/battery/GridBattery.scala

@@ -3,8 +3,8 @@ package resonantinduction.electrical.battery
 import java.util.Arrays
 import java.util.LinkedHashSet
 import java.util.Set
-import universalelectricity.core.grid.Grid
+import resonant.lib.grid.Grid
-import universalelectricity.core.grid.node.NodeEnergy
+import resonant.lib.grid.node.NodeEnergy
 import scala.collection.JavaConversions._
 
 /** Basic grid designed to be used for creating a level look for batteries connected together

src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala

@@ -9,15 +9,13 @@ import net.minecraft.item.ItemBlock
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.world.World
+import resonant.api.items.IEnergyItem
+import resonant.lib.grid.Compatibility
 import resonant.lib.render.EnumColor
+import resonant.lib.science.UnitDisplay
 import resonant.lib.utility.LanguageUtility
-import universalelectricity.api.UnitDisplay
-import universalelectricity.api.UniversalClass
-import universalelectricity.api.item.IEnergyItem
-import universalelectricity.compatibility.Compatibility
 import resonant.lib.wrapper.WrapList._
 
-@UniversalClass
 object ItemBlockBattery
 {
     def setTier(itemStack: ItemStack, tier: Int): ItemStack =

src/main/scala/resonantinduction/electrical/battery/RenderBattery.scala

@@ -18,7 +18,7 @@ import org.lwjgl.opengl.GL11.{glPopMatrix, glPushMatrix, glRotatef}
 import resonant.content.prefab.scal.render.ISimpleItemRenderer
 import resonant.lib.render.RenderUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * TODO: Make this more efficient.

src/main/scala/resonantinduction/electrical/battery/TileBattery.scala

@@ -13,7 +13,7 @@ import resonant.lib.content.prefab.TElectric
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
 import resonant.lib.network.netty.AbstractPacket
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /** A modular battery box that allows shared connections with boxes next to it.
   *

src/main/scala/resonantinduction/electrical/generator/TileMotor.scala

@@ -10,7 +10,7 @@ import resonant.content.prefab.java.TileNode
 import resonant.lib.content.prefab.TElectric
 import resonant.lib.content.prefab.java.TileElectric
 import resonantinduction.core.interfaces.IMechanicalNode
-import universalelectricity.api.core.grid.{IUpdate, INode, NodeRegistry}
+import resonant.api.grid.{NodeRegistry, IUpdate, INode}
 
 /**
  * A kinetic energy to electrical energy converter.

src/main/scala/resonantinduction/electrical/generator/TileSolarPanel.scala

@@ -7,7 +7,7 @@ import net.minecraft.util.IIcon
 import resonant.content.spatial.block.SpatialBlock
 import resonant.lib.content.prefab.java.TileElectric
 import resonantinduction.core.{Reference, Settings}
-import universalelectricity.core.transform.region.Cuboid
+import resonant.lib.transform.region.Cuboid
 
 class TileSolarPanel extends TileElectric(Material.iron)
 {

src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala

@@ -10,7 +10,7 @@ import net.minecraft.util.IIcon
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.content.spatial.block.SpatialBlock
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 import resonant.lib.content.prefab.java.TileElectric
 
 class TileThermopile extends TileElectric(Material.rock) {

src/main/scala/resonantinduction/electrical/laser/ILaserHandler.java

@@ -1,7 +1,7 @@
 package resonantinduction.electrical.laser;
 
 import net.minecraft.util.MovingObjectPosition;
-import universalelectricity.core.transform.vector.Vector3;
+import resonant.lib.transform.vector.Vector3;
 
 /**
  * @author Calclavia

src/main/scala/resonantinduction/electrical/laser/Laser.scala

@@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntityFurnace
 import net.minecraft.util.{DamageSource, MovingObjectPosition}
 import net.minecraft.world.World
 import resonantinduction.core.ResonantInduction
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 import scala.collection.mutable
 

src/main/scala/resonantinduction/electrical/laser/TileLaserEmitter.scala

@@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11._
 import resonant.content.prefab.java.TileAdvanced
 import resonant.lib.render.RenderUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * An emitter that shoots out lasers.

src/main/scala/resonantinduction/electrical/laser/TileLaserReceiver.scala

@@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11._
 import resonant.content.prefab.java.TileAdvanced
 import resonant.lib.render.RenderUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * A block that receives laser light and generates a voltage.

src/main/scala/resonantinduction/electrical/laser/focus/IFocus.java

@@ -1,6 +1,6 @@
 package resonantinduction.electrical.laser.focus;
 
-import universalelectricity.core.transform.vector.Vector3;
+import resonant.lib.transform.vector.Vector3;
 
 import java.util.List;
 

src/main/scala/resonantinduction/electrical/laser/focus/ItemFocusingMatrix.scala

@@ -7,8 +7,8 @@ import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.util.{ChatComponentText, EnumChatFormatting}
 import net.minecraft.world.World
 import resonantinduction.core.{RICreativeTab, Reference}
-import universalelectricity.core.transform.rotation.Quaternion
+import resonant.lib.transform.rotation.Quaternion
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 import scala.collection.convert.wrapAsScala._
 import scala.util.Random

src/main/scala/resonantinduction/electrical/laser/focus/TileFocus.scala

@@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.content.prefab.java.TileAdvanced
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * @author Calclavia

src/main/scala/resonantinduction/electrical/laser/focus/TileFocusCrystal.scala

@@ -14,8 +14,8 @@ import org.lwjgl.opengl.GL11._
 import resonant.lib.render.RenderUtility
 import resonantinduction.core.{Reference, ResonantInduction}
 import resonantinduction.electrical.laser.{ILaserHandler, Laser, TileLaserReceiver}
-import universalelectricity.core.transform.rotation.Quaternion
+import resonant.lib.transform.rotation.Quaternion
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Redirects lasers to one point

src/main/scala/resonantinduction/electrical/laser/focus/TileMirror.scala

@@ -13,8 +13,8 @@ import net.minecraftforge.common.util.ForgeDirection
 import org.lwjgl.opengl.GL11._
 import resonantinduction.core.{Reference, ResonantInduction}
 import resonantinduction.electrical.laser.{ILaserHandler, Laser}
-import universalelectricity.core.transform.rotation.Quaternion
+import resonant.lib.transform.rotation.Quaternion
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 import scala.collection.convert.wrapAsJava._
 

src/main/scala/resonantinduction/electrical/laser/fx/EntityLaserFX.scala

@@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11._
 import resonantinduction.core.Reference
 import resonantinduction.electrical.ElectricalContent
 import resonantinduction.electrical.laser.Laser
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * @author Calclavia

src/main/scala/resonantinduction/electrical/laser/fx/EntityScorchFX.scala

@@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import org.lwjgl.opengl.GL11._
 import resonantinduction.core.Reference
 import resonantinduction.electrical.ElectricalContent
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * @author Calclavia

src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.scala

@@ -1,12 +1,12 @@
 package resonantinduction.electrical.multimeter
 
 import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
+import resonant.lib.grid.{UpdateTicker, Grid}
+import resonant.lib.science.UnitDisplay
 import resonant.lib.utility.LanguageUtility
 import resonantinduction.electrical.multimeter.graph._
-import universalelectricity.api.UnitDisplay
+import resonant.api.grid.IUpdate
-import universalelectricity.api.core.grid.IUpdate
+import resonant.lib.transform.vector.Vector3
-import universalelectricity.core.grid.{Grid, UpdateTicker}
-import universalelectricity.core.transform.vector.Vector3
 
 import scala.collection.convert.wrapAll._
 import scala.collection.mutable.ArrayBuffer

src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.scala

@@ -16,6 +16,7 @@ import net.minecraft.util.{ChatComponentText, MovingObjectPosition}
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids.{FluidTankInfo, IFluidHandler}
 import resonant.api.IRemovable
+import resonant.lib.grid.Compatibility
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.IPacketReceiver
 import resonant.lib.utility.WrenchUtility
@@ -24,9 +25,8 @@ import resonantinduction.core.interfaces.IMechanicalNode
 import resonantinduction.core.prefab.part.ChickenBonesWrapper._
 import resonantinduction.core.prefab.part.PartFace
 import resonantinduction.electrical.ElectricalContent
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
-import universalelectricity.compatibility.Compatibility
+import resonant.lib.transform.vector.Vector3
-import universalelectricity.core.transform.vector.Vector3
 
 import scala.collection.convert.wrapAll._
 

src/main/scala/resonantinduction/electrical/multimeter/RenderMultimeter.scala

@@ -12,7 +12,7 @@ import resonant.content.prefab.scal.render.ISimpleItemRenderer
 import resonant.lib.render.RenderUtility
 import resonant.lib.utility.LanguageUtility
 import resonantinduction.core.Reference
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * Class used to render text onto the multimeter block.

src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala

@@ -26,7 +26,7 @@ import resonant.lib.render.EnumColor
 import resonant.lib.utility.{LanguageUtility, LinkUtility}
 import resonantinduction.core.util.ResonantUtil
 import resonantinduction.core.{Reference, ResonantInduction, Settings}
-import universalelectricity.core.transform.vector.{Vector3, VectorWorld}
+import resonant.lib.transform.vector.{Vector3, VectorWorld}
 
 import scala.collection.JavaConversions._
 

src/main/scala/resonantinduction/electrical/transformer/ElectricTransformerNode.scala

@@ -2,10 +2,10 @@ package resonantinduction.electrical.transformer
 
 import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.common.util.ForgeDirection
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.lib.grid.Compatibility
-import universalelectricity.compatibility.Compatibility
+import resonant.api.grid.INodeProvider
-import universalelectricity.core.grid.node.DCNode
+import resonant.lib.grid.node.DCNode
-import universalelectricity.core.transform.vector.VectorWorld
+import resonant.lib.transform.vector.VectorWorld
 
 /**
  * Created by robert on 8/11/2014.

src/main/scala/resonantinduction/electrical/transformer/PartElectricTransformer.scala

@@ -11,7 +11,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.utility.WrenchUtility
 import resonantinduction.core.prefab.part.PartFace
 import resonantinduction.electrical.ElectricalContent
-import universalelectricity.api.core.grid.{INode, INodeProvider}
+import resonant.api.grid.{INodeProvider, INode}
 
 /**
  * TODO: We can't use face parts, need to use thicker ones. Also, transformer is currently NO-OP

src/main/scala/resonantinduction/electrical/wire/ItemWire.scala

@@ -14,6 +14,7 @@ import net.minecraft.world.World
 import net.minecraftforge.common.util.ForgeDirection
 import org.lwjgl.input.Keyboard
 import resonant.lib.render.EnumColor
+import resonant.lib.science.UnitDisplay
 import resonant.lib.utility.LanguageUtility
 import resonant.lib.wrapper.WrapList._
 import resonantinduction.core.util.MultipartUtil
@@ -21,7 +22,6 @@ import resonantinduction.core.{Reference, ResonantPartFactory, RICreativeTab}
 import resonantinduction.electrical.wire.base.WireMaterial
 import resonantinduction.electrical.wire.flat.{PartFlatWire, RenderFlatWire}
 import resonantinduction.electrical.wire.framed.PartFramedWire
-import universalelectricity.api.UnitDisplay
 
 class ItemWire extends TItemMultiPart
 {

src/main/scala/resonantinduction/electrical/wire/base/TWire.scala

@@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
 import resonantinduction.core.prefab.part.connector._
 import resonantinduction.electrical.ElectricalContent
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
-import universalelectricity.core.grid.node.DCNode
+import resonant.lib.grid.node.DCNode
 
 /**
  * Abstract class extended by both flat and framed wires to handle material, insulation, color and multipart node logic.

src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala

@@ -21,8 +21,8 @@ import resonantinduction.core.prefab.part.ChickenBonesWrapper._
 import resonantinduction.core.prefab.part.connector.PartAbstract
 import resonantinduction.core.util.MultipartUtil
 import resonantinduction.electrical.wire.base.TWire
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
-import universalelectricity.core.grid.node.DCNode
+import resonant.lib.grid.node.DCNode
 
 import scala.collection.convert.wrapAll._
 

src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.scala

@@ -11,7 +11,7 @@ import resonant.lib.wrapper.BitmaskWrapper._
 import resonantinduction.core.prefab.node.TMultipartNode
 import resonantinduction.core.prefab.part.connector.PartFramedNode
 import resonantinduction.electrical.wire.base.TWire
-import universalelectricity.core.grid.node.DCNode
+import resonant.lib.grid.node.DCNode
 
 /**
  * Fluid transport pipe

src/main/scala/resonantinduction/mechanical/MechanicalContent.scala

@@ -20,7 +20,7 @@ import resonantinduction.mechanical.mech.process.crusher.TileMechanicalPiston
 import resonantinduction.mechanical.mech.process.grinder.TileGrindingWheel
 import resonantinduction.mechanical.mech.process.mixer.TileMixer
 import resonantinduction.mechanical.mech.turbine.{TileElectricTurbine, TileWaterTurbine, TileWindTurbine}
-import universalelectricity.api.core.grid.NodeRegistry
+import resonant.api.grid.NodeRegistry
 
 /**
  * The core contents of Resonant Induction

src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.scala

@@ -10,10 +10,10 @@ import net.minecraft.item.{Item, ItemStack}
 import net.minecraft.world.World
 import org.lwjgl.input.Keyboard
 import resonant.lib.render.EnumColor
+import resonant.lib.science.UnitDisplay
 import resonant.lib.utility.LanguageUtility
 import resonant.lib.wrapper.WrapList._
 import resonantinduction.core.ResonantPartFactory
-import universalelectricity.api.UnitDisplay
 
 class ItemPipe extends TItemMultiPart
 {

src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.scala

@@ -5,7 +5,7 @@ import net.minecraftforge.fluids.IFluidHandler
 import resonant.lib.wrapper.BitmaskWrapper._
 import resonantinduction.core.prefab.node.{NodePressure, TMultipartNode}
 import resonantinduction.core.prefab.part.connector.TColorable
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
 
 /**
  * Pressure node for the pipe

src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala

@@ -2,7 +2,7 @@ package resonantinduction.mechanical.fluid.transport
 
 import net.minecraftforge.common.util.ForgeDirection
 import resonantinduction.core.prefab.node.NodePressure
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
 
 /**
  * Created by robert on 9/27/2014.

src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala

@@ -6,7 +6,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo, IFluidHandler}
 import resonant.api.IRotatable
 import resonantinduction.mechanical.mech.TileMechanical
-import universalelectricity.api.core.grid.INode
+import resonant.api.grid.INode
 
 class TilePump extends TileMechanical(Material.iron) with IRotatable with IFluidHandler
 {

src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala

@@ -19,10 +19,10 @@ import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.IPacketReceiver
 import resonant.lib.utility.inventory.InternalInventoryHandler
 import resonantinduction.core.ResonantInduction
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 import cpw.mods.fml.relauncher.Side
 import cpw.mods.fml.relauncher.SideOnly
-import universalelectricity.core.transform.vector.VectorWorld
+import resonant.lib.transform.vector.VectorWorld
 
 /**
  * @author tgame14

src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala

@@ -20,7 +20,7 @@ import resonant.lib.network.handle.TPacketReceiver
 import resonant.lib.render.RenderItemOverlayUtility
 import resonant.lib.utility.LanguageUtility
 import resonant.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility}
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /**
  * @author tgame14

src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java

@@ -15,8 +15,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import resonant.lib.debug.FrameNodeDebug;
 import resonant.lib.debug.UpdatePanel;
 import resonant.lib.debug.UpdatedLabel;
-import universalelectricity.api.core.grid.INode;
+import resonant.api.grid.INode;
-import universalelectricity.api.core.grid.INodeProvider;
+import resonant.api.grid.INodeProvider;
 
 /** Java GUI used to help debug gear information
  *

src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java

@@ -5,11 +5,11 @@ import net.minecraftforge.common.util.ForgeDirection;
 import resonant.lib.utility.nbt.ISaveObj;
 import resonantinduction.core.interfaces.IMechanicalNode;
 import resonantinduction.core.prefab.node.TMultipartNode;
-import universalelectricity.api.core.grid.INode;
+import resonant.api.grid.INode;
-import universalelectricity.api.core.grid.INodeProvider;
+import resonant.api.grid.INodeProvider;
-import universalelectricity.api.core.grid.IUpdate;
+import resonant.api.grid.IUpdate;
-import universalelectricity.core.grid.node.NodeConnector;
+import resonant.lib.grid.node.NodeConnector;
-import universalelectricity.core.transform.vector.IVectorWorld;
+import resonant.lib.transform.vector.IVectorWorld;
 
 import java.util.Iterator;
 import java.util.Map.Entry;

src/main/scala/resonantinduction/mechanical/mech/PartMechanical.scala

@@ -12,8 +12,8 @@ import net.minecraft.util.MovingObjectPosition
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.engine.ResonantEngine
 import resonantinduction.core.prefab.part.connector.PartAbstract
-import universalelectricity.api.core.grid.{INode, INodeProvider}
+import resonant.api.grid.{INodeProvider, INode}
-import universalelectricity.core.transform.vector.VectorWorld
+import resonant.lib.transform.vector.VectorWorld
 
 /** We assume all the force acting on the gear is 90 degrees.
   *

src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala

@@ -14,8 +14,8 @@ import resonant.content.prefab.java.TileNode
 import resonant.engine.ResonantEngine
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketIDReceiver
-import universalelectricity.api.core.grid.{INode, INodeProvider}
+import resonant.api.grid.{INodeProvider, INode}
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 /** Prefab for resonantinduction.mechanical tiles
   *

src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.scala

@@ -3,7 +3,7 @@ package resonantinduction.mechanical.mech.gear
 import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.multiblock.reference.MultiBlockHandler
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 import codechicken.multipart.TMultiPart
 import codechicken.multipart.TileMultipart
 

src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.scala

@@ -7,8 +7,8 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonantinduction.core.interfaces.IMechanicalNode
 import resonantinduction.mechanical.mech.MechanicalNode
 import resonantinduction.mechanical.mech.gearshaft.PartGearShaft
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
-import universalelectricity.core.transform.vector.{IVectorWorld, Vector3, VectorWorld}
+import resonant.lib.transform.vector.{IVectorWorld, Vector3, VectorWorld}
 
 /**
  * Node for the gear

src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.scala

@@ -18,8 +18,8 @@ import resonantinduction.core.Reference
 import resonantinduction.core.prefab.part.CuboidShapes
 import resonantinduction.mechanical.MechanicalContent
 import resonantinduction.mechanical.mech.PartMechanical
-import universalelectricity.api.core.grid.INode
+import resonant.api.grid.INode
-import universalelectricity.core.transform.vector.VectorWorld
+import resonant.lib.transform.vector.VectorWorld
 
 /** We assume all the force acting on the gear is 90 degrees.
   *
@@ -136,10 +136,10 @@ class PartGear extends PartMechanical with IMultiBlockStructure[PartGear]
         getMultiBlock.save(nbt)
     }
 
-    override def getMultiBlockVectors: java.util.List[universalelectricity.core.transform.vector.Vector3] =
+    override def getMultiBlockVectors: java.util.List[resonant.lib.transform.vector.Vector3] =
     {
-        val vec = new universalelectricity.core.transform.vector.Vector3(this.x, this.y, this.z)
+        val vec = new resonant.lib.transform.vector.Vector3(this.x, this.y, this.z)
-        var array: java.util.List[universalelectricity.core.transform.vector.Vector3] = vec.getAround(this.world, placementSide, 1)
+        var array: java.util.List[resonant.lib.transform.vector.Vector3] = vec.getAround(this.world, placementSide, 1)
         return array
     }
 

src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.scala

@@ -4,8 +4,8 @@ import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.common.util.ForgeDirection
 import resonantinduction.mechanical.mech.MechanicalNode
 import resonantinduction.mechanical.mech.gear.PartGear
-import universalelectricity.api.core.grid.INodeProvider
+import resonant.api.grid.INodeProvider
-import universalelectricity.core.transform.vector.Vector3
+import resonant.lib.transform.vector.Vector3
 
 class GearShaftNode(parent: INodeProvider) extends MechanicalNode(parent)
 {