From 59d9d9506f71d63ef7cc1bb5baf08f3518f145e4 Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Fri, 20 May 2022 22:24:47 -0500
Subject: [PATCH] removed most uses of the 'package' keyword

---
 src/client/game.onyx                 |  8 ++++----
 src/client/gfx/canvas.onyx           |  4 ++--
 src/client/gfx/font.onyx             |  8 ++++----
 src/client/gfx/immediate.onyx        |  6 +++---
 src/client/gfx/mesh.onyx             |  6 +++---
 src/client/gfx/shader.onyx           |  8 ++++----
 src/client/gfx/texture.onyx          |  8 ++++----
 src/client/gfx/ui.onyx               | 15 +++++++--------
 src/client/globals.onyx              |  3 +--
 src/client/menu/connect_menu.onyx    |  8 ++++----
 src/client/net/handlers.onyx         |  7 +++----
 src/client/net/net.onyx              |  9 ++++-----
 src/client/net/outbound.onyx         |  9 ++++-----
 src/client/utils/camera.onyx         |  2 +-
 src/client/utils/colors.onyx         |  2 +-
 src/client/utils/input.onyx          |  4 ++--
 src/client/utils/logger.onyx         |  2 +-
 src/client/utils/utils.onyx          |  2 +-
 src/client/utils/vecmath.onyx        | 22 ++++++++--------------
 src/client/world/chunk.onyx          |  4 ++--
 src/client/world/physics.onyx        |  2 +-
 src/client/world/player.onyx         |  4 ++--
 src/client/world/player_manager.onyx |  2 +-
 src/client/world/world.onyx          |  2 +-
 src/client/world/worldgen.onyx       |  3 +--
 src/server/build.onyx                |  1 -
 src/server/server.onyx               | 13 +++++--------
 src/shared/packets.onyx              |  6 +++---
 28 files changed, 77 insertions(+), 93 deletions(-)

diff --git a/src/client/game.onyx b/src/client/game.onyx
index b29d17d..0460890 100644
--- a/src/client/game.onyx
+++ b/src/client/game.onyx
@@ -1,8 +1,8 @@
 
-use package core
-use package glfw3
-use package opengles
-use package stb_truetype
+use core
+use glfw3
+use opengles
+use stb_truetype
 
 #local {
     world_shader: Shader;
