diff --git a/.drone.yml b/.drone.yml index 7df631b..a33ad36 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,6 @@ steps: - apt update - apt install -y curl - haxe jq libarchive-dev libcurl4-openssl-dev diff --git a/build.zig b/build.zig index b641d39..d5c2194 100755 --- a/build.zig +++ b/build.zig @@ -38,8 +38,6 @@ pub fn main() !void { try archiveCreateDir(zip.?, entry.?, "minecraft/"); try archiveCreateDir(zip.?, entry.?, "minecraft/mods/"); - try installHaxe(zip.?, entry.?, &buf); - var overrides = try std.fs.cwd().openDir("overrides", .{ .iterate = true }); defer overrides.close(); var walker = try overrides.walk(std.heap.c_allocator); @@ -147,34 +145,6 @@ fn archiveCreateDir( try handleArchiveErr(c.archive_write_header(archive, entry), archive); } -fn installHaxe(archive: *c.archive, entry: *c.archive_entry, buf: []u8) !void { - const term = try std.ChildProcess.init( - &.{ "haxe", "kubejs/build.hxml" }, - std.heap.c_allocator, - ).spawnAndWait(); - - const term_n = switch (term) { - .Exited => |n| @intCast(u32, n), - .Signal, .Unknown, .Stopped => |n| n, - }; - - if (term_n != 0) - return error.BuildHaxeError; - - try archiveCreateDir(archive, entry, "minecraft/kubejs/"); - try archiveCreateDir(archive, entry, "minecraft/kubejs/server_scripts/"); - - var file = try std.fs.cwd().openFile("build/kubejs-server.js", .{}); - defer file.close(); - try archiveFile( - archive, - entry, - buf, - "minecraft/kubejs/server_scripts/script.js", - file, - ); -} - fn readMods(list: *std.ArrayList([]u8), alloc: std.mem.Allocator) !void { var file = try std.fs.cwd().openFile("mods.txt", .{}); defer file.close(); diff --git a/kubejs/Main.hx b/kubejs/Main.hx deleted file mode 100644 index 93bd163..0000000 --- a/kubejs/Main.hx +++ /dev/null @@ -1,15 +0,0 @@ -package; - -import kubejs.Events; -import kubejs.Settings; - -class Main { - static function main() { - Settings.logAddedRecipes = true; - Settings.logErroringRecipes = true; - Settings.logRemovedRecipes = true; - Settings.logSkippedRecipes = false; - - Events.onEvent(EventType.RecipesEventType, Recipes.onEvent); - } -} diff --git a/kubejs/Recipes.hx b/kubejs/Recipes.hx deleted file mode 100644 index 07f8935..0000000 --- a/kubejs/Recipes.hx +++ /dev/null @@ -1,20 +0,0 @@ -import kubejs.events.server.RecipesEvent; - -class Recipes { - public static function onEvent(event:RecipesEvent) { - event.shaped( - "flight_rings:t_basic_ring_treasure", - [ - "S", "W", "S", - "W", "R", "W", - "F", "W", "F", - ], - { - S: "terramine:mana_crystal", - W: "minecraft:feather", - R: "botania:pixie_ring", - F: "create:encased_fan", - } - ); - } -} diff --git a/kubejs/build.hxml b/kubejs/build.hxml deleted file mode 100644 index 4fcd46a..0000000 --- a/kubejs/build.hxml +++ /dev/null @@ -1,5 +0,0 @@ -# invoke haxe from the repository root --cp kubejs --main Main --lib kubejs --js build/kubejs-server.js diff --git a/overrides/kubejs/server_scripts/00-settings.js b/overrides/kubejs/server_scripts/00-settings.js new file mode 100644 index 0000000..8e03e4f --- /dev/null +++ b/overrides/kubejs/server_scripts/00-settings.js @@ -0,0 +1,4 @@ +settings.logAddedRecipes = true; +settings.logErroringRecipes = true; +settings.logRemovedRecipes = true; +settings.logSkippedRecipes = false; diff --git a/overrides/kubejs/server_scripts/40-recipes.js b/overrides/kubejs/server_scripts/40-recipes.js new file mode 100644 index 0000000..d0232b2 --- /dev/null +++ b/overrides/kubejs/server_scripts/40-recipes.js @@ -0,0 +1,18 @@ +function recipes(ev) { + ev.shaped( + "flight_rings:t_basic_ring_treasure", + [ + "SWS", + "WRW", + "FWF", + ], + { + S: "terramine:mana_crystal", + W: "minecraft:feather", + R: "botania:pixie_ring", + F: "create:encased_fan", + } + ); +} + +onEvent("recipes", recipes);