Separated into modules

src/main/java/resonantinduction/ClientProxy.java

@@ -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.machine.item.ItemDust;
+import resonantinduction.energy.battery.RenderBattery;
-import resonantinduction.transport.battery.RenderBattery;
+import resonantinduction.energy.battery.TileBattery;
-import resonantinduction.transport.battery.TileBattery;
+import resonantinduction.energy.fx.FXElectricBolt;
-import resonantinduction.transport.fx.FXElectricBolt;
+import resonantinduction.energy.gui.GuiMultimeter;
-import resonantinduction.transport.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.transport.tesla.RenderTesla;
-import resonantinduction.transport.tesla.TileTesla;
-import resonantinduction.utility.multimeter.PartMultimeter;
 import universalelectricity.api.vector.Vector3;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;

src/main/java/resonantinduction/CommonProxy.java

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

src/main/java/resonantinduction/MultipartRI.java

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

src/main/java/resonantinduction/ResonantInduction.java

@@ -26,29 +26,29 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import org.modstats.ModstatInfo;
 import org.modstats.Modstats;
 
-import resonantinduction.machine.BlockMachinePart;
+import resonantinduction.core.multimeter.ItemMultimeter;
-import resonantinduction.machine.furnace.BlockAdvancedFurnace;
+import resonantinduction.energy.LinkEvent;
-import resonantinduction.machine.furnace.TileAdvancedFurnace;
+import resonantinduction.energy.battery.BlockBattery;
-import resonantinduction.machine.grinder.BlockGrinderWheel;
+import resonantinduction.energy.battery.ItemBlockBattery;
-import resonantinduction.machine.grinder.TileGrinderWheel;
+import resonantinduction.energy.battery.TileBattery;
-import resonantinduction.machine.grinder.TilePurifier;
+import resonantinduction.energy.tesla.BlockTesla;
-import resonantinduction.machine.item.ItemDust;
+import resonantinduction.energy.tesla.TileTesla;
-import resonantinduction.machine.liquid.BlockFluidMixture;
+import resonantinduction.energy.transformer.ItemTransformer;
-import resonantinduction.machine.liquid.TileFluidMixture;
+import resonantinduction.energy.wire.EnumWireMaterial;
-import resonantinduction.machine.purifier.BlockPurifier;
+import resonantinduction.energy.wire.ItemWire;
-import resonantinduction.transport.LinkEvent;
+import resonantinduction.mechanics.BlockMachinePart;
-import resonantinduction.transport.battery.BlockBattery;
+import resonantinduction.mechanics.furnace.BlockAdvancedFurnace;
-import resonantinduction.transport.battery.ItemBlockBattery;
+import resonantinduction.mechanics.furnace.TileAdvancedFurnace;
-import resonantinduction.transport.battery.TileBattery;
+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.transport.tesla.BlockTesla;
-import resonantinduction.transport.tesla.TileTesla;
-import resonantinduction.transport.transformer.ItemTransformer;
-import resonantinduction.transport.wire.EnumWireMaterial;
-import resonantinduction.transport.wire.ItemWire;
-import resonantinduction.utility.multimeter.ItemMultimeter;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.network.PacketTile;
 import calclavia.lib.recipe.UniversalRecipe;
@@ -278,8 +278,6 @@ public class ResonantInduction
 		metadata.autogenerated = false;
 
 		MultipartRI.INSTANCE = new MultipartRI();
-
-		UniversalRecipe.init();
 	}
 
 	@EventHandler

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

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

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

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

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.utility.multimeter;
+package resonantinduction.core.multimeter;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -1,4 +1,4 @@
-package resonantinduction.utility.multimeter;
+package resonantinduction.core.multimeter;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.ResonantInduction;
-import resonantinduction.transport.model.ModelMultimeter;
+import resonantinduction.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/render/BlockRenderingHandler.java

@@ -6,12 +6,12 @@ package resonantinduction.core.render;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-import resonantinduction.transport.battery.BlockBattery;
+import resonantinduction.energy.battery.BlockBattery;
-import resonantinduction.transport.battery.RenderBattery;
+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.transport.tesla.BlockTesla;
-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/RenderRIItem.java

@@ -5,10 +5,10 @@ import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.transport.transformer.ItemTransformer;
+import resonantinduction.core.multimeter.ItemMultimeter;
-import resonantinduction.transport.transformer.RenderTransformer;
+import resonantinduction.core.multimeter.RenderMultimeter;
-import resonantinduction.utility.multimeter.ItemMultimeter;
+import resonantinduction.energy.transformer.ItemTransformer;
-import resonantinduction.utility.multimeter.RenderMultimeter;
+import resonantinduction.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/energy/ILinkable.java

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.transport.battery;
+package resonantinduction.energy.battery;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.EntityLivingBase;

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

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

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.transport.battery;
+package resonantinduction.energy.battery;
 
 import static org.lwjgl.opengl.GL11.glPopMatrix;
 import static org.lwjgl.opengl.GL11.glPushMatrix;

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

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

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

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

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

