diff --git a/src/main/scala/resonantinduction/archaic/Archaic.scala b/src/main/scala/resonantinduction/archaic/Archaic.scala index 3565c4b10..6167bd85c 100644 --- a/src/main/scala/resonantinduction/archaic/Archaic.scala +++ b/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 diff --git a/src/main/scala/resonantinduction/archaic/process/TileMillstone.java b/src/main/scala/resonantinduction/archaic/process/TileMillstone.java index 4e315fd76..037004e71 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileMillstone.java +++ b/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 diff --git a/src/main/scala/resonantinduction/atomic/ClientProxy.scala b/src/main/scala/resonantinduction/atomic/ClientProxy.scala index 7abc5eed8..3ecd28f74 100644 --- a/src/main/scala/resonantinduction/atomic/ClientProxy.scala +++ b/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 { diff --git a/src/main/scala/resonantinduction/mechanical/ClientProxy.java b/src/main/scala/resonantinduction/mechanical/ClientProxy.java index fb72f994e..a094f6a63 100644 --- a/src/main/scala/resonantinduction/mechanical/ClientProxy.java +++ b/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 { diff --git a/src/main/scala/resonantinduction/mechanical/Mechanical.java b/src/main/scala/resonantinduction/mechanical/Mechanical.java index 36e451241..ede80fa8b 100644 --- a/src/main/scala/resonantinduction/mechanical/Mechanical.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java index 6d2c95d84..359b3aeea 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java b/src/main/scala/resonantinduction/mechanical/machine/TileDetector.java similarity index 99% rename from src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java rename to src/main/scala/resonantinduction/mechanical/machine/TileDetector.java index ddd596e07..618f8ed27 100644 --- a/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java b/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.java similarity index 97% rename from src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java rename to src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.java index 8d5eadf46..6479db4fb 100644 --- a/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java b/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.java similarity index 97% rename from src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java rename to src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.java index ae5b53884..7bdefcb4b 100644 --- a/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/energy/grid/DebugFrameMechanical.java b/src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java similarity index 99% rename from src/main/scala/resonantinduction/mechanical/energy/grid/DebugFrameMechanical.java rename to src/main/scala/resonantinduction/mechanical/mech/DebugFrameMechanical.java index 61fa78aa7..7c53b8d20 100644 --- a/src/main/scala/resonantinduction/mechanical/energy/grid/DebugFrameMechanical.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java b/src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java similarity index 99% rename from src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java rename to src/main/scala/resonantinduction/mechanical/mech/MechanicalNode.java index d9c8567b4..fc2e8fb60 100644 --- a/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java b/src/main/scala/resonantinduction/mechanical/mech/PartMechanical.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java rename to src/main/scala/resonantinduction/mechanical/mech/PartMechanical.java index 5524758a0..6c5d96860 100644 --- a/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java b/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.java similarity index 92% rename from src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java rename to src/main/scala/resonantinduction/mechanical/mech/TileMechanical.java index 0cdbaa531..14f3d280c 100644 --- a/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java +++ b/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 */ diff --git a/src/main/scala/resonantinduction/mechanical/gear/GearMultiBlockHandler.java b/src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.java similarity index 95% rename from src/main/scala/resonantinduction/mechanical/gear/GearMultiBlockHandler.java rename to src/main/scala/resonantinduction/mechanical/mech/gear/GearMultiBlockHandler.java index bdcafb875..ed0449901 100644 --- a/src/main/scala/resonantinduction/mechanical/gear/GearMultiBlockHandler.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/gear/GearNode.java b/src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/gear/GearNode.java rename to src/main/scala/resonantinduction/mechanical/mech/gear/GearNode.java index 608bc046f..c2ac71024 100644 --- a/src/main/scala/resonantinduction/mechanical/gear/GearNode.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/gear/ItemGear.java b/src/main/scala/resonantinduction/mechanical/mech/gear/ItemGear.java similarity index 94% rename from src/main/scala/resonantinduction/mechanical/gear/ItemGear.java rename to src/main/scala/resonantinduction/mechanical/mech/gear/ItemGear.java index 5b904f818..f52e7a5c5 100644 --- a/src/main/scala/resonantinduction/mechanical/gear/ItemGear.java +++ b/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$; diff --git a/src/main/scala/resonantinduction/mechanical/gear/ItemHandCrank.scala b/src/main/scala/resonantinduction/mechanical/mech/gear/ItemHandCrank.scala similarity index 83% rename from src/main/scala/resonantinduction/mechanical/gear/ItemHandCrank.scala rename to src/main/scala/resonantinduction/mechanical/mech/gear/ItemHandCrank.scala index a7c31f85e..ccf33b6fe 100644 --- a/src/main/scala/resonantinduction/mechanical/gear/ItemHandCrank.scala +++ b/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 diff --git a/src/main/scala/resonantinduction/mechanical/gear/PartGear.java b/src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.java similarity index 95% rename from src/main/scala/resonantinduction/mechanical/gear/PartGear.java rename to src/main/scala/resonantinduction/mechanical/mech/gear/PartGear.java index 28d7e6aaa..402e80207 100644 --- a/src/main/scala/resonantinduction/mechanical/gear/PartGear.java +++ b/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. * diff --git a/src/main/scala/resonantinduction/mechanical/gear/RenderGear.java b/src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.java similarity index 97% rename from src/main/scala/resonantinduction/mechanical/gear/RenderGear.java rename to src/main/scala/resonantinduction/mechanical/mech/gear/RenderGear.java index 9b65990dd..45724cee6 100644 --- a/src/main/scala/resonantinduction/mechanical/gear/RenderGear.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.java similarity index 93% rename from src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java rename to src/main/scala/resonantinduction/mechanical/mech/gearshaft/GearShaftNode.java index 6130fea5e..b5d0a66c7 100644 --- a/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/ItemGearShaft.java similarity index 96% rename from src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java rename to src/main/scala/resonantinduction/mechanical/mech/gearshaft/ItemGearShaft.java index fb0715886..cb22641b7 100644 --- a/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/gearshaft/PartGearShaft.java b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/PartGearShaft.java similarity index 96% rename from src/main/scala/resonantinduction/mechanical/gearshaft/PartGearShaft.java rename to src/main/scala/resonantinduction/mechanical/mech/gearshaft/PartGearShaft.java index 80ead7ca3..f0e83ef0e 100644 --- a/src/main/scala/resonantinduction/mechanical/gearshaft/PartGearShaft.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java b/src/main/scala/resonantinduction/mechanical/mech/gearshaft/RenderGearShaft.java similarity index 97% rename from src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java rename to src/main/scala/resonantinduction/mechanical/mech/gearshaft/RenderGearShaft.java index c5a92df92..71959a497 100644 --- a/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/crusher/NodeMechanicalPiston.java b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/NodeMechanicalPiston.java similarity index 71% rename from src/main/scala/resonantinduction/mechanical/process/crusher/NodeMechanicalPiston.java rename to src/main/scala/resonantinduction/mechanical/mech/process/crusher/NodeMechanicalPiston.java index 86af87d51..9e58f99de 100644 --- a/src/main/scala/resonantinduction/mechanical/process/crusher/NodeMechanicalPiston.java +++ b/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. diff --git a/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/RenderMechanicalPiston.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java rename to src/main/scala/resonantinduction/mechanical/mech/process/crusher/RenderMechanicalPiston.java index 66e10252a..c0d6eda51 100644 --- a/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.java similarity index 96% rename from src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java rename to src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.java index 7544c864f..f6c04c457 100644 --- a/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/grinder/GrinderNode.java b/src/main/scala/resonantinduction/mechanical/mech/process/grinder/GrinderNode.java similarity index 84% rename from src/main/scala/resonantinduction/mechanical/process/grinder/GrinderNode.java rename to src/main/scala/resonantinduction/mechanical/mech/process/grinder/GrinderNode.java index ef09459b7..3dcb7d136 100644 --- a/src/main/scala/resonantinduction/mechanical/process/grinder/GrinderNode.java +++ b/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 * diff --git a/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java b/src/main/scala/resonantinduction/mechanical/mech/process/grinder/RenderGrindingWheel.java similarity index 96% rename from src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java rename to src/main/scala/resonantinduction/mechanical/mech/process/grinder/RenderGrindingWheel.java index 6e9a1abb4..12a58be9b 100644 --- a/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java b/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java rename to src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.java index ffbb0d314..0c67b2057 100644 --- a/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/mixer/MixerNode.java b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.java similarity index 67% rename from src/main/scala/resonantinduction/mechanical/process/mixer/MixerNode.java rename to src/main/scala/resonantinduction/mechanical/mech/process/mixer/MixerNode.java index 0839facf7..28dc3d18b 100644 --- a/src/main/scala/resonantinduction/mechanical/process/mixer/MixerNode.java +++ b/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 { diff --git a/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/RenderMixer.java similarity index 97% rename from src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java rename to src/main/scala/resonantinduction/mechanical/mech/process/mixer/RenderMixer.java index 9f5e996a3..e2ca461b5 100644 --- a/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/process/mixer/TileMixer.java b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.java similarity index 95% rename from src/main/scala/resonantinduction/mechanical/process/mixer/TileMixer.java rename to src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.java index e648a0862..dd4dc56e3 100644 --- a/src/main/scala/resonantinduction/mechanical/process/mixer/TileMixer.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/RenderElectricTurbine.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/RenderElectricTurbine.java index a85dbbec8..bb1d23b02 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/RenderWaterTurbine.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/RenderWaterTurbine.java index 9d620517e..96400b1fb 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/RenderWindTurbine.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/RenderWindTurbine.java index 096e56a2c..51f58ce45 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/SchematicWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/SchematicWaterTurbine.java similarity index 95% rename from src/main/scala/resonantinduction/mechanical/turbine/SchematicWaterTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/SchematicWaterTurbine.java index 3ad61f862..2b4486001 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/SchematicWaterTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/SchematicWindTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/SchematicWindTurbine.java similarity index 95% rename from src/main/scala/resonantinduction/mechanical/turbine/SchematicWindTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/SchematicWindTurbine.java index 899d37991..7e27f8e43 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/SchematicWindTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/TileElectricTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileElectricTurbine.scala similarity index 97% rename from src/main/scala/resonantinduction/mechanical/turbine/TileElectricTurbine.scala rename to src/main/scala/resonantinduction/mechanical/mech/turbine/TileElectricTurbine.scala index 6ae6ae836..ea5dc8d9b 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/TileElectricTurbine.scala +++ b/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} diff --git a/src/main/scala/resonantinduction/mechanical/turbine/TileTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.java similarity index 96% rename from src/main/scala/resonantinduction/mechanical/turbine/TileTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.java index dc136e905..2d579f2af 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/TileTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/TileWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.java similarity index 97% rename from src/main/scala/resonantinduction/mechanical/turbine/TileWaterTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.java index ca377b6b5..d0250f5d5 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/TileWaterTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/TileWindTurbine.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.java similarity index 98% rename from src/main/scala/resonantinduction/mechanical/turbine/TileWindTurbine.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/TileWindTurbine.java index 6508446aa..0f28a5003 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/TileWindTurbine.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/TurbineMBlockHandler.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.java similarity index 93% rename from src/main/scala/resonantinduction/mechanical/turbine/TurbineMBlockHandler.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineMBlockHandler.java index 9ebe20c49..0e00dbcd4 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/TurbineMBlockHandler.java +++ b/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; diff --git a/src/main/scala/resonantinduction/mechanical/turbine/TurbineNode.java b/src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineNode.java similarity index 81% rename from src/main/scala/resonantinduction/mechanical/turbine/TurbineNode.java rename to src/main/scala/resonantinduction/mechanical/mech/turbine/TurbineNode.java index e9c773133..df6bf1c26 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/TurbineNode.java +++ b/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