another big refactor

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;
-using tink.CoreApi;
-
+import lib.Pos;
 import kernel.ui.TermWriteable;
 import cc.Term;
-import util.Vec.Vec2;
-import util.Color;
+import lib.Vec.Vec2;
+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 util.Pos;
+import lib.Pos;
 import cc.Term.TerminalSize;
 import kernel.ui.TermWriteable;
-import util.Vec.Vec2;
-import util.Color;
+import lib.Vec.Vec2;
+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 util.Pos;
-import util.Vec.Vec2;
-import util.Color;
+import lib.Pos;
+import lib.Vec.Vec2;
+import lib.Color;
 import kernel.ui.TermWriteable;
 
 using tink.CoreApi;

src/kernel/ui/TermWriteable.hx

@@ -1,10 +1,10 @@
 package kernel.ui;
 
-import util.Pos;
-using tink.CoreApi;
+import lib.Pos;
+import lib.Color;
+import lib.Vec.Vec2;
 
-import util.Color;
-import util.Vec.Vec2;
+using tink.CoreApi;
 
 /**
 	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;
-using tink.CoreApi;
-
-import util.Vec.Vec2;
-import util.Color;
+import lib.Pos;
+import lib.Vec.Vec2;
+import lib.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;
-using tink.CoreApi;
-
-import util.Color;
+import lib.Pos;
+import lib.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.
 **/