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 150e116..c60fa02 100644 --- a/src/main/java/cz/jzitnik/game/core/sound/SoundKey.java +++ b/src/main/java/cz/jzitnik/game/core/sound/SoundKey.java @@ -7,7 +7,9 @@ public enum SoundKey { GRAVEL, GRAVEL_WALKING, - WOOD, + WOOD_DIG, + WOOD_WALKING, + WOOD_MINING, HURT, HIT, @@ -17,4 +19,6 @@ public enum SoundKey { STONE_DIG, STONE_WALKING, STONE_MINING, + + WOOL_DIG, } 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/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..0e4ae4e 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,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.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) @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..d48c902 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,8 +1,8 @@ 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; 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/grassy/GrassBushBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/GrassBushBlock.java index c3cbb43..d0dc4f5 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,13 @@ 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) @PlaceOnSolid @BreakableByWater @BreaksFalling 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/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/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