Compare commits

..

No commits in common. "main" and "main" have entirely different histories.
main ... main

28 changed files with 4 additions and 79 deletions

View File

@ -11,10 +11,4 @@ public enum SoundKey {
HURT, HURT,
HIT, HIT,
SAND_DIG,
STONE_DIG,
STONE_WALKING,
STONE_MINING,
} }

View File

@ -1,13 +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.SAND_DIG, resourceLocation = {
"sand/dig1.ogg",
"sand/dig2.ogg",
"sand/dig3.ogg",
"sand/dig4.ogg"
})
public class SandDigSound {
}

View File

@ -1,13 +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.STONE_DIG, resourceLocation = {
"stone/dig1.ogg",
"stone/dig2.ogg",
"stone/dig3.ogg",
"stone/dig4.ogg"
})
public class StoneDigSound {
}

View File

@ -1,15 +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.STONE_MINING, resourceLocation = {
"stone/mine1.ogg",
"stone/mine2.ogg",
"stone/mine3.ogg",
"stone/mine4.ogg",
"stone/mine5.ogg",
"stone/mine6.ogg"
})
public class StoneMiningSound {
}

View File

@ -1,15 +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.STONE_WALKING, resourceLocation = {
"stone/step1.ogg",
"stone/step2.ogg",
"stone/step3.ogg",
"stone/step4.ogg",
"stone/step5.ogg",
"stone/step6.ogg"
})
public class StoneWalkingSound {
}

View File

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

View File

@ -3,16 +3,11 @@ package cz.jzitnik.game.entities.items.registry.blocks.blocks;
import cz.jzitnik.game.SpriteLoader; import cz.jzitnik.game.SpriteLoader;
import cz.jzitnik.game.annotations.BlockRegistry; import cz.jzitnik.game.annotations.BlockRegistry;
import cz.jzitnik.game.annotations.FallingBlock; import cz.jzitnik.game.annotations.FallingBlock;
import cz.jzitnik.game.annotations.MineSound;
import cz.jzitnik.game.annotations.PlaceSound;
import cz.jzitnik.game.core.sound.SoundKey;
import cz.jzitnik.game.entities.Block; import cz.jzitnik.game.entities.Block;
import cz.jzitnik.game.entities.items.ItemType; import cz.jzitnik.game.entities.items.ItemType;
import java.util.ArrayList; import java.util.ArrayList;
@MineSound(SoundKey.SAND_DIG)
@PlaceSound(SoundKey.SAND_DIG)
@FallingBlock @FallingBlock
@BlockRegistry("sand") @BlockRegistry("sand")
public class SandBlock extends Block { public class SandBlock extends Block {

View File

@ -1,17 +1,13 @@
package cz.jzitnik.game.entities.items.registry.blocks.blocks; package cz.jzitnik.game.entities.items.registry.blocks.blocks;
import cz.jzitnik.game.SpriteLoader; import cz.jzitnik.game.SpriteLoader;
import cz.jzitnik.game.annotations.*; import cz.jzitnik.game.annotations.BlockRegistry;
import cz.jzitnik.game.core.sound.SoundKey;
import cz.jzitnik.game.entities.Block; import cz.jzitnik.game.entities.Block;
import cz.jzitnik.game.entities.items.ItemType; import cz.jzitnik.game.entities.items.ItemType;
import cz.jzitnik.game.entities.items.ToolVariant; import cz.jzitnik.game.entities.items.ToolVariant;
import java.util.Arrays; 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") @BlockRegistry(value = "stone", drops = "cobblestone")
public class StoneBlock extends Block { public class StoneBlock extends Block {
public StoneBlock() { public StoneBlock() {