Skip to content

Migrate branches #2347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
careeoki wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Migrate branches #2347

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7039513
Migrate branches
careeoki Nov 24, 2025
0931472
oops
careeoki Nov 24, 2025
2446e44
candy cane
careeoki Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/cubyz/biomes/forest/thin_birch.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 10 additions & 0 deletions assets/cubyz/blocks/_migrations.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
13 changes: 13 additions & 0 deletions assets/cubyz/blocks/branch/_defaults.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.decayProhibitor = true,
}
11 changes: 0 additions & 11 deletions assets/cubyz/blocks/baobab_branch.zig.zon → assets/cubyz/blocks/branch/baobab.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.texture0 = "cubyz:branch/baobab/dot",
.texture1 = "cubyz:branch/baobab/half_line",
.texture2 = "cubyz:branch/baobab/line",
Expand All @@ -34,5 +24,4 @@
},
.texture = "branch/baobab.png",
},
.decayProhibitor = true,
}
11 changes: 0 additions & 11 deletions assets/cubyz/blocks/birch_branch.zig.zon → assets/cubyz/blocks/branch/birch.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.texture0 = "cubyz:branch/birch/dot",
.texture1 = "cubyz:branch/birch/half_line",
.texture2 = "cubyz:branch/birch/line",
Expand Down Expand Up @@ -37,5 +27,4 @@
},
.texture = "branch/birch.png",
},
.decayProhibitor = true,
}
9 changes: 0 additions & 9 deletions assets/cubyz/blocks/bolete_branch.zig.zon → assets/cubyz/blocks/branch/bolete.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
.{
.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",
Expand All @@ -34,5 +26,4 @@
},
.texture = "branch/bolete.png",
},
.decayProhibitor = true,
}
8 changes: 0 additions & 8 deletions assets/cubyz/blocks/cactus_arm.zig.zon → assets/cubyz/blocks/branch/cactus.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
.{
.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",
Expand Down
9 changes: 0 additions & 9 deletions ...s/cubyz/blocks/glimmergill_branch.zig.zon → ...s/cubyz/blocks/branch/glimmergill.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
.{
.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",
Expand All @@ -34,5 +26,4 @@
},
.texture = "branch/glimmergill.png",
},
.decayProhibitor = true,
}
11 changes: 0 additions & 11 deletions assets/cubyz/blocks/mahogany_branch.zig.zon → assets/cubyz/blocks/branch/mahogany.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.texture0 = "cubyz:branch/mahogany/dot",
.texture1 = "cubyz:branch/mahogany/half_line",
.texture2 = "cubyz:branch/mahogany/line",
Expand All @@ -34,5 +24,4 @@
},
.texture = "branch/mahogany.png",
},
.decayProhibitor = true,
}
11 changes: 0 additions & 11 deletions assets/cubyz/blocks/oak_branch.zig.zon → assets/cubyz/blocks/branch/oak.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.texture0 = "cubyz:branch/oak/dot",
.texture1 = "cubyz:branch/oak/half_line",
.texture2 = "cubyz:branch/oak/line",
Expand All @@ -34,5 +24,4 @@
},
.texture = "branch/oak.png",
},
.decayProhibitor = true,
}
11 changes: 0 additions & 11 deletions assets/cubyz/blocks/branch/palm.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.texture0 = "cubyz:branch/palm/dot",
.texture1 = "cubyz:branch/palm/half_line",
.texture2 = "cubyz:branch/palm/line",
Expand All @@ -34,5 +24,4 @@
},
.texture = "branch/palm.png",
},
.decayProhibitor = true,
}
11 changes: 0 additions & 11 deletions assets/cubyz/blocks/pine_branch.zig.zon → assets/cubyz/blocks/branch/pine.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.texture0 = "cubyz:branch/pine/dot",
.texture1 = "cubyz:branch/pine/half_line",
.texture2 = "cubyz:branch/pine/line",
Expand All @@ -34,5 +24,4 @@
},
.texture = "branch/pine.png",
},
.decayProhibitor = true,
}
9 changes: 0 additions & 9 deletions assets/cubyz/blocks/toadstool_branch.zig.zon → assets/cubyz/blocks/branch/toadstool.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
.{
.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",
Expand All @@ -34,5 +26,4 @@
},
.texture = "branch/toadstool.png",
},
.decayProhibitor = true,
}
11 changes: 0 additions & 11 deletions assets/cubyz/blocks/willow_branch.zig.zon → assets/cubyz/blocks/branch/willow.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
.{
.tags = .{.choppable, .wood},
.blockHealth = 4,
.drops = .{
.{.items = .{.auto}},
},
.absorbedLight = 0x202830,
.rotation = "cubyz:branch",
.model = .{
.radius = 4,
},
.texture0 = "cubyz:branch/willow/dot",
.texture1 = "cubyz:branch/willow/half_line",
.texture2 = "cubyz:branch/willow/line",
Expand All @@ -34,5 +24,4 @@
},
.texture = "branch/willow.png",
},
.decayProhibitor = true,
}
10 changes: 10 additions & 0 deletions assets/cubyz/items/_migrations.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
8 changes: 2 additions & 6 deletions assets/cubyz/recipes/wood_recipes.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
.{
Expand All @@ -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",
Expand Down