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 d89ae19..150e116 100644 --- a/src/main/java/cz/jzitnik/game/core/sound/SoundKey.java +++ b/src/main/java/cz/jzitnik/game/core/sound/SoundKey.java @@ -12,5 +12,9 @@ public enum SoundKey { HURT, HIT, - SAND_DIG + SAND_DIG, + + STONE_DIG, + STONE_WALKING, + STONE_MINING, } 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/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/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/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