diff --git a/assets/cubyz/biomes/autumn/dead_forest.zig.zon b/assets/cubyz/biomes/autumn/dead_forest.zig.zon index 82c92ba5..0fe76171 100644 --- a/assets/cubyz/biomes/autumn/dead_forest.zig.zon +++ b/assets/cubyz/biomes/autumn/dead_forest.zig.zon @@ -104,5 +104,23 @@ .density = 0.3, .priority = 0.1, }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:bolete", + .chance = 0.035, + .width = 8, + .variation = 4, + .density = 0.08, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:toadstool", + .chance = 0.03, + .width = 8, + .variation = 4, + .density = 0.08, + .priority = 0.1, + }, }, } diff --git a/assets/cubyz/biomes/swamp/base.zig.zon b/assets/cubyz/biomes/swamp/base.zig.zon index a6b72ba3..5ef384ab 100644 --- a/assets/cubyz/biomes/swamp/base.zig.zon +++ b/assets/cubyz/biomes/swamp/base.zig.zon @@ -50,6 +50,24 @@ .density = 0.3, .priority = 0.1, }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:bolete", + .chance = 0.035, + .width = 6, + .variation = 6, + .density = 0.05, + .priority = 0.2, + }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:toadstool", + .chance = 0.03, + .width = 6, + .variation = 6, + .density = 0.05, + .priority = 0.2, + }, .{ .id = "cubyz:simple_tree", .leaves = "cubyz:willow_leaves", diff --git a/assets/cubyz/blocks/bolete.zig.zon b/assets/cubyz/blocks/bolete.zig.zon new file mode 100644 index 00000000..d4f2c215 --- /dev/null +++ b/assets/cubyz/blocks/bolete.zig.zon @@ -0,0 +1,23 @@ +.{ + .tags = .{.wood}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .solid = false, + .viewThrough = true, + .absorbedLight = 0x010101, + .collide= false, + .rotation = .torch, + .model = .{ + .base = "cubyz:bolete/floor", + .side = "cubyz:bolete/shelf", + }, + .texture = "cubyz:bolete_side", + .texture_top = "cubyz:bolete_top", + .texture_bottom = "cubyz:bolete_bottom", + .item = .{ + .texture = "bolete.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/textures/bolete_bottom.png b/assets/cubyz/blocks/textures/bolete_bottom.png new file mode 100644 index 00000000..6bd4c43a Binary files /dev/null and b/assets/cubyz/blocks/textures/bolete_bottom.png differ diff --git a/assets/cubyz/blocks/textures/bolete_side.png b/assets/cubyz/blocks/textures/bolete_side.png new file mode 100644 index 00000000..b2ac31de Binary files /dev/null and b/assets/cubyz/blocks/textures/bolete_side.png differ diff --git a/assets/cubyz/blocks/textures/bolete_top.png b/assets/cubyz/blocks/textures/bolete_top.png new file mode 100644 index 00000000..5199a634 Binary files /dev/null and b/assets/cubyz/blocks/textures/bolete_top.png differ diff --git a/assets/cubyz/blocks/textures/toadstool_bottom.png b/assets/cubyz/blocks/textures/toadstool_bottom.png new file mode 100644 index 00000000..98911662 Binary files /dev/null and b/assets/cubyz/blocks/textures/toadstool_bottom.png differ diff --git a/assets/cubyz/blocks/textures/toadstool_side.png b/assets/cubyz/blocks/textures/toadstool_side.png new file mode 100644 index 00000000..1a24605c Binary files /dev/null and b/assets/cubyz/blocks/textures/toadstool_side.png differ diff --git a/assets/cubyz/blocks/textures/toadstool_top.png b/assets/cubyz/blocks/textures/toadstool_top.png new file mode 100644 index 00000000..40725a80 Binary files /dev/null and b/assets/cubyz/blocks/textures/toadstool_top.png differ diff --git a/assets/cubyz/blocks/toadstool.zig.zon b/assets/cubyz/blocks/toadstool.zig.zon new file mode 100644 index 00000000..c2e438bb --- /dev/null +++ b/assets/cubyz/blocks/toadstool.zig.zon @@ -0,0 +1,23 @@ +.{ + .tags = .{.wood}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .solid = false, + .viewThrough = true, + .absorbedLight = 0x010101, + .collide= false, + .rotation = .torch, + .model = .{ + .base = "cubyz:toadstool/floor", + .side = "cubyz:toadstool/shelf", + }, + .texture = "cubyz:toadstool_side", + .texture_top = "cubyz:toadstool_top", + .texture_bottom = "cubyz:toadstool_bottom", + .item = .{ + .texture = "toadstool.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/items/textures/bolete.png b/assets/cubyz/items/textures/bolete.png new file mode 100644 index 00000000..1b514c43 Binary files /dev/null and b/assets/cubyz/items/textures/bolete.png differ diff --git a/assets/cubyz/items/textures/toadstool.png b/assets/cubyz/items/textures/toadstool.png new file mode 100644 index 00000000..1424a770 Binary files /dev/null and b/assets/cubyz/items/textures/toadstool.png differ diff --git a/assets/cubyz/models/bolete/floor.obj b/assets/cubyz/models/bolete/floor.obj new file mode 100644 index 00000000..17037ff8 --- /dev/null +++ b/assets/cubyz/models/bolete/floor.obj @@ -0,0 +1,78 @@ +o unknown +v 1 1 0.25 +v 1 1 0 +v 0 0 0 +v 0 0 0.25 +v 0 1 0.25 +v 0 1 0 +v 1 0 0 +v 1 0 0.25 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vn -0.7071067811865476 0.7071067811865476 0 +vn 0.7071067811865476 -0.7071067811865476 0 +vn -0.7071067811865476 -0.7071067811865476 0 +vn 0.7071067811865476 0.7071067811865476 0 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 4/5/2 3/6/2 2/7/2 1/8/2 +f 5/9/3 6/10/3 7/11/3 8/12/3 +f 8/13/4 7/14/4 6/15/4 5/16/4 +o unknown +v 0.75 0.25 0.375 +v 0.75 0.75 0.375 +v 0.25 0.75 0.375 +v 0.25 0.25 0.375 +v 0.25 0.25 0.25 +v 0.25 0.75 0.25 +v 0.75 0.75 0.25 +v 0.75 0.25 0.25 +vt 0 0.25 +vt 0 0.125 +vt 0.125 0.125 +vt 0.125 0.25 +vt 0.25 0.25 +vt 0.25 0.125 +vt 0.375 0.125 +vt 0.375 0.25 +vt 0.5625 0.09375 +vt 0.5625 0.0625 +vt 0.6875 0.0625 +vt 0.6875 0.09375 +vt 0.8125 0.09375 +vt 0.8125 0.0625 +vt 0.9375 0.0625 +vt 0.9375 0.09375 +vt 0.0625 0.34375 +vt 0.0625 0.3125 +vt 0.1875 0.3125 +vt 0.1875 0.34375 +vt 0.3125 0.34375 +vt 0.3125 0.3125 +vt 0.4375 0.3125 +vt 0.4375 0.34375 +vn 0 0 1 +vn 0 0 -1 +vn 1 0 0 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +f 9/17/5 10/18/5 11/19/5 12/20/5 +f 13/21/6 14/22/6 15/23/6 16/24/6 +f 9/25/7 16/26/7 15/27/7 10/28/7 +f 11/29/8 14/30/8 13/31/8 12/32/8 +f 10/33/9 15/34/9 14/35/9 11/36/9 +f 12/37/10 13/38/10 16/39/10 9/40/10 \ No newline at end of file diff --git a/assets/cubyz/models/bolete/shelf.obj b/assets/cubyz/models/bolete/shelf.obj new file mode 100644 index 00000000..f8ccfbe9 --- /dev/null +++ b/assets/cubyz/models/bolete/shelf.obj @@ -0,0 +1,78 @@ +o unknown +v 1.3877787807814457e-16 0.375 0.375 +v 0.2500000000000001 0.375 0.375 +v 0.25 0.9375 0.375 +v 1.3877787807814457e-17 0.9375 0.375 +v 1.3877787807814457e-17 0.9375 0.25 +v 0.25 0.9375 0.25 +v 0.2500000000000001 0.375 0.25 +v 1.3877787807814457e-16 0.375 0.25 +vt 0.140625 0 +vt 0.140625 0.0625 +vt 0 0.0625 +vt 0 0 +vt 0.25 0 +vt 0.25 0.0625 +vt 0.390625 0.0625 +vt 0.390625 0 +vt 0.75 0.21875 +vt 0.75 0.1875 +vt 0.828125 0.1875 +vt 0.828125 0.21875 +vt 0.828125 0.21875 +vt 0.828125 0.1875 +vt 0.890625 0.1875 +vt 0.890625 0.21875 +vt 0 0.46875 +vt 0 0.4375 +vt 0.140625 0.4375 +vt 0.140625 0.46875 +vn 0 0 1 +vn 0 0 -1 +vn 2.220446049250313e-16 -1 0 +vn -2.220446049250313e-16 1 0 +vn 1 2.220446049250313e-16 0 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 5/5/2 6/6/2 7/7/2 8/8/2 +f 1/9/3 8/10/3 7/11/3 2/12/3 +f 3/13/4 6/14/4 5/15/4 4/16/4 +f 2/17/5 7/18/5 6/19/5 3/20/5 +o unknown +v 2.0816681711721685e-16 0.0625 0.8125 +v 0.18750000000000022 0.0625 0.8125 +v 0.1875000000000001 0.5625 0.8125 +v 9.71445146547012e-17 0.5625 0.8125 +v 9.71445146547012e-17 0.5625 0.6875 +v 0.1875000000000001 0.5625 0.6875 +v 0.18750000000000022 0.0625 0.6875 +v 2.0816681711721685e-16 0.0625 0.6875 +vt 0.125 0.0625 +vt 0.125 0.109375 +vt 0 0.109375 +vt 0 0.0625 +vt 0.375 0.0625 +vt 0.375 0.109375 +vt 0.25 0.109375 +vt 0.25 0.0625 +vt 0.5 0.25 +vt 0.5 0.21875 +vt 0.546875 0.21875 +vt 0.546875 0.25 +vt 0.828125 0.25 +vt 0.828125 0.21875 +vt 0.875 0.21875 +vt 0.875 0.25 +vt 0 0.5 +vt 0 0.46875 +vt 0.125 0.46875 +vt 0.125 0.5 +vn 0 0 1 +vn 0 0 -1 +vn 2.220446049250313e-16 -1 0 +vn -2.220446049250313e-16 1 0 +vn 1 2.220446049250313e-16 0 +f 9/21/6 10/22/6 11/23/6 12/24/6 +f 13/25/7 14/26/7 15/27/7 16/28/7 +f 9/29/8 16/30/8 15/31/8 10/32/8 +f 11/33/9 14/34/9 13/35/9 12/36/9 +f 10/37/10 15/38/10 14/39/10 11/40/10 \ No newline at end of file diff --git a/assets/cubyz/models/toadstool/floor.obj b/assets/cubyz/models/toadstool/floor.obj new file mode 100644 index 00000000..00366958 --- /dev/null +++ b/assets/cubyz/models/toadstool/floor.obj @@ -0,0 +1,78 @@ +o unknown +v 1 1 0.25 +v 1 1 0 +v 0 0 0 +v 0 0 0.25 +v 0 1 0.25 +v 0 1 0 +v 1 0 0 +v 1 0 0.25 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vn -0.7071067811865476 0.7071067811865476 0 +vn 0.7071067811865476 -0.7071067811865476 0 +vn -0.7071067811865476 -0.7071067811865476 0 +vn 0.7071067811865476 0.7071067811865476 0 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 4/5/2 3/6/2 2/7/2 1/8/2 +f 5/9/3 6/10/3 7/11/3 8/12/3 +f 8/13/4 7/14/4 6/15/4 5/16/4 +o unknown +v 0.75 0.25 0.5 +v 0.75 0.75 0.5 +v 0.25 0.75 0.5 +v 0.25 0.25 0.5 +v 0.25 0.25 0.25 +v 0.25 0.75 0.25 +v 0.75 0.75 0.25 +v 0.75 0.25 0.25 +vt 0 0.25 +vt 0 0.125 +vt 0.125 0.125 +vt 0.125 0.25 +vt 0.25 0.25 +vt 0.25 0.125 +vt 0.375 0.125 +vt 0.375 0.25 +vt 0.5625 0.125 +vt 0.5625 0.0625 +vt 0.6875 0.0625 +vt 0.6875 0.125 +vt 0.8125 0.125 +vt 0.8125 0.0625 +vt 0.9375 0.0625 +vt 0.9375 0.125 +vt 0.0625 0.375 +vt 0.0625 0.3125 +vt 0.1875 0.3125 +vt 0.1875 0.375 +vt 0.3125 0.375 +vt 0.3125 0.3125 +vt 0.4375 0.3125 +vt 0.4375 0.375 +vn 0 0 1 +vn 0 0 -1 +vn 1 0 0 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +f 9/17/5 10/18/5 11/19/5 12/20/5 +f 13/21/6 14/22/6 15/23/6 16/24/6 +f 9/25/7 16/26/7 15/27/7 10/28/7 +f 11/29/8 14/30/8 13/31/8 12/32/8 +f 10/33/9 15/34/9 14/35/9 11/36/9 +f 12/37/10 13/38/10 16/39/10 9/40/10 \ No newline at end of file diff --git a/assets/cubyz/models/toadstool/shelf.obj b/assets/cubyz/models/toadstool/shelf.obj new file mode 100644 index 00000000..27855d15 --- /dev/null +++ b/assets/cubyz/models/toadstool/shelf.obj @@ -0,0 +1,78 @@ +o unknown +v 1.3877787807814457e-16 0.4375 0.5 +v 0.2500000000000001 0.4375 0.5 +v 0.25 0.875 0.5 +v 1.3877787807814457e-17 0.875 0.5 +v 1.3877787807814457e-17 0.875 0.25 +v 0.25 0.875 0.25 +v 0.2500000000000001 0.4375 0.25 +v 1.3877787807814457e-16 0.4375 0.25 +vt 0.109375 0 +vt 0.109375 0.0625 +vt 0 0.0625 +vt 0 0 +vt 0.25 0 +vt 0.25 0.0625 +vt 0.359375 0.0625 +vt 0.359375 0 +vt 0.75 0.203125 +vt 0.75 0.140625 +vt 0.8125 0.140625 +vt 0.8125 0.203125 +vt 0.796875 0.203125 +vt 0.796875 0.140625 +vt 0.859375 0.140625 +vt 0.859375 0.203125 +vt 0 0.453125 +vt 0 0.390625 +vt 0.109375 0.390625 +vt 0.109375 0.453125 +vn 0 0 1 +vn 0 0 -1 +vn 2.220446049250313e-16 -1 0 +vn -2.220446049250313e-16 1 0 +vn 1 2.220446049250313e-16 0 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 5/5/2 6/6/2 7/7/2 8/8/2 +f 1/9/3 8/10/3 7/11/3 2/12/3 +f 3/13/4 6/14/4 5/15/4 4/16/4 +f 2/17/5 7/18/5 6/19/5 3/20/5 +o unknown +v 2.0816681711721685e-16 0.125 0.875 +v 0.1875000000000002 0.125 0.875 +v 0.1875000000000001 0.5 0.875 +v 9.71445146547012e-17 0.5 0.875 +v 9.71445146547012e-17 0.5 0.6875 +v 0.1875000000000001 0.5 0.6875 +v 0.1875000000000002 0.125 0.6875 +v 2.0816681711721685e-16 0.125 0.6875 +vt 0.09375 0.0625 +vt 0.09375 0.109375 +vt 0 0.109375 +vt 0 0.0625 +vt 0.34375 0.0625 +vt 0.34375 0.109375 +vt 0.25 0.109375 +vt 0.25 0.0625 +vt 0.5 0.25 +vt 0.5 0.203125 +vt 0.546875 0.203125 +vt 0.546875 0.25 +vt 0.796875 0.25 +vt 0.796875 0.203125 +vt 0.84375 0.203125 +vt 0.84375 0.25 +vt 0 0.5 +vt 0 0.453125 +vt 0.09375 0.453125 +vt 0.09375 0.5 +vn 0 0 1 +vn 0 0 -1 +vn 2.220446049250313e-16 -1 0 +vn -2.220446049250313e-16 1 0 +vn 1 2.220446049250313e-16 0 +f 9/21/6 10/22/6 11/23/6 12/24/6 +f 13/25/7 14/26/7 15/27/7 16/28/7 +f 9/29/8 16/30/8 15/31/8 10/32/8 +f 11/33/9 14/34/9 13/35/9 12/36/9 +f 10/37/10 15/38/10 14/39/10 11/40/10 \ No newline at end of file