Disabled Animations, Started Connection rewrite, finished Flow Packets

hilburn · May 25, 2015 · ea8a913 · ea8a913
1 parent 20a157e
commit ea8a913
Show file tree

Hide file tree

Showing 13 changed files with 886 additions and 844 deletions.
diff --git a/src/main/java/advancedsystemsmanager/animation/AnimationController.java b/src/main/java/advancedsystemsmanager/animation/AnimationController.java
diff --git a/src/main/java/advancedsystemsmanager/api/gui/IGuiElement.java b/src/main/java/advancedsystemsmanager/api/gui/IGuiElement.java
@@ -7,7 +7,7 @@
 public interface IGuiElement<Gui extends GuiScreen>
 {
     @SideOnly(Side.CLIENT)
-    public abstract void draw(Gui gui, int mouseX, int mouseY, int zLevel);
+    void draw(Gui gui, int mouseX, int mouseY, int zLevel);
 
     @SideOnly(Side.CLIENT)
     void drawMouseOver(Gui gui, int mouseX, int mouseY);

diff --git a/src/main/java/advancedsystemsmanager/flow/Connection.java b/src/main/java/advancedsystemsmanager/flow/Connection.java
@@ -8,7 +8,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public class Connection
 {
@@ -22,7 +21,7 @@ public class Connection
     public int componentId;
     public int connectionId;
     public List<Point> nodes;
-    public Point selectedNode;
+    public int selected = -1;
 
     public Connection(int componentId, int connectionId)
     {
@@ -63,20 +62,21 @@ public Connection copy()
 
     public void addAndSelectNode(int mX, int mY, int id)
     {
-        nodes.add(id, selectedNode = new Point(mX, mY));
+        nodes.add(selected = id, new Point(mX, mY));
     }
 
     @SideOnly(Side.CLIENT)
     public void update(int mX, int mY)
     {
-        if (selectedNode != null)
+        if (selected != -1)
         {
-            selectedNode.setX(mX);
-            selectedNode.setY(mY);
+            Point selected = getSelectedNode();
+            selected.setX(mX);
+            selected.setY(mY);
 
             if (GuiScreen.isShiftKeyDown())
             {
-                selectedNode.adjustToGrid(10);
+                selected.adjustToGrid(10);
             }
         }
     }
@@ -94,15 +94,19 @@ public List<Point> getNodes()
         return nodes;
     }
 
-
     public Point getSelectedNode()
     {
-        return selectedNode;
+        return selected == -1? null : nodes.get(selected);
+    }
+
+    public int getSelected()
+    {
+        return selected;
     }
 
-    public void setSelectedNode(Point selectedNode)
+    public void setSelected(int selected)
     {
-        this.selectedNode = selectedNode;
+        this.selected = selected;
     }
 
     public void writeToNBT(NBTTagCompound tagCompound, int index)