diff --git a/assets/cubyz/biomes/forest/thin_birch.zig.zon b/assets/cubyz/biomes/forest/thin_birch.zig.zon index 0e69804bab..268722e2c4 100644 --- a/assets/cubyz/biomes/forest/thin_birch.zig.zon +++ b/assets/cubyz/biomes/forest/thin_birch.zig.zon @@ -37,8 +37,8 @@ .{ .id = "cubyz:simple_tree", .leaves = "cubyz:leaves/birch", - .log = "cubyz:birch_branch:0b11", - .top = "cubyz:birch_branch:0b11", + .log = "cubyz:branch/birch:0b11", + .top = "cubyz:branch/birch:0b11", .chance = 0.7, .type = .round, .height = 14, diff --git a/assets/cubyz/blocks/_migrations.zig.zon b/assets/cubyz/blocks/_migrations.zig.zon index e446a8855e..ee05116770 100644 --- a/assets/cubyz/blocks/_migrations.zig.zon +++ b/assets/cubyz/blocks/_migrations.zig.zon @@ -29,4 +29,14 @@ .{.old = "yellow_leaves_opaque", .new = "leaves/opaque/yellow"}, .{.old = "pine_needles", .new = "leaves/pine"}, .{.old = "pine_needles_opaque", .new = "leaves/opaque/pine"}, + .{.old = "baobab_branch", .new = "branch/baobab"}, + .{.old = "birch_branch", .new = "branch/birch"}, + .{.old = "bolete_branch", .new = "branch/bolete"}, + .{.old = "cactus_arm", .new = "branch/cactus"}, + .{.old = "glimmergill_branch", .new = "branch/glimmergill"}, + .{.old = "mahogany_branch", .new = "branch/mahogany"}, + .{.old = "oak_branch", .new = "branch/oak"}, + .{.old = "pine_branch", .new = "branch/pine"}, + .{.old = "toadstool_branch", .new = "branch/toadstool"}, + .{.old = "willow_branch", .new = "branch/willow"}, } diff --git a/assets/cubyz/blocks/branch/_defaults.zig.zon b/assets/cubyz/blocks/branch/_defaults.zig.zon new file mode 100644 index 0000000000..0c857cd617 --- /dev/null +++ b/assets/cubyz/blocks/branch/_defaults.zig.zon @@ -0,0 +1,13 @@ +.{ + .tags = .{.choppable, .wood}, + .blockHealth = 4, + .drops = .{ + .{.items = .{.auto}}, + }, + .absorbedLight = 0x202830, + .rotation = "cubyz:branch", + .model = .{ + .radius = 4, + }, + .decayProhibitor = true, +} diff --git a/assets/cubyz/blocks/baobab_branch.zig.zon b/assets/cubyz/blocks/branch/baobab.zig.zon similarity index 75% rename from assets/cubyz/blocks/baobab_branch.zig.zon rename to assets/cubyz/blocks/branch/baobab.zig.zon index 33711c6b7f..a34754d6fc 100644 --- a/assets/cubyz/blocks/baobab_branch.zig.zon +++ b/assets/cubyz/blocks/branch/baobab.zig.zon @@ -1,14 +1,5 @@ .{ - .tags = .{.choppable, .wood}, - .blockHealth = 4, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, + .lodReplacement = "cubyz:log/baobab", .texture0 = "cubyz:branch/baobab/dot", .texture1 = "cubyz:branch/baobab/half_line", .texture2 = "cubyz:branch/baobab/line", @@ -34,5 +25,4 @@ }, .texture = "branch/baobab.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/birch_branch.zig.zon b/assets/cubyz/blocks/branch/birch.zig.zon similarity index 76% rename from assets/cubyz/blocks/birch_branch.zig.zon rename to assets/cubyz/blocks/branch/birch.zig.zon index 994f37b5a6..a27accaa9a 100644 --- a/assets/cubyz/blocks/birch_branch.zig.zon +++ b/assets/cubyz/blocks/branch/birch.zig.zon @@ -1,14 +1,5 @@ .{ - .tags = .{.choppable, .wood}, - .blockHealth = 4, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, + .lodReplacement = "cubyz:log/birch", .texture0 = "cubyz:branch/birch/dot", .texture1 = "cubyz:branch/birch/half_line", .texture2 = "cubyz:branch/birch/line", @@ -37,5 +28,4 @@ }, .texture = "branch/birch.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/bolete_branch.zig.zon b/assets/cubyz/blocks/branch/bolete.zig.zon similarity index 81% rename from assets/cubyz/blocks/bolete_branch.zig.zon rename to assets/cubyz/blocks/branch/bolete.zig.zon index 1fa09ef7a8..a29a46fe33 100644 --- a/assets/cubyz/blocks/bolete_branch.zig.zon +++ b/assets/cubyz/blocks/branch/bolete.zig.zon @@ -1,14 +1,7 @@ .{ + .lodReplacement = "cubyz:log/bolete", .tags = .{.choppable, .cuttable, .mushroom}, .blockHealth = 2, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, .texture0 = "cubyz:branch/bolete/dot", .texture1 = "cubyz:branch/bolete/half_line", .texture2 = "cubyz:branch/bolete/line", @@ -34,5 +27,4 @@ }, .texture = "branch/bolete.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/cactus_arm.zig.zon b/assets/cubyz/blocks/branch/cactus.zig.zon similarity index 83% rename from assets/cubyz/blocks/cactus_arm.zig.zon rename to assets/cubyz/blocks/branch/cactus.zig.zon index 08dcc3d1c7..32fff43bcf 100644 --- a/assets/cubyz/blocks/cactus_arm.zig.zon +++ b/assets/cubyz/blocks/branch/cactus.zig.zon @@ -1,14 +1,7 @@ .{ + .lodReplacement = "cubyz:log/cactus", .tags = .{.choppable, .cuttable}, .blockHealth = 2.5, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, .texture0 = "cubyz:branch/cactus/dot", .texture1 = "cubyz:branch/cactus/half_line", .texture2 = "cubyz:branch/cactus/line", diff --git a/assets/cubyz/blocks/glimmergill_branch.zig.zon b/assets/cubyz/blocks/branch/glimmergill.zig.zon similarity index 82% rename from assets/cubyz/blocks/glimmergill_branch.zig.zon rename to assets/cubyz/blocks/branch/glimmergill.zig.zon index 9df4e2e2fe..c4e6bccd80 100644 --- a/assets/cubyz/blocks/glimmergill_branch.zig.zon +++ b/assets/cubyz/blocks/branch/glimmergill.zig.zon @@ -1,14 +1,7 @@ .{ + .lodReplacement = "cubyz:log/glimmergill", .tags = .{.choppable, .cuttable, .mushroom}, .blockHealth = 2, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, .texture0 = "cubyz:branch/glimmergill/dot", .texture1 = "cubyz:branch/glimmergill/half_line", .texture2 = "cubyz:branch/glimmergill/line", @@ -34,5 +27,4 @@ }, .texture = "branch/glimmergill.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/mahogany_branch.zig.zon b/assets/cubyz/blocks/branch/mahogany.zig.zon similarity index 75% rename from assets/cubyz/blocks/mahogany_branch.zig.zon rename to assets/cubyz/blocks/branch/mahogany.zig.zon index 111581aabd..7a3df109be 100644 --- a/assets/cubyz/blocks/mahogany_branch.zig.zon +++ b/assets/cubyz/blocks/branch/mahogany.zig.zon @@ -1,14 +1,5 @@ .{ - .tags = .{.choppable, .wood}, - .blockHealth = 4, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, + .lodReplacement = "cubyz:log/mahogany", .texture0 = "cubyz:branch/mahogany/dot", .texture1 = "cubyz:branch/mahogany/half_line", .texture2 = "cubyz:branch/mahogany/line", @@ -34,5 +25,4 @@ }, .texture = "branch/mahogany.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/oak_branch.zig.zon b/assets/cubyz/blocks/branch/oak.zig.zon similarity index 74% rename from assets/cubyz/blocks/oak_branch.zig.zon rename to assets/cubyz/blocks/branch/oak.zig.zon index 39413c1806..c809a55b71 100644 --- a/assets/cubyz/blocks/oak_branch.zig.zon +++ b/assets/cubyz/blocks/branch/oak.zig.zon @@ -1,14 +1,5 @@ .{ - .tags = .{.choppable, .wood}, - .blockHealth = 4, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, + .lodReplacement = "cubyz:log/oak", .texture0 = "cubyz:branch/oak/dot", .texture1 = "cubyz:branch/oak/half_line", .texture2 = "cubyz:branch/oak/line", @@ -34,5 +25,4 @@ }, .texture = "branch/oak.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/branch/palm.zig.zon b/assets/cubyz/blocks/branch/palm.zig.zon index fc62f720fc..f65a8ee129 100644 --- a/assets/cubyz/blocks/branch/palm.zig.zon +++ b/assets/cubyz/blocks/branch/palm.zig.zon @@ -1,14 +1,5 @@ .{ - .tags = .{.choppable, .wood}, - .blockHealth = 4, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, + .lodReplacement = "cubyz:log/palm", .texture0 = "cubyz:branch/palm/dot", .texture1 = "cubyz:branch/palm/half_line", .texture2 = "cubyz:branch/palm/line", @@ -34,5 +25,4 @@ }, .texture = "branch/palm.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/pine_branch.zig.zon b/assets/cubyz/blocks/branch/pine.zig.zon similarity index 74% rename from assets/cubyz/blocks/pine_branch.zig.zon rename to assets/cubyz/blocks/branch/pine.zig.zon index d0723b65f5..459d74b8eb 100644 --- a/assets/cubyz/blocks/pine_branch.zig.zon +++ b/assets/cubyz/blocks/branch/pine.zig.zon @@ -1,14 +1,5 @@ .{ - .tags = .{.choppable, .wood}, - .blockHealth = 4, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, + .lodReplacement = "cubyz:log/pine", .texture0 = "cubyz:branch/pine/dot", .texture1 = "cubyz:branch/pine/half_line", .texture2 = "cubyz:branch/pine/line", @@ -34,5 +25,4 @@ }, .texture = "branch/pine.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/toadstool_branch.zig.zon b/assets/cubyz/blocks/branch/toadstool.zig.zon similarity index 82% rename from assets/cubyz/blocks/toadstool_branch.zig.zon rename to assets/cubyz/blocks/branch/toadstool.zig.zon index dff3ad772d..e3df9a8802 100644 --- a/assets/cubyz/blocks/toadstool_branch.zig.zon +++ b/assets/cubyz/blocks/branch/toadstool.zig.zon @@ -1,14 +1,7 @@ .{ + .lodReplacement = "cubyz:log/toadstool", .tags = .{.choppable, .cuttable, .mushroom}, .blockHealth = 2, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, .texture0 = "cubyz:branch/toadstool/dot", .texture1 = "cubyz:branch/toadstool/half_line", .texture2 = "cubyz:branch/toadstool/line", @@ -34,5 +27,4 @@ }, .texture = "branch/toadstool.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/blocks/willow_branch.zig.zon b/assets/cubyz/blocks/branch/willow.zig.zon similarity index 75% rename from assets/cubyz/blocks/willow_branch.zig.zon rename to assets/cubyz/blocks/branch/willow.zig.zon index d6bce32aa2..865ffd04ad 100644 --- a/assets/cubyz/blocks/willow_branch.zig.zon +++ b/assets/cubyz/blocks/branch/willow.zig.zon @@ -1,14 +1,5 @@ .{ - .tags = .{.choppable, .wood}, - .blockHealth = 4, - .drops = .{ - .{.items = .{.auto}}, - }, - .absorbedLight = 0x202830, - .rotation = "cubyz:branch", - .model = .{ - .radius = 4, - }, + .lodReplacement = "cubyz:log/willow", .texture0 = "cubyz:branch/willow/dot", .texture1 = "cubyz:branch/willow/half_line", .texture2 = "cubyz:branch/willow/line", @@ -34,5 +25,4 @@ }, .texture = "branch/willow.png", }, - .decayProhibitor = true, } diff --git a/assets/cubyz/items/_migrations.zig.zon b/assets/cubyz/items/_migrations.zig.zon index 699e3cc5f5..e70c144390 100644 --- a/assets/cubyz/items/_migrations.zig.zon +++ b/assets/cubyz/items/_migrations.zig.zon @@ -17,4 +17,14 @@ .{.old = "willow_leaves", .new = "leaves/willow"}, .{.old = "yellow_leaves", .new = "leaves/yellow"}, .{.old = "pine_needles", .new = "leaves/pine"}, + .{.old = "baobab_branch", .new = "branch/baobab"}, + .{.old = "birch_branch", .new = "branch/birch"}, + .{.old = "bolete_branch", .new = "branch/bolete"}, + .{.old = "cactus_arm", .new = "branch/cactus"}, + .{.old = "glimmergill_branch", .new = "branch/glimmergill"}, + .{.old = "mahogany_branch", .new = "branch/mahogany"}, + .{.old = "oak_branch", .new = "branch/oak"}, + .{.old = "pine_branch", .new = "branch/pine"}, + .{.old = "toadstool_branch", .new = "branch/toadstool"}, + .{.old = "willow_branch", .new = "branch/willow"}, } diff --git a/assets/cubyz/recipes/wood_recipes.zig.zon b/assets/cubyz/recipes/wood_recipes.zig.zon index f6fd8495cd..d02e52c89b 100644 --- a/assets/cubyz/recipes/wood_recipes.zig.zon +++ b/assets/cubyz/recipes/wood_recipes.zig.zon @@ -9,10 +9,10 @@ }, .{ .inputs = .{"cubyz:log/{type}"}, - .output = "2 cubyz:{type}_branch", + .output = "2 cubyz:branch/{type}", }, .{ - .inputs = .{"cubyz:{type}_branch"}, + .inputs = .{"cubyz:branch/{type}"}, .output = "2 cubyz:{type}_planks", }, .{ @@ -27,10 +27,6 @@ .inputs = .{"4 cubyz:{type}_planks"}, .output = "cubyz:chest/{type}", }, - .{ - .inputs = .{"cubyz:log/cactus"}, - .output = "2 cubyz:cactus_arm", - }, .{ .inputs = .{"cubyz:candy_cane/block"}, .output = "2 cubyz:candy_cane/branch",