diff --git a/src/main/java/cz/jzitnik/game/SpriteLoader.java b/src/main/java/cz/jzitnik/game/SpriteLoader.java index 5907b60..22d5dc7 100644 --- a/src/main/java/cz/jzitnik/game/SpriteLoader.java +++ b/src/main/java/cz/jzitnik/game/SpriteLoader.java @@ -108,17 +108,22 @@ public class SpriteLoader { IRON_SHOVEL, IRON_HOE, - BUCKET, - WATER_BUCKET, - LAVA_BUCKET, - MILK_BUCKET, - GOLDEN_SWORD, GOLDEN_PICKAXE, GOLDEN_AXE, GOLDEN_SHOVEL, GOLDEN_HOE, + DIAMOND_SWORD, + DIAMOND_PICKAXE, + DIAMOND_AXE, + DIAMOND_SHOVEL, + DIAMOND_HOE, + + BUCKET, + WATER_BUCKET, + LAVA_BUCKET, + MILK_BUCKET, // Food ITEM_PORKCHOP, ITEM_COOKED_PORKCHOP, @@ -226,12 +231,19 @@ public class SpriteLoader { SPRITES_MAP.put(SPRITES.IRON_AXE, new SimpleSprite("items/iron_axe.ans")); SPRITES_MAP.put(SPRITES.IRON_SHOVEL, new SimpleSprite("items/iron_shovel.ans")); SPRITES_MAP.put(SPRITES.IRON_HOE, new SimpleSprite("items/iron_hoe.ans")); + SPRITES_MAP.put(SPRITES.GOLDEN_SWORD, new SimpleSprite("items/golden_sword.ans")); SPRITES_MAP.put(SPRITES.GOLDEN_PICKAXE, new SimpleSprite("items/golden_pickaxe.ans")); SPRITES_MAP.put(SPRITES.GOLDEN_AXE, new SimpleSprite("items/golden_axe.ans")); SPRITES_MAP.put(SPRITES.GOLDEN_SHOVEL, new SimpleSprite("items/golden_shovel.ans")); SPRITES_MAP.put(SPRITES.GOLDEN_HOE, new SimpleSprite("items/golden_hoe.ans")); + SPRITES_MAP.put(SPRITES.DIAMOND_SWORD, new SimpleSprite("items/diamond_sword.ans")); + SPRITES_MAP.put(SPRITES.DIAMOND_PICKAXE, new SimpleSprite("items/diamond_pickaxe.ans")); + SPRITES_MAP.put(SPRITES.DIAMOND_AXE, new SimpleSprite("items/diamond_axe.ans")); + SPRITES_MAP.put(SPRITES.DIAMOND_SHOVEL, new SimpleSprite("items/diamond_shovel.ans")); + SPRITES_MAP.put(SPRITES.DIAMOND_HOE, new SimpleSprite("items/diamond_hoe.ans")); + SPRITES_MAP.put(SPRITES.BUCKET, new SimpleSprite("items/bucket.ans")); SPRITES_MAP.put(SPRITES.WATER_BUCKET, new SimpleSprite("items/water_bucket.ans")); SPRITES_MAP.put(SPRITES.LAVA_BUCKET, new SimpleSprite("items/lava_bucket.ans")); diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxe2Recipe.java new file mode 100644 index 0000000..c39c0cf --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxe2Recipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "diamond", "diamond", + "_", "stick", "diamond", + "_", "stick", "_" + }, + result = "diamond_axe", + amount = 1 +) +public class DiamondAxe2Recipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxeRecipe.java new file mode 100644 index 0000000..2032223 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxeRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "diamond", "diamond", "_", + "diamond", "stick", "_", + "_", "stick", "_" + }, + result = "diamond_axe", + amount = 1 +) +public class DiamondAxeRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoe2Recipe.java new file mode 100644 index 0000000..b99c838 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoe2Recipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "diamond", "diamond", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "diamond_hoe", + amount = 1 +) +public class DiamondHoe2Recipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoeRecipe.java new file mode 100644 index 0000000..e76a024 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoeRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "diamond", "diamond", "_", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "diamond_hoe", + amount = 1 +) +public class DiamondHoeRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondPickaxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondPickaxeRecipe.java new file mode 100644 index 0000000..4838f43 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondPickaxeRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "diamond", "diamond", "diamond", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "diamond_pickaxe", + amount = 1 +) +public class DiamondPickaxeRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondShovelRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondShovelRecipe.java new file mode 100644 index 0000000..13d5e9e --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondShovelRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "diamond", "_", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "diamond_shovel", + amount = 1 +) +public class DiamondShovelRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondSwordRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondSwordRecipe.java new file mode 100644 index 0000000..7479801 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondSwordRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "diamond", "_", + "_", "diamond", "_", + "_", "stick", "_" + }, + result = "diamond_sword", + amount = 1 +) +public class DiamondSwordRecipe {} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondAxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondAxe.java new file mode 100644 index 0000000..ae8e1d9 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondAxe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +@ItemRegistry("diamond_axe") +public class DiamondAxe extends Item { + public DiamondAxe() { + super("diamond_axe", "Diamond axe", ItemType.AXE, SpriteLoader.SPRITES.DIAMOND_AXE, ToolVariant.DIAMOND, 2, 1561, false); + } +} \ No newline at end of file diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondHoe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondHoe.java new file mode 100644 index 0000000..bca6c3c --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondHoe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +@ItemRegistry("diamond_hoe") +public class DiamondHoe extends Item { + public DiamondHoe() { + super("diamond_hoe", "Diamond hoe", ItemType.HOE, SpriteLoader.SPRITES.DIAMOND_HOE, ToolVariant.DIAMOND, 0, 1561, false); + } +} \ No newline at end of file diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondPickaxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondPickaxe.java new file mode 100644 index 0000000..f06471d --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondPickaxe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +@ItemRegistry("diamond_pickaxe") +public class DiamondPickaxe extends Item { + public DiamondPickaxe() { + super("diamond_pickaxe", "Diamond pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.DIAMOND_PICKAXE, ToolVariant.DIAMOND, 14, 1561, false); + } +} \ No newline at end of file diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondShovel.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondShovel.java new file mode 100644 index 0000000..359d426 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondShovel.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +@ItemRegistry("diamond_shovel") +public class DiamondShovel extends Item { + public DiamondShovel() { + super("diamond_shovel", "Diamond shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.DIAMOND_SHOVEL, ToolVariant.DIAMOND, 0.5, 1561, false); + } +} \ No newline at end of file diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondSword.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondSword.java new file mode 100644 index 0000000..02de620 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondSword.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +@ItemRegistry("diamond_sword") +public class DiamondSword extends Item { + public DiamondSword() { + super("diamond_sword", "Diamond sword", ItemType.SWORD, SpriteLoader.SPRITES.DIAMOND_SWORD, ToolVariant.DIAMOND, 1562, false, 4); + } +} \ No newline at end of file diff --git a/src/main/resources/textures/items/diamond_axe.ans b/src/main/resources/textures/items/diamond_axe.ans new file mode 100644 index 0000000..be526c0 --- /dev/null +++ b/src/main/resources/textures/items/diamond_axe.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                              +                                        +                                        +                                        +                                  +                                  +                                    +                                   +                                   +                                    +                                       +                                       +                                            +                                            +                                              +                                            +                                            +                                              +                                            +                                            +                                              +                                                   +                                                   diff --git a/src/main/resources/textures/items/diamond_hoe.ans b/src/main/resources/textures/items/diamond_hoe.ans new file mode 100644 index 0000000..a229022 --- /dev/null +++ b/src/main/resources/textures/items/diamond_hoe.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                          +                                       +                                       +                                   +                                       +                                       +                                           +                                           +                                           +                                            +                                            +                                            +                                            +                                            +                                              +                                            +                                            +                                              +                                            +                                            +                                              +                                                   +                                                   diff --git a/src/main/resources/textures/items/diamond_pickaxe.ans b/src/main/resources/textures/items/diamond_pickaxe.ans new file mode 100644 index 0000000..abb3206 --- /dev/null +++ b/src/main/resources/textures/items/diamond_pickaxe.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                                   +                                    +                                    +                               +                              +                              +                                           +                                       +                                       +                                       +                                       +                                       +                                       +                                       +                                         +                                         +                                         +                                              +                                            +                                            +                                              +                                                   +                                                   diff --git a/src/main/resources/textures/items/diamond_shovel.ans b/src/main/resources/textures/items/diamond_shovel.ans new file mode 100644 index 0000000..0208d20 --- /dev/null +++ b/src/main/resources/textures/items/diamond_shovel.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                                   +                                           +                                           +                                         +                                       +                                       +                                    +                                        +                                        +                                        +                                         +                                         +                                            +                                            +                                              +                                            +                                            +                                          +                                            +                                            +                                              +                                                   +                                                   diff --git a/src/main/resources/textures/items/diamond_sword.ans b/src/main/resources/textures/items/diamond_sword.ans new file mode 100644 index 0000000..600f5b7 --- /dev/null +++ b/src/main/resources/textures/items/diamond_sword.ans @@ -0,0 +1,25 @@ +                                          +                                          +                                          +                                        +                                        +                                          +                                        +                                        +                                        +                                   +                                   +                                 +                                    +                                    +                                      +                                      +                                           +                                      +                                      +                                 +                                   +                                   +                                            +                                          +