src/main/java/cz/jzitnik/game/core/sound/SoundKey.java

@@ -3,12 +3,29 @@ package cz.jzitnik.game.core.sound;
 public enum SoundKey {
     GRASS,
     GRASS_WALKING,
+    GRASS_MINING,
 
     GRAVEL,
     GRAVEL_WALKING,
 
-    WOOD,
+    WOOD_DIG,
+    WOOD_WALKING,
+    WOOD_MINING,
 
     HURT,
     HIT,
+
+    SAND_DIG,
+    SAND_MINING,
+    SAND_WALKING,
+
+    STONE_DIG,
+    STONE_WALKING,
+    STONE_MINING,
+
+    WOOL_DIG,
+
+    METAL_DIG,
+    METAL_WALKING,
+    METAL_MINING,
 }

src/main/java/cz/jzitnik/game/core/sound/registry/GrassDigSound.java

@@ -9,5 +9,5 @@ import cz.jzitnik.game.core.sound.SoundKey;
         "grass/grass3.ogg",
         "grass/grass4.ogg"
 })
-public class GrassSound {
+public class GrassDigSound {
 }

src/main/java/cz/jzitnik/game/core/sound/registry/GrassMiningSound.java

@@ -0,0 +1,15 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.GRASS_MINING, resourceLocation = {
+        "grass/mining1.ogg",
+        "grass/mining2.ogg",
+        "grass/mining3.ogg",
+        "grass/mining4.ogg",
+        "grass/mining5.ogg",
+        "grass/mining6.ogg"
+})
+public class GrassMiningSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/GravelDigSound.java

@@ -9,5 +9,5 @@ import cz.jzitnik.game.core.sound.SoundKey;
         "gravel/gravel3.ogg",
         "gravel/gravel4.ogg"
 })
-public class GravelSound {
+public class GravelDigSound {
 }

src/main/java/cz/jzitnik/game/core/sound/registry/MetalDigSound.java

@@ -0,0 +1,13 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.METAL_DIG, resourceLocation = {
+        "metal/dig1.ogg",
+        "metal/dig2.ogg",
+        "metal/dig3.ogg",
+        "metal/dig4.ogg"
+})
+public class MetalDigSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/MetalMiningSound.java

@@ -0,0 +1,16 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.METAL_MINING, resourceLocation = {
+        "metal/mining1.ogg",
+        "metal/mining2.ogg",
+        "metal/mining3.ogg",
+        "metal/mining4.ogg",
+        "metal/mining5.ogg",
+        "metal/mining6.ogg"
+
+})
+public class MetalMiningSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/MetalWalkingSound.java

@@ -0,0 +1,15 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.METAL_WALKING, resourceLocation = {
+        "metal/step1.ogg",
+        "metal/step2.ogg",
+        "metal/step3.ogg",
+        "metal/step4.ogg",
+        "metal/step5.ogg",
+        "metal/step6.ogg"
+})
+public class MetalWalkingSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/SandDigSound.java

@@ -0,0 +1,13 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.SAND_DIG, resourceLocation = {
+        "sand/dig1.ogg",
+        "sand/dig2.ogg",
+        "sand/dig3.ogg",
+        "sand/dig4.ogg"
+})
+public class SandDigSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/SandMiningSound.java

@@ -0,0 +1,15 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.SAND_MINING, resourceLocation = {
+        "sand/mining1.ogg",
+        "sand/mining2.ogg",
+        "sand/mining3.ogg",
+        "sand/mining4.ogg",
+        "sand/mining5.ogg",
+
+})
+public class SandMiningSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/SandWalkingSound.java

@@ -0,0 +1,15 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.SAND_WALKING, resourceLocation = {
+        "sand/step1.ogg",
+        "sand/step2.ogg",
+        "sand/step3.ogg",
+        "sand/step4.ogg",
+        "sand/step5.ogg",
+        "sand/step6.ogg"
+})
+public class SandWalkingSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/StoneDigSound.java

@@ -0,0 +1,13 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.STONE_DIG, resourceLocation = {
+        "stone/dig1.ogg",
+        "stone/dig2.ogg",
+        "stone/dig3.ogg",
+        "stone/dig4.ogg"
+})
+public class StoneDigSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/StoneMiningSound.java

