Refactored main RI things into core module

src/main/java/resonantinduction/core/ClientProxy.java

@@ -1,4 +1,4 @@
-package resonantinduction;
+package resonantinduction.core;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
@@ -6,18 +6,18 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
-import resonantinduction.core.multimeter.PartMultimeter;
-import resonantinduction.core.render.BlockRenderingHandler;
-import resonantinduction.core.render.RenderRIItem;
-import resonantinduction.energy.battery.RenderBattery;
-import resonantinduction.energy.battery.TileBattery;
-import resonantinduction.energy.fx.FXElectricBolt;
-import resonantinduction.energy.gui.GuiMultimeter;
-import resonantinduction.energy.tesla.RenderTesla;
-import resonantinduction.energy.tesla.TileTesla;
-import resonantinduction.mechanics.item.ItemDust;
-import resonantinduction.transport.levitator.RenderLevitator;
-import resonantinduction.transport.levitator.TileEMLevitator;
+import resonantinduction.core.core.multimeter.PartMultimeter;
+import resonantinduction.core.core.render.BlockRenderingHandler;
+import resonantinduction.core.core.render.RenderRIItem;
+import resonantinduction.core.energy.battery.RenderBattery;
+import resonantinduction.core.energy.battery.TileBattery;
+import resonantinduction.core.energy.fx.FXElectricBolt;
+import resonantinduction.core.energy.gui.GuiMultimeter;
+import resonantinduction.core.energy.tesla.RenderTesla;
+import resonantinduction.core.energy.tesla.TileTesla;
+import resonantinduction.core.mechanics.item.ItemDust;
+import resonantinduction.core.transport.levitator.RenderLevitator;
+import resonantinduction.core.transport.levitator.TileEMLevitator;
 import universalelectricity.api.vector.Vector3;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;

src/main/java/resonantinduction/core/CommonProxy.java

@@ -1,13 +1,13 @@
 /**
  * 
  */
-package resonantinduction;
+package resonantinduction.core;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import resonantinduction.core.multimeter.ContainerMultimeter;
-import resonantinduction.core.multimeter.PartMultimeter;
+import resonantinduction.core.core.multimeter.ContainerMultimeter;
+import resonantinduction.core.core.multimeter.PartMultimeter;
 import universalelectricity.api.vector.Vector3;
 import codechicken.lib.colour.ColourRGBA;
 import codechicken.multipart.TMultiPart;

src/main/java/resonantinduction/core/MultipartRI.java

@@ -1,11 +1,11 @@
-package resonantinduction;
+package resonantinduction.core;
 
-import resonantinduction.core.multimeter.PartMultimeter;
-import resonantinduction.energy.transformer.PartTransformer;
-import resonantinduction.energy.wire.flat.PartFlatSwitchWire;
-import resonantinduction.energy.wire.flat.PartFlatWire;
-import resonantinduction.energy.wire.framed.PartFramedSwitchWire;
-import resonantinduction.energy.wire.framed.PartFramedWire;
+import resonantinduction.core.core.multimeter.PartMultimeter;
+import resonantinduction.core.energy.transformer.PartTransformer;
+import resonantinduction.core.energy.wire.flat.PartFlatSwitchWire;
+import resonantinduction.core.energy.wire.flat.PartFlatWire;
+import resonantinduction.core.energy.wire.framed.PartFramedSwitchWire;
+import resonantinduction.core.energy.wire.framed.PartFramedWire;
 import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.MultiPartRegistry.IPartFactory;
 import codechicken.multipart.MultipartGenerator;

src/main/java/resonantinduction/core/PacketMultiPart.java

@@ -1,4 +1,4 @@
-package resonantinduction;
+package resonantinduction.core;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/core/ResonantInduction.java

@@ -1,4 +1,4 @@
-package resonantinduction;
+package resonantinduction.core;
 
 import ic2.api.item.Items;
 
@@ -26,29 +26,29 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import org.modstats.ModstatInfo;
 import org.modstats.Modstats;
 
