Moved classes around in the mechanical package

src/main/scala/resonantinduction/archaic/Archaic.scala

@@ -16,7 +16,7 @@ import resonantinduction.archaic.fluid.gutter.TileGutter
 import resonantinduction.archaic.fluid.tank.TileTank
 import resonantinduction.archaic.process.{TileCastingMold, TileMillstone}
 import resonantinduction.core.{Reference, ResonantTab, Settings}
-import resonantinduction.mechanical.gear.ItemHandCrank
+import resonantinduction.mechanical.mech.gear.ItemHandCrank
 
 @Mod(modid = Archaic.ID, name = Archaic.NAME, version = Reference.version, modLanguage = "scala", dependencies = "required-after:" + Reference.coreID)
 object Archaic

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

@@ -21,7 +21,7 @@ import resonant.lib.network.discriminator.PacketType;
 import resonant.lib.network.handle.IPacketReceiver;
 import resonant.lib.utility.inventory.InventoryUtility;
 import resonantinduction.core.Reference;
-import resonantinduction.mechanical.gear.ItemHandCrank;
+import resonantinduction.mechanical.mech.gear.ItemHandCrank;
 import universalelectricity.core.transform.vector.Vector3;
 
 public class TileMillstone extends TileInventory implements IPacketReceiver

src/main/scala/resonantinduction/atomic/ClientProxy.scala

