From 0c6388d22f004a9cdd2641744b7cce42350265a1 Mon Sep 17 00:00:00 2001
From: Beyley Thomas <ep1cm1n10n123@gmail.com>
Date: Wed, 6 Mar 2024 17:18:53 -0800
Subject: [PATCH] update mach and mach-core

---
 build.zig                    | 16 ++--------------
 build.zig.zon                |  8 ++------
 game/app.zig                 |  2 +-
 game/fontstash.zig           |  2 +-
 game/gfx.zig                 |  2 +-
 game/renderer.zig            |  2 +-
 game/screen.zig              |  2 +-
 game/screens/gameplay.zig    |  2 +-
 game/screens/main_menu.zig   |  2 +-
 game/screens/song_select.zig |  2 +-
 10 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/build.zig b/build.zig
index 1ae1ff9..a8de463 100644
--- a/build.zig
+++ b/build.zig
@@ -4,17 +4,12 @@ const cimgui = @import("libs/cimgui/build.zig");
 const iconv = @import("libs/iconv-zig/build.zig");
 const ImageProcessor = @import("image_processor.zig");
 const builtin = @import("builtin");
-const mach_core = @import("mach_core");
+const mach_core = @import("mach");
 
 pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const mach_core_dep = b.dependency("mach_core", .{
-        .target = target,
-        .optimize = optimize,
-    });
-
     const zig_bass = b.addModule("bass", .{
         .root_source_file = .{ .path = root_path ++ "libs/zig-bass/src/bass.zig" },
     });
@@ -29,19 +24,12 @@ pub fn build(b: *std.Build) !void {
     stb_truetype.addIncludePath(.{ .path = root_path ++ "libs/stb" });
 
     const zigimg_module = b.dependency("zigimg", .{}).module("zigimg");
-    const app = try mach_core.App.init(b, mach_core_dep.builder, .{
+    const app = try mach_core.App.init(b, .{
         .name = "ztyping",
         .src = "game/app.zig",
         .target = target,
         .optimize = optimize,
         .deps = &[_]std.Build.Module.Import{
-            .{
-                .name = "mach",
-                .module = b.dependency("mach", .{
-                    .target = target,
-                    .optimize = optimize,
-                }).module("mach"),
-            },
             .{
                 .name = "zigimg",
                 .module = zigimg_module,
diff --git a/build.zig.zon b/build.zig.zon
index 479daf1..c5704c1 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -2,13 +2,9 @@
     .name = "ztyping",
     .version = "0.0.0",
     .dependencies = .{
-        .mach_core = .{
-            .url = "https://pkg.machengine.org/mach-core/6a62bcc90e0d072d632788a6575d77942bd09a19.tar.gz",
-            .hash = "12209d39954fcda0be158461c10f64d14d5c7d097bd6d26785b332d75ffefa7dd7a0",
-        },
         .mach = .{
-            .url = "https://pkg.machengine.org/mach/d4cd79440ea16bf59156cd57707e5833acb8e1b5.tar.gz",
-            .hash = "12204662d0dc8a74270b1b219ad1b41e63568f7ae532a243a5fc38b1a95f58f756ae",
+            .url = "https://pkg.machengine.org/mach/f42135795afaf52307f3a2a8757462fd8efa71ac.tar.gz",
+            .hash = "12208fd50c06eaa0a88a489303da7ed99fb4fea839b6b75a10990d014aadc638c2d0",
         },
         .zigimg = .{
             .url = "https://github.com/Beyley/zigimg/archive/d54b946d4b33cf1a18c31ab8ce6a1b4e4f7c2d38.tar.gz",
diff --git a/game/app.zig b/game/app.zig
index 1589e3f..baef6cc 100644
--- a/game/app.zig
+++ b/game/app.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const bass = @import("bass");
-const core = @import("mach-core");
+const core = @import("mach").core;
 const gpu = core.gpu;
 const builtin = @import("builtin");
 const Gfx = @import("gfx.zig");
diff --git a/game/fontstash.zig b/game/fontstash.zig
index 408f92d..2be2f44 100644
--- a/game/fontstash.zig
+++ b/game/fontstash.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const core = @import("mach-core");
+const core = @import("mach").core;
 
 const Gfx = @import("gfx.zig");
 const Renderer = @import("renderer.zig");
diff --git a/game/gfx.zig b/game/gfx.zig
index 0f325f3..9bd08c6 100644
--- a/game/gfx.zig
+++ b/game/gfx.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const core = @import("mach-core");
+const core = @import("mach").core;
 const math = @import("mach").math;
 const img = @import("zigimg");
 
diff --git a/game/renderer.zig b/game/renderer.zig
index afcc65b..9166435 100644
--- a/game/renderer.zig
+++ b/game/renderer.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const core = @import("mach-core");
+const core = @import("mach").core;
 
 const Gfx = @import("gfx.zig");
 
diff --git a/game/screen.zig b/game/screen.zig
index 9e8f5c6..537dada 100644
--- a/game/screen.zig
+++ b/game/screen.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const bass = @import("bass");
-const core = @import("mach-core");
+const core = @import("mach").core;
 
 const App = @import("app.zig");
 const Renderer = @import("renderer.zig");
diff --git a/game/screens/gameplay.zig b/game/screens/gameplay.zig
index 6c677f5..7b57cb7 100644
--- a/game/screens/gameplay.zig
+++ b/game/screens/gameplay.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const bass = @import("bass");
 const builtin = @import("builtin");
 const fumen_compiler = @import("fumen_compiler");
-const core = @import("mach-core");
+const core = @import("mach").core;
 
 const Screen = @import("../screen.zig");
 const Gfx = @import("../gfx.zig");
diff --git a/game/screens/main_menu.zig b/game/screens/main_menu.zig
index d2732f4..88ef16d 100644
--- a/game/screens/main_menu.zig
+++ b/game/screens/main_menu.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const core = @import("mach-core");
+const core = @import("mach").core;
 
 const SongSelect = @import("song_select.zig");
 
diff --git a/game/screens/song_select.zig b/game/screens/song_select.zig
index 6471765..8bef141 100644
--- a/game/screens/song_select.zig
+++ b/game/screens/song_select.zig
@@ -1,6 +1,6 @@
 const builtin = @import("builtin");
 const std = @import("std");
-const core = @import("mach-core");
+const core = @import("mach").core;
 
 const Screen = @import("../screen.zig");
 const Gfx = @import("../gfx.zig");