diff --git a/src/client/gfx/canvas.onyx b/src/client/gfx/canvas.onyx
index f8ffef2..862c451 100644
--- a/src/client/gfx/canvas.onyx
+++ b/src/client/gfx/canvas.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package opengles
+use core
+use opengles
 
 
 Canvas :: struct {
diff --git a/src/client/gfx/font.onyx b/src/client/gfx/font.onyx
index d4b406c..755c571 100644
--- a/src/client/gfx/font.onyx
+++ b/src/client/gfx/font.onyx
@@ -1,8 +1,8 @@
 
-use package core
-use package core.intrinsics.onyx {__zero_value}
-use package stb_truetype
-use package opengles
+use core
+use core.intrinsics.onyx {__zero_value}
+use stb_truetype
+use opengles
 
 #local {
     font_registry: Map(FontDescriptor, Font);
diff --git a/src/client/gfx/immediate.onyx b/src/client/gfx/immediate.onyx
index 4adb269..f5fbed7 100644
--- a/src/client/gfx/immediate.onyx
+++ b/src/client/gfx/immediate.onyx
@@ -1,7 +1,7 @@
 
-use package core
-use package opengles
-use package glfw3
+use core
+use opengles
+use glfw3
 
 immediate_init :: () {
     vertex_data = make([] Immediate_Vertex, Maximum_Vertex_Count);
diff --git a/src/client/gfx/mesh.onyx b/src/client/gfx/mesh.onyx
index 689a68e..89f1946 100644
--- a/src/client/gfx/mesh.onyx
+++ b/src/client/gfx/mesh.onyx
@@ -1,5 +1,5 @@
-use package core
-use package opengles
+use core
+use opengles
 
 Mesh :: struct (Vertex_Type: type_expr) {
     handle: GLint;
@@ -23,7 +23,7 @@ mesh_make :: (verticies: [] $T, indicies: [] u32, gl_hint := GL_STATIC_DRAW) ->
     glBindBuffer(GL_ARRAY_BUFFER, mesh.vertex_handle);
     glBufferData(GL_ARRAY_BUFFER, sizeof T * verticies.count, verticies.data, gl_hint);
 
-    type_info :: package runtime.info
+    type_info :: runtime.info
     vertex_info := cast(^type_info.Type_Info_Struct) type_info.get_type_info(T);
     vertex_attr := 0;
     for attr: vertex_info.members {
diff --git a/src/client/gfx/shader.onyx b/src/client/gfx/shader.onyx
index 5b8fe94..a00b4dc 100644
--- a/src/client/gfx/shader.onyx
+++ b/src/client/gfx/shader.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package opengles
+use core
+use opengles
 
 Shader :: struct {
     vs, fs: GLuint;
@@ -178,7 +178,7 @@ Shader_Block :: struct {
 }
 
 shader_block_create :: (T: type_expr) -> Shader_Block {
-    type_info :: package runtime.info
+    type_info :: runtime.info
 
     // This is 2 beacuse the window and world matrix blocks are
     // not allocated using this procedure.
@@ -207,7 +207,7 @@ shader_block_link :: (s: ^Shader_Block, use shader: Shader, field_name: cstr) {
 }
 
 shader_block_update :: (s: ^Shader_Block, field: str, value: $T) {
-    type_info :: package runtime.info
+    type_info :: runtime.info
 
     glBindBuffer(GL_UNIFORM_BUFFER, s.block_buffer);
     defer glBindBuffer(GL_UNIFORM_BUFFER, -1);
diff --git a/src/client/gfx/texture.onyx b/src/client/gfx/texture.onyx
index 289eb57..da353b9 100644
--- a/src/client/gfx/texture.onyx
+++ b/src/client/gfx/texture.onyx
@@ -1,8 +1,8 @@
 
-use package core
-use package core.intrinsics.onyx { __zero_value as Zero }
-use package opengles
-use package stb_image
+use core
+use core.intrinsics.onyx { __zero_value as Zero }
+use opengles
+use stb_image
 
 #local texture_cache: Map(str, Texture);
 
diff --git a/src/client/gfx/ui.onyx b/src/client/gfx/ui.onyx
index c9d7a4e..b807ef5 100644
--- a/src/client/gfx/ui.onyx
+++ b/src/client/gfx/ui.onyx
@@ -3,10 +3,10 @@
 //
 package ui
 
-use package core
-use package opengles
-use package glfw3
-use package main
+use core
+use opengles
+use glfw3
+use main
 
 UI_Id :: u32
 
@@ -800,10 +800,9 @@ scrolling_region_stop :: () {
     scroll_states : Map(UI_Id, Scroll_State);
 
     get_site_hash :: macro (site: CallSite, increment := 0) -> UI_Id {
-        hash :: package core.hash
-        file_hash   := hash.to_u32(site.file);
-        line_hash   := hash.to_u32(site.line);
-        column_hash := hash.to_u32(site.column);
+        file_hash   := core.hash.to_u32(site.file);
+        line_hash   := core.hash.to_u32(site.line);
+        column_hash := core.hash.to_u32(site.column);
 
         return ~~ (file_hash * 0x472839 + line_hash * 0x6849210 + column_hash * 0x1248382 + increment);
     }
diff --git a/src/client/globals.onyx b/src/client/globals.onyx
index 3c56a03..8ea3318 100644
--- a/src/client/globals.onyx
+++ b/src/client/globals.onyx
@@ -1,5 +1,4 @@
-use package glfw3
 
-@GlobalVariable window: GLFWwindow_p;
+@GlobalVariable window: glfw3.GLFWwindow_p;
 
 debug_screen := false;
diff --git a/src/client/menu/connect_menu.onyx b/src/client/menu/connect_menu.onyx
index cb7cdbb..19be689 100644
--- a/src/client/menu/connect_menu.onyx
+++ b/src/client/menu/connect_menu.onyx
@@ -1,7 +1,7 @@
 
-use package core
-use package glfw3
-use package opengles
+use core
+use glfw3
+use opengles
 
 #local {
     ip_addr: [..] u8;
@@ -15,7 +15,7 @@ Connect_Menu :: struct {
     init :: (_: rawptr) {
         array.clear(^port);
         port_buffer: [8] u8;
-        string.concat(^port, conv.format(port_buffer, "{}", (package runtime.vars).Game_Port));
+        string.concat(^port, conv.format(port_buffer, "{}", runtime.vars.Game_Port));
 
         title_font = font_lookup(.{"./assets/fonts/calibri.ttf", 64});
 
diff --git a/src/client/net/handlers.onyx b/src/client/net/handlers.onyx
index 241cbb6..19f3156 100644
--- a/src/client/net/handlers.onyx
+++ b/src/client/net/handlers.onyx
@@ -1,10 +1,9 @@
 package game_net
 
 #local {
-    use package core
-    use package main   
-    onet    :: package onyx_net
-    packets :: package packets
+    use core
+    use main   
+    onet :: onyx_net
 }
 
 #tag Packet_Handler.{ .Verify_Connect }
diff --git a/src/client/net/net.onyx b/src/client/net/net.onyx
index 91c91c1..b6528d2 100644
--- a/src/client/net/net.onyx
+++ b/src/client/net/net.onyx
@@ -1,14 +1,13 @@
 package game_net
 
 #local {
-    use package core
-    use package main   
-    onet    :: package onyx_net
-    packets :: package packets
+    use core
+    use main
+    onet :: onyx_net
 }
 
 register_handles :: () {
-    use package runtime.info;
+    use runtime.info;
 
     procs := get_procedures_with_tag(Packet_Handler);
     defer delete(^procs);
diff --git a/src/client/net/outbound.onyx b/src/client/net/outbound.onyx
index c2d58df..16b1896 100644
--- a/src/client/net/outbound.onyx
+++ b/src/client/net/outbound.onyx
@@ -1,16 +1,15 @@
 package game_net
 
 #local {
-    use package core
-    use package main
-    onet    :: package onyx_net
-    packets :: package packets
+    use core
+    use main
+    onet :: onyx_net
 }
 
 send_connect :: (name: str) {
     msg := cast(^packets.Connect) calloc(sizeof packets.Connect + name.count);
     msg.type = .Connect;
-    msg.client_version = (package runtime.vars).Game_Version;
+    msg.client_version = runtime.vars.Game_Version;
     msg.name_length = ~~ name.count;
     memory.copy(~~ ^msg.name_data, name.data, name.count);
 
diff --git a/src/client/utils/camera.onyx b/src/client/utils/camera.onyx
index c8bc72d..1e701b1 100644
--- a/src/client/utils/camera.onyx
+++ b/src/client/utils/camera.onyx
@@ -1,4 +1,4 @@
-use package core
+use core
 
 @GlobalVariable
 camera: Camera;
diff --git a/src/client/utils/colors.onyx b/src/client/utils/colors.onyx
index ab6231d..b8f18f2 100644
--- a/src/client/utils/colors.onyx
+++ b/src/client/utils/colors.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 Color :: struct {
     r, g, b :  f32;
diff --git a/src/client/utils/input.onyx b/src/client/utils/input.onyx
index 8e7143b..6ae5a57 100644
--- a/src/client/utils/input.onyx
+++ b/src/client/utils/input.onyx
@@ -1,5 +1,5 @@
-use package core
-use package glfw3
+use core
+use glfw3
 
 // If you are offseting the mouse coordinate for world space
 // or UI scrolling etc., set this function to be the function
diff --git a/src/client/utils/logger.onyx b/src/client/utils/logger.onyx
index 57b0ffc..8d76c71 100644
--- a/src/client/utils/logger.onyx
+++ b/src/client/utils/logger.onyx
@@ -2,7 +2,7 @@
 // This may become an in-game or external file logger in the future,
 // but for now this is just for logging to the command line.
 
-use package core
+use core
 
 Enable_Log_Colors :: false
 
diff --git a/src/client/utils/utils.onyx b/src/client/utils/utils.onyx
index 25a9873..5b3c592 100644
--- a/src/client/utils/utils.onyx
+++ b/src/client/utils/utils.onyx
@@ -1,4 +1,4 @@
-use package core
+use core
 
 Ray :: struct {
     origin, direction: Vector3;
diff --git a/src/client/utils/vecmath.onyx b/src/client/utils/vecmath.onyx
index 897d687..dc91d55 100644
--- a/src/client/utils/vecmath.onyx
+++ b/src/client/utils/vecmath.onyx
@@ -1,5 +1,3 @@
-#local hash :: package core.hash
-
 #tag conv.Custom_Format.{format_vector2i}
 #tag conv.Custom_Parse.{parse_vector2i}
 Vector2i :: struct {
@@ -71,7 +69,7 @@ Vector3 :: struct {
 #operator * macro (v: Vector2i, s: i32) => (typeof v ).{ v.x * s,     v.y * s     };
 #operator * macro (v1, v2: Vector2i)   => (typeof v1).{ v1.x * v2.x, v1.y * v2.y };
 #operator == macro (v1, v2: Vector2i)  => v1.x == v2.x && v1.y == v2.y;
-#match hash.to_u32 macro (v: Vector2i) => 13 * v.x + 17 * v.y;
+#match core.hash.to_u32 macro (v: Vector2i) => 13 * v.x + 17 * v.y;
 
 #operator + macro (v1, v2: Vector2)    => (typeof v1).{ v1.x + v2.x, v1.y + v2.y };
 #operator - macro (v1, v2: Vector2)    => (typeof v1).{ v1.x - v2.x, v1.y - v2.y };
@@ -92,7 +90,7 @@ Vector3 :: struct {
 #operator == macro (v1, v2: Vector3i)   => v1.x == v2.x && v1.y == v2.y && v1.z == v2.z;
 
 #local {
-    conv :: package core.conv
+    conv :: core.conv
 
     format_vector2i :: (output: ^conv.Format_Output, format: ^conv.Format, v: ^Vector2i) {
         conv.format(output, "({}, {})", v.x, v.y);
@@ -111,12 +109,10 @@ Vector3 :: struct {
     }
 
     parse_vector2i :: (output: ^Vector2i, line_: str, string_allocator: Allocator) -> bool {
-        string :: package core.string
-
         line := line_;
-        xs := string.read_until(^line, #char " ");
-        string.advance(^line, 1);
-        ys := string.read_until(^line, #char " ");
+        xs := core.string.read_until(^line, #char " ");
+        core.string.advance(^line, 1);
+        ys := core.string.read_until(^line, #char " ");
 
         if xs == "" || ys == "" do return false;
 
@@ -126,12 +122,10 @@ Vector3 :: struct {
     }
 
     parse_vector2 :: (output: ^Vector2, line_: str, string_allocator: Allocator) -> bool {
-        string :: package core.string
-
         line := line_;
-        xs := string.read_until(^line, #char " ");
-        string.advance(^line, 1);
-        ys := string.read_until(^line, #char " ");
+        xs := core.string.read_until(^line, #char " ");
+        core.string.advance(^line, 1);
+        ys := core.string.read_until(^line, #char " ");
 
         if xs == "" || ys == "" do return false;
 
diff --git a/src/client/world/chunk.onyx b/src/client/world/chunk.onyx
index 8e49480..4a280ca 100644
--- a/src/client/world/chunk.onyx
+++ b/src/client/world/chunk.onyx
@@ -1,5 +1,5 @@
-use package core
-use package opengles
+use core
+use opengles
 
 Chunk_Vertex :: struct {
     position : Vector3;
diff --git a/src/client/world/physics.onyx b/src/client/world/physics.onyx
index 66cf957..5406d15 100644
--- a/src/client/world/physics.onyx
+++ b/src/client/world/physics.onyx
@@ -1,4 +1,4 @@
-use package core
+use core
 
 AABB :: struct {
     x0, y0, z0, x1, y1, z1: f32;
diff --git a/src/client/world/player.onyx b/src/client/world/player.onyx
index 01fd581..5d6d18f 100644
--- a/src/client/world/player.onyx
+++ b/src/client/world/player.onyx
@@ -1,5 +1,5 @@
-use package core
-use package glfw3
+use core
+use glfw3
 
 Player :: struct {
     camera: ^Camera; // Should the camera exist on the player? Or should the player just control the camera?
diff --git a/src/client/world/player_manager.onyx b/src/client/world/player_manager.onyx
index c0260c2..05bf4e6 100644
--- a/src/client/world/player_manager.onyx
+++ b/src/client/world/player_manager.onyx
@@ -1,4 +1,4 @@
-use package core
+use core
 
 Remote_Player :: struct {
     name: str;
diff --git a/src/client/world/world.onyx b/src/client/world/world.onyx
index 2bff142..c8e6faa 100644
--- a/src/client/world/world.onyx
+++ b/src/client/world/world.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 World :: struct {
     chunk_dist: i32;
diff --git a/src/client/world/worldgen.onyx b/src/client/world/worldgen.onyx
index 583887d..ae69f8c 100644
--- a/src/client/world/worldgen.onyx
+++ b/src/client/world/worldgen.onyx
@@ -1,6 +1,5 @@
 
-use package core
-#local perlin :: package perlin
+use core
 
 #local seed :: 8675309
 
diff --git a/src/server/build.onyx b/src/server/build.onyx
index 8962445..1a6c22e 100644
--- a/src/server/build.onyx
+++ b/src/server/build.onyx
@@ -2,7 +2,6 @@ package runtime.vars
 
 #load "core/std"
 
-#local runtime :: package runtime
 #load_path "./../src/server"
 #library_path "./lib"
 
diff --git a/src/server/server.onyx b/src/server/server.onyx
index a81ae80..3b5957a 100644
--- a/src/server/server.onyx
+++ b/src/server/server.onyx
@@ -1,11 +1,8 @@
 
-use package core
-use package core.intrinsics.onyx {__initialize}
+use core
+use core.intrinsics.onyx {__initialize}
 
-#local {
-    onet    :: package onyx_net
-    packets :: package packets
-}
+#local onet :: onyx_net
 
 Player_Data :: struct {
     id: u16;
@@ -26,7 +23,7 @@ host: ^onet.Host;
 
 setup_server :: () {
     addr: net.Socket_Address;
-    addr.port = (package runtime.vars).Game_Port;
+    addr.port = runtime.vars.Game_Port;
 
     host', err := onet.host_create(^addr, 16);
     if err != .None {
@@ -41,7 +38,7 @@ handle_packet :: (peer: ^onet.Peer, packet_data: [] u8) {
         case .Connect {
             connect_packet := cast(^packets.Connect) packet;
 
-            if connect_packet.client_version != (package runtime.vars).Game_Version {
+            if connect_packet.client_version != runtime.vars.Game_Version {
                 respond_with_error(.Client_Version_Wrong);
             }
 
diff --git a/src/shared/packets.onyx b/src/shared/packets.onyx
index 53d839d..7a9acbd 100644
--- a/src/shared/packets.onyx
+++ b/src/shared/packets.onyx
@@ -1,7 +1,7 @@
 
 package packets
-use package main { Vector3, Vector3i }
-use package main { Block }
+use main { Vector3, Vector3i }
+use main { Block }
 
 Type :: enum (u8) {
     Connect;
@@ -17,7 +17,7 @@ Type :: enum (u8) {
 
     Block_Updates;
 }
-#match (package core.hash).to_u32 macro (t: Type) => cast(u32) t;
+#match core.hash.to_u32 macro (t: Type) => cast(u32) t;
 
 Packet_Base :: struct #pack {
     type: Type;
-- 
2.25.1