From 14c7fafce99d6fc205ad68f4175b131bede46c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Wi=C5=9Bniewski?= Date: Sat, 24 May 2025 13:23:51 +0200 Subject: [PATCH] Merge `sbb` and `blueprint` asset directories (#1498) ## Description This pull request merges `sbb` and `blueprint` directory trees into single directory tree as discussed in #1403 searched twice, once to load blueprint files, once to load sbb zon files. ## Links Related to: #1403 Related to: #1408 --- .../cubyz/{blueprints => sbb}/deco/birch_leaf.blp | Bin assets/cubyz/{blueprints => sbb}/deco/bolete.blp | Bin .../cubyz/{blueprints => sbb}/deco/bolete_side.blp | Bin .../cubyz/{blueprints => sbb}/deco/ivy_side_2.blp | Bin .../cubyz/{blueprints => sbb}/deco/ivy_side_3.blp | Bin assets/cubyz/{blueprints => sbb}/generator.blp | Bin .../{blueprints => sbb}/tree/birch/1/base/base.blp | Bin .../{blueprints => sbb}/tree/birch/1/branch/1.blp | Bin .../{blueprints => sbb}/tree/birch/1/branch/2.blp | Bin .../{blueprints => sbb}/tree/birch/1/branch/3.blp | Bin .../{blueprints => sbb}/tree/birch/1/leaf/1.blp | Bin .../{blueprints => sbb}/tree/birch/1/root/1.blp | Bin .../{blueprints => sbb}/tree/birch/1/root/2.blp | Bin .../{blueprints => sbb}/tree/birch/1/root/3.blp | Bin .../tree/birch/1/small_branch/1.blp | Bin .../tree/birch/1/small_branch/2.blp | Bin .../tree/birch/1/small_branch/3.blp | Bin .../{blueprints => sbb}/tree/birch/1/stub/1.blp | Bin .../{blueprints => sbb}/tree/birch/1/stub/2.blp | Bin .../{blueprints => sbb}/tree/birch/1/stub/3.blp | Bin .../{blueprints => sbb}/tree/birch/1/stub/4.blp | Bin .../{blueprints => sbb}/tree/birch/1/top/1.blp | Bin .../{blueprints => sbb}/tree/birch/1/top/2.blp | Bin .../{blueprints => sbb}/tree/birch/1/tree/1.blp | Bin .../{blueprints => sbb}/tree/birch/1/tree/2.blp | Bin .../{blueprints => sbb}/tree/birch/1/tree/3.blp | Bin .../{blueprints => sbb}/tree/birch/1/tree/4.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/base/1.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/base/2.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/base/3.blp | Bin .../{blueprints => sbb}/tree/oak/1/branch/1.blp | Bin .../{blueprints => sbb}/tree/oak/1/branch/2.blp | Bin .../{blueprints => sbb}/tree/oak/1/branch/3.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/leaf/1.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/leaf/2.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/leaf/3.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/root/1.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/root/2.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/root/3.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/root/4.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/root/5.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/root/6.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/stub/1.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/stub/2.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/stub/3.blp | Bin .../cubyz/{blueprints => sbb}/tree/oak/1/stub/4.blp | Bin .../{blueprints => sbb}/tree/oak/1/trunk/1.blp | Bin .../{blueprints => sbb}/tree/oak/1/trunk/2.blp | Bin .../{blueprints => sbb}/tree/oak/1/trunk/3.blp | Bin .../{blueprints => sbb}/tree/oak/1/trunk/4.blp | Bin .../{blueprints => sbb}/tree/oak/1/trunk/5.blp | Bin .../{blueprints => sbb}/tree/oak/1/trunk/6.blp | Bin src/assets.zig | 5 ++--- 53 files changed, 2 insertions(+), 3 deletions(-) rename assets/cubyz/{blueprints => sbb}/deco/birch_leaf.blp (100%) rename assets/cubyz/{blueprints => sbb}/deco/bolete.blp (100%) rename assets/cubyz/{blueprints => sbb}/deco/bolete_side.blp (100%) rename assets/cubyz/{blueprints => sbb}/deco/ivy_side_2.blp (100%) rename assets/cubyz/{blueprints => sbb}/deco/ivy_side_3.blp (100%) rename assets/cubyz/{blueprints => sbb}/generator.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/base/base.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/branch/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/branch/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/branch/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/leaf/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/root/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/root/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/root/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/small_branch/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/small_branch/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/small_branch/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/stub/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/stub/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/stub/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/stub/4.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/top/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/top/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/tree/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/tree/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/tree/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/birch/1/tree/4.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/base/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/base/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/base/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/branch/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/branch/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/branch/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/leaf/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/leaf/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/leaf/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/root/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/root/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/root/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/root/4.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/root/5.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/root/6.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/stub/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/stub/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/stub/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/stub/4.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/trunk/1.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/trunk/2.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/trunk/3.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/trunk/4.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/trunk/5.blp (100%) rename assets/cubyz/{blueprints => sbb}/tree/oak/1/trunk/6.blp (100%) diff --git a/assets/cubyz/blueprints/deco/birch_leaf.blp b/assets/cubyz/sbb/deco/birch_leaf.blp similarity index 100% rename from assets/cubyz/blueprints/deco/birch_leaf.blp rename to assets/cubyz/sbb/deco/birch_leaf.blp diff --git a/assets/cubyz/blueprints/deco/bolete.blp b/assets/cubyz/sbb/deco/bolete.blp similarity index 100% rename from assets/cubyz/blueprints/deco/bolete.blp rename to assets/cubyz/sbb/deco/bolete.blp diff --git a/assets/cubyz/blueprints/deco/bolete_side.blp b/assets/cubyz/sbb/deco/bolete_side.blp similarity index 100% rename from assets/cubyz/blueprints/deco/bolete_side.blp rename to assets/cubyz/sbb/deco/bolete_side.blp diff --git a/assets/cubyz/blueprints/deco/ivy_side_2.blp b/assets/cubyz/sbb/deco/ivy_side_2.blp similarity index 100% rename from assets/cubyz/blueprints/deco/ivy_side_2.blp rename to assets/cubyz/sbb/deco/ivy_side_2.blp diff --git a/assets/cubyz/blueprints/deco/ivy_side_3.blp b/assets/cubyz/sbb/deco/ivy_side_3.blp similarity index 100% rename from assets/cubyz/blueprints/deco/ivy_side_3.blp rename to assets/cubyz/sbb/deco/ivy_side_3.blp diff --git a/assets/cubyz/blueprints/generator.blp b/assets/cubyz/sbb/generator.blp similarity index 100% rename from assets/cubyz/blueprints/generator.blp rename to assets/cubyz/sbb/generator.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/base/base.blp b/assets/cubyz/sbb/tree/birch/1/base/base.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/base/base.blp rename to assets/cubyz/sbb/tree/birch/1/base/base.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/branch/1.blp b/assets/cubyz/sbb/tree/birch/1/branch/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/branch/1.blp rename to assets/cubyz/sbb/tree/birch/1/branch/1.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/branch/2.blp b/assets/cubyz/sbb/tree/birch/1/branch/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/branch/2.blp rename to assets/cubyz/sbb/tree/birch/1/branch/2.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/branch/3.blp b/assets/cubyz/sbb/tree/birch/1/branch/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/branch/3.blp rename to assets/cubyz/sbb/tree/birch/1/branch/3.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/leaf/1.blp b/assets/cubyz/sbb/tree/birch/1/leaf/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/leaf/1.blp rename to assets/cubyz/sbb/tree/birch/1/leaf/1.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/root/1.blp b/assets/cubyz/sbb/tree/birch/1/root/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/root/1.blp rename to assets/cubyz/sbb/tree/birch/1/root/1.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/root/2.blp b/assets/cubyz/sbb/tree/birch/1/root/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/root/2.blp rename to assets/cubyz/sbb/tree/birch/1/root/2.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/root/3.blp b/assets/cubyz/sbb/tree/birch/1/root/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/root/3.blp rename to assets/cubyz/sbb/tree/birch/1/root/3.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/small_branch/1.blp b/assets/cubyz/sbb/tree/birch/1/small_branch/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/small_branch/1.blp rename to assets/cubyz/sbb/tree/birch/1/small_branch/1.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/small_branch/2.blp b/assets/cubyz/sbb/tree/birch/1/small_branch/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/small_branch/2.blp rename to assets/cubyz/sbb/tree/birch/1/small_branch/2.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/small_branch/3.blp b/assets/cubyz/sbb/tree/birch/1/small_branch/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/small_branch/3.blp rename to assets/cubyz/sbb/tree/birch/1/small_branch/3.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/stub/1.blp b/assets/cubyz/sbb/tree/birch/1/stub/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/stub/1.blp rename to assets/cubyz/sbb/tree/birch/1/stub/1.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/stub/2.blp b/assets/cubyz/sbb/tree/birch/1/stub/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/stub/2.blp rename to assets/cubyz/sbb/tree/birch/1/stub/2.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/stub/3.blp b/assets/cubyz/sbb/tree/birch/1/stub/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/stub/3.blp rename to assets/cubyz/sbb/tree/birch/1/stub/3.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/stub/4.blp b/assets/cubyz/sbb/tree/birch/1/stub/4.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/stub/4.blp rename to assets/cubyz/sbb/tree/birch/1/stub/4.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/top/1.blp b/assets/cubyz/sbb/tree/birch/1/top/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/top/1.blp rename to assets/cubyz/sbb/tree/birch/1/top/1.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/top/2.blp b/assets/cubyz/sbb/tree/birch/1/top/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/top/2.blp rename to assets/cubyz/sbb/tree/birch/1/top/2.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/tree/1.blp b/assets/cubyz/sbb/tree/birch/1/tree/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/tree/1.blp rename to assets/cubyz/sbb/tree/birch/1/tree/1.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/tree/2.blp b/assets/cubyz/sbb/tree/birch/1/tree/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/tree/2.blp rename to assets/cubyz/sbb/tree/birch/1/tree/2.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/tree/3.blp b/assets/cubyz/sbb/tree/birch/1/tree/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/tree/3.blp rename to assets/cubyz/sbb/tree/birch/1/tree/3.blp diff --git a/assets/cubyz/blueprints/tree/birch/1/tree/4.blp b/assets/cubyz/sbb/tree/birch/1/tree/4.blp similarity index 100% rename from assets/cubyz/blueprints/tree/birch/1/tree/4.blp rename to assets/cubyz/sbb/tree/birch/1/tree/4.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/base/1.blp b/assets/cubyz/sbb/tree/oak/1/base/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/base/1.blp rename to assets/cubyz/sbb/tree/oak/1/base/1.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/base/2.blp b/assets/cubyz/sbb/tree/oak/1/base/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/base/2.blp rename to assets/cubyz/sbb/tree/oak/1/base/2.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/base/3.blp b/assets/cubyz/sbb/tree/oak/1/base/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/base/3.blp rename to assets/cubyz/sbb/tree/oak/1/base/3.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/branch/1.blp b/assets/cubyz/sbb/tree/oak/1/branch/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/branch/1.blp rename to assets/cubyz/sbb/tree/oak/1/branch/1.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/branch/2.blp b/assets/cubyz/sbb/tree/oak/1/branch/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/branch/2.blp rename to assets/cubyz/sbb/tree/oak/1/branch/2.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/branch/3.blp b/assets/cubyz/sbb/tree/oak/1/branch/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/branch/3.blp rename to assets/cubyz/sbb/tree/oak/1/branch/3.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/leaf/1.blp b/assets/cubyz/sbb/tree/oak/1/leaf/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/leaf/1.blp rename to assets/cubyz/sbb/tree/oak/1/leaf/1.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/leaf/2.blp b/assets/cubyz/sbb/tree/oak/1/leaf/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/leaf/2.blp rename to assets/cubyz/sbb/tree/oak/1/leaf/2.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/leaf/3.blp b/assets/cubyz/sbb/tree/oak/1/leaf/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/leaf/3.blp rename to assets/cubyz/sbb/tree/oak/1/leaf/3.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/root/1.blp b/assets/cubyz/sbb/tree/oak/1/root/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/root/1.blp rename to assets/cubyz/sbb/tree/oak/1/root/1.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/root/2.blp b/assets/cubyz/sbb/tree/oak/1/root/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/root/2.blp rename to assets/cubyz/sbb/tree/oak/1/root/2.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/root/3.blp b/assets/cubyz/sbb/tree/oak/1/root/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/root/3.blp rename to assets/cubyz/sbb/tree/oak/1/root/3.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/root/4.blp b/assets/cubyz/sbb/tree/oak/1/root/4.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/root/4.blp rename to assets/cubyz/sbb/tree/oak/1/root/4.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/root/5.blp b/assets/cubyz/sbb/tree/oak/1/root/5.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/root/5.blp rename to assets/cubyz/sbb/tree/oak/1/root/5.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/root/6.blp b/assets/cubyz/sbb/tree/oak/1/root/6.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/root/6.blp rename to assets/cubyz/sbb/tree/oak/1/root/6.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/stub/1.blp b/assets/cubyz/sbb/tree/oak/1/stub/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/stub/1.blp rename to assets/cubyz/sbb/tree/oak/1/stub/1.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/stub/2.blp b/assets/cubyz/sbb/tree/oak/1/stub/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/stub/2.blp rename to assets/cubyz/sbb/tree/oak/1/stub/2.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/stub/3.blp b/assets/cubyz/sbb/tree/oak/1/stub/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/stub/3.blp rename to assets/cubyz/sbb/tree/oak/1/stub/3.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/stub/4.blp b/assets/cubyz/sbb/tree/oak/1/stub/4.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/stub/4.blp rename to assets/cubyz/sbb/tree/oak/1/stub/4.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/trunk/1.blp b/assets/cubyz/sbb/tree/oak/1/trunk/1.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/trunk/1.blp rename to assets/cubyz/sbb/tree/oak/1/trunk/1.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/trunk/2.blp b/assets/cubyz/sbb/tree/oak/1/trunk/2.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/trunk/2.blp rename to assets/cubyz/sbb/tree/oak/1/trunk/2.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/trunk/3.blp b/assets/cubyz/sbb/tree/oak/1/trunk/3.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/trunk/3.blp rename to assets/cubyz/sbb/tree/oak/1/trunk/3.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/trunk/4.blp b/assets/cubyz/sbb/tree/oak/1/trunk/4.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/trunk/4.blp rename to assets/cubyz/sbb/tree/oak/1/trunk/4.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/trunk/5.blp b/assets/cubyz/sbb/tree/oak/1/trunk/5.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/trunk/5.blp rename to assets/cubyz/sbb/tree/oak/1/trunk/5.blp diff --git a/assets/cubyz/blueprints/tree/oak/1/trunk/6.blp b/assets/cubyz/sbb/tree/oak/1/trunk/6.blp similarity index 100% rename from assets/cubyz/blueprints/tree/oak/1/trunk/6.blp rename to assets/cubyz/sbb/tree/oak/1/trunk/6.blp diff --git a/src/assets.zig b/src/assets.zig index 45ef292c9..3f463355b 100644 --- a/src/assets.zig +++ b/src/assets.zig @@ -86,7 +86,7 @@ pub const Assets = struct { addon.readAllZon(allocator, "biomes", true, &self.biomes, &self.biomeMigrations); addon.readAllZon(allocator, "recipes", false, &self.recipes, null); addon.readAllZon(allocator, "sbb", true, &self.structureBuildingBlocks, null); - addon.readAllBlueprints(allocator, &self.blueprints); + addon.readAllBlueprints(allocator, "sbb", &self.blueprints); addon.readAllModels(allocator, &self.models); } } @@ -227,8 +227,7 @@ pub const Assets = struct { } } - pub fn readAllBlueprints(addon: Addon, allocator: NeverFailingAllocator, output: *BytesHashMap) void { - const subPath = "blueprints"; + pub fn readAllBlueprints(addon: Addon, allocator: NeverFailingAllocator, subPath: []const u8, output: *BytesHashMap) void { var assetsDirectory = addon.dir.openDir(subPath, .{.iterate = true}) catch |err| { if(err != error.FileNotFound) { std.log.err("Could not open addon directory {s}: {s}", .{subPath, @errorName(err)});