@@ -0,0 +1,15 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.STONE_MINING, resourceLocation = {
+        "stone/mine1.ogg",
+        "stone/mine2.ogg",
+        "stone/mine3.ogg",
+        "stone/mine4.ogg",
+        "stone/mine5.ogg",
+        "stone/mine6.ogg"
+})
+public class StoneMiningSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/StoneWalkingSound.java

@@ -0,0 +1,15 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.STONE_WALKING, resourceLocation = {
+        "stone/step1.ogg",
+        "stone/step2.ogg",
+        "stone/step3.ogg",
+        "stone/step4.ogg",
+        "stone/step5.ogg",
+        "stone/step6.ogg"
+})
+public class StoneWalkingSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/WoodDigSound.java

@@ -0,0 +1,13 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.WOOD_DIG, resourceLocation = {
+        "wood/dig1.ogg",
+        "wood/dig2.ogg",
+        "wood/dig3.ogg",
+        "wood/dig4.ogg",
+})
+public class WoodDigSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/WoodMiningSound.java

@@ -0,0 +1,16 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.WOOD_MINING, resourceLocation = {
+        "wood/mining1.ogg",
+        "wood/mining2.ogg",
+        "wood/mining3.ogg",
+        "wood/mining4.ogg",
+        "wood/mining5.ogg",
+        "wood/mining6.ogg"
+
+})
+public class WoodMiningSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/WoodSound.java

@@ -1,10 +0,0 @@
-package cz.jzitnik.game.core.sound.registry;
-
-import cz.jzitnik.game.annotations.SoundRegistry;
-import cz.jzitnik.game.core.sound.SoundKey;
-
-@SoundRegistry(key = SoundKey.WOOD, resourceLocation = {
-        "wood/wood1.ogg",
-})
-public class WoodSound {
-}

src/main/java/cz/jzitnik/game/core/sound/registry/WoodWalkingSound.java

@@ -0,0 +1,15 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.STONE_WALKING, resourceLocation = {
+        "wood/step1.ogg",
+        "wood/step2.ogg",
+        "wood/step3.ogg",
+        "wood/step4.ogg",
+        "wood/step5.ogg",
+        "wood/step6.ogg"
+})
+public class WoodWalkingSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/WoolDigSound.java

@@ -0,0 +1,13 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.WOOL_DIG, resourceLocation = {
+        "wool/dig1.ogg",
+        "wool/dig2.ogg",
+        "wool/dig3.ogg",
+        "wool/dig4.ogg"
+})
+public class WoolDigSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/WoolMiningSound.java

@@ -0,0 +1,13 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.WOOL_DIG, resourceLocation = {
+        "wool/dig1.ogg",
+        "wool/dig2.ogg",
+        "wool/dig3.ogg",
+        "wool/dig4.ogg"
+})
+public class WoolMiningSound {
+}

src/main/java/cz/jzitnik/game/core/sound/registry/WoolWalkingSound.java

@@ -0,0 +1,13 @@
+package cz.jzitnik.game.core.sound.registry;
+
+import cz.jzitnik.game.annotations.SoundRegistry;
+import cz.jzitnik.game.core.sound.SoundKey;
+
+@SoundRegistry(key = SoundKey.WOOL_DIG, resourceLocation = {
+        "wool/dig1.ogg",
+        "wool/dig2.ogg",
+        "wool/dig3.ogg",
+        "wool/dig4.ogg"
+})
+public class WoolWalkingSound {
+}

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/CobblestoneBlock.java