@@ -1,15 +1,15 @@
 /**
  * 
  */
-package resonantinduction.transport.gui;
+package resonantinduction.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.utility.multimeter.ContainerMultimeter;
+import resonantinduction.core.multimeter.ContainerMultimeter;
-import resonantinduction.utility.multimeter.PartMultimeter;
+import resonantinduction.core.multimeter.PartMultimeter;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.gui.GuiContainerBase;
 import calclavia.lib.render.EnumColor;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.transport.tesla;
+package resonantinduction.energy.tesla;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.transport.tesla;
+package resonantinduction.energy.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.transport.model.ModelTeslaBottom;
+import resonantinduction.energy.model.ModelTeslaBottom;
-import resonantinduction.transport.model.ModelTeslaMiddle;
+import resonantinduction.energy.model.ModelTeslaMiddle;
-import resonantinduction.transport.model.ModelTeslaTop;
+import resonantinduction.energy.model.ModelTeslaTop;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

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

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

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

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

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

@@ -1,11 +1,11 @@
-package resonantinduction.transport.transformer;
+package resonantinduction.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.transport.wire.EnumWireMaterial;
+import resonantinduction.energy.wire.EnumWireMaterial;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
 import codechicken.multipart.MultiPartRegistry;

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.transport.transformer;
+package resonantinduction.energy.transformer;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.transport.wire;
+package resonantinduction.energy.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.transport.wire.flat.PartFlatWire;
+import resonantinduction.energy.wire.flat.PartFlatWire;
-import resonantinduction.transport.wire.flat.RenderFlatWire;
+import resonantinduction.energy.wire.flat.RenderFlatWire;
-import resonantinduction.transport.wire.framed.PartFramedWire;
+import resonantinduction.energy.wire.framed.PartFramedWire;
-import resonantinduction.transport.wire.framed.RenderPartWire;
+import resonantinduction.energy.wire.framed.RenderPartWire;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.render.EnumColor;

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.transport.wire;
+package resonantinduction.energy.wire;
 
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.transport.wire.framed;
+package resonantinduction.energy.wire.framed;
 
 import java.nio.FloatBuffer;
 import java.util.Map;

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.machine;
+package resonantinduction.mechanics;
 
 import resonantinduction.core.base.BlockBase;
 import universalelectricity.api.UniversalElectricity;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package resonantinduction.machine.grinder;
+package resonantinduction.mechanics.grinder;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.Entity;

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

@@ -1,4 +1,4 @@
-package resonantinduction.machine.grinder;
+package resonantinduction.mechanics.grinder;
 
 import java.util.HashMap;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.machine.grinder;
+package resonantinduction.mechanics.grinder;
 
 import java.util.HashMap;
 import java.util.List;
@@ -12,7 +12,7 @@ import resonantinduction.api.MachineRecipes;
 import resonantinduction.api.MachineRecipes.RecipeType;
 import resonantinduction.api.RecipeUtils.ItemStackResource;
 import resonantinduction.api.RecipeUtils.Resource;
-import resonantinduction.machine.item.ItemDust;
+import resonantinduction.mechanics.item.ItemDust;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.prefab.tile.TileElectrical;

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

@@ -1,4 +1,4 @@
-package resonantinduction.machine.item;
+package resonantinduction.mechanics.item;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;

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

@@ -1,4 +1,4 @@
-package resonantinduction.machine.liquid;
+package resonantinduction.mechanics.liquid;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;

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

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

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

@@ -1,11 +1,11 @@
-package resonantinduction.machine.purifier;
+package resonantinduction.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.machine.grinder.TilePurifier;
+import resonantinduction.mechanics.grinder.TilePurifier;
 import universalelectricity.api.vector.VectorWorld;
 
 /**

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

@@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.ResonantInduction;
-import resonantinduction.transport.model.ModelEMContractor;
+import resonantinduction.energy.model.ModelEMContractor;
 
 public class RenderLevitator extends TileEntitySpecialRenderer
 {

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

@@ -22,8 +22,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.IFluidBlock;
 import resonantinduction.ResonantInduction;
-import resonantinduction.transport.ILinkable;
+import resonantinduction.energy.ILinkable;
-import resonantinduction.transport.tesla.TileTesla;
+import resonantinduction.energy.tesla.TileTesla;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorWorld;
 import calclavia.lib.network.IPacketReceiver;