diff --git a/assets/cubyz/blocks/castilleja.zig.zon b/assets/cubyz/blocks/castilleja.zig.zon new file mode 100644 index 00000000..79782381 --- /dev/null +++ b/assets/cubyz/blocks/castilleja.zig.zon @@ -0,0 +1,19 @@ +.{ + .class = .leaf, + .hardness = 0.1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:flower/height_10", + .texture = "cubyz:castilleja", + .texture_top = "cubyz:castilleja_top", + .texture_bottom = "cubyz:castilleja_top", + .item = .{ + .texture = "castilleja.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/daffodil.zig.zon b/assets/cubyz/blocks/daffodil.zig.zon new file mode 100644 index 00000000..d397ea32 --- /dev/null +++ b/assets/cubyz/blocks/daffodil.zig.zon @@ -0,0 +1,19 @@ +.{ + .class = .leaf, + .hardness = 0.1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:flower/height_8", + .texture = "cubyz:daffodil", + .texture_top = "cubyz:daffodil_top", + .texture_bottom = "cubyz:daffodil_top", + .item = .{ + .texture = "daffodil.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/dry_grass_vegetation.zig.zon b/assets/cubyz/blocks/dry_grass_vegetation.zig.zon index 73679613..50268c6a 100644 --- a/assets/cubyz/blocks/dry_grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/dry_grass_vegetation.zig.zon @@ -7,10 +7,10 @@ .degradable = true, .viewThrough = true, .absorbedLight = 0x000000, - .collide= false, + .collide = false, .model = "cubyz:cross", .texture = "cubyz:dry_grass_vegetation", - .item= .{ + .item = .{ .texture = "dry_grass.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/fern.zig.zon b/assets/cubyz/blocks/fern.zig.zon new file mode 100644 index 00000000..b69bf565 --- /dev/null +++ b/assets/cubyz/blocks/fern.zig.zon @@ -0,0 +1,17 @@ +.{ + .class = .leaf, + .hardness = 0.1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:cross", + .texture = "cubyz:fern", + .item = .{ + .texture = "fern.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/grass_vegetation.zig.zon b/assets/cubyz/blocks/grass_vegetation.zig.zon index e951088a..461ff3ff 100644 --- a/assets/cubyz/blocks/grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/grass_vegetation.zig.zon @@ -7,10 +7,10 @@ .degradable = true, .viewThrough = true, .absorbedLight = 0x000000, - .collide= false, + .collide = false, .model = "cubyz:cross", .texture = "cubyz:grass_vegetation", - .item= .{ + .item = .{ .texture = "grass.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/lush_grass_vegetation.zig.zon b/assets/cubyz/blocks/lush_grass_vegetation.zig.zon index 56870266..3d978a65 100644 --- a/assets/cubyz/blocks/lush_grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/lush_grass_vegetation.zig.zon @@ -7,10 +7,10 @@ .degradable = true, .viewThrough = true, .absorbedLight = 0x000000, - .collide= false, + .collide = false, .model = "cubyz:cross", .texture = "cubyz:lush_grass_vegetation", - .item= .{ + .item = .{ .texture = "lush_grass.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/textures/castilleja.png b/assets/cubyz/blocks/textures/castilleja.png new file mode 100644 index 00000000..33abfdbe Binary files /dev/null and b/assets/cubyz/blocks/textures/castilleja.png differ diff --git a/assets/cubyz/blocks/textures/castilleja_top.png b/assets/cubyz/blocks/textures/castilleja_top.png new file mode 100644 index 00000000..2cdc81da Binary files /dev/null and b/assets/cubyz/blocks/textures/castilleja_top.png differ diff --git a/assets/cubyz/blocks/textures/daffodil.png b/assets/cubyz/blocks/textures/daffodil.png new file mode 100644 index 00000000..fadceb6a Binary files /dev/null and b/assets/cubyz/blocks/textures/daffodil.png differ diff --git a/assets/cubyz/blocks/textures/daffodil_top.png b/assets/cubyz/blocks/textures/daffodil_top.png new file mode 100644 index 00000000..bd9a9f0e Binary files /dev/null and b/assets/cubyz/blocks/textures/daffodil_top.png differ diff --git a/assets/cubyz/blocks/textures/fern.png b/assets/cubyz/blocks/textures/fern.png new file mode 100644 index 00000000..d9fbc7de Binary files /dev/null and b/assets/cubyz/blocks/textures/fern.png differ diff --git a/assets/cubyz/blocks/textures/vetch.png b/assets/cubyz/blocks/textures/vetch.png index 0f187f04..7357eec9 100644 Binary files a/assets/cubyz/blocks/textures/vetch.png and b/assets/cubyz/blocks/textures/vetch.png differ diff --git a/assets/cubyz/blocks/vetch.zig.zon b/assets/cubyz/blocks/vetch.zig.zon index 8fe9a6a1..8aec6683 100644 --- a/assets/cubyz/blocks/vetch.zig.zon +++ b/assets/cubyz/blocks/vetch.zig.zon @@ -7,10 +7,10 @@ .degradable = true, .viewThrough = true, .absorbedLight = 0x121012, - .collide= false, + .collide = false, .model = "cubyz:cross", .texture = "cubyz:vetch", - .item= .{ + .item = .{ .texture = "vetch.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/items/textures/castilleja.png b/assets/cubyz/items/textures/castilleja.png new file mode 100644 index 00000000..ba60ba54 Binary files /dev/null and b/assets/cubyz/items/textures/castilleja.png differ diff --git a/assets/cubyz/items/textures/daffodil.png b/assets/cubyz/items/textures/daffodil.png new file mode 100644 index 00000000..a725ff6d Binary files /dev/null and b/assets/cubyz/items/textures/daffodil.png differ diff --git a/assets/cubyz/items/textures/dry_grass.png b/assets/cubyz/items/textures/dry_grass.png index fbe86ce8..6f24f750 100644 Binary files a/assets/cubyz/items/textures/dry_grass.png and b/assets/cubyz/items/textures/dry_grass.png differ diff --git a/assets/cubyz/items/textures/fern.png b/assets/cubyz/items/textures/fern.png new file mode 100644 index 00000000..a823fc42 Binary files /dev/null and b/assets/cubyz/items/textures/fern.png differ diff --git a/assets/cubyz/items/textures/lush_grass.png b/assets/cubyz/items/textures/lush_grass.png index e2496021..19927a35 100644 Binary files a/assets/cubyz/items/textures/lush_grass.png and b/assets/cubyz/items/textures/lush_grass.png differ diff --git a/assets/cubyz/items/textures/vetch.png b/assets/cubyz/items/textures/vetch.png index 6d303868..89c8890f 100644 Binary files a/assets/cubyz/items/textures/vetch.png and b/assets/cubyz/items/textures/vetch.png differ diff --git a/assets/cubyz/models/flower/height_10.obj b/assets/cubyz/models/flower/height_10.obj new file mode 100644 index 00000000..aa2dc9c1 --- /dev/null +++ b/assets/cubyz/models/flower/height_10.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 0.9375 1 +v 0 0.9375 0 +v 0.9375 0 0 +v 0.9375 0 1 +vt 0.75 0.25 +vt 0.75 0 +vt 1 0 +vt 1 0.25 +vt 1 0.25 +vt 1 0 +vt 0.75 0 +vt 0.75 0.25 +vt 0.515625 0.25 +vt 0.515625 0 +vt 0.75 0 +vt 0.75 0.25 +vt 0.75 0.25 +vt 0.75 0 +vt 0.515625 0 +vt 0.515625 0.25 +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.625 +v 1 1 0.625 +v 0 1 0.625 +v 0 0 0.625 +vt 0 0.25 +vt 0 0 +vt 0.25 0 +vt 0.25 0.25 +vn 0 0 1 +f 9/17/5 10/18/5 11/19/5 12/20/5 +o plane +v 0 0 0.625 +v 0 1 0.625 +v 1 1 0.625 +v 1 0 0.625 +vt 0.25 0.25 +vt 0.25 0 +vt 0 0 +vt 0 0.25 +vn 0 0 -1 +f 13/21/6 14/22/6 15/23/6 16/24/6 \ No newline at end of file diff --git a/assets/cubyz/models/flower/height_8.obj b/assets/cubyz/models/flower/height_8.obj new file mode 100644 index 00000000..c73b6275 --- /dev/null +++ b/assets/cubyz/models/flower/height_8.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 0.9375 1 +v 0 0.9375 0 +v 0.9375 0 0 +v 0.9375 0 1 +vt 0.75 0.25 +vt 0.75 0 +vt 1 0 +vt 1 0.25 +vt 1 0.25 +vt 1 0 +vt 0.75 0 +vt 0.75 0.25 +vt 0.515625 0.25 +vt 0.515625 0 +vt 0.75 0 +vt 0.75 0.25 +vt 0.75 0.25 +vt 0.75 0 +vt 0.515625 0 +vt 0.515625 0.25 +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.5 +v 1 1 0.5 +v 0 1 0.5 +v 0 0 0.5 +vt 0 0.25 +vt 0 0 +vt 0.25 0 +vt 0.25 0.25 +vn 0 0 1 +f 9/17/5 10/18/5 11/19/5 12/20/5 +o plane +v 0 0 0.5 +v 0 1 0.5 +v 1 1 0.5 +v 1 0 0.5 +vt 0.25 0.25 +vt 0.25 0 +vt 0 0 +vt 0 0.25 +vn 0 0 -1 +f 13/21/6 14/22/6 15/23/6 16/24/6 \ No newline at end of file