diff --git a/src/main/java/cz/jzitnik/game/core/sound/SoundKey.java b/src/main/java/cz/jzitnik/game/core/sound/SoundKey.java index 0e97da8..d83d568 100644 --- a/src/main/java/cz/jzitnik/game/core/sound/SoundKey.java +++ b/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, } diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/GrassSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/GrassDigSound.java similarity index 91% rename from src/main/java/cz/jzitnik/game/core/sound/registry/GrassSound.java rename to src/main/java/cz/jzitnik/game/core/sound/registry/GrassDigSound.java index 9e200f9..fc7f988 100644 --- a/src/main/java/cz/jzitnik/game/core/sound/registry/GrassSound.java +++ b/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 { } diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/GrassMiningSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/GrassMiningSound.java new file mode 100644 index 0000000..d53bc6f --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/GravelSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/GravelDigSound.java similarity index 91% rename from src/main/java/cz/jzitnik/game/core/sound/registry/GravelSound.java rename to src/main/java/cz/jzitnik/game/core/sound/registry/GravelDigSound.java index fddd7ea..74a76a1 100644 --- a/src/main/java/cz/jzitnik/game/core/sound/registry/GravelSound.java +++ b/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 { } diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/MetalDigSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/MetalDigSound.java new file mode 100644 index 0000000..73e7c77 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/MetalMiningSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/MetalMiningSound.java new file mode 100644 index 0000000..a99b1fe --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/MetalWalkingSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/MetalWalkingSound.java new file mode 100644 index 0000000..8fdcc1f --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/SandDigSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/SandDigSound.java new file mode 100644 index 0000000..77201d9 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/SandMiningSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/SandMiningSound.java new file mode 100644 index 0000000..4c6ac92 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/SandWalkingSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/SandWalkingSound.java new file mode 100644 index 0000000..e887e59 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/StoneDigSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/StoneDigSound.java new file mode 100644 index 0000000..d987cc2 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/StoneMiningSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/StoneMiningSound.java new file mode 100644 index 0000000..52db44a --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/StoneWalkingSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/StoneWalkingSound.java new file mode 100644 index 0000000..76321f4 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/WoodDigSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/WoodDigSound.java new file mode 100644 index 0000000..4d856bc --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/WoodMiningSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/WoodMiningSound.java new file mode 100644 index 0000000..a890d29 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/WoodSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/WoodSound.java deleted file mode 100644 index ca332ed..0000000 --- a/src/main/java/cz/jzitnik/game/core/sound/registry/WoodSound.java +++ /dev/null @@ -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 { -} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/WoodWalkingSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/WoodWalkingSound.java new file mode 100644 index 0000000..3b56d7a --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/WoolDigSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/WoolDigSound.java new file mode 100644 index 0000000..3d1a5c2 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/WoolMiningSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/WoolMiningSound.java new file mode 100644 index 0000000..2ab6a0c --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/core/sound/registry/WoolWalkingSound.java b/src/main/java/cz/jzitnik/game/core/sound/registry/WoolWalkingSound.java new file mode 100644 index 0000000..d6031d2 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/CobblestoneBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/CobblestoneBlock.java index 12fd58a..4de005c 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/CobblestoneBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/FarmlandBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/FarmlandBlock.java index 50b9778..2e84761 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/FarmlandBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/HaybaleBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/HaybaleBlock.java index aa61c1a..06710e1 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/HaybaleBlock.java +++ b/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) diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/LavaBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/LavaBlock.java index ff66f23..8859d21 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/LavaBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakDoorBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakDoorBlock.java index 3cb2438..74c1405 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakDoorBlock.java +++ b/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") diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLeavesBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLeavesBlock.java index 0affae4..591d116 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLeavesBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLogBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLogBlock.java index 15d17b1..683e3bd 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLogBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakPlanksBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakPlanksBlock.java index aa9cec6..30fcb62 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakPlanksBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/ObsidianBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/ObsidianBlock.java index 9768b59..82a1eec 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/ObsidianBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/SandBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/SandBlock.java index 6f3b8e2..4a93d13 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/SandBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/StoneBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/StoneBlock.java index 86853a3..03b7e47 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/StoneBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/GrassBushBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/GrassBushBlock.java index c3cbb43..7877de6 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/GrassBushBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/OakSaplingBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/OakSaplingBlock.java index 92f7e60..585bcfb 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/OakSaplingBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/WheatBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/WheatBlock.java index 3027944..18040bb 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/WheatBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AlliumBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AlliumBlock.java index 8695750..49d3ef5 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AlliumBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AzureBluetBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AzureBluetBlock.java index e1e518e..eb82380 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/AzureBluetBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/BlueOrchidBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/BlueOrchidBlock.java index 0559d1d..88f7229 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/BlueOrchidBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/CornflowerBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/CornflowerBlock.java index 9db2389..3dd8903 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/CornflowerBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/DandelionBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/DandelionBlock.java index d4899af..072d6b3 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/DandelionBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilacBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilacBlock.java index 15ffa80..655b0fa 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilacBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilyOfTheValleyBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilyOfTheValleyBlock.java index d95fb43..26dcb9a 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/LilyOfTheValleyBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OrangeTulipBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OrangeTulipBlock.java index 64cf45b..9320074 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OrangeTulipBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OxeyeDaisyBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OxeyeDaisyBlock.java index 90169e3..b2a9b7e 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/OxeyeDaisyBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PeonyBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PeonyBlock.java index dcc1ce7..7addf6f 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PeonyBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PinkTulipBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PinkTulipBlock.java index fb9c38a..b5475f9 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PinkTulipBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PoppyBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PoppyBlock.java index 8300689..9bcb2fb 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/PoppyBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RedTulipBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RedTulipBlock.java index 2346853..5a75b4b 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RedTulipBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RoseBushBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RoseBushBlock.java index 52b5cb5..80ba771 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/RoseBushBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/SunflowerBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/SunflowerBlock.java index 66f9cc4..cac4528 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/SunflowerBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/WhiteTulipBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/WhiteTulipBlock.java index 4123248..f57222a 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/flowers/WhiteTulipBlock.java +++ b/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 diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalBlock.java index de52114..a9578b3 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalOreBlock.java index b9774d2..7de05ec 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/coal/CoalOreBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondBlock.java index 027241e..5110275 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondOreBlock.java index 15cfb14..8df7f8b 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/diamond/DiamondOreBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldBlock.java index 48ea578..e27120a 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldOreBlock.java index d6b1afc..06964f8 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/gold/GoldOreBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronBlock.java index bbc7f3e..131a76d 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronOreBlock.java index d676afb..c0d4f70 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/ores/iron/IronOreBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlackWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlackWoolBlock.java index 7df1fda..e760781 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlackWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java index f578784..c0ca88d 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BrownWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BrownWoolBlock.java index df7d2fd..eef24bc 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BrownWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java index 91e3eef..84933d2 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GrayWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GrayWoolBlock.java index f7d1f81..7c9fbee 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GrayWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java index 1fb401b..710a643 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java index 629cd28..b5825f0 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightGrayWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightGrayWoolBlock.java index a9a3be0..f7f6a74 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightGrayWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java index d3c0b17..bd98ed8 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java index 1e380b4..da59130 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java index 8d21970..23d8dc3 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PinkWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PinkWoolBlock.java index 4b165a0..c165a9f 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PinkWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java index 192345c..a5ccac1 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java index 676f170..c1f1f2c 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/WhiteWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/WhiteWoolBlock.java index 3092385..a4188bb 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/WhiteWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java index d65eedc..ff497ad 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/BedBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/BedBlock.java index 64e21a7..a549559 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/BedBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/ChestBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/ChestBlock.java index 5ea2b35..7fd7814 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/ChestBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/CraftingTableBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/CraftingTableBlock.java index 4e809db..f938ee6 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/CraftingTableBlock.java +++ b/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 { diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/FurnaceBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/FurnaceBlock.java index aa30806..21f37bc 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/work/FurnaceBlock.java +++ b/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() { diff --git a/src/main/java/cz/jzitnik/game/sprites/Wool.java b/src/main/java/cz/jzitnik/game/sprites/Wool.java index 2c1d886..a030bf0 100644 --- a/src/main/java/cz/jzitnik/game/sprites/Wool.java +++ b/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; diff --git a/src/main/resources/sounds/grass/Grass_mining5.ogg b/src/main/resources/sounds/grass/Grass_mining5.ogg new file mode 100644 index 0000000..ca4b590 Binary files /dev/null and b/src/main/resources/sounds/grass/Grass_mining5.ogg differ diff --git a/src/main/resources/sounds/grass/Grass_mining6.ogg b/src/main/resources/sounds/grass/Grass_mining6.ogg new file mode 100644 index 0000000..532f297 Binary files /dev/null and b/src/main/resources/sounds/grass/Grass_mining6.ogg differ diff --git a/src/main/resources/sounds/grass/mining1.ogg b/src/main/resources/sounds/grass/mining1.ogg new file mode 100644 index 0000000..e145d9e Binary files /dev/null and b/src/main/resources/sounds/grass/mining1.ogg differ diff --git a/src/main/resources/sounds/grass/mining2.ogg b/src/main/resources/sounds/grass/mining2.ogg new file mode 100644 index 0000000..a6f0efd Binary files /dev/null and b/src/main/resources/sounds/grass/mining2.ogg differ diff --git a/src/main/resources/sounds/grass/mining3.ogg b/src/main/resources/sounds/grass/mining3.ogg new file mode 100644 index 0000000..1343516 Binary files /dev/null and b/src/main/resources/sounds/grass/mining3.ogg differ diff --git a/src/main/resources/sounds/grass/mining4.ogg b/src/main/resources/sounds/grass/mining4.ogg new file mode 100644 index 0000000..591ca19 Binary files /dev/null and b/src/main/resources/sounds/grass/mining4.ogg differ diff --git a/src/main/resources/sounds/metal/dig1.ogg b/src/main/resources/sounds/metal/dig1.ogg new file mode 100644 index 0000000..8f5b465 Binary files /dev/null and b/src/main/resources/sounds/metal/dig1.ogg differ diff --git a/src/main/resources/sounds/metal/dig2.ogg b/src/main/resources/sounds/metal/dig2.ogg new file mode 100644 index 0000000..3d924a2 Binary files /dev/null and b/src/main/resources/sounds/metal/dig2.ogg differ diff --git a/src/main/resources/sounds/metal/dig3.ogg b/src/main/resources/sounds/metal/dig3.ogg new file mode 100644 index 0000000..71f8e52 Binary files /dev/null and b/src/main/resources/sounds/metal/dig3.ogg differ diff --git a/src/main/resources/sounds/metal/dig4.ogg b/src/main/resources/sounds/metal/dig4.ogg new file mode 100644 index 0000000..e3737f3 Binary files /dev/null and b/src/main/resources/sounds/metal/dig4.ogg differ diff --git a/src/main/resources/sounds/metal/mining1.ogg b/src/main/resources/sounds/metal/mining1.ogg new file mode 100644 index 0000000..e8569f6 Binary files /dev/null and b/src/main/resources/sounds/metal/mining1.ogg differ diff --git a/src/main/resources/sounds/metal/mining2.ogg b/src/main/resources/sounds/metal/mining2.ogg new file mode 100644 index 0000000..24433b4 Binary files /dev/null and b/src/main/resources/sounds/metal/mining2.ogg differ diff --git a/src/main/resources/sounds/metal/mining3.ogg b/src/main/resources/sounds/metal/mining3.ogg new file mode 100644 index 0000000..ad14bf1 Binary files /dev/null and b/src/main/resources/sounds/metal/mining3.ogg differ diff --git a/src/main/resources/sounds/metal/mining4.ogg b/src/main/resources/sounds/metal/mining4.ogg new file mode 100644 index 0000000..1a81029 Binary files /dev/null and b/src/main/resources/sounds/metal/mining4.ogg differ diff --git a/src/main/resources/sounds/metal/mining5.ogg b/src/main/resources/sounds/metal/mining5.ogg new file mode 100644 index 0000000..c0f755c Binary files /dev/null and b/src/main/resources/sounds/metal/mining5.ogg differ diff --git a/src/main/resources/sounds/metal/mining6.ogg b/src/main/resources/sounds/metal/mining6.ogg new file mode 100644 index 0000000..3d5cd90 Binary files /dev/null and b/src/main/resources/sounds/metal/mining6.ogg differ diff --git a/src/main/resources/sounds/metal/step1.ogg b/src/main/resources/sounds/metal/step1.ogg new file mode 100644 index 0000000..cacd597 Binary files /dev/null and b/src/main/resources/sounds/metal/step1.ogg differ diff --git a/src/main/resources/sounds/metal/step2.ogg b/src/main/resources/sounds/metal/step2.ogg new file mode 100644 index 0000000..885ee86 Binary files /dev/null and b/src/main/resources/sounds/metal/step2.ogg differ diff --git a/src/main/resources/sounds/metal/step3.ogg b/src/main/resources/sounds/metal/step3.ogg new file mode 100644 index 0000000..5ce46fd Binary files /dev/null and b/src/main/resources/sounds/metal/step3.ogg differ diff --git a/src/main/resources/sounds/metal/step4.ogg b/src/main/resources/sounds/metal/step4.ogg new file mode 100644 index 0000000..d908fb0 Binary files /dev/null and b/src/main/resources/sounds/metal/step4.ogg differ diff --git a/src/main/resources/sounds/metal/step5.ogg b/src/main/resources/sounds/metal/step5.ogg new file mode 100644 index 0000000..fd06c59 Binary files /dev/null and b/src/main/resources/sounds/metal/step5.ogg differ diff --git a/src/main/resources/sounds/metal/step6.ogg b/src/main/resources/sounds/metal/step6.ogg new file mode 100644 index 0000000..d421e36 Binary files /dev/null and b/src/main/resources/sounds/metal/step6.ogg differ diff --git a/src/main/resources/sounds/sand/dig1.ogg b/src/main/resources/sounds/sand/dig1.ogg new file mode 100644 index 0000000..31464ad Binary files /dev/null and b/src/main/resources/sounds/sand/dig1.ogg differ diff --git a/src/main/resources/sounds/sand/dig2.ogg b/src/main/resources/sounds/sand/dig2.ogg new file mode 100644 index 0000000..4a39000 Binary files /dev/null and b/src/main/resources/sounds/sand/dig2.ogg differ diff --git a/src/main/resources/sounds/sand/dig3.ogg b/src/main/resources/sounds/sand/dig3.ogg new file mode 100644 index 0000000..c66a813 Binary files /dev/null and b/src/main/resources/sounds/sand/dig3.ogg differ diff --git a/src/main/resources/sounds/sand/dig4.ogg b/src/main/resources/sounds/sand/dig4.ogg new file mode 100644 index 0000000..f32677f Binary files /dev/null and b/src/main/resources/sounds/sand/dig4.ogg differ diff --git a/src/main/resources/sounds/sand/mining.ogg b/src/main/resources/sounds/sand/mining.ogg new file mode 100644 index 0000000..420cecf Binary files /dev/null and b/src/main/resources/sounds/sand/mining.ogg differ diff --git a/src/main/resources/sounds/sand/mining2.ogg b/src/main/resources/sounds/sand/mining2.ogg new file mode 100644 index 0000000..656a9e6 Binary files /dev/null and b/src/main/resources/sounds/sand/mining2.ogg differ diff --git a/src/main/resources/sounds/sand/mining3.ogg b/src/main/resources/sounds/sand/mining3.ogg new file mode 100644 index 0000000..1987ef5 Binary files /dev/null and b/src/main/resources/sounds/sand/mining3.ogg differ diff --git a/src/main/resources/sounds/sand/mining4.ogg b/src/main/resources/sounds/sand/mining4.ogg new file mode 100644 index 0000000..a26b5aa Binary files /dev/null and b/src/main/resources/sounds/sand/mining4.ogg differ diff --git a/src/main/resources/sounds/sand/mining5.ogg b/src/main/resources/sounds/sand/mining5.ogg new file mode 100644 index 0000000..20df020 Binary files /dev/null and b/src/main/resources/sounds/sand/mining5.ogg differ diff --git a/src/main/resources/sounds/sand/walk1.ogg b/src/main/resources/sounds/sand/walk1.ogg new file mode 100644 index 0000000..55441c9 Binary files /dev/null and b/src/main/resources/sounds/sand/walk1.ogg differ diff --git a/src/main/resources/sounds/sand/walk2.ogg b/src/main/resources/sounds/sand/walk2.ogg new file mode 100644 index 0000000..9abbb96 Binary files /dev/null and b/src/main/resources/sounds/sand/walk2.ogg differ diff --git a/src/main/resources/sounds/sand/walk3.ogg b/src/main/resources/sounds/sand/walk3.ogg new file mode 100644 index 0000000..31d339e Binary files /dev/null and b/src/main/resources/sounds/sand/walk3.ogg differ diff --git a/src/main/resources/sounds/sand/walk4.ogg b/src/main/resources/sounds/sand/walk4.ogg new file mode 100644 index 0000000..edfbd32 Binary files /dev/null and b/src/main/resources/sounds/sand/walk4.ogg differ diff --git a/src/main/resources/sounds/sand/walk5.ogg b/src/main/resources/sounds/sand/walk5.ogg new file mode 100644 index 0000000..5a3be54 Binary files /dev/null and b/src/main/resources/sounds/sand/walk5.ogg differ diff --git a/src/main/resources/sounds/stone/dig1.ogg b/src/main/resources/sounds/stone/dig1.ogg new file mode 100644 index 0000000..2a2bd2d Binary files /dev/null and b/src/main/resources/sounds/stone/dig1.ogg differ diff --git a/src/main/resources/sounds/stone/dig2.ogg b/src/main/resources/sounds/stone/dig2.ogg new file mode 100644 index 0000000..5a279cc Binary files /dev/null and b/src/main/resources/sounds/stone/dig2.ogg differ diff --git a/src/main/resources/sounds/stone/dig3.ogg b/src/main/resources/sounds/stone/dig3.ogg new file mode 100644 index 0000000..dc0b0c6 Binary files /dev/null and b/src/main/resources/sounds/stone/dig3.ogg differ diff --git a/src/main/resources/sounds/stone/dig4.ogg b/src/main/resources/sounds/stone/dig4.ogg new file mode 100644 index 0000000..90b4d7d Binary files /dev/null and b/src/main/resources/sounds/stone/dig4.ogg differ diff --git a/src/main/resources/sounds/stone/mine1.ogg b/src/main/resources/sounds/stone/mine1.ogg new file mode 100644 index 0000000..ff6d344 Binary files /dev/null and b/src/main/resources/sounds/stone/mine1.ogg differ diff --git a/src/main/resources/sounds/stone/mine2.ogg b/src/main/resources/sounds/stone/mine2.ogg new file mode 100644 index 0000000..0088bc2 Binary files /dev/null and b/src/main/resources/sounds/stone/mine2.ogg differ diff --git a/src/main/resources/sounds/stone/mine3.ogg b/src/main/resources/sounds/stone/mine3.ogg new file mode 100644 index 0000000..1323e66 Binary files /dev/null and b/src/main/resources/sounds/stone/mine3.ogg differ diff --git a/src/main/resources/sounds/stone/mine4.ogg b/src/main/resources/sounds/stone/mine4.ogg new file mode 100644 index 0000000..e2c0dcf Binary files /dev/null and b/src/main/resources/sounds/stone/mine4.ogg differ diff --git a/src/main/resources/sounds/stone/mine5.ogg b/src/main/resources/sounds/stone/mine5.ogg new file mode 100644 index 0000000..30f626e Binary files /dev/null and b/src/main/resources/sounds/stone/mine5.ogg differ diff --git a/src/main/resources/sounds/stone/mine6.ogg b/src/main/resources/sounds/stone/mine6.ogg new file mode 100644 index 0000000..c16d800 Binary files /dev/null and b/src/main/resources/sounds/stone/mine6.ogg differ diff --git a/src/main/resources/sounds/stone/step1.ogg b/src/main/resources/sounds/stone/step1.ogg new file mode 100644 index 0000000..b4c14b0 Binary files /dev/null and b/src/main/resources/sounds/stone/step1.ogg differ diff --git a/src/main/resources/sounds/stone/step2.ogg b/src/main/resources/sounds/stone/step2.ogg new file mode 100644 index 0000000..b50e7ba Binary files /dev/null and b/src/main/resources/sounds/stone/step2.ogg differ diff --git a/src/main/resources/sounds/stone/step3.ogg b/src/main/resources/sounds/stone/step3.ogg new file mode 100644 index 0000000..bab6016 Binary files /dev/null and b/src/main/resources/sounds/stone/step3.ogg differ diff --git a/src/main/resources/sounds/stone/step4.ogg b/src/main/resources/sounds/stone/step4.ogg new file mode 100644 index 0000000..dd3c6f3 Binary files /dev/null and b/src/main/resources/sounds/stone/step4.ogg differ diff --git a/src/main/resources/sounds/stone/step5.ogg b/src/main/resources/sounds/stone/step5.ogg new file mode 100644 index 0000000..c5146ee Binary files /dev/null and b/src/main/resources/sounds/stone/step5.ogg differ diff --git a/src/main/resources/sounds/stone/step6.ogg b/src/main/resources/sounds/stone/step6.ogg new file mode 100644 index 0000000..7095f58 Binary files /dev/null and b/src/main/resources/sounds/stone/step6.ogg differ diff --git a/src/main/resources/sounds/wood/wood1.ogg b/src/main/resources/sounds/wood/dig1.ogg similarity index 100% rename from src/main/resources/sounds/wood/wood1.ogg rename to src/main/resources/sounds/wood/dig1.ogg diff --git a/src/main/resources/sounds/wood/dig2.ogg b/src/main/resources/sounds/wood/dig2.ogg new file mode 100644 index 0000000..c2c5363 Binary files /dev/null and b/src/main/resources/sounds/wood/dig2.ogg differ diff --git a/src/main/resources/sounds/wood/dig3.ogg b/src/main/resources/sounds/wood/dig3.ogg new file mode 100644 index 0000000..4d3a20f Binary files /dev/null and b/src/main/resources/sounds/wood/dig3.ogg differ diff --git a/src/main/resources/sounds/wood/dig4.ogg b/src/main/resources/sounds/wood/dig4.ogg new file mode 100644 index 0000000..329c514 Binary files /dev/null and b/src/main/resources/sounds/wood/dig4.ogg differ diff --git a/src/main/resources/sounds/wood/mining1.ogg b/src/main/resources/sounds/wood/mining1.ogg new file mode 100644 index 0000000..9a5e2de Binary files /dev/null and b/src/main/resources/sounds/wood/mining1.ogg differ diff --git a/src/main/resources/sounds/wood/mining2.ogg b/src/main/resources/sounds/wood/mining2.ogg new file mode 100644 index 0000000..d8d7a5b Binary files /dev/null and b/src/main/resources/sounds/wood/mining2.ogg differ diff --git a/src/main/resources/sounds/wood/mining3.ogg b/src/main/resources/sounds/wood/mining3.ogg new file mode 100644 index 0000000..84b4243 Binary files /dev/null and b/src/main/resources/sounds/wood/mining3.ogg differ diff --git a/src/main/resources/sounds/wood/mining4.ogg b/src/main/resources/sounds/wood/mining4.ogg new file mode 100644 index 0000000..49be9ab Binary files /dev/null and b/src/main/resources/sounds/wood/mining4.ogg differ diff --git a/src/main/resources/sounds/wood/mining5.ogg b/src/main/resources/sounds/wood/mining5.ogg new file mode 100644 index 0000000..64a69cb Binary files /dev/null and b/src/main/resources/sounds/wood/mining5.ogg differ diff --git a/src/main/resources/sounds/wood/mining6.ogg b/src/main/resources/sounds/wood/mining6.ogg new file mode 100644 index 0000000..7d8805c Binary files /dev/null and b/src/main/resources/sounds/wood/mining6.ogg differ diff --git a/src/main/resources/sounds/wood/step1.ogg b/src/main/resources/sounds/wood/step1.ogg new file mode 100644 index 0000000..5c917b0 Binary files /dev/null and b/src/main/resources/sounds/wood/step1.ogg differ diff --git a/src/main/resources/sounds/wood/step2.ogg b/src/main/resources/sounds/wood/step2.ogg new file mode 100644 index 0000000..f47f438 Binary files /dev/null and b/src/main/resources/sounds/wood/step2.ogg differ diff --git a/src/main/resources/sounds/wood/step3.ogg b/src/main/resources/sounds/wood/step3.ogg new file mode 100644 index 0000000..e1dfff5 Binary files /dev/null and b/src/main/resources/sounds/wood/step3.ogg differ diff --git a/src/main/resources/sounds/wood/step4.ogg b/src/main/resources/sounds/wood/step4.ogg new file mode 100644 index 0000000..c2122fb Binary files /dev/null and b/src/main/resources/sounds/wood/step4.ogg differ diff --git a/src/main/resources/sounds/wood/step5.ogg b/src/main/resources/sounds/wood/step5.ogg new file mode 100644 index 0000000..7aff8a0 Binary files /dev/null and b/src/main/resources/sounds/wood/step5.ogg differ diff --git a/src/main/resources/sounds/wood/step6.ogg b/src/main/resources/sounds/wood/step6.ogg new file mode 100644 index 0000000..2466463 Binary files /dev/null and b/src/main/resources/sounds/wood/step6.ogg differ diff --git a/src/main/resources/sounds/wool/dig1.ogg b/src/main/resources/sounds/wool/dig1.ogg new file mode 100644 index 0000000..89cd397 Binary files /dev/null and b/src/main/resources/sounds/wool/dig1.ogg differ diff --git a/src/main/resources/sounds/wool/dig2.ogg b/src/main/resources/sounds/wool/dig2.ogg new file mode 100644 index 0000000..076ff78 Binary files /dev/null and b/src/main/resources/sounds/wool/dig2.ogg differ diff --git a/src/main/resources/sounds/wool/dig3.ogg b/src/main/resources/sounds/wool/dig3.ogg new file mode 100644 index 0000000..1c94ae5 Binary files /dev/null and b/src/main/resources/sounds/wool/dig3.ogg differ diff --git a/src/main/resources/sounds/wool/dig4.ogg b/src/main/resources/sounds/wool/dig4.ogg new file mode 100644 index 0000000..9b14207 Binary files /dev/null and b/src/main/resources/sounds/wool/dig4.ogg differ