Reorganized packages

src/main/java/resonantinduction/ClientProxy.java

@@ -6,17 +6,17 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
-import resonantinduction.battery.RenderBattery;
+import resonantinduction.core.render.BlockRenderingHandler;
-import resonantinduction.battery.TileBattery;
-import resonantinduction.fx.FXElectricBolt;
-import resonantinduction.gui.GuiMultimeter;
-import resonantinduction.levitator.RenderLevitator;
-import resonantinduction.levitator.TileEMLevitator;
 import resonantinduction.multimeter.PartMultimeter;
 import resonantinduction.multimeter.RenderRIItem;
-import resonantinduction.render.BlockRenderingHandler;
+import resonantinduction.transport.battery.RenderBattery;
-import resonantinduction.tesla.RenderTesla;
+import resonantinduction.transport.battery.TileBattery;
-import resonantinduction.tesla.TileTesla;
+import resonantinduction.transport.fx.FXElectricBolt;
+import resonantinduction.transport.gui.GuiMultimeter;
+import resonantinduction.transport.levitator.RenderLevitator;
+import resonantinduction.transport.levitator.TileEMLevitator;
+import resonantinduction.transport.tesla.RenderTesla;
+import resonantinduction.transport.tesla.TileTesla;
 import universalelectricity.api.vector.Vector3;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;

src/main/java/resonantinduction/MultipartRI.java

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

src/main/java/resonantinduction/ResonantInduction.java

@@ -19,21 +19,21 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import org.modstats.ModstatInfo;
 import org.modstats.Modstats;
 
-import resonantinduction.battery.BlockBattery;
+import resonantinduction.machine.furnace.BlockAdvancedFurnace;
-import resonantinduction.battery.ItemBlockBattery;
+import resonantinduction.machine.furnace.TileAdvancedFurnace;
-import resonantinduction.battery.TileBattery;
-import resonantinduction.furnace.BlockAdvancedFurnace;
-import resonantinduction.furnace.TileAdvancedFurnace;
-import resonantinduction.levitator.BlockEMContractor;
-import resonantinduction.levitator.ItemBlockContractor;
-import resonantinduction.levitator.ItemLinker;
-import resonantinduction.levitator.TileEMLevitator;
 import resonantinduction.multimeter.ItemMultimeter;
-import resonantinduction.tesla.BlockTesla;
+import resonantinduction.transport.battery.BlockBattery;
-import resonantinduction.tesla.TileTesla;
+import resonantinduction.transport.battery.ItemBlockBattery;
-import resonantinduction.transformer.ItemTransformer;
+import resonantinduction.transport.battery.TileBattery;
-import resonantinduction.wire.EnumWireMaterial;
+import resonantinduction.transport.levitator.BlockEMContractor;
-import resonantinduction.wire.ItemWire;
+import resonantinduction.transport.levitator.ItemBlockContractor;
+import resonantinduction.transport.levitator.ItemLinker;
+import resonantinduction.transport.levitator.TileEMLevitator;
+import resonantinduction.transport.tesla.BlockTesla;
+import resonantinduction.transport.tesla.TileTesla;
+import resonantinduction.transport.transformer.ItemTransformer;
+import resonantinduction.transport.wire.EnumWireMaterial;
+import resonantinduction.transport.wire.ItemWire;
 import calclavia.lib.UniversalRecipe;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.network.PacketTile;

src/main/java/resonantinduction/battery/BatteryManager.java

@@ -1,39 +0,0 @@
-package resonantinduction.battery;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import universalelectricity.api.item.IEnergyItem;
-
-public class BatteryManager
-{
-	public static final int CELLS_PER_BATTERY = 16;
-
-	public static class SlotOut extends Slot
-	{
-		public SlotOut(IInventory inventory, int index, int x, int y)
-		{
-			super(inventory, index, x, y);
-		}
-
-		@Override
-		public boolean isItemValid(ItemStack itemstack)
-		{
-			return false;
-		}
-	}
-
-	public static class SlotBattery extends Slot
-	{
-		public SlotBattery(IInventory inventory, int index, int x, int y)
-		{
-			super(inventory, index, x, y);
-		}
-
-		@Override
-		public boolean isItemValid(ItemStack itemstack)
-		{
-			return itemstack.getItem() instanceof IEnergyItem;
-		}
-	}
-}

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.base;
+package resonantinduction.core.base;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.base;
+package resonantinduction.core.base;
 
 import net.minecraft.item.Item;
 import net.minecraftforge.common.Configuration;

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