@@ -14,7 +14,7 @@ import resonantinduction.atomic.machine.plasma.{RenderPlasmaHeater, TilePlasmaHe
 import resonantinduction.atomic.machine.quantum.{GuiQuantumAssembler, RenderQuantumAssembler, TileQuantumAssembler}
 import resonantinduction.atomic.machine.reactor.{GuiReactorCell, RenderReactorCell, TileReactorCell}
 import resonantinduction.atomic.machine.thermometer.{RenderThermometer, TileThermometer}
-import resonantinduction.mechanical.turbine.{RenderElectricTurbine, TileElectricTurbine}
+import resonantinduction.mechanical.mech.turbine.{RenderElectricTurbine, TileElectricTurbine}
 
 class ClientProxy extends CommonProxy
 {

src/main/scala/resonantinduction/mechanical/ClientProxy.java

@@ -6,15 +6,15 @@ import resonant.content.wrapper.ItemRenderHandler;
 import resonantinduction.mechanical.fluid.pipe.RenderPipe;
 import resonantinduction.mechanical.fluid.transport.RenderPump;
 import resonantinduction.mechanical.fluid.transport.TilePump;
-import resonantinduction.mechanical.gear.RenderGear;
-import resonantinduction.mechanical.gearshaft.RenderGearShaft;
-import resonantinduction.mechanical.process.crusher.RenderMechanicalPiston;
-import resonantinduction.mechanical.process.crusher.TileMechanicalPiston;
-import resonantinduction.mechanical.process.grinder.RenderGrindingWheel;
-import resonantinduction.mechanical.process.grinder.TileGrindingWheel;
-import resonantinduction.mechanical.process.mixer.RenderMixer;
-import resonantinduction.mechanical.process.mixer.TileMixer;
-import resonantinduction.mechanical.turbine.*;
+import resonantinduction.mechanical.mech.gear.RenderGear;
+import resonantinduction.mechanical.mech.gearshaft.RenderGearShaft;
+import resonantinduction.mechanical.mech.process.crusher.RenderMechanicalPiston;
+import resonantinduction.mechanical.mech.process.crusher.TileMechanicalPiston;
+import resonantinduction.mechanical.mech.process.grinder.RenderGrindingWheel;
+import resonantinduction.mechanical.mech.process.grinder.TileGrindingWheel;
+import resonantinduction.mechanical.mech.process.mixer.RenderMixer;
+import resonantinduction.mechanical.mech.process.mixer.TileMixer;
+import resonantinduction.mechanical.mech.turbine.*;
 
 public class ClientProxy extends CommonProxy
 {

src/main/scala/resonantinduction/mechanical/Mechanical.java

@@ -5,24 +5,23 @@ import net.minecraft.init.Items;
 import resonant.content.loader.ModManager;
 import resonant.engine.content.debug.TileCreativeBuilder;
 import resonant.lib.network.discriminator.PacketAnnotationManager;
-import resonantinduction.core.ResonantPartFactory;
 import resonantinduction.core.ResonantPartFactory$;
 import resonantinduction.core.ResonantTab;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
+import resonantinduction.mechanical.mech.MechanicalNode;
 import resonantinduction.mechanical.fluid.pipe.PartPipe;
 import resonantinduction.mechanical.fluid.pipe.PipeMaterials;
-import resonantinduction.mechanical.gear.PartGear;
-import resonantinduction.mechanical.gearshaft.PartGearShaft;
-import resonantinduction.mechanical.turbine.*;
+import resonantinduction.mechanical.mech.gear.PartGear;
+import resonantinduction.mechanical.mech.gearshaft.PartGearShaft;
+import resonantinduction.mechanical.mech.turbine.*;
 import resonantinduction.mechanical.fluid.pipe.ItemPipe;
 import resonantinduction.mechanical.fluid.transport.TilePump;
-import resonantinduction.mechanical.gear.ItemGear;
-import resonantinduction.mechanical.gearshaft.ItemGearShaft;
-import resonantinduction.mechanical.logistic.belt.TileDetector;
-import resonantinduction.mechanical.process.crusher.TileMechanicalPiston;
-import resonantinduction.mechanical.process.edit.TileBreaker;
-import resonantinduction.mechanical.process.edit.TilePlacer;
-import resonantinduction.mechanical.process.grinder.TileGrindingWheel;
+import resonantinduction.mechanical.mech.gear.ItemGear;
+import resonantinduction.mechanical.mech.gearshaft.ItemGearShaft;
+import resonantinduction.mechanical.machine.TileDetector;
+import resonantinduction.mechanical.mech.process.crusher.TileMechanicalPiston;
+import resonantinduction.mechanical.machine.edit.TileBreaker;
+import resonantinduction.mechanical.machine.edit.TilePlacer;
+import resonantinduction.mechanical.mech.process.grinder.TileGrindingWheel;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -32,7 +31,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import resonant.lib.recipe.UniversalRecipe;
 import resonantinduction.core.Reference;
 import resonantinduction.core.interfaces.IMechanicalNode;
-import resonantinduction.mechanical.process.mixer.TileMixer;
+import resonantinduction.mechanical.mech.process.mixer.TileMixer;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;

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

@@ -2,7 +2,7 @@ package resonantinduction.mechanical.fluid.transport;
 
 import net.minecraft.block.material.Material;
 import resonantinduction.core.prefab.node.NodePressure;
-import resonantinduction.mechanical.energy.grid.TileMechanical;
+import resonantinduction.mechanical.mech.TileMechanical;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;

src/main/scala/resonantinduction/mechanical/machine/TileDetector.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.logistic.belt;
+package resonantinduction.mechanical.machine;
 
 import java.util.ArrayList;
 

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

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.process.edit;
+package resonantinduction.mechanical.machine.edit;
 
 import java.util.ArrayList;
 
@@ -22,8 +22,6 @@ import resonant.lib.utility.inventory.InternalInventoryHandler;
 import resonantinduction.core.ResonantInduction;
 import universalelectricity.core.transform.vector.Vector3;
 
-import com.google.common.io.ByteArrayDataInput;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import universalelectricity.core.transform.vector.VectorWorld;

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

@@ -1,15 +1,13 @@
-package resonantinduction.mechanical.process.edit;
+package resonantinduction.mechanical.machine.edit;
 
 import java.util.EnumSet;
 
-import com.sun.org.apache.bcel.internal.generic.FieldGenOrMethodGen;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;

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

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.energy.grid;
+package resonantinduction.mechanical.mech;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;

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

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.energy.grid;
+package resonantinduction.mechanical.mech;
 
 import java.util.Iterator;
 import java.util.Map.Entry;

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

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.energy.grid;
+package resonantinduction.mechanical.mech;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,6 @@ import java.util.List;
 import codechicken.multipart.*;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MovingObjectPosition;

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

@@ -1,34 +1,24 @@
-package resonantinduction.mechanical.energy.grid;
-
-import java.io.IOException;
-import java.util.List;
+package resonantinduction.mechanical.mech;
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.Packet;
 import net.minecraftforge.common.util.ForgeDirection;
-import resonant.content.prefab.java.TileAdvanced;
 import resonant.content.prefab.java.TileNode;
 import resonant.engine.ResonantEngine;
-import resonant.lib.network.ByteBufWrapper;
 import resonant.lib.network.discriminator.PacketTile;
 import resonant.lib.network.discriminator.PacketType;
 import resonant.lib.network.handle.IPacketIDReceiver;
-import resonantinduction.core.ResonantInduction;
-import resonantinduction.mechanical.Mechanical;
 import universalelectricity.api.core.grid.INode;
 import universalelectricity.api.core.grid.INodeProvider;
 import universalelectricity.core.transform.vector.Vector3;
 import codechicken.multipart.ControlKeyModifer;
 
-import com.google.common.io.ByteArrayDataInput;
-
 /** Prefab for resonantinduction.mechanical tiles
  *
  * @author Calclavia */

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

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.gear;
+package resonantinduction.mechanical.mech.gear;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;

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

@@ -1,10 +1,10 @@
-package resonantinduction.mechanical.gear;
+package resonantinduction.mechanical.mech.gear;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 import resonantinduction.core.interfaces.IMechanicalNode;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
-import resonantinduction.mechanical.gearshaft.PartGearShaft;
+import resonantinduction.mechanical.mech.MechanicalNode;
+import resonantinduction.mechanical.mech.gearshaft.PartGearShaft;
 import codechicken.lib.vec.Rotation;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;

src/main/scala/resonantinduction/mechanical/mech/gear/ItemGear.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.gear;
+package resonantinduction.mechanical.mech.gear;
 
 import java.util.List;
 
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import resonantinduction.core.prefab.part.IHighlight;
-import resonantinduction.mechanical.gearshaft.PartGearShaft;
+import resonantinduction.mechanical.mech.gearshaft.PartGearShaft;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
 import codechicken.microblock.FacePlacementGrid$;

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

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.gear
+package resonantinduction.mechanical.mech.gear
 
 import net.minecraft.item.Item
 import net.minecraft.world.World

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

@@ -1,8 +1,6 @@
-package resonantinduction.mechanical.gear;
+package resonantinduction.mechanical.mech.gear;
 
 import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -14,7 +12,7 @@ import resonant.lib.multiblock.reference.IMultiBlockStructure;
 import resonant.lib.utility.WrenchUtility;
 import resonantinduction.core.Reference;
 import resonantinduction.mechanical.Mechanical;
-import resonantinduction.mechanical.energy.grid.PartMechanical;
+import resonantinduction.mechanical.mech.PartMechanical;
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Rotation;
 import codechicken.lib.vec.Transformation;
@@ -24,8 +22,6 @@ import codechicken.multipart.ControlKeyModifer;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import universalelectricity.api.core.grid.INode;
-import universalelectricity.core.transform.rotation.EulerAngle;
-import universalelectricity.core.transform.vector.VectorWorld;
 
 /** We assume all the force acting on the gear is 90 degrees.
  *

src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.gear;
+package resonantinduction.mechanical.mech.gear;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;

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

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.gearshaft;
+package resonantinduction.mechanical.mech.gearshaft;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -6,9 +6,8 @@ import java.util.List;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
-import resonantinduction.core.interfaces.IMechanicalNode;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
-import resonantinduction.mechanical.gear.PartGear;
+import resonantinduction.mechanical.mech.MechanicalNode;
+import resonantinduction.mechanical.mech.gear.PartGear;
 import universalelectricity.api.core.grid.INodeProvider;
 import universalelectricity.core.transform.vector.Vector3;
 

src/main/scala/resonantinduction/mechanical/mech/gearshaft/ItemGearShaft.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.gearshaft;
+package resonantinduction.mechanical.mech.gearshaft;
 
 import java.util.List;
 

src/main/scala/resonantinduction/mechanical/mech/gearshaft/PartGearShaft.java

@@ -1,10 +1,10 @@
-package resonantinduction.mechanical.gearshaft;
+package resonantinduction.mechanical.mech.gearshaft;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import resonantinduction.mechanical.energy.grid.PartMechanical;
+import resonantinduction.mechanical.mech.PartMechanical;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import resonantinduction.mechanical.Mechanical;

src/main/scala/resonantinduction/mechanical/mech/gearshaft/RenderGearShaft.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.gearshaft;
+package resonantinduction.mechanical.mech.gearshaft;
 
 import static org.lwjgl.opengl.GL11.glRotatef;
 

src/main/scala/resonantinduction/mechanical/mech/process/crusher/NodeMechanicalPiston.java

@@ -1,9 +1,7 @@
-package resonantinduction.mechanical.process.crusher;
+package resonantinduction.mechanical.mech.process.crusher;
 
 import net.minecraftforge.common.util.ForgeDirection;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
-import resonantinduction.mechanical.energy.grid.TileMechanical;
-import universalelectricity.api.core.grid.INodeProvider;
+import resonantinduction.mechanical.mech.MechanicalNode;
 
 /**
  * Created by robert on 8/28/2014.

src/main/scala/resonantinduction/mechanical/mech/process/crusher/RenderMechanicalPiston.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.process.crusher;
+package resonantinduction.mechanical.mech.process.crusher;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;

src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.java

@@ -1,18 +1,15 @@
-package resonantinduction.mechanical.process.crusher;
+package resonantinduction.mechanical.mech.process.crusher;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import resonant.content.factory.resources.RecipeType;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
-import resonantinduction.mechanical.energy.grid.TileMechanical;
+import resonantinduction.mechanical.mech.TileMechanical;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import resonant.api.IRotatable;
 import resonant.api.recipe.MachineRecipes;
 import resonant.api.recipe.RecipeResource;
 import resonant.lib.config.Config;

src/main/scala/resonantinduction/mechanical/mech/process/grinder/GrinderNode.java

@@ -1,8 +1,7 @@
-package resonantinduction.mechanical.process.grinder;
+package resonantinduction.mechanical.mech.process.grinder;
 
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
+import resonantinduction.mechanical.mech.MechanicalNode;
 import net.minecraftforge.common.util.ForgeDirection;
-import resonantinduction.core.interfaces.IMechanicalNode;
 
 /** Node just for the grinder
  *

src/main/scala/resonantinduction/mechanical/mech/process/grinder/RenderGrindingWheel.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.process.grinder;
+package resonantinduction.mechanical.mech.process.grinder;
 
 import static org.lwjgl.opengl.GL11.glPopMatrix;
 import static org.lwjgl.opengl.GL11.glPushMatrix;

src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.java

@@ -1,7 +1,7 @@
-package resonantinduction.mechanical.process.grinder;
+package resonantinduction.mechanical.mech.process.grinder;
 
 import resonant.lib.prefab.damage.CustomDamageSource;
-import resonantinduction.mechanical.energy.grid.TileMechanical;
+import resonantinduction.mechanical.mech.TileMechanical;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;

src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.java

@@ -1,14 +1,9 @@
-package resonantinduction.mechanical.process.mixer;
+package resonantinduction.mechanical.mech.process.mixer;
 
-import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
-import resonantinduction.core.interfaces.IMechanicalNode;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
-import universalelectricity.api.core.grid.INode;
+import resonantinduction.mechanical.mech.MechanicalNode;
 import universalelectricity.api.core.grid.INodeProvider;
 
-import java.util.WeakHashMap;
-
 public class MixerNode extends MechanicalNode
 {
 

src/main/scala/resonantinduction/mechanical/mech/process/mixer/RenderMixer.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.process.mixer;
+package resonantinduction.mechanical.mech.process.mixer;
 
 import static org.lwjgl.opengl.GL11.glPopMatrix;
 import static org.lwjgl.opengl.GL11.glPushMatrix;

src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.process.mixer;
+package resonantinduction.mechanical.mech.process.mixer;
 
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -7,19 +7,16 @@ import java.util.Set;
 import net.minecraft.init.Blocks;
 import resonant.content.factory.resources.RecipeType;
 import resonant.engine.ResonantEngine;
-import resonantinduction.mechanical.energy.grid.TileMechanical;
+import resonantinduction.mechanical.mech.TileMechanical;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.IFluidBlock;
 import resonant.api.recipe.MachineRecipes;
-import resonant.lib.utility.inventory.InventoryUtility;
 import resonantinduction.core.Reference;
 import resonantinduction.core.Timer;
 import resonant.content.factory.resources.block.BlockFluidMixture;

src/main/scala/resonantinduction/mechanical/mech/turbine/RenderElectricTurbine.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;

src/main/scala/resonantinduction/mechanical/mech/turbine/RenderWaterTurbine.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;

src/main/scala/resonantinduction/mechanical/mech/turbine/RenderWindTurbine.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;

src/main/scala/resonantinduction/mechanical/mech/turbine/SchematicWaterTurbine.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import java.util.HashMap;
 

src/main/scala/resonantinduction/mechanical/mech/turbine/SchematicWindTurbine.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import java.util.HashMap;
 

src/main/scala/resonantinduction/mechanical/mech/turbine/TileElectricTurbine.scala

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine
+package resonantinduction.mechanical.mech.turbine
 
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids.{FluidTank, Fluid, FluidStack, FluidTankInfo}

src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.java

@@ -1,21 +1,19 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
 import resonant.lib.multiblock.reference.IMultiBlockStructure;
 import resonant.lib.network.handle.IPacketIDReceiver;
-import resonantinduction.core.Reference;
-import resonantinduction.mechanical.energy.grid.TileMechanical;
+import resonantinduction.mechanical.mech.TileMechanical;
 import net.minecraft.block.material.Material;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import resonantinduction.mechanical.gear.ItemHandCrank;
+import resonantinduction.mechanical.mech.gear.ItemHandCrank;
 import universalelectricity.api.core.grid.INodeProvider;
 import universalelectricity.core.transform.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;

src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -15,7 +15,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 import resonant.content.prefab.itemblock.ItemBlockMetadata;
 import resonantinduction.core.Settings;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
+import resonantinduction.mechanical.mech.MechanicalNode;
 import universalelectricity.api.core.grid.INodeProvider;
 import universalelectricity.core.transform.vector.Vector3;
 import cpw.mods.fml.relauncher.ReflectionHelper;

src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.java

@@ -1,6 +1,5 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
-import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;

src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
 import net.minecraft.tileentity.TileEntity;
 import resonant.lib.multiblock.reference.MultiBlockHandler;

src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineNode.java

@@ -1,8 +1,7 @@
-package resonantinduction.mechanical.turbine;
+package resonantinduction.mechanical.mech.turbine;
 
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
+import resonantinduction.mechanical.mech.MechanicalNode;
 import net.minecraftforge.common.util.ForgeDirection;
-import resonantinduction.core.interfaces.IMechanicalNode;
 
 /**
  * Turbine's Mechanical node