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 fa197bbee..bc06a7deb 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java @@ -83,7 +83,7 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu //Opens a debug GUI if (frame == null) { - frame = new GearDebugFrame(this); + frame = new GearDebugFrame(this.node); frame.showDebugFrame(); } //Closes the debug GUI else diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/gear/GearDebugFrame.java b/mechanical/src/main/scala/resonantinduction/mechanical/gear/GearDebugFrame.java index e71e60a6c..51f703f4e 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/gear/GearDebugFrame.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/gear/GearDebugFrame.java @@ -28,9 +28,9 @@ public class GearDebugFrame extends Frame implements ActionListener Label[] connections = new Label[20]; long tick = 0; - PartMechanical part = null; + MechanicalNode part = null; - public GearDebugFrame(PartMechanical part) + public GearDebugFrame(MechanicalNode part) { this.part = part; setLayout(new BorderLayout()); @@ -93,7 +93,7 @@ public class GearDebugFrame extends Frame implements ActionListener @Override public String buildLabel() { - return super.buildLabel() + GearDebugFrame.this.part.node.angularVelocity; + return super.buildLabel() + GearDebugFrame.this.part.angularVelocity; } }; dataLabels.add(velLabel); @@ -104,7 +104,7 @@ public class GearDebugFrame extends Frame implements ActionListener @Override public String buildLabel() { - return super.buildLabel() + GearDebugFrame.this.part.node.renderAngle; + return super.buildLabel() + GearDebugFrame.this.part.renderAngle; } }; dataLabels.add(angleLabel); @@ -115,7 +115,7 @@ public class GearDebugFrame extends Frame implements ActionListener @Override public String buildLabel() { - return super.buildLabel() + GearDebugFrame.this.part.node.torque; + return super.buildLabel() + GearDebugFrame.this.part.torque; } }; dataLabels.add(torqueLabel); @@ -154,7 +154,7 @@ public class GearDebugFrame extends Frame implements ActionListener label.update(); } int c = 0; - for (Entry entry : part.node.getConnections().entrySet()) + for (Entry entry : part.getConnections().entrySet()) { if (entry.getKey() != null) { diff --git a/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.java b/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.java index 90653c535..9d4724835 100644 --- a/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.java +++ b/src/main/scala/resonantinduction/core/interfaces/IMechanicalNode.java @@ -16,8 +16,7 @@ public interface IMechanicalNode extends INode public double getAngularSpeed(); /** Applies rotational force and velocity to the mechanical object */ - public void apply(Object source, double torque, double angularVelocity); - + public void apply(Object source, double torque, double angularVelocity); /** The Rotational force */