-import resonantinduction.core.multimeter.ItemMultimeter;
-import resonantinduction.energy.LinkEvent;
-import resonantinduction.energy.battery.BlockBattery;
-import resonantinduction.energy.battery.ItemBlockBattery;
-import resonantinduction.energy.battery.TileBattery;
-import resonantinduction.energy.tesla.BlockTesla;
-import resonantinduction.energy.tesla.TileTesla;
-import resonantinduction.energy.transformer.ItemTransformer;
-import resonantinduction.energy.wire.EnumWireMaterial;
-import resonantinduction.energy.wire.ItemWire;
-import resonantinduction.mechanics.BlockMachinePart;
-import resonantinduction.mechanics.furnace.BlockAdvancedFurnace;
-import resonantinduction.mechanics.furnace.TileAdvancedFurnace;
-import resonantinduction.mechanics.grinder.BlockGrinderWheel;
-import resonantinduction.mechanics.grinder.TileGrinderWheel;
-import resonantinduction.mechanics.grinder.TilePurifier;
-import resonantinduction.mechanics.item.ItemDust;
-import resonantinduction.mechanics.liquid.BlockFluidMixture;
-import resonantinduction.mechanics.liquid.TileFluidMixture;
-import resonantinduction.mechanics.purifier.BlockPurifier;
-import resonantinduction.transport.levitator.BlockLevitator;
-import resonantinduction.transport.levitator.ItemBlockContractor;
-import resonantinduction.transport.levitator.TileEMLevitator;
+import resonantinduction.core.core.multimeter.ItemMultimeter;
+import resonantinduction.core.energy.LinkEvent;
+import resonantinduction.core.energy.battery.BlockBattery;
+import resonantinduction.core.energy.battery.ItemBlockBattery;
+import resonantinduction.core.energy.battery.TileBattery;
+import resonantinduction.core.energy.tesla.BlockTesla;
+import resonantinduction.core.energy.tesla.TileTesla;
+import resonantinduction.core.energy.transformer.ItemTransformer;
+import resonantinduction.core.energy.wire.EnumWireMaterial;
+import resonantinduction.core.energy.wire.ItemWire;
+import resonantinduction.core.mechanics.BlockMachinePart;
+import resonantinduction.core.mechanics.furnace.BlockAdvancedFurnace;
+import resonantinduction.core.mechanics.furnace.TileAdvancedFurnace;
+import resonantinduction.core.mechanics.grinder.BlockGrinderWheel;
+import resonantinduction.core.mechanics.grinder.TileGrinderWheel;
+import resonantinduction.core.mechanics.grinder.TilePurifier;
+import resonantinduction.core.mechanics.item.ItemDust;
+import resonantinduction.core.mechanics.liquid.BlockFluidMixture;
+import resonantinduction.core.mechanics.liquid.TileFluidMixture;
+import resonantinduction.core.mechanics.purifier.BlockPurifier;
+import resonantinduction.core.transport.levitator.BlockLevitator;
+import resonantinduction.core.transport.levitator.ItemBlockContractor;
+import resonantinduction.core.transport.levitator.TileEMLevitator;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.network.PacketTile;
 import calclavia.lib.recipe.UniversalRecipe;
@@ -72,6 +72,8 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 /**
+ * The core module of Resonant Induction
+ * 
  * @author Calclavia
  * 
  */
@@ -83,7 +85,7 @@ public class ResonantInduction
 	/**
 	 * Mod Information
 	 */
-	public static final String ID = "resonantinduction";
+	public static final String ID = "ResonantInduction|Core";
 	public static final String NAME = "Resonant Induction";
 	public static final String CHANNEL = "RESIND";
 
@@ -96,7 +98,7 @@ public class ResonantInduction
 	@Instance(ID)
 	public static ResonantInduction INSTANCE;
 
-	@SidedProxy(clientSide = ID + ".ClientProxy", serverSide = ID + ".CommonProxy")
+	@SidedProxy(clientSide = "resonantinduction.core.ClientProxy", serverSide = "resonantinduction.core.CommonProxy")
 	public static CommonProxy proxy;
 
 	@Mod.Metadata(ID)

src/main/java/resonantinduction/core/SoundHandler.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction;
+package resonantinduction.core;
 
 import net.minecraftforge.client.event.sound.SoundLoadEvent;
 import net.minecraftforge.event.ForgeSubscribe;

src/main/java/resonantinduction/core/TabRI.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction;
+package resonantinduction.core;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;

