Add cactus flowers, tussock, and cactus top texture (#1195)

* Add cactus flowers, tussock, and cactus top texture

* minor cactus flower texture tweaks

* Gradient cactus flower

assets/cubyz/biomes/desert/base.zig.zon

@@ -23,6 +23,27 @@
 			.height = 2,
 			.height_variation = 3,
 		},
+		.{
+			.id = "cubyz:simple_tree",
+			.leaves = "cubyz:air",
+			.log = "cubyz:cactus",
+			.top = "cubyz:cactus_flower",
+			.chance = 0.005,
+			.type = .round,
+			.height = 2,
+			.height_variation = 4,
+			.leafRadius = 0,
+			.branched = false,
+		},
+		.{
+			.id = "cubyz:flower_patch",
+			.block = "cubyz:tussock",
+			.chance = 0.03,
+			.width = 4,
+			.variation = 4,
+			.density = 0.2,
+			.priority = 0.1,
+		},
 	},
 	.stoneBlock = "cubyz:sandstone",
 }

assets/cubyz/blocks/cactus.zig.zon

@@ -4,6 +4,9 @@
 	.drops = .{
 		.{.items = .{.auto}},
 	},
+	.rotation = .log,
 	.model = "cubyz:cube",
 	.texture = "cubyz:cactus",
+	.texture_top = "cubyz:cactus_top",
+	.texture_bottom = "cubyz:cactus_top",
 }

assets/cubyz/blocks/cactus_flower.zig.zon

@@ -0,0 +1,20 @@
+.{
+	.tags = .{.leaf},
+	.blockHealth = 0.2,
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.degradable = true,
+	.collide = false,
+	.alwaysViewThrough = true,
+	.absorbedLight = 0x121012,
+	.model = "cubyz:cactus_flower",
+	.rotation = .log,
+	.texture = "cubyz:cactus_flower",
+	.texture_top = "cubyz:cactus_flower_top",
+	.texture_bottom = "cubyz:cactus_flower_top",
+	.item = .{
+		.texture = "cactus_flower.png",
+	},
+	.lodReplacement = "cubyz:air",
+}

assets/cubyz/blocks/textures/cactus_flower.zig.zon

@@ -0,0 +1,3 @@
+.{
+	.hasOcclusion = false,
+}

assets/cubyz/blocks/textures/cactus_flower_top.zig.zon

@@ -0,0 +1,3 @@
+.{
+	.hasOcclusion = false,
+}

assets/cubyz/blocks/textures/tussock.zig.zon

@@ -0,0 +1,3 @@
+.{
+	.hasOcclusion = false,
+}

assets/cubyz/blocks/tussock.zig.zon

@@ -0,0 +1,17 @@
+.{
+	.tags = .{.leaf},
+	.blockHealth = 0.2,
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.degradable = true,
+	.viewThrough = true,
+	.absorbedLight = 0x000000,
+	.collide = false,
+	.model = "cubyz:cross",
+	.texture = "cubyz:tussock",
+	.item = .{
+		.texture = "tussock.png",
+	},
+	.lodReplacement = "cubyz:air",
+}

assets/cubyz/models/cactus_flower.obj

@@ -0,0 +1,55 @@
+o unknown
+v 1 1 1
+v 1 1 0
+v 0 0 0
+v 0 0 1
+v 0 1 1
+v 0 1 0
+v 1 0 0
+v 1 0 1
+vt 0 0.5
+vt 0 0.25
+vt 0.25 0.25
+vt 0.25 0.5
+vt 0 0.5
+vt 0 0.25
+vt 0.25 0.25
+vt 0.25 0.5
+vt 0 0.5
+vt 0 0.25
+vt 0.25 0.25
+vt 0.25 0.5
+vt 0 0.5
+vt 0 0.25
+vt 0.25 0.25
+vt 0.25 0.5
+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 plane
+v 1 0 0.25
+v 1 1 0.25
+v 0 1 0.25
+v 0 0 0.25
+vt 0.25 0
+vt 0.25 0.25
+vt 0 0.25
+vt 0 0
+vn 0 0 1
+f 9/17/5 10/18/5 11/19/5 12/20/5
+o plane
+v 0 0 0.25
+v 0 1 0.25
+v 1 1 0.25
+v 1 0 0.25
+vt 0 0
+vt 0 0.25
+vt 0.25 0.25
+vt 0.25 0
+vn 0 0 -1
+f 13/21/6 14/22/6 15/23/6 16/24/6