another big refactor

src/Startup.hx

@@ -1,7 +1,5 @@
 import bin.Terminal;
 
-using util.Extender.LambdaExtender;
-
 class Startup {
 	public static function main() {
 		var terminal = new Terminal();

src/bin/HelloWorld.hx

@@ -1,8 +1,9 @@
 package bin;
 
+import lib.cli.TermHandle;
+import lib.cli.CLIBase;
+
 using tink.CoreApi;
-import lib.TermHandle;
-import lib.CLIBase;
 
 class HelloWorld extends CLIBase {
 	public function invoke(handle: TermHandle):Future<Bool> {

src/bin/Net.hx

@@ -1,12 +1,12 @@
 package bin;
 
-using tink.CoreApi;
-
 import kernel.peripherals.Peripherals.Peripheral;
 import kernel.net.Routing;
 import haxe.ds.ReadOnlyArray;
-import lib.TermHandle;
+import lib.cli.TermHandle;
-import lib.CLIBase;
+import lib.cli.CLIBase;
+
+using tink.CoreApi;
 
 class Net extends CLIBase {
 	private var handle:TermHandle;

src/bin/Terminal.hx

@@ -1,8 +1,8 @@
 package bin;
 
-import lib.TermHandle;
+import lib.cli.TermHandle;
-import lib.CLIBase;
+import lib.cli.CLIBase;
-import util.Color;
+import lib.Color;
 import kernel.ui.WindowContext;
 import kernel.ui.WindowManager;
 

src/kernel/Init.hx

@@ -4,7 +4,7 @@ import kernel.turtle.Turtle;
 import haxe.MainLoop;
 import kernel.net.Routing;
 import cc.OS;
-import util.Debug;
+import lib.Debug;
 import kernel.ui.WindowManager;
 import kernel.peripherals.Peripherals.Peripheral;
 import kernel.net.Net;

src/kernel/KernelEvents.hx

@@ -1,10 +1,10 @@
 package kernel;
 
-import util.Pos;
+import lib.Pos;
 import cc.HTTP.HTTPResponse;
 import lua.TableTools;
 import lua.Coroutine;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
 import haxe.Exception;
 
 using tink.CoreApi;

src/kernel/Log.hx

@@ -6,7 +6,7 @@ import kernel.ui.TermWriteable;
 import lib.TermIO;
 #if webconsole
 import kernel.net.Net;
-import util.Debug;
+import lib.Debug;
 #end
 
 /**

src/kernel/MainTerm.hx

@@ -1,12 +1,12 @@
 package kernel;
 
-import util.Pos;
+import lib.Pos;
-using tink.CoreApi;
-
 import kernel.ui.TermWriteable;
 import cc.Term;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
-import util.Color;
+import lib.Color;
+
+using tink.CoreApi;
 
 /**
 	Represents the main computer screen.

src/kernel/Timer.hx

@@ -1,9 +1,9 @@
 package kernel;
 
-using tink.CoreApi;
-
 import cc.OS;
 
+using tink.CoreApi;
+
 /**
 	Wrapper class for using timer.
 **/

src/kernel/net/Net.hx

@@ -1,16 +1,15 @@
 package kernel.net;
 
 import haxe.ds.ReadOnlyArray;
-using tink.CoreApi;
-
 import kernel.net.Package.NetworkID;
 import kernel.peripherals.Peripherals.Peripheral;
 import kernel.Log;
 import kernel.Timer;
 import cc.OS;
 
+using tink.CoreApi;
 using Lambda;
-using util.Extender.LambdaExtender;
+using lib.Extender.LambdaExtender;
 
 /**
 	Class responsible for everything network related.

src/kernel/net/Routing.hx

@@ -2,11 +2,10 @@ package kernel.net;
 
 import kernel.peripherals.Peripherals.Peripheral;
 import kernel.net.INetworkInterface;
+import kernel.net.Package.NetworkID;
 
 using tink.CoreApi;
 
-import kernel.net.Package.NetworkID;
-
 @:structInit typedef Route = {
 	interf:INetworkInterface,
 	rep: NetworkID,

src/kernel/peripherals/Drive.hx

@@ -1,6 +1,5 @@
 package kernel.peripherals;
 
-import kernel.net.Package;
 using tink.CoreApi;
 
 class Drive implements IPeripheral {

src/kernel/peripherals/Modem.hx

@@ -1,10 +1,10 @@
 package kernel.peripherals;
 
-using tink.CoreApi;
-
 import kernel.net.Package;
 import kernel.net.INetworkInterface;
 
+using tink.CoreApi;
+
 class Modem implements INetworkInterface implements IPeripheral {
 	public final addr:String;
 	public var onMessage(default, null):Signal<Package>;

src/kernel/peripherals/Redstone.hx

@@ -1,7 +1,7 @@
 package kernel.peripherals;
 
 import haxe.ds.ReadOnlyArray;
-import util.Color;
+import lib.Color;
 
 using tink.CoreApi;
 

src/kernel/peripherals/Screen.hx

@@ -1,11 +1,10 @@
 package kernel.peripherals;
 
-
+import lib.Pos;
-import util.Pos;
 import cc.Term.TerminalSize;
 import kernel.ui.TermWriteable;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
-import util.Color;
+import lib.Color;
 
 using tink.CoreApi;
 

src/kernel/ui/Pixel.hx

@@ -1,6 +1,6 @@
 package kernel.ui;
 
-import util.Color;
+import lib.Color;
 
 @:structInit class Pixel {
 	public var char:String;

src/kernel/ui/TermBuffer.hx

@@ -1,9 +1,8 @@
 package kernel.ui;
 
-
+import lib.Pos;
-import util.Pos;
+import lib.Vec.Vec2;
-import util.Vec.Vec2;
+import lib.Color;
-import util.Color;
 import kernel.ui.TermWriteable;
 
 using tink.CoreApi;

src/kernel/ui/TermWriteable.hx

@@ -1,10 +1,10 @@
 package kernel.ui;
 
-import util.Pos;
+import lib.Pos;
-using tink.CoreApi;
+import lib.Color;
+import lib.Vec.Vec2;
 
-import util.Color;
+using tink.CoreApi;
-import util.Vec.Vec2;
 
 /**
 	Interface describing a terminal. E.g. the main computer screen or a external screen.

src/kernel/ui/VirtualTermWriter.hx

@@ -1,12 +1,12 @@
 package kernel.ui;
 
-import util.Pos;
+import lib.Pos;
-using tink.CoreApi;
+import lib.Vec.Vec2;
-
+import lib.Color;
-import util.Vec.Vec2;
-import util.Color;
 import kernel.ui.TermWriteable;
 
+using tink.CoreApi;
+
 /**
 	A term writer that can switch beetween its internal buffer and another termwriter.
 	The other target is most of the time a real screen

src/kernel/ui/WindowContext.hx

@@ -1,13 +1,13 @@
 package kernel.ui;
 
-import util.Pos;
+import lib.Pos;
-using tink.CoreApi;
+import lib.Color;
-
-import util.Color;
 import kernel.ButtonType;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
 import kernel.ui.TermWriteable;
 
+using tink.CoreApi;
+
 /**
 	The main object you interact with when writing anything to the screen.
 **/

src/lib/BuildInfo.hx

@@ -1,4 +1,4 @@
-package util;
+package lib;
 
 /**
 	Macros with static information.

src/lib/Color.hx

@@ -1,4 +1,4 @@
-package util;
+package lib;
 
 import kernel.peripherals.Redstone.BundleMask;
 

src/lib/Debug.hx

@@ -1,4 +1,4 @@
-package util;
+package lib;
 
 import lua.NativeStringTools;
 import lib.ui.Canvas;

src/lib/Extender.hx

@@ -1,4 +1,4 @@
-package util;
+package lib;
 
 import haxe.Exception;
 

src/lib/MathI.hx

@@ -1,4 +1,4 @@
-package util;
+package lib;
 
 class MathI {
 	public static function max(a:Int, b:Int):Int {

src/lib/ObjMerge.hx

@@ -1,4 +1,4 @@
-package util;
+package lib;
 
 class ObjMerge {
 	public static function merge<T>(obj1:T, obj2:T): T {

src/lib/Pos.hx

@@ -1,6 +1,6 @@
-package util;
+package lib;
 
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
 
 /**
 	Reporesents a Point in a 2D `Int` System.

src/lib/Pos3.hx

@@ -1,6 +1,6 @@
-package util;
+package lib;
 
-import util.Vec.Vec3;
+import lib.Vec.Vec3;
 
 /**
 	Reporesents a Point in a 3D `Int` System.

src/lib/Rect.hx

@@ -1,6 +1,4 @@
-package util;
+package lib;
-
-import util.Vec.Vec2;
 
 class Rect {
 

src/lib/TermIO.hx

@@ -1,6 +1,6 @@
 package lib;
 
-import util.Color;
+import lib.Color;
 import kernel.ui.TermWriteable;
 
 /**

src/lib/Vec.hx

@@ -1,4 +1,4 @@
-package util;
+package lib;
 
 @:structInit class Vec2<T> {
 	public final x:T;

src/lib/cli/CLIBase.hx

@@ -1,4 +1,4 @@
-package lib;
+package lib.cli;
 
 using tink.CoreApi;
 

src/lib/cli/TermHandle.hx

@@ -1,4 +1,4 @@
-package lib;
+package lib.cli;
 
 import haxe.ds.ReadOnlyArray;
 

src/lib/observable/DummyObservable.hx

@@ -1,4 +1,4 @@
-package util;
+package lib.observable;
 
 using tink.CoreApi;
 

src/lib/observable/Observable.hx

@@ -1,4 +1,4 @@
-package util;
+package lib.observable;
 
 using tink.CoreApi;
 

src/lib/observable/ObservableArray.hx

@@ -1,4 +1,4 @@
-package util;
+package lib.observable;
 
 class ObservableArray<T> extends ObservableValue<Array<T>> {
 	public function new(value: Array<T>) {

src/lib/observable/ObservableValue.hx

@@ -1,4 +1,4 @@
-package util;
+package lib.observable;
 
 using tink.CoreApi;
 

src/lib/turtle/TurtleExecuter.hx

@@ -1,8 +1,9 @@
 package lib.turtle;
 
-import util.Pos;
+import lib.Pos;
-import util.Pos3;
+import lib.Pos3;
 import kernel.turtle.Turtle;
+
 using tink.CoreApi;
 
 class TurtleExecuter {

src/lib/turtle/TurtleInstructionParser.hx

@@ -10,7 +10,6 @@ import lua.NativeStringTools;
 
 using tink.CoreApi;
 
-
 /**
 	Save a set of turtle instructions to a string and execute them.
 **/

src/lib/ui/Canvas.hx

@@ -1,7 +1,7 @@
 package lib.ui;
 
-import util.Pos;
+import lib.Pos;
-import util.Rect;
+import lib.Rect;
 import kernel.ui.Pixel;
 
 abstract Canvas(Array<Array<Pixel>>) to Array<Array<Pixel>> from Array<Array<Pixel>>{

src/lib/ui/UIEvents.hx

@@ -1,8 +1,8 @@
 package lib.ui;
 
-import util.Pos;
+import lib.Pos;
-import util.Vec.Vec2;
 import kernel.ButtonType;
+
 using tink.CoreApi;
 
 typedef UIEvents = {

src/lib/ui/reactive/ListElement.hx

@@ -1,9 +1,9 @@
 package lib.ui.reactive;
 
-import util.Pos;
+import lib.Pos;
 import util.Rect;
 import util.ObservableArray;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
 
 class ListElement extends UIElement {
 

src/lib/ui/reactive/TextElement.hx

@@ -2,10 +2,10 @@ package lib.ui.reactive;
 
 import lib.ui.Dimensions;
 import util.ObjMerge;
-import util.Pos;
+import lib.Pos;
 import util.Observable;
-import util.Color;
+import lib.Color;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
 
 using tink.CoreApi;
 

src/lib/ui/reactive/TurtleController.hx

@@ -1,8 +1,8 @@
 package lib.ui.reactive;
 
-import util.Debug;
+import lib.Debug;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
-import util.Pos;
+import lib.Pos;
 
 class TurtleController extends UIElement {
 
@@ -21,8 +21,6 @@ class TurtleController extends UIElement {
 		canvas.combine(addButton("F"),{x:1,y:1});
 		canvas.combine(addButton("F"),{x:5,y:2});
 
-		Debug.printCanvasToConsole(canvas);
-
 		return canvas;
 
 	}

src/lib/ui/reactive/UIElement.hx

@@ -1,9 +1,9 @@
 package lib.ui.reactive;
 
 import util.ObjMerge;
-import util.Pos;
+import lib.Pos;
-import util.Rect;
+import lib.Rect;
-import util.Vec.Vec2;
+import lib.Vec.Vec2;
 
 using tink.CoreApi;