Removed Hard dependency on gregtech as another Project and added dev versions of all requires libs.

Also started work on GT-EU EnderIO conduits, adding @Optional annotations where possible and a few other nice things.

11 files changed, 0 insertions, 698 deletions

diff --git a/src/Java/binnie/craftgui/events/Event.java b/src/Java/binnie/craftgui/events/Event.java
deleted file mode 100644
index 0b4a39426a..0000000000
--- a/src/Java/binnie/craftgui/events/Event.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class Event
-{
-  IWidget origin;
-  
-  public Event(IWidget origin)
-  {
-    this.origin = origin;
-  }
-  
-  public IWidget getOrigin()
-  {
-    return this.origin;
-  }
-  
-  public boolean isOrigin(IWidget widget)
-  {
-    return this.origin == widget;
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventButtonClicked.java b/src/Java/binnie/craftgui/events/EventButtonClicked.java
deleted file mode 100644
index 1823e6d430..0000000000
--- a/src/Java/binnie/craftgui/events/EventButtonClicked.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class EventButtonClicked
-  extends Event
-{
-  public EventButtonClicked(IWidget origin)
-  {
-    super(origin);
-  }
-  
-  public static abstract class Handler
-    extends EventHandler<EventButtonClicked>
-  {
-    public Handler()
-    {
-      super();
-    }
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventCycleChanged.java b/src/Java/binnie/craftgui/events/EventCycleChanged.java
deleted file mode 100644
index 628a177449..0000000000
--- a/src/Java/binnie/craftgui/events/EventCycleChanged.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class EventCycleChanged
-  extends Event
-{
-  public int value;
-  
-  public EventCycleChanged(IWidget origin, int value)
-  {
-    super(origin);
-    this.value = value;
-  }
-  
-  public int getValue()
-  {
-    return this.value;
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventHandler.java b/src/Java/binnie/craftgui/events/EventHandler.java
deleted file mode 100644
index 9d2e5d2ad3..0000000000
--- a/src/Java/binnie/craftgui/events/EventHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-import java.util.List;
-
-public abstract class EventHandler<E extends Event>
-{
-  Class<E> eventClass;
-  Origin origin = Origin.Any;
-  IWidget relative = null;
-  
-  public EventHandler(Class<E> eventClass)
-  {
-    this.eventClass = eventClass;
-  }
-  
-  public EventHandler setOrigin(Origin origin, IWidget relative)
-  {
-    this.origin = origin;
-    this.relative = relative;
-    return this;
-  }
-  
-  public abstract void onEvent(E paramE);
-  
-  public final boolean handles(Event e)
-  {
-    return (this.eventClass.isInstance(e)) && (this.origin.isOrigin(e.getOrigin(), this.relative));
-  }
-  
-  public static enum Origin
-  {
-    Any,  Self,  Parent,  DirectChild;
-    
-    private Origin() {}
-    
-    public boolean isOrigin(IWidget origin, IWidget test)
-    {
-      switch (EventHandler.1.$SwitchMap$binnie$craftgui$events$EventHandler$Origin[ordinal()])
-      {
-      case 1: 
-        return true;
-      case 2: 
-        return test.getWidgets().contains(origin);
-      case 3: 
-        return test.getParent() == origin;
-      case 4: 
-        return test == origin;
-      }
-      return false;
-    }
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventKey.java b/src/Java/binnie/craftgui/events/EventKey.java
deleted file mode 100644
index e49b736f43..0000000000
--- a/src/Java/binnie/craftgui/events/EventKey.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public abstract class EventKey
-  extends Event
-{
-  char character;
-  int key;
-  
-  public EventKey(IWidget origin, char character, int key)
-  {
-    super(origin);
-    this.character = character;
-    this.key = key;
-  }
-  
-  public char getCharacter()
-  {
-    return this.character;
-  }
-  
-  public int getKey()
-  {
-    return this.key;
-  }
-  
-  public static class Down
-    extends EventKey
-  {
-    public Down(IWidget origin, char character, int key)
-    {
-      super(character, key);
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventKey.Down>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Up
-    extends EventKey
-  {
-    public Up(IWidget origin, char character, int key)
-    {
-      super(character, key);
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventKey.Up>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventMouse.java b/src/Java/binnie/craftgui/events/EventMouse.java
deleted file mode 100644
index 162552098a..0000000000
--- a/src/Java/binnie/craftgui/events/EventMouse.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public abstract class EventMouse
-  extends Event
-{
-  public EventMouse(IWidget origin)
-  {
-    super(origin);
-  }
-  
-  public static class Button
-    extends EventMouse
-  {
-    int x;
-    int y;
-    int button;
-    
-    public int getX()
-    {
-      return this.x;
-    }
-    
-    public int getY()
-    {
-      return this.y;
-    }
-    
-    public int getButton()
-    {
-      return this.button;
-    }
-    
-    public Button(IWidget currentMousedOverWidget, int x, int y, int button)
-    {
-      super();
-      this.x = x;
-      this.y = y;
-      this.button = button;
-    }
-  }
-  
-  public static class Down
-    extends EventMouse.Button
-  {
-    public Down(IWidget currentMousedOverWidget, int x, int y, int button)
-    {
-      super(x, y, button);
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventMouse.Down>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Up
-    extends EventMouse.Button
-  {
-    public Up(IWidget currentMousedOverWidget, int x, int y, int button)
-    {
-      super(x, y, button);
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventMouse.Up>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Move
-    extends EventMouse
-  {
-    float dx;
-    float dy;
-    
-    public float getDx()
-    {
-      return this.dx;
-    }
-    
-    public float getDy()
-    {
-      return this.dy;
-    }
-    
-    public Move(IWidget origin, float dx, float dy)
-    {
-      super();
-      this.dx = dx;
-      this.dy = dy;
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventMouse.Move>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Drag
-    extends EventMouse.Move
-  {
-    public Drag(IWidget draggedWidget, float dx, float dy)
-    {
-      super(dx, dy);
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventMouse.Drag>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Wheel
-    extends EventMouse
-  {
-    int dWheel = 0;
-    
-    public Wheel(IWidget origin, int dWheel)
-    {
-      super();
-      this.dWheel = (dWheel / 28);
-    }
-    
-    public int getDWheel()
-    {
-      return this.dWheel;
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventMouse.Wheel>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventTextEdit.java b/src/Java/binnie/craftgui/events/EventTextEdit.java
deleted file mode 100644
index d61ae34008..0000000000
--- a/src/Java/binnie/craftgui/events/EventTextEdit.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class EventTextEdit
-  extends EventValueChanged<String>
-{
-  public EventTextEdit(IWidget origin, String text)
-  {
-    super(origin, text);
-  }
-  
-  public static abstract class Handler
-    extends EventHandler<EventTextEdit>
-  {
-    public Handler()
-    {
-      super();
-    }
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventToggleButtonClicked.java b/src/Java/binnie/craftgui/events/EventToggleButtonClicked.java
deleted file mode 100644
index 79ff26fa59..0000000000
--- a/src/Java/binnie/craftgui/events/EventToggleButtonClicked.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class EventToggleButtonClicked
-  extends Event
-{
-  boolean toggled;
-  
-  public EventToggleButtonClicked(IWidget origin, boolean toggled)
-  {
-    super(origin);
-    this.toggled = toggled;
-  }
-  
-  public boolean isActive()
-  {
-    return this.toggled;
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventValueChanged.java b/src/Java/binnie/craftgui/events/EventValueChanged.java
deleted file mode 100644
index df804cbfa5..0000000000
--- a/src/Java/binnie/craftgui/events/EventValueChanged.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class EventValueChanged<T>
-  extends Event
-{
-  public T value;
-  
-  public EventValueChanged(IWidget origin, T value)
-  {
-    super(origin);
-    this.value = value;
-  }
-  
-  public T getValue()
-  {
-    return this.value;
-  }
-  
-  public static abstract class Handler
-    extends EventHandler<EventValueChanged>
-  {
-    public Handler()
-    {
-      super();
-    }
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventValuesChanged.java b/src/Java/binnie/craftgui/events/EventValuesChanged.java
deleted file mode 100644
index e102487f14..0000000000
--- a/src/Java/binnie/craftgui/events/EventValuesChanged.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class EventValuesChanged<T>
-  extends Event
-{
-  public T[] values;
-  
-  public EventValuesChanged(IWidget origin, T[] values)
-  {
-    super(origin);
-    this.values = values;
-  }
-  
-  public T[] getValues()
-  {
-    return this.values;
-  }
-}
diff --git a/src/Java/binnie/craftgui/events/EventWidget.java b/src/Java/binnie/craftgui/events/EventWidget.java
deleted file mode 100644
index 87ca98521f..0000000000
--- a/src/Java/binnie/craftgui/events/EventWidget.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package binnie.craftgui.events;
-
-import binnie.craftgui.core.IWidget;
-
-public class EventWidget
-  extends Event
-{
-  public EventWidget(IWidget origin)
-  {
-    super(origin);
-  }
-  
-  public static class Enable
-    extends EventWidget
-  {
-    public Enable(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.Enable>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Disable
-    extends EventWidget
-  {
-    public Disable(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.Disable>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Show
-    extends EventWidget
-  {
-    public Show(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.Show>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class Hide
-    extends EventWidget
-  {
-    public Hide(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.Hide>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class ChangePosition
-    extends EventWidget
-  {
-    public ChangePosition(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.ChangePosition>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class ChangeSize
-    extends EventWidget
-  {
-    public ChangeSize(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.ChangeSize>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class ChangeOffset
-    extends EventWidget
-  {
-    public ChangeOffset(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.ChangeOffset>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class ChangeColour
-    extends EventWidget
-  {
-    public ChangeColour(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.ChangeColour>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class StartMouseOver
-    extends EventWidget
-  {
-    public StartMouseOver(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.StartMouseOver>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class EndMouseOver
-    extends EventWidget
-  {
-    public EndMouseOver(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.EndMouseOver>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class StartDrag
-    extends EventWidget
-  {
-    int button;
-    
-    public StartDrag(IWidget origin, int button)
-    {
-      super();
-      this.button = button;
-    }
-    
-    public int getButton()
-    {
-      return this.button;
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.StartDrag>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class EndDrag
-    extends EventWidget
-  {
-    public EndDrag(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.EndDrag>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class GainFocus
-    extends EventWidget
-  {
-    public GainFocus(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.GainFocus>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-  
-  public static class LoseFocus
-    extends EventWidget
-  {
-    public LoseFocus(IWidget origin)
-    {
-      super();
-    }
-    
-    public static abstract class Handler
-      extends EventHandler<EventWidget.LoseFocus>
-    {
-      public Handler()
-      {
-        super();
-      }
-    }
-  }
-}