@@ -1,4 +1,4 @@
-package resonantinduction.base;
+package resonantinduction.core.base;
 
 import net.minecraftforge.common.Configuration;
 import resonantinduction.ResonantInduction;

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

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

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

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

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.render;
+package resonantinduction.core.render;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
@@ -9,12 +9,12 @@ import net.minecraft.world.IBlockAccess;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.battery.BlockBattery;
+import resonantinduction.transport.battery.BlockBattery;
-import resonantinduction.battery.RenderBattery;
+import resonantinduction.transport.battery.RenderBattery;
-import resonantinduction.levitator.BlockEMContractor;
+import resonantinduction.transport.levitator.BlockEMContractor;
-import resonantinduction.levitator.RenderLevitator;
+import resonantinduction.transport.levitator.RenderLevitator;
-import resonantinduction.tesla.BlockTesla;
+import resonantinduction.transport.tesla.BlockTesla;
-import resonantinduction.tesla.RenderTesla;
+import resonantinduction.transport.tesla.RenderTesla;
 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/render/InvertX.java

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

src/main/java/resonantinduction/machine/furnace/BlockAdvancedFurnace.java

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

src/main/java/resonantinduction/machine/furnace/TileAdvancedFurnace.java

@@ -1,4 +1,4 @@
-package resonantinduction.furnace;
+package resonantinduction.machine.furnace;
 
 import java.util.ArrayList;
 

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

@@ -3,15 +3,14 @@ package resonantinduction.multimeter;
 import java.util.List;
 
 import calclavia.lib.prefab.TranslationHelper;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.base.ItemMultipartBase;
+import resonantinduction.core.base.ItemMultipartBase;
-import resonantinduction.wire.EnumWireMaterial;
+import resonantinduction.transport.wire.EnumWireMaterial;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
 import codechicken.multipart.MultiPartRegistry;

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

@@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.ResonantInduction;
-import resonantinduction.model.ModelMultimeter;
+import resonantinduction.transport.model.ModelMultimeter;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import cpw.mods.fml.client.FMLClientHandler;

src/main/java/resonantinduction/multimeter/RenderRIItem.java

@@ -5,8 +5,8 @@ import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.transformer.ItemTransformer;
+import resonantinduction.transport.transformer.ItemTransformer;
-import resonantinduction.transformer.RenderTransformer;
+import resonantinduction.transport.transformer.RenderTransformer;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/transport/battery/BatteryStructure.java

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

src/main/java/resonantinduction/transport/battery/BlockBattery.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.battery;
+package resonantinduction.transport.battery;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.EntityLivingBase;
@@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import resonantinduction.ResonantInduction;
-import resonantinduction.base.BlockBase;
+import resonantinduction.core.base.BlockBase;
-import resonantinduction.render.BlockRenderingHandler;
+import resonantinduction.core.render.BlockRenderingHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/transport/battery/ItemBlockBattery.java

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

src/main/java/resonantinduction/transport/battery/RenderBattery.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.battery;
+package resonantinduction.transport.battery;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -12,7 +12,7 @@ import net.minecraftforge.client.model.IModelCustom;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.ResonantInduction;
-import resonantinduction.model.ModelBattery;
+import resonantinduction.transport.model.ModelBattery;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/transport/battery/TileBattery.java

@@ -1,4 +1,4 @@
-package resonantinduction.battery;
+package resonantinduction.transport.battery;
 
 import java.util.ArrayList;
 import java.util.EnumSet;

src/main/java/resonantinduction/transport/fx/FXElectricBolt.java

@@ -1,4 +1,4 @@
-package resonantinduction.fx;
+package resonantinduction.transport.fx;
 
 import static org.lwjgl.opengl.GL11.GL_BLEND;
 import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;

src/main/java/resonantinduction/transport/gui/GuiMultimeter.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.gui;
+package resonantinduction.transport.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;

src/main/java/resonantinduction/transport/levitator/BlockEMContractor.java

@@ -1,4 +1,4 @@
-package resonantinduction.levitator;
+package resonantinduction.transport.levitator;
 
 import calclavia.lib.prefab.item.ItemCoordLink;
 import net.minecraft.block.ITileEntityProvider;
@@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.ResonantInduction;
-import resonantinduction.base.BlockBase;
+import resonantinduction.core.base.BlockBase;
-import resonantinduction.render.BlockRenderingHandler;
+import resonantinduction.core.render.BlockRenderingHandler;
 import universalelectricity.api.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

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

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

src/main/java/resonantinduction/transport/levitator/ItemLinker.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.levitator;
+package resonantinduction.transport.levitator;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.levitator;
+package resonantinduction.transport.levitator;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -22,7 +22,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.IFluidBlock;
 import resonantinduction.ResonantInduction;
-import resonantinduction.tesla.TileTesla;
+import resonantinduction.transport.tesla.TileTesla;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.IPacketReceiver;
 import calclavia.lib.network.IPacketSender;

src/main/java/resonantinduction/transport/model/ModelBattery.java

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

src/main/java/resonantinduction/transport/model/ModelEMContractor.java

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

src/main/java/resonantinduction/transport/model/ModelInsulation.java

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

src/main/java/resonantinduction/transport/model/ModelMultimeter.java

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

src/main/java/resonantinduction/transport/model/ModelTeslaBottom.java

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

src/main/java/resonantinduction/transport/model/ModelTeslaMiddle.java

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

src/main/java/resonantinduction/transport/model/ModelTeslaTop.java

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