@@ -1,13 +1,17 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
-
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry("cobblestone")
 public class CobblestoneBlock extends Block {
     public CobblestoneBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/FarmlandBlock.java

@@ -1,14 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.ResetDataOnMine;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.logic.services.farmland.FarmlandData;
 
 import java.util.ArrayList;
 
+@PlaceSound(SoundKey.GRAVEL)
+@MineSound(SoundKey.GRAVEL)
+@WalkSound(SoundKey.GRAVEL_WALKING)
+@MiningSound(SoundKey.GRAVEL_WALKING)
 @ResetDataOnMine
 @BlockRegistry(value = "farmland", drops = "dirt")
 public class FarmlandBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/HaybaleBlock.java

@@ -1,15 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
-import cz.jzitnik.game.annotations.ReduceFallDamage;
+import cz.jzitnik.game.annotations.*;
 import cz.jzitnik.game.core.reducefalldamage.HaybaleFallDamageReducer;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @Flamable
 @BlockRegistry("haybale")
 @ReduceFallDamage(HaybaleFallDamageReducer.class)

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/LavaBlock.java

@@ -7,6 +7,7 @@ import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.logic.services.flowing.FlowingData;
 import cz.jzitnik.game.sprites.Water;
 
+
 @Burning
 @BlockRegistry(value = "lava", drops = "lava_bucket")
 public class LavaBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakDoorBlock.java

@@ -1,15 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
-import cz.jzitnik.game.annotations.PlaceOnSolidNoHandler;
+import cz.jzitnik.game.annotations.*;
 import cz.jzitnik.game.blocks.OakDoorData;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
+@MineSound(SoundKey.WOOD_DIG)
+@PlaceSound(SoundKey.WOOD_DIG)
+@MiningSound(SoundKey.WOOD_MINING)
+@WalkSound(SoundKey.WOOD_WALKING)
 @Flamable
 @PlaceOnSolidNoHandler
 @BlockRegistry("oak_door")

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLeavesBlock.java

@@ -1,13 +1,17 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @Flamable
 @BlockRegistry("oak_leaves")
 public class OakLeavesBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLogBlock.java

@@ -1,18 +1,17 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
-import cz.jzitnik.game.annotations.MineSound;
-import cz.jzitnik.game.annotations.PlaceSound;
+import cz.jzitnik.game.annotations.*;
 import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
-@MineSound(SoundKey.WOOD)
-@PlaceSound(SoundKey.WOOD)
+@MineSound(SoundKey.WOOD_DIG)
+@PlaceSound(SoundKey.WOOD_DIG)
+@MiningSound(SoundKey.WOOD_MINING)
+@WalkSound(SoundKey.WOOD_WALKING)
 @Flamable
 @BlockRegistry("oak_log")
 public class OakLogBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakPlanksBlock.java

@@ -1,13 +1,17 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
+@MineSound(SoundKey.WOOD_DIG)
+@PlaceSound(SoundKey.WOOD_DIG)
+@MiningSound(SoundKey.WOOD_MINING)
+@WalkSound(SoundKey.WOOD_WALKING)
 @Flamable
 @BlockRegistry("oak_planks")
 public class OakPlanksBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/ObsidianBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.List;
 
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry("obsidian")
 public class ObsidianBlock extends Block {
     public ObsidianBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/SandBlock.java

@@ -1,13 +1,17 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.FallingBlock;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
+@MineSound(SoundKey.SAND_DIG)
+@PlaceSound(SoundKey.SAND_DIG)
+@MiningSound(SoundKey.SAND_MINING)
+@WalkSound(SoundKey.SAND_WALKING)
 @FallingBlock
 @BlockRegistry("sand")
 public class SandBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/StoneBlock.java

@@ -1,13 +1,17 @@
 package cz.jzitnik.game.entities.items.registry.blocks.blocks;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
-
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry(value = "stone", drops = "cobblestone")
 public class StoneBlock extends Block {
     public StoneBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/GrassBushBlock.java

@@ -1,20 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockDropPercentage;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksByPlace;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.CustomDrop;
-import cz.jzitnik.game.annotations.MineSound;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
-import cz.jzitnik.game.annotations.PlaceSound;
+import cz.jzitnik.game.annotations.*;
 import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
 @MineSound(SoundKey.GRASS)
 @PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/OakSaplingBlock.java

@@ -1,13 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
-import cz.jzitnik.game.annotations.ResetDataOnMine;
-import cz.jzitnik.game.annotations.Sapling;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.logic.services.saplings.SaplingData;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @Sapling
 @PlaceOnSolid
 @ResetDataOnMine

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/WheatBlock.java

@@ -1,14 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Farmable;
-import cz.jzitnik.game.annotations.PlaceOnSolidNoHandler;
-import cz.jzitnik.game.annotations.ResetDataOnMine;
-import cz.jzitnik.game.annotations.ResetSpriteStateOnMine;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.logic.services.farmable.FarmableData;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @Farmable("wheat")
 @PlaceOnSolidNoHandler
 @ResetDataOnMine

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AlliumBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AzureBluetBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/BlueOrchidBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/CornflowerBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/DandelionBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilacBlock.java

@@ -1,13 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
-import cz.jzitnik.game.annotations.TwoblockBlock;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilyOfTheValleyBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OrangeTulipBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OxeyeDaisyBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PeonyBlock.java

@@ -1,13 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
-import cz.jzitnik.game.annotations.TwoblockBlock;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PinkTulipBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PoppyBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RedTulipBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RoseBushBlock.java

@@ -1,13 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
-import cz.jzitnik.game.annotations.TwoblockBlock;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/SunflowerBlock.java

@@ -1,13 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
-import cz.jzitnik.game.annotations.TwoblockBlock;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/WhiteTulipBlock.java

@@ -1,12 +1,14 @@
 package cz.jzitnik.game.entities.items.registry.blocks.grassy.flowers;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.BreakableByWater;
-import cz.jzitnik.game.annotations.BreaksFalling;
-import cz.jzitnik.game.annotations.PlaceOnSolid;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 
+@MineSound(SoundKey.GRASS)
+@PlaceSound(SoundKey.GRASS)
+@WalkSound(SoundKey.GRASS_WALKING)
+@MiningSound(SoundKey.GRASS_MINING)
 @PlaceOnSolid
 @BreakableByWater
 @BreaksFalling

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalBlock.java

@@ -1,14 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.coal;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @Flamable
 @BlockRegistry("coal_block")
 public class CoalBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalOreBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.coal;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry("coal_ore")
 public class CoalOreBlock extends Block {
     public CoalOreBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.diamond;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@WalkSound(SoundKey.METAL_WALKING)
+@MiningSound(SoundKey.METAL_MINING)
+@PlaceSound(SoundKey.METAL_DIG)
+@MineSound(SoundKey.METAL_DIG)
 @BlockRegistry("diamond_block")
 public class DiamondBlock extends Block {
     public DiamondBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondOreBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.diamond;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry("diamond_ore")
 public class DiamondOreBlock extends Block {
     public DiamondOreBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.gold;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@WalkSound(SoundKey.METAL_WALKING)
+@MiningSound(SoundKey.METAL_MINING)
+@PlaceSound(SoundKey.METAL_DIG)
+@MineSound(SoundKey.METAL_DIG)
 @BlockRegistry("gold_block")
 public class GoldBlock extends Block {
     public GoldBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldOreBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.gold;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry("gold_ore")
 public class GoldOreBlock extends Block {
     public GoldOreBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.iron;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@WalkSound(SoundKey.METAL_WALKING)
+@MiningSound(SoundKey.METAL_MINING)
+@PlaceSound(SoundKey.METAL_DIG)
+@MineSound(SoundKey.METAL_DIG)
 @BlockRegistry("iron_block")
 public class IronBlock extends Block {
     public IronBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronOreBlock.java

@@ -1,13 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.ores.iron;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry("iron_ore")
 public class IronOreBlock extends Block {
     public IronOreBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlackWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("black_wool")
 public class BlackWoolBlock extends Block {
     public BlackWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("blue_wool")
 public class BlueWoolBlock extends Block {
     public BlueWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BrownWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("brown_wool")
 public class BrownWoolBlock extends Block {
     public BrownWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("cyan_wool")
 public class CyanWoolBlock extends Block {
     public CyanWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GrayWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("gray_wool")
 public class GrayWoolBlock extends Block {
     public GrayWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("green_wool")
 public class GreenWoolBlock extends Block {
     public GreenWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("light_blue_wool")
 public class LightBlueWoolBlock extends Block {
     public LightBlueWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightGrayWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("light_gray_wool")
 public class LightGrayWoolBlock extends Block {
     public LightGrayWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("lime_wool")
 public class LimeWoolBlock extends Block {
     public LimeWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("magenta_wool")
 public class MagentaWoolBlock extends Block {
     public MagentaWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("orange_wool")
 public class OrangeWoolBlock extends Block {
     public OrangeWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PinkWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("pink_wool")
 public class PinkWoolBlock extends Block {
     public PinkWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("purple_wool")
 public class PurpleWoolBlock extends Block {
     public PurpleWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("red_wool")
 public class RedWoolBlock extends Block {
     public RedWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/WhiteWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("white_wool")
 public class WhiteWoolBlock extends Block {
     public WhiteWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java

@@ -1,10 +1,15 @@
 package cz.jzitnik.game.entities.items.registry.blocks.wools;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Wool;
 
+@PlaceSound(SoundKey.WOOL_DIG)
+@MineSound(SoundKey.WOOL_DIG)
+@WalkSound(SoundKey.WOOL_DIG)
+@MiningSound(SoundKey.WOOL_DIG)
 @BlockRegistry("yellow_wool")
 public class YellowWoolBlock extends Block {
     public YellowWoolBlock() {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/BedBlock.java

@@ -1,12 +1,16 @@
 package cz.jzitnik.game.entities.items.registry.blocks.work;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.ReduceFallDamage;
+import cz.jzitnik.game.annotations.*;
 import cz.jzitnik.game.core.reducefalldamage.BedFallDamageReducer;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.sprites.Bed;
 
+@MineSound(SoundKey.WOOD_DIG)
+@PlaceSound(SoundKey.WOOD_DIG)
+@MiningSound(SoundKey.WOOD_MINING)
+@WalkSound(SoundKey.WOOD_WALKING)
 @ReduceFallDamage(BedFallDamageReducer.class)
 @BlockRegistry("bed")
 public class BedBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/ChestBlock.java

@@ -1,14 +1,18 @@
 package cz.jzitnik.game.entities.items.registry.blocks.work;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
+import cz.jzitnik.game.annotations.*;
 import cz.jzitnik.game.blocks.Chest;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
+@MineSound(SoundKey.WOOD_DIG)
+@PlaceSound(SoundKey.WOOD_DIG)
+@MiningSound(SoundKey.WOOD_MINING)
+@WalkSound(SoundKey.WOOD_WALKING)
 @Flamable(false)
 @BlockRegistry("chest")
 public class ChestBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/CraftingTableBlock.java

@@ -1,13 +1,17 @@
 package cz.jzitnik.game.entities.items.registry.blocks.work;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
-import cz.jzitnik.game.annotations.Flamable;
+import cz.jzitnik.game.annotations.*;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 
 import java.util.ArrayList;
 
+@MineSound(SoundKey.WOOD_DIG)
+@PlaceSound(SoundKey.WOOD_DIG)
+@MiningSound(SoundKey.WOOD_MINING)
+@WalkSound(SoundKey.WOOD_WALKING)
 @Flamable(false)
 @BlockRegistry("crafting_table")
 public class CraftingTableBlock extends Block {

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/FurnaceBlock.java

@@ -1,14 +1,19 @@
 package cz.jzitnik.game.entities.items.registry.blocks.work;
 
 import cz.jzitnik.game.SpriteLoader;
-import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.*;
 import cz.jzitnik.game.blocks.Furnace;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemType;
 import cz.jzitnik.game.entities.items.ToolVariant;
 
 import java.util.Arrays;
 
+@PlaceSound(SoundKey.STONE_DIG)
+@MineSound(SoundKey.STONE_DIG)
+@WalkSound(SoundKey.STONE_WALKING)
+@MiningSound(SoundKey.STONE_MINING)
 @BlockRegistry("furnace")
 public class FurnaceBlock extends Block {
     public FurnaceBlock() {

src/main/java/cz/jzitnik/game/sprites/Wool.java

@@ -1,5 +1,10 @@
 package cz.jzitnik.game.sprites;
 
+import cz.jzitnik.game.annotations.MineSound;
+import cz.jzitnik.game.annotations.MiningSound;
+import cz.jzitnik.game.annotations.PlaceSound;
+import cz.jzitnik.game.annotations.WalkSound;
+import cz.jzitnik.game.core.sound.SoundKey;
 import cz.jzitnik.tui.Sprite;
 
 import java.util.HashMap;