From 884cd972960aa06e9c5db8afb2c87bee6682698f Mon Sep 17 00:00:00 2001 From: Robert S Date: Thu, 12 Jun 2014 02:20:01 -0400 Subject: [PATCH] Moved MechanicalNodeFrame to a different package --- .../grid}/MechanicalNodeFrame.java | 6 ++-- .../energy/grid/PartMechanical.java | 1 - .../energy/grid/TileMechanical.java | 1 - .../mechanical/gear/UpdatedLabel.java | 30 ------------------- 4 files changed, 2 insertions(+), 36 deletions(-) rename mechanical/src/main/scala/resonantinduction/mechanical/{gear => energy/grid}/MechanicalNodeFrame.java (96%) delete mode 100644 mechanical/src/main/scala/resonantinduction/mechanical/gear/UpdatedLabel.java diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/gear/MechanicalNodeFrame.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNodeFrame.java similarity index 96% rename from mechanical/src/main/scala/resonantinduction/mechanical/gear/MechanicalNodeFrame.java rename to mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNodeFrame.java index 7ec921bd2..2a034db9d 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/gear/MechanicalNodeFrame.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNodeFrame.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.gear; +package resonantinduction.mechanical.energy.grid; import java.awt.BorderLayout; import java.awt.Color; @@ -15,9 +15,7 @@ import java.util.List; import java.util.Map.Entry; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.mechanical.energy.grid.MechanicalNode; -import resonantinduction.mechanical.energy.grid.PartMechanical; -import resonantinduction.mechanical.energy.grid.TileMechanical; +import resonantinduction.core.debug.UpdatedLabel; /** Java GUI used to help debug gear information * diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java index 920da296e..548401ca3 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java @@ -12,7 +12,6 @@ import net.minecraftforge.common.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonant.core.ResonantEngine; -import resonantinduction.mechanical.gear.MechanicalNodeFrame; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.multipart.ControlKeyModifer; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java index b513d5199..0c90373c1 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java @@ -19,7 +19,6 @@ import resonant.lib.network.IPacketReceiverWithID; import resonant.lib.network.PacketHandler; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.Mechanical; -import resonantinduction.mechanical.gear.MechanicalNodeFrame; import universalelectricity.api.vector.Vector3; import codechicken.multipart.ControlKeyModifer; diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/gear/UpdatedLabel.java b/mechanical/src/main/scala/resonantinduction/mechanical/gear/UpdatedLabel.java deleted file mode 100644 index 3622ba47e..000000000 --- a/mechanical/src/main/scala/resonantinduction/mechanical/gear/UpdatedLabel.java +++ /dev/null @@ -1,30 +0,0 @@ -package resonantinduction.mechanical.gear; - -import java.awt.Label; - -/** Simple label with an update method - * - * @author Darkguardsman */ -@SuppressWarnings("serial") -public class UpdatedLabel extends Label -{ - String start_string = "I Am a Label"; - - public UpdatedLabel(String start) - { - super(start); - this.start_string = start; - } - - /** Called to update the content of the label */ - public void update() - { - this.setText(buildLabel()); - } - - /** Recreates then returns the label's string value */ - public String buildLabel() - { - return start_string; - } -}