src/main/java/resonantinduction/transport/model/ModelWire.java

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

src/main/java/resonantinduction/transport/tesla/BlockTesla.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.tesla;
+package resonantinduction.transport.tesla;
 
 import calclavia.lib.prefab.TranslationHelper;
 import calclavia.lib.prefab.item.ItemCoordLink;
@@ -13,8 +13,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import resonantinduction.ResonantInduction;
 import resonantinduction.Utility;
-import resonantinduction.base.BlockBase;
+import resonantinduction.core.base.BlockBase;
-import resonantinduction.render.BlockRenderingHandler;
+import resonantinduction.core.render.BlockRenderingHandler;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorWorld;
 import cpw.mods.fml.relauncher.Side;

src/main/java/resonantinduction/transport/tesla/RenderTesla.java

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

src/main/java/resonantinduction/transport/tesla/TeslaGrid.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.tesla;
+package resonantinduction.transport.tesla;
 
 import java.util.HashSet;
 import java.util.Iterator;

src/main/java/resonantinduction/transport/tesla/TileTesla.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.tesla;
+package resonantinduction.transport.tesla;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/resonantinduction/transport/transformer/ItemTransformer.java

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

src/main/java/resonantinduction/transport/transformer/ModelTransformer.java

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

src/main/java/resonantinduction/transport/transformer/PartTransformer.java

@@ -1,4 +1,4 @@
-package resonantinduction.transformer;
+package resonantinduction.transport.transformer;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/resonantinduction/transport/transformer/RenderTransformer.java

@@ -1,4 +1,4 @@
-package resonantinduction.transformer;
+package resonantinduction.transport.transformer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/resonantinduction/transport/wire/EnumWireMaterial.java

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

src/main/java/resonantinduction/transport/wire/ItemWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.wire;
+package resonantinduction.transport.wire;
 
 import java.util.List;
 
@@ -16,10 +16,10 @@ import org.lwjgl.input.Keyboard;
 import resonantinduction.ResonantInduction;
 import resonantinduction.TabRI;
 import resonantinduction.Utility;
-import resonantinduction.wire.flat.PartFlatWire;
+import resonantinduction.transport.wire.flat.PartFlatWire;
-import resonantinduction.wire.flat.RenderFlatWire;
+import resonantinduction.transport.wire.flat.RenderFlatWire;
-import resonantinduction.wire.framed.PartFramedWire;
+import resonantinduction.transport.wire.framed.PartFramedWire;
-import resonantinduction.wire.framed.RenderPartWire;
+import resonantinduction.transport.wire.framed.RenderPartWire;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.Calclavia;

src/main/java/resonantinduction/transport/wire/PartAdvancedWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.wire;
+package resonantinduction.transport.wire;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/resonantinduction/transport/wire/PartConductor.java

@@ -1,4 +1,4 @@
-package resonantinduction.wire;
+package resonantinduction.transport.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.base.PartAdvanced;
+import resonantinduction.core.base.PartAdvanced;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.UniversalClass;
 import universalelectricity.api.energy.EnergyNetworkLoader;

src/main/java/resonantinduction/transport/wire/flat/PartFlatSwitchWire.java

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

src/main/java/resonantinduction/transport/wire/flat/PartFlatWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.wire.flat;
+package resonantinduction.transport.wire.flat;
 
 import java.util.Arrays;
 
@@ -17,8 +17,8 @@ import org.lwjgl.opengl.GL11;
 
 import resonantinduction.ResonantInduction;
 import resonantinduction.Utility;
-import resonantinduction.wire.EnumWireMaterial;
+import resonantinduction.transport.wire.EnumWireMaterial;
-import resonantinduction.wire.PartAdvancedWire;
+import resonantinduction.transport.wire.PartAdvancedWire;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;

src/main/java/resonantinduction/transport/wire/flat/RenderFlatWire.java

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

src/main/java/resonantinduction/transport/wire/framed/PartFramedSwitchWire.java

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

src/main/java/resonantinduction/transport/wire/framed/PartFramedWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.wire.framed;
+package resonantinduction.transport.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.wire.EnumWireMaterial;
+import resonantinduction.transport.wire.EnumWireMaterial;
-import resonantinduction.wire.PartAdvancedWire;
+import resonantinduction.transport.wire.PartAdvancedWire;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.vector.Vector3;

src/main/java/resonantinduction/transport/wire/framed/RenderPartWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.wire.framed;
+package resonantinduction.transport.wire.framed;
 
 import java.nio.FloatBuffer;
 import java.util.Map;
@@ -12,7 +12,7 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.ResonantInduction;
-import resonantinduction.render.InvertX;
+import resonantinduction.core.render.InvertX;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.lighting.LightModel;
 import codechicken.lib.render.CCModel;

src/main/java/resonantinduction/transport/wire/trait/TraitConductor.java

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

src/main/java/resonantinduction/transport/wire/trait/TraitEnergyHandler.java

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

src/main/java/resonantinduction/transport/wire/trait/TraitEnergySink.java

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