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 c60fa02..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,6 +3,7 @@ package cz.jzitnik.game.core.sound; public enum SoundKey { GRASS, GRASS_WALKING, + GRASS_MINING, GRAVEL, GRAVEL_WALKING, @@ -15,10 +16,16 @@ public enum SoundKey { 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/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/entities/items/registry/blocks/blocks/HaybaleBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/HaybaleBlock.java index 0e4ae4e..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 @@ -12,6 +12,7 @@ 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/OakLeavesBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/blocks/OakLeavesBlock.java index d48c902..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 @@ -8,6 +8,10 @@ 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/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 3fdfe84..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,10 +1,7 @@ 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.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; @@ -13,6 +10,8 @@ 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/grassy/GrassBushBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/grassy/GrassBushBlock.java index d0dc4f5..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 @@ -8,6 +8,7 @@ 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/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() {