diff --git a/assets/cubyz/blocks/baobab_fence.zig.zon b/assets/cubyz/blocks/baobab_fence.zig.zon index dd5e859f..b88df918 100644 --- a/assets/cubyz/blocks/baobab_fence.zig.zon +++ b/assets/cubyz/blocks/baobab_fence.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/baobab_leaves.zig.zon b/assets/cubyz/blocks/baobab_leaves.zig.zon index 875e5dcc..acf2eeaa 100644 --- a/assets/cubyz/blocks/baobab_leaves.zig.zon +++ b/assets/cubyz/blocks/baobab_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/baobab_log.zig.zon b/assets/cubyz/blocks/baobab_log.zig.zon index e9dee139..fa2a1ff2 100644 --- a/assets/cubyz/blocks/baobab_log.zig.zon +++ b/assets/cubyz/blocks/baobab_log.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/baobab_planks.zig.zon b/assets/cubyz/blocks/baobab_planks.zig.zon index eaddf4d7..56560737 100644 --- a/assets/cubyz/blocks/baobab_planks.zig.zon +++ b/assets/cubyz/blocks/baobab_planks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 6, .item = .{ .material = .{ .density = 1.0, diff --git a/assets/cubyz/blocks/baobab_top.zig.zon b/assets/cubyz/blocks/baobab_top.zig.zon index a04a8ce9..f3a6957d 100644 --- a/assets/cubyz/blocks/baobab_top.zig.zon +++ b/assets/cubyz/blocks/baobab_top.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/basalt.zig.zon b/assets/cubyz/blocks/basalt.zig.zon index c5bf0fb6..1d4f6ea1 100644 --- a/assets/cubyz/blocks/basalt.zig.zon +++ b/assets/cubyz/blocks/basalt.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 20, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/basalt_bricks.zig.zon b/assets/cubyz/blocks/basalt_bricks.zig.zon index fb34b8a5..5a4f13cd 100644 --- a/assets/cubyz/blocks/basalt_bricks.zig.zon +++ b/assets/cubyz/blocks/basalt_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 20, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/basalt_tile.zig.zon b/assets/cubyz/blocks/basalt_tile.zig.zon index 7b8f0e45..1fabc542 100644 --- a/assets/cubyz/blocks/basalt_tile.zig.zon +++ b/assets/cubyz/blocks/basalt_tile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 20, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/basalt_wall.zig.zon b/assets/cubyz/blocks/basalt_wall.zig.zon index fcb56d1e..4c7bd7a1 100644 --- a/assets/cubyz/blocks/basalt_wall.zig.zon +++ b/assets/cubyz/blocks/basalt_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 20, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/birch_fence.zig.zon b/assets/cubyz/blocks/birch_fence.zig.zon index c5ca703d..71aea0fe 100644 --- a/assets/cubyz/blocks/birch_fence.zig.zon +++ b/assets/cubyz/blocks/birch_fence.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/birch_leaves.zig.zon b/assets/cubyz/blocks/birch_leaves.zig.zon index 519f96cf..ff5322b8 100644 --- a/assets/cubyz/blocks/birch_leaves.zig.zon +++ b/assets/cubyz/blocks/birch_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.5, .drops = .{ .{.items = .{.auto}}, .{.chance = 0.1, .items = .{"cubyz:apple"}}, diff --git a/assets/cubyz/blocks/birch_log.zig.zon b/assets/cubyz/blocks/birch_log.zig.zon index bcdebe94..96ad2150 100644 --- a/assets/cubyz/blocks/birch_log.zig.zon +++ b/assets/cubyz/blocks/birch_log.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/birch_planks.zig.zon b/assets/cubyz/blocks/birch_planks.zig.zon index 30c4fb44..6b279df7 100644 --- a/assets/cubyz/blocks/birch_planks.zig.zon +++ b/assets/cubyz/blocks/birch_planks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 6, .item = .{ .material = .{ .density = 0.6, diff --git a/assets/cubyz/blocks/birch_top.zig.zon b/assets/cubyz/blocks/birch_top.zig.zon index 7e6243b1..47183f7a 100644 --- a/assets/cubyz/blocks/birch_top.zig.zon +++ b/assets/cubyz/blocks/birch_top.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/cactus.zig.zon b/assets/cubyz/blocks/cactus.zig.zon index fe655e02..6302354d 100644 --- a/assets/cubyz/blocks/cactus.zig.zon +++ b/assets/cubyz/blocks/cactus.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 4, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/castilleja.zig.zon b/assets/cubyz/blocks/castilleja.zig.zon index 79782381..930abc1e 100644 --- a/assets/cubyz/blocks/castilleja.zig.zon +++ b/assets/cubyz/blocks/castilleja.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/chalk/_defaults.zig.zon b/assets/cubyz/blocks/chalk/_defaults.zig.zon index c88f26a4..3ded5be8 100644 --- a/assets/cubyz/blocks/chalk/_defaults.zig.zon +++ b/assets/cubyz/blocks/chalk/_defaults.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 6, + .blockHealth = 12, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/clay.zig.zon b/assets/cubyz/blocks/clay.zig.zon index 8c2c2884..7780d91a 100644 --- a/assets/cubyz/blocks/clay.zig.zon +++ b/assets/cubyz/blocks/clay.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 5.5, + .blockHealth = 5.75, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/cloth/_defaults.zig.zon b/assets/cubyz/blocks/cloth/_defaults.zig.zon index 15521afc..a9883dcb 100644 --- a/assets/cubyz/blocks/cloth/_defaults.zig.zon +++ b/assets/cubyz/blocks/cloth/_defaults.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 2, + .blockHealth = 2, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/coal_ore.zig.zon b/assets/cubyz/blocks/coal_ore.zig.zon index 713b2c06..1db34ec8 100644 --- a/assets/cubyz/blocks/coal_ore.zig.zon +++ b/assets/cubyz/blocks/coal_ore.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 40, + .blockHealth = 30, .breakingPower = 1, .ore = .{ .veins = 10, diff --git a/assets/cubyz/blocks/cobblestone.zig.zon b/assets/cubyz/blocks/cobblestone.zig.zon index aaf6f5c2..e700acb3 100644 --- a/assets/cubyz/blocks/cobblestone.zig.zon +++ b/assets/cubyz/blocks/cobblestone.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/daffodil.zig.zon b/assets/cubyz/blocks/daffodil.zig.zon index d397ea32..3c4c979e 100644 --- a/assets/cubyz/blocks/daffodil.zig.zon +++ b/assets/cubyz/blocks/daffodil.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/daisies.zig.zon b/assets/cubyz/blocks/daisies.zig.zon index bfec0306..dc8adc62 100644 --- a/assets/cubyz/blocks/daisies.zig.zon +++ b/assets/cubyz/blocks/daisies.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/dead_leaf_pile.zig.zon b/assets/cubyz/blocks/dead_leaf_pile.zig.zon index 14bf50f1..98b6a526 100644 --- a/assets/cubyz/blocks/dead_leaf_pile.zig.zon +++ b/assets/cubyz/blocks/dead_leaf_pile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{}, .degradable = true, .collide = false, diff --git a/assets/cubyz/blocks/dead_leaves.zig.zon b/assets/cubyz/blocks/dead_leaves.zig.zon index c2a34cf8..eb0c2636 100644 --- a/assets/cubyz/blocks/dead_leaves.zig.zon +++ b/assets/cubyz/blocks/dead_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.0, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/diamond_ore.zig.zon b/assets/cubyz/blocks/diamond_ore.zig.zon index 83d3186a..9d4e9962 100644 --- a/assets/cubyz/blocks/diamond_ore.zig.zon +++ b/assets/cubyz/blocks/diamond_ore.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 80, + .blockHealth = 50, .breakingPower = 10, .ore = .{ .veins = 1, diff --git a/assets/cubyz/blocks/dirt.zig.zon b/assets/cubyz/blocks/dirt.zig.zon index fe6c87a8..0ad6b8d9 100644 --- a/assets/cubyz/blocks/dirt.zig.zon +++ b/assets/cubyz/blocks/dirt.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 5.5, + .blockHealth = 6.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/dry_grass.zig.zon b/assets/cubyz/blocks/dry_grass.zig.zon index f867b033..e2626710 100644 --- a/assets/cubyz/blocks/dry_grass.zig.zon +++ b/assets/cubyz/blocks/dry_grass.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 6, + .blockHealth = 7, .drops = .{ .{.items = .{"cubyz:dirt"}}, }, diff --git a/assets/cubyz/blocks/dry_grass_vegetation.zig.zon b/assets/cubyz/blocks/dry_grass_vegetation.zig.zon index 50268c6a..45460cc4 100644 --- a/assets/cubyz/blocks/dry_grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/dry_grass_vegetation.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/fern.zig.zon b/assets/cubyz/blocks/fern.zig.zon index b69bf565..f39bf7bd 100644 --- a/assets/cubyz/blocks/fern.zig.zon +++ b/assets/cubyz/blocks/fern.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/ferrock.zig.zon b/assets/cubyz/blocks/ferrock.zig.zon index 27abbf75..03b6598f 100644 --- a/assets/cubyz/blocks/ferrock.zig.zon +++ b/assets/cubyz/blocks/ferrock.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 20, + .blockHealth = 23.75, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/ferrock_bricks.zig.zon b/assets/cubyz/blocks/ferrock_bricks.zig.zon index d32e895c..ad59f2f1 100644 --- a/assets/cubyz/blocks/ferrock_bricks.zig.zon +++ b/assets/cubyz/blocks/ferrock_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 23.75, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/ferrock_tiles.zig.zon b/assets/cubyz/blocks/ferrock_tiles.zig.zon index b4f038fd..380c9958 100644 --- a/assets/cubyz/blocks/ferrock_tiles.zig.zon +++ b/assets/cubyz/blocks/ferrock_tiles.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 23.75, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/ferrock_wall.zig.zon b/assets/cubyz/blocks/ferrock_wall.zig.zon index 84ba1a9a..059dffd8 100644 --- a/assets/cubyz/blocks/ferrock_wall.zig.zon +++ b/assets/cubyz/blocks/ferrock_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 23.75, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/fog/_defaults.zig.zon b/assets/cubyz/blocks/fog/_defaults.zig.zon index c31e319e..b9296603 100644 --- a/assets/cubyz/blocks/fog/_defaults.zig.zon +++ b/assets/cubyz/blocks/fog/_defaults.zig.zon @@ -1,6 +1,6 @@ .{ .class = .air, - .hardness = 2, + .blockHealth = 2, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/frost.zig.zon b/assets/cubyz/blocks/frost.zig.zon index af691a6b..20695d41 100644 --- a/assets/cubyz/blocks/frost.zig.zon +++ b/assets/cubyz/blocks/frost.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 10, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/glacite.zig.zon b/assets/cubyz/blocks/glacite.zig.zon index ed2baee3..96ed5da8 100644 --- a/assets/cubyz/blocks/glacite.zig.zon +++ b/assets/cubyz/blocks/glacite.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 20, + .blockHealth = 22, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/glacite_bricks.zig.zon b/assets/cubyz/blocks/glacite_bricks.zig.zon index 06185c87..ecd4a8fd 100644 --- a/assets/cubyz/blocks/glacite_bricks.zig.zon +++ b/assets/cubyz/blocks/glacite_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 20, + .blockHealth = 22, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/glacite_tile.zig.zon b/assets/cubyz/blocks/glacite_tile.zig.zon index 784f666b..44da8bb7 100644 --- a/assets/cubyz/blocks/glacite_tile.zig.zon +++ b/assets/cubyz/blocks/glacite_tile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 20, + .blockHealth = 22, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/glacite_wall.zig.zon b/assets/cubyz/blocks/glacite_wall.zig.zon index 6327d41e..e7016166 100644 --- a/assets/cubyz/blocks/glacite_wall.zig.zon +++ b/assets/cubyz/blocks/glacite_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 20, + .blockHealth = 22, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/glass/_defaults.zig.zon b/assets/cubyz/blocks/glass/_defaults.zig.zon index 74aa6de0..f802cc58 100644 --- a/assets/cubyz/blocks/glass/_defaults.zig.zon +++ b/assets/cubyz/blocks/glass/_defaults.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 2, + .blockHealth = 2.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/glow_crystal/_defaults.zig.zon b/assets/cubyz/blocks/glow_crystal/_defaults.zig.zon index c852c9df..29f12562 100644 --- a/assets/cubyz/blocks/glow_crystal/_defaults.zig.zon +++ b/assets/cubyz/blocks/glow_crystal/_defaults.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 2, + .blockHealth = 5, .drops = .{}, .model = "cubyz:cube", } \ No newline at end of file diff --git a/assets/cubyz/blocks/grass.zig.zon b/assets/cubyz/blocks/grass.zig.zon index 40c89c45..27d83739 100644 --- a/assets/cubyz/blocks/grass.zig.zon +++ b/assets/cubyz/blocks/grass.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 6, + .blockHealth = 7, .drops = .{ .{.items = .{"cubyz:soil"}}, }, diff --git a/assets/cubyz/blocks/grass_vegetation.zig.zon b/assets/cubyz/blocks/grass_vegetation.zig.zon index 461ff3ff..5f7e8477 100644 --- a/assets/cubyz/blocks/grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/grass_vegetation.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/gravel.zig.zon b/assets/cubyz/blocks/gravel.zig.zon index a837149b..7d23f450 100644 --- a/assets/cubyz/blocks/gravel.zig.zon +++ b/assets/cubyz/blocks/gravel.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 11, + .blockHealth = 5.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/ice.zig.zon b/assets/cubyz/blocks/ice.zig.zon index 87f5cb2a..0fbe280f 100644 --- a/assets/cubyz/blocks/ice.zig.zon +++ b/assets/cubyz/blocks/ice.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 10, + .blockHealth = 7, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/iron_block.zig.zon b/assets/cubyz/blocks/iron_block.zig.zon index 9e9c399a..c25d17ed 100644 --- a/assets/cubyz/blocks/iron_block.zig.zon +++ b/assets/cubyz/blocks/iron_block.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 50, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/iron_ore.zig.zon b/assets/cubyz/blocks/iron_ore.zig.zon index 2bcd36e7..08e7b570 100644 --- a/assets/cubyz/blocks/iron_ore.zig.zon +++ b/assets/cubyz/blocks/iron_ore.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 60, + .blockHealth = 35, .breakingPower = 5, .ore = .{ .veins = 4, diff --git a/assets/cubyz/blocks/ivy.zig.zon b/assets/cubyz/blocks/ivy.zig.zon index eb066f8c..0477d697 100644 --- a/assets/cubyz/blocks/ivy.zig.zon +++ b/assets/cubyz/blocks/ivy.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/lamp.zig.zon b/assets/cubyz/blocks/lamp.zig.zon index 2f4de166..765ea92b 100644 --- a/assets/cubyz/blocks/lamp.zig.zon +++ b/assets/cubyz/blocks/lamp.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 10, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/limestone.zig.zon b/assets/cubyz/blocks/limestone.zig.zon index 9c245878..468e87db 100644 --- a/assets/cubyz/blocks/limestone.zig.zon +++ b/assets/cubyz/blocks/limestone.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 27.5, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/limestone_bricks.zig.zon b/assets/cubyz/blocks/limestone_bricks.zig.zon index 9c364dfb..05527855 100644 --- a/assets/cubyz/blocks/limestone_bricks.zig.zon +++ b/assets/cubyz/blocks/limestone_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class= .stone, - .hardness= 12, + .blockHealth = 27.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/limestone_tiles.zig.zon b/assets/cubyz/blocks/limestone_tiles.zig.zon index 650bdda4..4909a25e 100644 --- a/assets/cubyz/blocks/limestone_tiles.zig.zon +++ b/assets/cubyz/blocks/limestone_tiles.zig.zon @@ -1,6 +1,6 @@ .{ .class= .stone, - .hardness= 12, + .blockHealth = 27.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/limestone_wall.zig.zon b/assets/cubyz/blocks/limestone_wall.zig.zon index 64ebf51e..078663b8 100644 --- a/assets/cubyz/blocks/limestone_wall.zig.zon +++ b/assets/cubyz/blocks/limestone_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 27.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/lush_grass.zig.zon b/assets/cubyz/blocks/lush_grass.zig.zon index bdfaab72..783817c3 100644 --- a/assets/cubyz/blocks/lush_grass.zig.zon +++ b/assets/cubyz/blocks/lush_grass.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 6, + .blockHealth = 7, .drops = .{ .{.items = .{"cubyz:mud"}}, }, diff --git a/assets/cubyz/blocks/lush_grass_vegetation.zig.zon b/assets/cubyz/blocks/lush_grass_vegetation.zig.zon index 3d978a65..c8567e2e 100644 --- a/assets/cubyz/blocks/lush_grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/lush_grass_vegetation.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/magma.zig.zon b/assets/cubyz/blocks/magma.zig.zon index c64c7b9e..bbc2af26 100644 --- a/assets/cubyz/blocks/magma.zig.zon +++ b/assets/cubyz/blocks/magma.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 2, + .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/mahogany_fence.zig.zon b/assets/cubyz/blocks/mahogany_fence.zig.zon index 964f19df..8f17e8d2 100644 --- a/assets/cubyz/blocks/mahogany_fence.zig.zon +++ b/assets/cubyz/blocks/mahogany_fence.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/mahogany_leaves.zig.zon b/assets/cubyz/blocks/mahogany_leaves.zig.zon index 54156f9d..53a8142e 100644 --- a/assets/cubyz/blocks/mahogany_leaves.zig.zon +++ b/assets/cubyz/blocks/mahogany_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/mahogany_log.zig.zon b/assets/cubyz/blocks/mahogany_log.zig.zon index eace7018..361a24c1 100644 --- a/assets/cubyz/blocks/mahogany_log.zig.zon +++ b/assets/cubyz/blocks/mahogany_log.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/mahogany_planks.zig.zon b/assets/cubyz/blocks/mahogany_planks.zig.zon index aa4c6893..3de94dc6 100644 --- a/assets/cubyz/blocks/mahogany_planks.zig.zon +++ b/assets/cubyz/blocks/mahogany_planks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 6, .item = .{ .material = .{ .density = 1.0, diff --git a/assets/cubyz/blocks/mahogany_top.zig.zon b/assets/cubyz/blocks/mahogany_top.zig.zon index 9e90cf3f..76938a9a 100644 --- a/assets/cubyz/blocks/mahogany_top.zig.zon +++ b/assets/cubyz/blocks/mahogany_top.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/marble.zig.zon b/assets/cubyz/blocks/marble.zig.zon index 85bc3464..3b593527 100644 --- a/assets/cubyz/blocks/marble.zig.zon +++ b/assets/cubyz/blocks/marble.zig.zon @@ -1,6 +1,6 @@ .{ .class= .stone, - .hardness= 12, + .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/marble_bricks.zig.zon b/assets/cubyz/blocks/marble_bricks.zig.zon index 213644a9..e741969e 100644 --- a/assets/cubyz/blocks/marble_bricks.zig.zon +++ b/assets/cubyz/blocks/marble_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class= .stone, - .hardness= 12, + .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/marble_tile.zig.zon b/assets/cubyz/blocks/marble_tile.zig.zon index bcd4dedd..050c9df0 100644 --- a/assets/cubyz/blocks/marble_tile.zig.zon +++ b/assets/cubyz/blocks/marble_tile.zig.zon @@ -1,6 +1,6 @@ .{ .class= .stone, - .hardness= 12, + .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/marble_wall.zig.zon b/assets/cubyz/blocks/marble_wall.zig.zon index c8e48f41..330a9fe9 100644 --- a/assets/cubyz/blocks/marble_wall.zig.zon +++ b/assets/cubyz/blocks/marble_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/mossy_cobblestone.zig.zon b/assets/cubyz/blocks/mossy_cobblestone.zig.zon index d3fa6b3a..1858dd8d 100644 --- a/assets/cubyz/blocks/mossy_cobblestone.zig.zon +++ b/assets/cubyz/blocks/mossy_cobblestone.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 22.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/mud.zig.zon b/assets/cubyz/blocks/mud.zig.zon index 657ab8c5..22ceeccf 100644 --- a/assets/cubyz/blocks/mud.zig.zon +++ b/assets/cubyz/blocks/mud.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 5.5, + .blockHealth = 6.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/oak_fence.zig.zon b/assets/cubyz/blocks/oak_fence.zig.zon index b4af7782..5271b4e1 100644 --- a/assets/cubyz/blocks/oak_fence.zig.zon +++ b/assets/cubyz/blocks/oak_fence.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/oak_leaves.zig.zon b/assets/cubyz/blocks/oak_leaves.zig.zon index b60717a7..3ef2effe 100644 --- a/assets/cubyz/blocks/oak_leaves.zig.zon +++ b/assets/cubyz/blocks/oak_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.5, .drops = .{ .{.items = .{.auto}}, .{.chance = 0.1, .items = .{"cubyz:apple"}}, diff --git a/assets/cubyz/blocks/oak_log.zig.zon b/assets/cubyz/blocks/oak_log.zig.zon index 8597b740..73ecdbb1 100644 --- a/assets/cubyz/blocks/oak_log.zig.zon +++ b/assets/cubyz/blocks/oak_log.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/oak_planks.zig.zon b/assets/cubyz/blocks/oak_planks.zig.zon index 2cf18c77..ed9a4189 100644 --- a/assets/cubyz/blocks/oak_planks.zig.zon +++ b/assets/cubyz/blocks/oak_planks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 6, .item = .{ .material = .{ .density = 1.0, diff --git a/assets/cubyz/blocks/oak_top.zig.zon b/assets/cubyz/blocks/oak_top.zig.zon index af76abe9..0470225c 100644 --- a/assets/cubyz/blocks/oak_top.zig.zon +++ b/assets/cubyz/blocks/oak_top.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/obsidian.zig.zon b/assets/cubyz/blocks/obsidian.zig.zon index d9776ee7..5f547813 100644 --- a/assets/cubyz/blocks/obsidian.zig.zon +++ b/assets/cubyz/blocks/obsidian.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 50, + .blockHealth = 16, .breakingPower = 2, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/pine_fence.zig.zon b/assets/cubyz/blocks/pine_fence.zig.zon index 989aa8dc..796e56c0 100644 --- a/assets/cubyz/blocks/pine_fence.zig.zon +++ b/assets/cubyz/blocks/pine_fence.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/pine_log.zig.zon b/assets/cubyz/blocks/pine_log.zig.zon index df388a85..6cc10858 100644 --- a/assets/cubyz/blocks/pine_log.zig.zon +++ b/assets/cubyz/blocks/pine_log.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/pine_needles.zig.zon b/assets/cubyz/blocks/pine_needles.zig.zon index ae6b7aed..63549b29 100644 --- a/assets/cubyz/blocks/pine_needles.zig.zon +++ b/assets/cubyz/blocks/pine_needles.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/pine_planks.zig.zon b/assets/cubyz/blocks/pine_planks.zig.zon index 18eb1318..78844c70 100644 --- a/assets/cubyz/blocks/pine_planks.zig.zon +++ b/assets/cubyz/blocks/pine_planks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 6, .item = .{ .material = .{ .density = 1.5, diff --git a/assets/cubyz/blocks/pine_top.zig.zon b/assets/cubyz/blocks/pine_top.zig.zon index 6e9aba11..c2aee26b 100644 --- a/assets/cubyz/blocks/pine_top.zig.zon +++ b/assets/cubyz/blocks/pine_top.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/red_leaf_pile.zig.zon b/assets/cubyz/blocks/red_leaf_pile.zig.zon index 088d3179..3d88a492 100644 --- a/assets/cubyz/blocks/red_leaf_pile.zig.zon +++ b/assets/cubyz/blocks/red_leaf_pile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/red_leaves.zig.zon b/assets/cubyz/blocks/red_leaves.zig.zon index 9ecc31f0..4562b72a 100644 --- a/assets/cubyz/blocks/red_leaves.zig.zon +++ b/assets/cubyz/blocks/red_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.25, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/sand.zig.zon b/assets/cubyz/blocks/sand.zig.zon index f0d3dc2d..3b852a32 100644 --- a/assets/cubyz/blocks/sand.zig.zon +++ b/assets/cubyz/blocks/sand.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 5, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/sandstone.zig.zon b/assets/cubyz/blocks/sandstone.zig.zon index 7b823502..f8ac9f43 100644 --- a/assets/cubyz/blocks/sandstone.zig.zon +++ b/assets/cubyz/blocks/sandstone.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/sandstone_bricks.zig.zon b/assets/cubyz/blocks/sandstone_bricks.zig.zon index 05626861..942793f6 100644 --- a/assets/cubyz/blocks/sandstone_bricks.zig.zon +++ b/assets/cubyz/blocks/sandstone_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/sandstone_tile.zig.zon b/assets/cubyz/blocks/sandstone_tile.zig.zon index 4d149915..3de87661 100644 --- a/assets/cubyz/blocks/sandstone_tile.zig.zon +++ b/assets/cubyz/blocks/sandstone_tile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/sandstone_wall.zig.zon b/assets/cubyz/blocks/sandstone_wall.zig.zon index 394d16a0..1e6f1d39 100644 --- a/assets/cubyz/blocks/sandstone_wall.zig.zon +++ b/assets/cubyz/blocks/sandstone_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/snow.zig.zon b/assets/cubyz/blocks/snow.zig.zon index 293f7532..2a84aa68 100644 --- a/assets/cubyz/blocks/snow.zig.zon +++ b/assets/cubyz/blocks/snow.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 6.5, + .blockHealth = 4, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/soil.zig.zon b/assets/cubyz/blocks/soil.zig.zon index 217adfdb..272ae54d 100644 --- a/assets/cubyz/blocks/soil.zig.zon +++ b/assets/cubyz/blocks/soil.zig.zon @@ -1,6 +1,6 @@ .{ .class = .sand, - .hardness = 5.5, + .blockHealth = 6.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/stone.zig.zon b/assets/cubyz/blocks/stone.zig.zon index b839f62e..e1cea097 100644 --- a/assets/cubyz/blocks/stone.zig.zon +++ b/assets/cubyz/blocks/stone.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 25, .breakingPower = 1, .drops = .{ .{.items = .{"cubyz:cobblestone"}}, diff --git a/assets/cubyz/blocks/stone_bricks.zig.zon b/assets/cubyz/blocks/stone_bricks.zig.zon index 8c3fdba6..dc369377 100644 --- a/assets/cubyz/blocks/stone_bricks.zig.zon +++ b/assets/cubyz/blocks/stone_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/stone_tile.zig.zon b/assets/cubyz/blocks/stone_tile.zig.zon index a9783123..32195ce8 100644 --- a/assets/cubyz/blocks/stone_tile.zig.zon +++ b/assets/cubyz/blocks/stone_tile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/stone_wall.zig.zon b/assets/cubyz/blocks/stone_wall.zig.zon index 8a27932b..63a65f40 100644 --- a/assets/cubyz/blocks/stone_wall.zig.zon +++ b/assets/cubyz/blocks/stone_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 12, + .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/torch.zig.zon b/assets/cubyz/blocks/torch.zig.zon index 3a511bc8..e1cf56c8 100644 --- a/assets/cubyz/blocks/torch.zig.zon +++ b/assets/cubyz/blocks/torch.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 0.3, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/vetch.zig.zon b/assets/cubyz/blocks/vetch.zig.zon index 8aec6683..52437ecd 100644 --- a/assets/cubyz/blocks/vetch.zig.zon +++ b/assets/cubyz/blocks/vetch.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/void_stone.zig.zon b/assets/cubyz/blocks/void_stone.zig.zon index 2b8a61c4..4ad08b8b 100644 --- a/assets/cubyz/blocks/void_stone.zig.zon +++ b/assets/cubyz/blocks/void_stone.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 60, + .blockHealth = 30, .breakingPower = 2, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/void_stone_bricks.zig.zon b/assets/cubyz/blocks/void_stone_bricks.zig.zon index 7d74e7df..f357b81e 100644 --- a/assets/cubyz/blocks/void_stone_bricks.zig.zon +++ b/assets/cubyz/blocks/void_stone_bricks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 30, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/void_stone_tile.zig.zon b/assets/cubyz/blocks/void_stone_tile.zig.zon index 126e749e..9fe72e60 100644 --- a/assets/cubyz/blocks/void_stone_tile.zig.zon +++ b/assets/cubyz/blocks/void_stone_tile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 25, + .blockHealth = 30, .breakingPower = 1, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/void_stone_wall.zig.zon b/assets/cubyz/blocks/void_stone_wall.zig.zon index e8e0b54b..258f3abd 100644 --- a/assets/cubyz/blocks/void_stone_wall.zig.zon +++ b/assets/cubyz/blocks/void_stone_wall.zig.zon @@ -1,6 +1,6 @@ .{ .class = .stone, - .hardness = 60, + .blockHealth = 30, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/willow_fence.zig.zon b/assets/cubyz/blocks/willow_fence.zig.zon index 9fd49fc9..d23c8c7a 100644 --- a/assets/cubyz/blocks/willow_fence.zig.zon +++ b/assets/cubyz/blocks/willow_fence.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/willow_leaves.zig.zon b/assets/cubyz/blocks/willow_leaves.zig.zon index f9bde717..097dad64 100644 --- a/assets/cubyz/blocks/willow_leaves.zig.zon +++ b/assets/cubyz/blocks/willow_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.5, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/willow_log.zig.zon b/assets/cubyz/blocks/willow_log.zig.zon index f2058d86..dfc983a3 100644 --- a/assets/cubyz/blocks/willow_log.zig.zon +++ b/assets/cubyz/blocks/willow_log.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/willow_planks.zig.zon b/assets/cubyz/blocks/willow_planks.zig.zon index 917120a3..8a37b607 100644 --- a/assets/cubyz/blocks/willow_planks.zig.zon +++ b/assets/cubyz/blocks/willow_planks.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7, + .blockHealth = 6, .item = .{ .material = .{ .density = 1.0, diff --git a/assets/cubyz/blocks/willow_top.zig.zon b/assets/cubyz/blocks/willow_top.zig.zon index 22ca5033..29b91efe 100644 --- a/assets/cubyz/blocks/willow_top.zig.zon +++ b/assets/cubyz/blocks/willow_top.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 8, + .blockHealth = 8, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/workbench.zig.zon b/assets/cubyz/blocks/workbench.zig.zon index cafe4076..017b3dd7 100644 --- a/assets/cubyz/blocks/workbench.zig.zon +++ b/assets/cubyz/blocks/workbench.zig.zon @@ -1,6 +1,6 @@ .{ .class = .wood, - .hardness = 7.5, + .blockHealth = 10, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/yellow_leaf_pile.zig.zon b/assets/cubyz/blocks/yellow_leaf_pile.zig.zon index ce592d59..c47f0f87 100644 --- a/assets/cubyz/blocks/yellow_leaf_pile.zig.zon +++ b/assets/cubyz/blocks/yellow_leaf_pile.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.1, + .blockHealth = 1, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/yellow_leaves.zig.zon b/assets/cubyz/blocks/yellow_leaves.zig.zon index 9dd0b15f..0e69cb7b 100644 --- a/assets/cubyz/blocks/yellow_leaves.zig.zon +++ b/assets/cubyz/blocks/yellow_leaves.zig.zon @@ -1,6 +1,6 @@ .{ .class = .leaf, - .hardness = 0.4, + .blockHealth = 1.25, .drops = .{ .{.items = .{.auto}}, }, diff --git a/src/blocks.zig b/src/blocks.zig index 9fd1e2a0..3680b04d 100644 --- a/src/blocks.zig +++ b/src/blocks.zig @@ -62,7 +62,7 @@ var _transparent: [maxBlockCount]bool = undefined; var _collide: [maxBlockCount]bool = undefined; var _id: [maxBlockCount][]u8 = undefined; /// Time in seconds to break this block by hand. -var _hardness: [maxBlockCount]f32 = undefined; +var _blockHealth: [maxBlockCount]f32 = undefined; /// Minimum pickaxe/axe/shovel power required. var _breakingPower: [maxBlockCount]f32 = undefined; var _solid: [maxBlockCount]bool = undefined; @@ -108,7 +108,7 @@ pub fn register(_: []const u8, id: []const u8, zon: ZonElement) u16 { _mode[size] = rotation.getByID(zon.get([]const u8, "rotation", "no_rotation")); _breakingPower[size] = zon.get(f32, "breakingPower", 0); - _hardness[size] = zon.get(f32, "hardness", 1); + _blockHealth[size] = zon.get(f32, "blockHealth", 1); _blockClass[size] = std.meta.stringToEnum(BlockClass, zon.get([]const u8, "class", "stone")) orelse .stone; _light[size] = zon.get(u32, "emittedLight", 0); @@ -274,8 +274,8 @@ pub const Block = packed struct { // MARK: Block } /// Time in seconds to break this block by hand. - pub inline fn hardness(self: Block) f32 { - return _hardness[self.typ]; + pub inline fn blockHealth(self: Block) f32 { + return _blockHealth[self.typ]; } /// Minimum pickaxe/axe/shovel power required. diff --git a/src/renderer.zig b/src/renderer.zig index 8cf53df7..c712fce5 100644 --- a/src/renderer.zig +++ b/src/renderer.zig @@ -825,7 +825,7 @@ pub const MeshSelection = struct { // MARK: MeshSelection power = stack.item.?.tool.getPowerByBlockClass(block.blockClass()); } if(power >= block.breakingPower()) { - var breakTime: f32 = block.hardness(); + var breakTime: f32 = block.blockHealth(); if(isTool) { breakTime = breakTime*stack.item.?.tool.swingTime/power; } diff --git a/src/server/terrain/chunkgen/OreGenerator.zig b/src/server/terrain/chunkgen/OreGenerator.zig index 3891c944..d7291cf0 100644 --- a/src/server/terrain/chunkgen/OreGenerator.zig +++ b/src/server/terrain/chunkgen/OreGenerator.zig @@ -62,7 +62,7 @@ pub fn generate(worldSeed: u64, chunk: *main.chunk.ServerChunk, caveMap: CaveMap fn considerCoordinates(ore: *const main.blocks.Ore, relX: f32, relY: f32, relZ: f32, chunk: *main.chunk.ServerChunk, startSeed: u64) void { const chunkSizeFloat: f32 = @floatFromInt(main.chunk.chunkSize); // Compose the seeds from some random stats of the ore. They generally shouldn't be the same for two different ores. TODO: Give each block a hash function (id based) that can be used in cases like this. - var seed = startSeed ^ @as(u32, @bitCast(ore.maxHeight)) ^ @as(u32, @bitCast(ore.size)) ^ @as(u32, @bitCast(main.blocks.Block.hardness(.{.typ = ore.blockType, .data = 0}))); + var seed = startSeed ^ @as(u32, @bitCast(ore.maxHeight)) ^ @as(u32, @bitCast(ore.size)) ^ @as(u32, @bitCast(main.blocks.Block.blockHealth(.{.typ = ore.blockType, .data = 0}))); random.scrambleSeed(&seed); // Determine how many veins of this type start in this chunk. The number depends on parameters set for the specific ore: const veins: u32 = @intFromFloat(random.nextFloat(&seed)*ore.veins*2);