src/main/java/resonantinduction/core/Utility.java

@@ -1,4 +1,4 @@
-package resonantinduction;
+package resonantinduction.core;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;

src/main/java/resonantinduction/core/api/ICapacitor.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.core.api;
 
 import universalelectricity.api.item.IEnergyItem;
 

src/main/java/resonantinduction/core/api/ITesla.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.api;
+package resonantinduction.core.api;
 
 import net.minecraft.tileentity.TileEntity;
 

src/main/java/resonantinduction/core/api/MachineRecipes.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.core.api;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -7,9 +7,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import net.minecraft.item.ItemStack;
-import resonantinduction.api.RecipeUtils.ItemStackResource;
-import resonantinduction.api.RecipeUtils.OreDictResource;
-import resonantinduction.api.RecipeUtils.Resource;
+import resonantinduction.core.api.RecipeUtils.ItemStackResource;
+import resonantinduction.core.api.RecipeUtils.OreDictResource;
+import resonantinduction.core.api.RecipeUtils.Resource;
 
 public final class MachineRecipes
 {

src/main/java/resonantinduction/core/api/OreDetectionBlackList.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.core.api;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

src/main/java/resonantinduction/core/api/RecipeUtils.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.core.api;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/resonantinduction/core/core/base/BlockBase.java

@@ -1,12 +1,12 @@
 /**
  * 
  */
-package resonantinduction.core.base;
+package resonantinduction.core.core.base;
 
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.Configuration;
-import resonantinduction.ResonantInduction;
-import resonantinduction.TabRI;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.TabRI;
 import universalelectricity.api.UniversalElectricity;
 import calclavia.lib.prefab.block.BlockAdvanced;
 

src/main/java/resonantinduction/core/core/base/BlockIOBase.java

@@ -1,12 +1,12 @@
 /**
  * 
  */
-package resonantinduction.core.base;
+package resonantinduction.core.core.base;
 
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.Configuration;
-import resonantinduction.ResonantInduction;
-import resonantinduction.TabRI;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.TabRI;
 import calclavia.lib.prefab.block.BlockSidedIO;
 
 /**

src/main/java/resonantinduction/core/core/base/BlockRotatableBase.java

@@ -1,13 +1,13 @@
 /**
  * 
  */
-package resonantinduction.core.base;
+package resonantinduction.core.core.base;
 
 import calclavia.lib.prefab.block.BlockRotatable;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.Configuration;
-import resonantinduction.ResonantInduction;
-import resonantinduction.TabRI;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.TabRI;
 import universalelectricity.api.UniversalElectricity;
 
 /**

src/main/java/resonantinduction/core/core/base/InventoryUtil.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.base;
+package resonantinduction.core.core.base;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;

src/main/java/resonantinduction/core/core/base/ItemBase.java

@@ -1,9 +1,9 @@
-package resonantinduction.core.base;
+package resonantinduction.core.core.base;
 
 import net.minecraft.item.Item;
 import net.minecraftforge.common.Configuration;
-import resonantinduction.ResonantInduction;
-import resonantinduction.TabRI;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.TabRI;
 
 /**
  * 

src/main/java/resonantinduction/core/core/base/ItemMultipartBase.java

@@ -1,8 +1,8 @@
-package resonantinduction.core.base;
+package resonantinduction.core.core.base;
 
 import net.minecraftforge.common.Configuration;
-import resonantinduction.ResonantInduction;
-import resonantinduction.TabRI;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.TabRI;
 import codechicken.multipart.JItemMultiPart;
 
 /**

src/main/java/resonantinduction/core/core/base/PartAdvanced.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.base;
+package resonantinduction.core.core.base;
 
 import net.minecraft.world.World;
 import codechicken.multipart.TMultiPart;

src/main/java/resonantinduction/core/core/multimeter/ContainerMultimeter.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.core.multimeter;
+package resonantinduction.core.core.multimeter;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/main/java/resonantinduction/core/core/multimeter/ItemMultimeter.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.multimeter;
+package resonantinduction.core.core.multimeter;
 
 import java.util.List;
 
@@ -9,8 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.core.base.ItemMultipartBase;
-import resonantinduction.energy.wire.EnumWireMaterial;
+import resonantinduction.core.core.base.ItemMultipartBase;
+import resonantinduction.core.energy.wire.EnumWireMaterial;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
 import codechicken.multipart.MultiPartRegistry;

src/main/java/resonantinduction/core/core/multimeter/PartMultimeter.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.core.multimeter;
+package resonantinduction.core.core.multimeter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,7 +17,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.energy.IEnergyNetwork;

src/main/java/resonantinduction/core/core/multimeter/RenderMultimeter.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.multimeter;
+package resonantinduction.core.core.multimeter;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -7,8 +7,8 @@ import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.ResonantInduction;
-import resonantinduction.energy.model.ModelMultimeter;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.energy.model.ModelMultimeter;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import cpw.mods.fml.client.FMLClientHandler;

src/main/java/resonantinduction/core/core/render/BlockRenderingHandler.java

@@ -1,17 +1,17 @@
 /**
  * 
  */
-package resonantinduction.core.render;
+package resonantinduction.core.core.render;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-import resonantinduction.energy.battery.BlockBattery;
-import resonantinduction.energy.battery.RenderBattery;
-import resonantinduction.energy.tesla.BlockTesla;
-import resonantinduction.energy.tesla.RenderTesla;
-import resonantinduction.transport.levitator.BlockLevitator;
-import resonantinduction.transport.levitator.RenderLevitator;
+import resonantinduction.core.energy.battery.BlockBattery;
+import resonantinduction.core.energy.battery.RenderBattery;
+import resonantinduction.core.energy.tesla.BlockTesla;
+import resonantinduction.core.energy.tesla.RenderTesla;
+import resonantinduction.core.transport.levitator.BlockLevitator;
+import resonantinduction.core.transport.levitator.RenderLevitator;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;

src/main/java/resonantinduction/core/core/render/InvertX.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.render;
+package resonantinduction.core.core.render;
 
 import codechicken.lib.vec.Matrix4;
 import codechicken.lib.vec.Transformation;

src/main/java/resonantinduction/core/core/render/RenderRIItem.java

@@ -1,14 +1,14 @@
-package resonantinduction.core.render;
+package resonantinduction.core.core.render;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.core.multimeter.ItemMultimeter;
-import resonantinduction.core.multimeter.RenderMultimeter;
-import resonantinduction.energy.transformer.ItemTransformer;
-import resonantinduction.energy.transformer.RenderTransformer;
+import resonantinduction.core.core.multimeter.ItemMultimeter;
+import resonantinduction.core.core.multimeter.RenderMultimeter;
+import resonantinduction.core.energy.transformer.ItemTransformer;
+import resonantinduction.core.energy.transformer.RenderTransformer;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/core/energy/ILinkable.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy;
+package resonantinduction.core.energy;
 
 import net.minecraft.entity.player.EntityPlayer;
 import universalelectricity.api.vector.VectorWorld;

src/main/java/resonantinduction/core/energy/LinkEvent.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.energy;
+package resonantinduction.core.energy;
 
 import codechicken.multipart.ControlKeyModifer;
 import net.minecraft.item.ItemStack;

src/main/java/resonantinduction/core/energy/battery/BatteryStructure.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.battery;
+package resonantinduction.core.energy.battery;
 
 import java.util.Arrays;
 

src/main/java/resonantinduction/core/energy/battery/BlockBattery.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.energy.battery;
+package resonantinduction.core.energy.battery;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.EntityLivingBase;
@@ -11,9 +11,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import resonantinduction.ResonantInduction;
-import resonantinduction.core.base.BlockIOBase;
-import resonantinduction.core.render.BlockRenderingHandler;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.core.base.BlockIOBase;
+import resonantinduction.core.core.render.BlockRenderingHandler;
 import universalelectricity.api.CompatibilityModule;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/core/energy/battery/ItemBlockBattery.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.battery;
+package resonantinduction.core.energy.battery;
 
 import java.util.List;
 

src/main/java/resonantinduction/core/energy/battery/RenderBattery.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.energy.battery;
+package resonantinduction.core.energy.battery;
 
 import static org.lwjgl.opengl.GL11.glPopMatrix;
 import static org.lwjgl.opengl.GL11.glPushMatrix;
@@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.AdvancedModelLoader;
 import net.minecraftforge.client.model.IModelCustom;
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/core/energy/battery/TileBattery.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.battery;
+package resonantinduction.core.energy.battery;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -8,7 +8,7 @@ import java.util.Set;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.UniversalElectricity;
 import universalelectricity.api.electricity.IVoltageInput;
 import universalelectricity.api.electricity.IVoltageOutput;

src/main/java/resonantinduction/core/energy/fx/FXElectricBolt.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.fx;
+package resonantinduction.core.energy.fx;
 
 import static org.lwjgl.opengl.GL11.GL_BLEND;
 import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;
@@ -26,7 +26,7 @@ import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.vector.Vector3;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;

src/main/java/resonantinduction/core/energy/gui/GuiMultimeter.java

@@ -1,15 +1,15 @@
 /**
  * 
  */
-package resonantinduction.energy.gui;
+package resonantinduction.core.energy.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
-import resonantinduction.ResonantInduction;
-import resonantinduction.core.multimeter.ContainerMultimeter;
-import resonantinduction.core.multimeter.PartMultimeter;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.core.multimeter.ContainerMultimeter;
+import resonantinduction.core.core.multimeter.PartMultimeter;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.gui.GuiContainerBase;
 import calclavia.lib.render.EnumColor;

src/main/java/resonantinduction/core/energy/model/ModelBattery.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/model/ModelEMContractor.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/model/ModelInsulation.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/model/ModelMultimeter.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/model/ModelTeslaBottom.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/model/ModelTeslaMiddle.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/model/ModelTeslaTop.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/model/ModelWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.model;
+package resonantinduction.core.energy.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/tesla/BlockTesla.java

@@ -1,18 +1,18 @@
 /**
  * 
  */
-package resonantinduction.energy.tesla;
+package resonantinduction.core.energy.tesla;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import resonantinduction.ResonantInduction;
-import resonantinduction.Utility;
-import resonantinduction.core.base.BlockIOBase;
-import resonantinduction.core.render.BlockRenderingHandler;
-import resonantinduction.transport.levitator.TileEMLevitator;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.Utility;
+import resonantinduction.core.core.base.BlockIOBase;
+import resonantinduction.core.core.render.BlockRenderingHandler;
+import resonantinduction.core.transport.levitator.TileEMLevitator;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorWorld;
 import calclavia.lib.prefab.item.ItemCoordLink;

src/main/java/resonantinduction/core/energy/tesla/RenderTesla.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.energy.tesla;
+package resonantinduction.core.energy.tesla;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -9,10 +9,10 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.ResonantInduction;
-import resonantinduction.energy.model.ModelTeslaBottom;
-import resonantinduction.energy.model.ModelTeslaMiddle;
-import resonantinduction.energy.model.ModelTeslaTop;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.energy.model.ModelTeslaBottom;
+import resonantinduction.core.energy.model.ModelTeslaMiddle;
+import resonantinduction.core.energy.model.ModelTeslaTop;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/core/energy/tesla/TeslaGrid.java

@@ -1,14 +1,14 @@
 /**
  * 
  */
-package resonantinduction.energy.tesla;
+package resonantinduction.core.energy.tesla;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
 import net.minecraft.tileentity.TileEntity;
-import resonantinduction.api.ITesla;
+import resonantinduction.core.api.ITesla;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 

src/main/java/resonantinduction/core/energy/tesla/TileTesla.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.energy.tesla;
+package resonantinduction.core.energy.tesla;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,9 +19,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.ResonantInduction;
-import resonantinduction.api.ITesla;
-import resonantinduction.energy.ILinkable;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.api.ITesla;
+import resonantinduction.core.energy.ILinkable;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorWorld;

src/main/java/resonantinduction/core/energy/transformer/ItemTransformer.java

@@ -1,11 +1,11 @@
-package resonantinduction.energy.transformer;
+package resonantinduction.core.energy.transformer;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
-import resonantinduction.core.base.ItemMultipartBase;
-import resonantinduction.energy.wire.EnumWireMaterial;
+import resonantinduction.core.core.base.ItemMultipartBase;
+import resonantinduction.core.energy.wire.EnumWireMaterial;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
 import codechicken.multipart.MultiPartRegistry;

src/main/java/resonantinduction/core/energy/transformer/ModelTransformer.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.transformer;
+package resonantinduction.core.energy.transformer;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/core/energy/transformer/PartTransformer.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.transformer;
+package resonantinduction.core.energy.transformer;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChatMessageComponent;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.electricity.IElectricalNetwork;
 import universalelectricity.api.electricity.IVoltageInput;
 import universalelectricity.api.electricity.IVoltageOutput;

src/main/java/resonantinduction/core/energy/transformer/RenderTransformer.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.transformer;
+package resonantinduction.core.energy.transformer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.render.CalclaviaRenderHelper;
 import calclavia.lib.utility.LanguageUtility;

src/main/java/resonantinduction/core/energy/wire/EnumWireMaterial.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire;
+package resonantinduction.core.energy.wire;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;

src/main/java/resonantinduction/core/energy/wire/ItemWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire;
+package resonantinduction.core.energy.wire;
 
 import java.util.List;
 
@@ -13,13 +13,13 @@ import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.input.Keyboard;
 
-import resonantinduction.ResonantInduction;
-import resonantinduction.TabRI;
-import resonantinduction.Utility;
-import resonantinduction.energy.wire.flat.PartFlatWire;
-import resonantinduction.energy.wire.flat.RenderFlatWire;
-import resonantinduction.energy.wire.framed.PartFramedWire;
-import resonantinduction.energy.wire.framed.RenderPartWire;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.TabRI;
+import resonantinduction.core.Utility;
+import resonantinduction.core.energy.wire.flat.PartFlatWire;
+import resonantinduction.core.energy.wire.flat.RenderFlatWire;
+import resonantinduction.core.energy.wire.framed.PartFramedWire;
+import resonantinduction.core.energy.wire.framed.RenderPartWire;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.render.EnumColor;

src/main/java/resonantinduction/core/energy/wire/PartAdvancedWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire;
+package resonantinduction.core.energy.wire;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.Utility;
+import resonantinduction.core.Utility;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IConductor;
 import calclavia.lib.CustomDamageSource;

src/main/java/resonantinduction/core/energy/wire/PartConductor.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire;
+package resonantinduction.core.energy.wire;
 
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
@@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.MinecraftForge;
-import resonantinduction.core.base.PartAdvanced;
+import resonantinduction.core.core.base.PartAdvanced;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.UniversalClass;
 import universalelectricity.api.energy.EnergyNetworkLoader;

src/main/java/resonantinduction/core/energy/wire/flat/PartFlatSwitchWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.flat;
+package resonantinduction.core.energy.wire.flat;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/resonantinduction/core/energy/wire/flat/PartFlatWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.flat;
+package resonantinduction.core.energy.wire.flat;
 
 import java.util.Arrays;
 
@@ -15,10 +15,10 @@ import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.ResonantInduction;
-import resonantinduction.Utility;
-import resonantinduction.energy.wire.EnumWireMaterial;
-import resonantinduction.energy.wire.PartAdvancedWire;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.Utility;
+import resonantinduction.core.energy.wire.EnumWireMaterial;
+import resonantinduction.core.energy.wire.PartAdvancedWire;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;

src/main/java/resonantinduction/core/energy/wire/flat/RenderFlatWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.flat;
+package resonantinduction.core.energy.wire.flat;
 
 import java.util.Arrays;
 import java.util.LinkedList;

src/main/java/resonantinduction/core/energy/wire/framed/PartFramedSwitchWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.framed;
+package resonantinduction.core.energy.wire.framed;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/resonantinduction/core/energy/wire/framed/PartFramedWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.framed;
+package resonantinduction.core.energy.wire.framed;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -14,8 +14,8 @@ import net.minecraft.util.Icon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.energy.wire.EnumWireMaterial;
-import resonantinduction.energy.wire.PartAdvancedWire;
+import resonantinduction.core.energy.wire.EnumWireMaterial;
+import resonantinduction.core.energy.wire.PartAdvancedWire;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.vector.Vector3;

src/main/java/resonantinduction/core/energy/wire/framed/RenderPartWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.framed;
+package resonantinduction.core.energy.wire.framed;
 
 import java.nio.FloatBuffer;
 import java.util.Map;
@@ -11,8 +11,8 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.ResonantInduction;
-import resonantinduction.core.render.InvertX;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.core.render.InvertX;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.lighting.LightModel;
 import codechicken.lib.render.CCModel;

src/main/java/resonantinduction/core/energy/wire/trait/TraitConductor.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.trait;
+package resonantinduction.core.energy.wire.trait;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/resonantinduction/core/energy/wire/trait/TraitEnergyHandler.java

@@ -1,10 +1,10 @@
-package resonantinduction.energy.wire.trait;
+package resonantinduction.core.energy.wire.trait;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.energy.wire.PartConductor;
+import resonantinduction.core.energy.wire.PartConductor;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
 import cofh.api.energy.IEnergyHandler;

src/main/java/resonantinduction/core/energy/wire/trait/TraitEnergySink.java

@@ -1,4 +1,4 @@
-package resonantinduction.energy.wire.trait;
+package resonantinduction.core.energy.wire.trait;
 
 import ic2.api.energy.tile.IEnergySink;
 

src/main/java/resonantinduction/core/mechanics/BlockMachinePart.java

@@ -1,6 +1,6 @@
-package resonantinduction.mechanics;
+package resonantinduction.core.mechanics;
 
-import resonantinduction.core.base.BlockBase;
+import resonantinduction.core.core.base.BlockBase;
 import universalelectricity.api.UniversalElectricity;
 
 /**

src/main/java/resonantinduction/core/mechanics/furnace/BlockAdvancedFurnace.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.furnace;
+package resonantinduction.core.mechanics.furnace;
 
 import java.util.Random;
 

src/main/java/resonantinduction/core/mechanics/furnace/TileAdvancedFurnace.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.furnace;
+package resonantinduction.core.mechanics.furnace;
 
 import java.util.ArrayList;
 
@@ -9,7 +9,7 @@ import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.UniversalClass;
 import universalelectricity.api.energy.EnergyStorageHandler;

src/main/java/resonantinduction/core/mechanics/grinder/BlockGrinderWheel.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.grinder;
+package resonantinduction.core.mechanics.grinder;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.Entity;
@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.core.base.BlockRotatableBase;
+import resonantinduction.core.core.base.BlockRotatableBase;
 import universalelectricity.api.vector.VectorWorld;
 
 /**

src/main/java/resonantinduction/core/mechanics/grinder/TileGrinderWheel.java

@@ -1,14 +1,14 @@
-package resonantinduction.mechanics.grinder;
+package resonantinduction.core.mechanics.grinder;
 
 import java.util.HashMap;
 
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
-import resonantinduction.ResonantInduction;
-import resonantinduction.api.MachineRecipes;
-import resonantinduction.api.MachineRecipes.RecipeType;
-import resonantinduction.api.RecipeUtils.ItemStackResource;
-import resonantinduction.api.RecipeUtils.Resource;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.api.MachineRecipes;
+import resonantinduction.core.api.MachineRecipes.RecipeType;
+import resonantinduction.core.api.RecipeUtils.ItemStackResource;
+import resonantinduction.core.api.RecipeUtils.Resource;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.prefab.tile.TileElectrical;

src/main/java/resonantinduction/core/mechanics/grinder/TilePurifier.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.grinder;
+package resonantinduction.core.mechanics.grinder;
 
 import java.util.HashMap;
 import java.util.List;
@@ -7,12 +7,12 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.AxisAlignedBB;
-import resonantinduction.ResonantInduction;
-import resonantinduction.api.MachineRecipes;
-import resonantinduction.api.MachineRecipes.RecipeType;
-import resonantinduction.api.RecipeUtils.ItemStackResource;
-import resonantinduction.api.RecipeUtils.Resource;
-import resonantinduction.mechanics.item.ItemDust;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.api.MachineRecipes;
+import resonantinduction.core.api.MachineRecipes.RecipeType;
+import resonantinduction.core.api.RecipeUtils.ItemStackResource;
+import resonantinduction.core.api.RecipeUtils.Resource;
+import resonantinduction.core.mechanics.item.ItemDust;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.prefab.tile.TileElectrical;

src/main/java/resonantinduction/core/mechanics/item/ItemDust.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.item;
+package resonantinduction.core.mechanics.item;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
@@ -23,11 +23,11 @@ import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent;
-import resonantinduction.ResonantInduction;
-import resonantinduction.api.MachineRecipes;
-import resonantinduction.api.MachineRecipes.RecipeType;
-import resonantinduction.api.OreDetectionBlackList;
-import resonantinduction.core.base.ItemBase;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.api.MachineRecipes;
+import resonantinduction.core.api.OreDetectionBlackList;
+import resonantinduction.core.api.MachineRecipes.RecipeType;
+import resonantinduction.core.core.base.ItemBase;
 import calclavia.lib.utility.LanguageUtility;
 import calclavia.lib.utility.NBTUtility;
 import cpw.mods.fml.relauncher.ReflectionHelper;

src/main/java/resonantinduction/core/mechanics/liquid/BlockFluidMixture.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.liquid;
+package resonantinduction.core.mechanics.liquid;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import resonantinduction.ResonantInduction;
+import resonantinduction.core.ResonantInduction;
 
 /**
  * @author Calclavia

src/main/java/resonantinduction/core/mechanics/liquid/TileFluidMixture.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.liquid;
+package resonantinduction.core.mechanics.liquid;
 
 import java.util.TreeSet;
 

src/main/java/resonantinduction/core/mechanics/purifier/BlockPurifier.java

@@ -1,11 +1,11 @@
-package resonantinduction.mechanics.purifier;
+package resonantinduction.core.mechanics.purifier;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.core.base.BlockRotatableBase;
-import resonantinduction.mechanics.grinder.TilePurifier;
+import resonantinduction.core.core.base.BlockRotatableBase;
+import resonantinduction.core.mechanics.grinder.TilePurifier;
 import universalelectricity.api.vector.VectorWorld;
 
 /**

src/main/java/resonantinduction/core/transport/levitator/BlockFilter.java

@@ -1,6 +1,6 @@
-package resonantinduction.transport.levitator;
+package resonantinduction.core.transport.levitator;
 
-import resonantinduction.core.base.BlockRotatableBase;
+import resonantinduction.core.core.base.BlockRotatableBase;
 
 /**
  * A block that represents a filter for item transportation.

src/main/java/resonantinduction/core/transport/levitator/BlockLevitator.java

@@ -1,4 +1,4 @@
-package resonantinduction.transport.levitator;
+package resonantinduction.core.transport.levitator;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,9 @@ import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.ResonantInduction;
-import resonantinduction.core.base.BlockBase;
-import resonantinduction.core.render.BlockRenderingHandler;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.core.base.BlockBase;
+import resonantinduction.core.core.render.BlockRenderingHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/core/transport/levitator/ItemBlockContractor.java

@@ -1,4 +1,4 @@
-package resonantinduction.transport.levitator;
+package resonantinduction.core.transport.levitator;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

src/main/java/resonantinduction/core/transport/levitator/PathfinderEMContractor.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.transport.levitator;
+package resonantinduction.core.transport.levitator;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/resonantinduction/core/transport/levitator/RenderLevitator.java

@@ -1,4 +1,4 @@
-package resonantinduction.transport.levitator;
+package resonantinduction.core.transport.levitator;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.ResonantInduction;
-import resonantinduction.energy.model.ModelEMContractor;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.energy.model.ModelEMContractor;
 
 public class RenderLevitator extends TileEntitySpecialRenderer
 {

src/main/java/resonantinduction/core/transport/levitator/ThreadEMPathfinding.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.transport.levitator;
+package resonantinduction.core.transport.levitator;
 
 import universalelectricity.api.vector.Vector3;
 

src/main/java/resonantinduction/core/transport/levitator/TileEMLevitator.java

@@ -1,4 +1,4 @@
-package resonantinduction.transport.levitator;
+package resonantinduction.core.transport.levitator;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -21,9 +21,9 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.IFluidBlock;
-import resonantinduction.ResonantInduction;
-import resonantinduction.energy.ILinkable;
-import resonantinduction.energy.tesla.TileTesla;
+import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.energy.ILinkable;
+import resonantinduction.core.energy.tesla.TileTesla;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorWorld;
 import calclavia.lib.network.IPacketReceiver;