From af3244800147b0cacc090370e820ca8f67d6a63f Mon Sep 17 00:00:00 2001 From: Robert S Date: Sat, 24 May 2014 21:06:49 -0400 Subject: [PATCH] Fixed gear shaft being in the wrong package --- .../main/scala/resonantinduction/mechanical/ClientProxy.java | 2 +- .../main/scala/resonantinduction/mechanical/Mechanical.java | 2 +- .../resonantinduction/mechanical/gear/PartGearShaft.java | 4 ++-- .../{mechanica => mechanical}/gearshaft/GearShaftNode.java | 2 +- .../{mechanica => mechanical}/gearshaft/ItemGearShaft.java | 2 +- .../{mechanica => mechanical}/gearshaft/RenderGearShaft.java | 2 +- .../{mechanica => mechanical}/gearshaft/ShaftGrid.java | 2 +- .../{mechanica => mechanical}/gearshaft/ShaftSubNode.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename mechanical/src/main/scala/resonantinduction/{mechanica => mechanical}/gearshaft/GearShaftNode.java (98%) rename mechanical/src/main/scala/resonantinduction/{mechanica => mechanical}/gearshaft/ItemGearShaft.java (96%) rename mechanical/src/main/scala/resonantinduction/{mechanica => mechanical}/gearshaft/RenderGearShaft.java (97%) rename mechanical/src/main/scala/resonantinduction/{mechanica => mechanical}/gearshaft/ShaftGrid.java (81%) rename mechanical/src/main/scala/resonantinduction/{mechanica => mechanical}/gearshaft/ShaftSubNode.java (89%) diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java index 3a33d0856..99ead715c 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java @@ -1,9 +1,9 @@ package resonantinduction.mechanical; import resonant.lib.render.item.GlobalItemRenderer; -import resonantinduction.mechanica.gearshaft.RenderGearShaft; import resonantinduction.mechanical.fluid.pipe.RenderPipe; import resonantinduction.mechanical.gear.RenderGear; +import resonantinduction.mechanical.gearshaft.RenderGearShaft; public class ClientProxy extends CommonProxy { diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java index d7abce816..6498598aa 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java @@ -18,7 +18,6 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; import resonantinduction.core.TabRI; -import resonantinduction.mechanica.gearshaft.ItemGearShaft; import resonantinduction.mechanical.belt.BlockConveyorBelt; import resonantinduction.mechanical.belt.TileConveyorBelt; import resonantinduction.mechanical.energy.grid.MechanicalNode; @@ -32,6 +31,7 @@ import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial; 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.BlockDetector; import resonantinduction.mechanical.logistic.belt.BlockManipulator; import resonantinduction.mechanical.logistic.belt.TileDetector; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java index eb3c773c3..42ce2aa4e 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java @@ -6,10 +6,10 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.mechanica.gearshaft.GearShaftNode; -import resonantinduction.mechanica.gearshaft.RenderGearShaft; import resonantinduction.mechanical.Mechanical; import resonantinduction.mechanical.energy.grid.PartMechanical; +import resonantinduction.mechanical.gearshaft.GearShaftNode; +import resonantinduction.mechanical.gearshaft.RenderGearShaft; import codechicken.lib.raytracer.IndexedCuboid6; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Vector3; diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/GearShaftNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java similarity index 98% rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/GearShaftNode.java rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java index 95ca38fc1..a74bfa21c 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/GearShaftNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanica.gearshaft; +package resonantinduction.mechanical.gearshaft; import java.util.ArrayList; import java.util.Iterator; diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ItemGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java similarity index 96% rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ItemGearShaft.java rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java index 6bff56daf..32f01b24d 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ItemGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanica.gearshaft; +package resonantinduction.mechanical.gearshaft; import java.util.List; diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/RenderGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java similarity index 97% rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/RenderGearShaft.java rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java index 99b43490c..20cf4712e 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/RenderGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanica.gearshaft; +package resonantinduction.mechanical.gearshaft; import static org.lwjgl.opengl.GL11.glRotatef; import net.minecraft.item.ItemStack; diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftGrid.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftGrid.java similarity index 81% rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftGrid.java rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftGrid.java index 6aff0639c..bd2f392ea 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftGrid.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftGrid.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanica.gearshaft; +package resonantinduction.mechanical.gearshaft; import resonant.lib.grid.NodeGrid; diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftSubNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftSubNode.java similarity index 89% rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftSubNode.java rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftSubNode.java index 51e3e957b..5a1b75762 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftSubNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftSubNode.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanica.gearshaft; +package resonantinduction.mechanical.gearshaft; import resonant.api.grid.INodeProvider; import resonant.lib.grid.Node;