From 58141f22149533a944c1e92069145a5e9f070c02 Mon Sep 17 00:00:00 2001 From: Robert S Date: Thu, 10 Apr 2014 19:17:18 -0400 Subject: [PATCH] Moved gear shaft to its own package --- .../main/scala/resonantinduction/mechanical/ClientProxy.java | 2 +- .../main/scala/resonantinduction/mechanical/Mechanical.java | 2 +- .../mechanical/energy/gear/PartGearShaft.java | 2 ++ .../mechanical/energy/{gear => gearshaft}/GearShaftNode.java | 5 +++-- .../mechanical/energy/{gear => gearshaft}/ItemGearShaft.java | 3 ++- .../energy/{gear => gearshaft}/RenderGearShaft.java | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) rename mechanical/src/main/scala/resonantinduction/mechanical/energy/{gear => gearshaft}/GearShaftNode.java (95%) rename mechanical/src/main/scala/resonantinduction/mechanical/energy/{gear => gearshaft}/ItemGearShaft.java (91%) rename mechanical/src/main/scala/resonantinduction/mechanical/energy/{gear => gearshaft}/RenderGearShaft.java (94%) diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java index 0ce7e9b11..53d3fe0eb 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java @@ -1,7 +1,7 @@ package resonantinduction.mechanical; import resonantinduction.mechanical.energy.gear.RenderGear; -import resonantinduction.mechanical.energy.gear.RenderGearShaft; +import resonantinduction.mechanical.energy.gearshaft.RenderGearShaft; import resonantinduction.mechanical.fluid.pipe.RenderPipe; import calclavia.lib.render.item.GlobalItemRenderer; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java index b5b2081e2..082449d2f 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java @@ -32,7 +32,7 @@ import resonantinduction.core.TabRI; import resonantinduction.mechanical.belt.BlockConveyorBelt; import resonantinduction.mechanical.belt.TileConveyorBelt; import resonantinduction.mechanical.energy.gear.ItemGear; -import resonantinduction.mechanical.energy.gear.ItemGearShaft; +import resonantinduction.mechanical.energy.gearshaft.ItemGearShaft; import resonantinduction.mechanical.energy.grid.MechanicalNode; import resonantinduction.mechanical.energy.turbine.*; import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java index e31fcfe27..e8b5b055d 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java @@ -12,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import resonantinduction.mechanical.Mechanical; +import resonantinduction.mechanical.energy.gearshaft.GearShaftNode; +import resonantinduction.mechanical.energy.gearshaft.RenderGearShaft; import resonantinduction.mechanical.energy.grid.MechanicalNode; import resonantinduction.mechanical.energy.grid.PartMechanical; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/GearShaftNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/GearShaftNode.java similarity index 95% rename from mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/GearShaftNode.java rename to mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/GearShaftNode.java index f6884ba5c..890730f5c 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/GearShaftNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/GearShaftNode.java @@ -1,14 +1,15 @@ -package resonantinduction.mechanical.energy.gear; +package resonantinduction.mechanical.energy.gearshaft; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import calclavia.api.resonantinduction.IMechanicalNode; import calclavia.lib.grid.INodeProvider; +import resonantinduction.mechanical.energy.gear.PartGear; +import resonantinduction.mechanical.energy.gear.PartGearShaft; import resonantinduction.mechanical.energy.grid.MechanicalNode; public class GearShaftNode extends MechanicalNode { - public GearShaftNode(PartGearShaft parent) { super(parent); diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/ItemGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ItemGearShaft.java similarity index 91% rename from mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/ItemGearShaft.java rename to mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ItemGearShaft.java index 0e187e6c7..adb1f4dae 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/ItemGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/ItemGearShaft.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.energy.gear; +package resonantinduction.mechanical.energy.gearshaft; import java.util.List; @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import resonantinduction.core.prefab.part.IHighlight; +import resonantinduction.mechanical.energy.gear.PartGearShaft; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/RenderGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/RenderGearShaft.java similarity index 94% rename from mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/RenderGearShaft.java rename to mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/RenderGearShaft.java index 4328e3581..8f33e1fb5 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/RenderGearShaft.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gearshaft/RenderGearShaft.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.energy.gear; +package resonantinduction.mechanical.energy.gearshaft; import static org.lwjgl.opengl.GL11.glRotatef; import net.minecraft.item.ItemStack; @@ -9,6 +9,7 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; +import resonantinduction.mechanical.energy.gear.PartGearShaft; import calclavia.lib.render.RenderUtility; import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.relauncher.Side;