diff --git a/src/main/java/cz/jzitnik/game/SpriteLoader.java b/src/main/java/cz/jzitnik/game/SpriteLoader.java index d3013e2..22d5dc7 100644 --- a/src/main/java/cz/jzitnik/game/SpriteLoader.java +++ b/src/main/java/cz/jzitnik/game/SpriteLoader.java @@ -26,11 +26,14 @@ public class SpriteLoader { // Ores COAL_ORE, - IRON_ORE, // NEWW - GOLD_ORE, //NEWW - COAL_BLOCK, // NEWW - IRON_BLOCK, // NEWW - GOLD_BLOCK, // NEWW + IRON_ORE, + GOLD_ORE, + DIAMOND_ORE, + + COAL_BLOCK, + IRON_BLOCK, + GOLD_BLOCK, + DIAMOND_BLOCK, // Work FURNACE, @@ -65,17 +68,20 @@ public class SpriteLoader { ITEM_WOOL, // Ore Items - ITEM_COAL_ORE,//NEWWW - ITEM_IRON_ORE, //NEWWW - ITEM_GOLD_ORE, // NEWW + ITEM_COAL_ORE, + ITEM_IRON_ORE, + ITEM_GOLD_ORE, + ITEM_DIAMOND_ORE, - ITEM_COAL_BLOCK, // NEWW - ITEM_IRON_BLOCK, //NEWWW - ITEM_GOLD_BLOCK, // NEWW + ITEM_COAL_BLOCK, + ITEM_IRON_BLOCK, + ITEM_GOLD_BLOCK, + ITEM_DIAMOND_BLOCK, - COAL, // NEWW - ITEM_IRON_INGOT, //NEWW - ITEM_GOLD_INGOT, // NEWW + COAL, + ITEM_IRON_INGOT, + ITEM_GOLD_INGOT, + DIAMOND, // Work Items ITEM_CRAFTING_TABLE, @@ -83,31 +89,41 @@ public class SpriteLoader { ITEM_FURNACE, ITEM_BED, - // Weapons - WOODEN_SWORD, //NEWWW + // Tools + WOODEN_SWORD, WOODEN_PICKAXE, WOODEN_AXE, WOODEN_SHOVEL, - WOODEN_HOE, //NEWW + WOODEN_HOE, - STONE_SWORD,//NEWWW + STONE_SWORD, STONE_PICKAXE, STONE_AXE, STONE_SHOVEL, - STONE_HOE, //NEWW + STONE_HOE, - IRON_SWORD, //NEWWW - IRON_PICKAXE, //NEWWW - IRON_AXE, // NEWW - IRON_SHOVEL, //NEWWW - IRON_HOE, // NEWWW + IRON_SWORD, + IRON_PICKAXE, + IRON_AXE, + IRON_SHOVEL, + IRON_HOE, - GOLDEN_SWORD, // NEWW - GOLDEN_PICKAXE, // NEWWW - GOLDEN_AXE, //NEWWW - GOLDEN_SHOVEL, //NEWWW - GOLDEN_HOE, // NEWW + 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, @@ -137,12 +153,14 @@ public class SpriteLoader { // Ores SPRITES_MAP.put(SPRITES.COAL_ORE, new SimpleSprite("coal_ore.ans")); - SPRITES_MAP.put(SPRITES.IRON_ORE, new SimpleSprite("iron_ore.ans")); //NEWW - SPRITES_MAP.put(SPRITES.GOLD_ORE, new SimpleSprite("gold_ore.ans")); //NEWW + SPRITES_MAP.put(SPRITES.IRON_ORE, new SimpleSprite("iron_ore.ans")); + SPRITES_MAP.put(SPRITES.GOLD_ORE, new SimpleSprite("gold_ore.ans")); + SPRITES_MAP.put(SPRITES.DIAMOND_ORE, new SimpleSprite("diamond_ore.ans")); - SPRITES_MAP.put(SPRITES.COAL_BLOCK, new SimpleSprite("coal_block.ans")); //NEWW - SPRITES_MAP.put(SPRITES.IRON_BLOCK, new SimpleSprite("iron_block.ans")); //NEWW - SPRITES_MAP.put(SPRITES.GOLD_BLOCK, new SimpleSprite("gold_block.ans")); //NEWW + SPRITES_MAP.put(SPRITES.COAL_BLOCK, new SimpleSprite("coal_block.ans")); + SPRITES_MAP.put(SPRITES.IRON_BLOCK, new SimpleSprite("iron_block.ans")); + SPRITES_MAP.put(SPRITES.GOLD_BLOCK, new SimpleSprite("gold_block.ans")); + SPRITES_MAP.put(SPRITES.DIAMOND_BLOCK, new SimpleSprite("diamond_block.ans")); //NEWW // Work SPRITES_MAP.put(SPRITES.CRAFTING_TABLE, new SimpleSprite("crafting_table.ans")); @@ -177,17 +195,17 @@ public class SpriteLoader { SPRITES_MAP.put(SPRITES.ITEM_WOOL, new WoolItem()); // Ore Items - SPRITES_MAP.put(SPRITES.ITEM_COAL_ORE, new SimpleSprite("items/coal_ore.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.ITEM_IRON_ORE, new SimpleSprite("items/iron_ore.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.ITEM_GOLD_ORE, new SimpleSprite("items/gold_ore.ans")); //NEWWW + SPRITES_MAP.put(SPRITES.ITEM_COAL_ORE, new SimpleSprite("items/coal_ore.ans")); + SPRITES_MAP.put(SPRITES.ITEM_IRON_ORE, new SimpleSprite("items/iron_ore.ans")); + SPRITES_MAP.put(SPRITES.ITEM_GOLD_ORE, new SimpleSprite("items/gold_ore.ans")); - SPRITES_MAP.put(SPRITES.ITEM_COAL_BLOCK, new SimpleSprite("items/coal_block.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.ITEM_IRON_BLOCK, new SimpleSprite("items/iron_block.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.ITEM_GOLD_BLOCK, new SimpleSprite("items/gold_block.ans")); //NEWWW + SPRITES_MAP.put(SPRITES.ITEM_COAL_BLOCK, new SimpleSprite("items/coal_block.ans")); + SPRITES_MAP.put(SPRITES.ITEM_IRON_BLOCK, new SimpleSprite("items/iron_block.ans")); + SPRITES_MAP.put(SPRITES.ITEM_GOLD_BLOCK, new SimpleSprite("items/gold_block.ans")); - SPRITES_MAP.put(SPRITES.COAL, new SimpleSprite("items/coal.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.ITEM_IRON_INGOT, new SimpleSprite("items/iron_ingot.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.ITEM_GOLD_INGOT, new SimpleSprite("items/gold_ingot.ans")); //NEWWW + SPRITES_MAP.put(SPRITES.COAL, new SimpleSprite("items/coal.ans")); + SPRITES_MAP.put(SPRITES.ITEM_IRON_INGOT, new SimpleSprite("items/iron_ingot.ans")); + SPRITES_MAP.put(SPRITES.ITEM_GOLD_INGOT, new SimpleSprite("items/gold_ingot.ans")); // Work Items SPRITES_MAP.put(SPRITES.ITEM_CRAFTING_TABLE, new SimpleSprite("items/crafting_table.ans")); @@ -195,30 +213,41 @@ public class SpriteLoader { SPRITES_MAP.put(SPRITES.ITEM_FURNACE, new SimpleSprite("items/furnace.ans")); SPRITES_MAP.put(SPRITES.ITEM_BED, new SimpleSprite("items/bed.ans")); - // Weapons - SPRITES_MAP.put(SPRITES.WOODEN_SWORD, new SimpleSprite("items/wooden_sword.ans")); //NEWWW + // Tools + SPRITES_MAP.put(SPRITES.WOODEN_SWORD, new SimpleSprite("items/wooden_sword.ans")); SPRITES_MAP.put(SPRITES.WOODEN_PICKAXE, new SimpleSprite("items/wooden_pickaxe.ans")); SPRITES_MAP.put(SPRITES.WOODEN_AXE, new SimpleSprite("items/wooden_axe.ans")); SPRITES_MAP.put(SPRITES.WOODEN_SHOVEL, new SimpleSprite("items/wooden_shovel.ans")); - SPRITES_MAP.put(SPRITES.WOODEN_HOE, new SimpleSprite("items/wooden_hoe.ans")); //NEWWW + SPRITES_MAP.put(SPRITES.WOODEN_HOE, new SimpleSprite("items/wooden_hoe.ans")); - SPRITES_MAP.put(SPRITES.STONE_SWORD, new SimpleSprite("items/wooden_sword.ans")); //NEWWW + SPRITES_MAP.put(SPRITES.STONE_SWORD, new SimpleSprite("items/wooden_sword.ans")); SPRITES_MAP.put(SPRITES.STONE_PICKAXE, new SimpleSprite("items/stone_pickaxe.ans")); SPRITES_MAP.put(SPRITES.STONE_AXE, new SimpleSprite("items/stone_axe.ans")); SPRITES_MAP.put(SPRITES.STONE_SHOVEL, new SimpleSprite("items/stone_shovel.ans")); - SPRITES_MAP.put(SPRITES.STONE_HOE, new SimpleSprite("items/stone_hoe.ans")); //NEWWW + SPRITES_MAP.put(SPRITES.STONE_HOE, new SimpleSprite("items/stone_hoe.ans")); - SPRITES_MAP.put(SPRITES.IRON_SWORD, new SimpleSprite("items/iron_sword.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.IRON_PICKAXE, new SimpleSprite("items/iron_pickaxe.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.IRON_AXE, new SimpleSprite("items/iron_axe.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.IRON_SHOVEL, new SimpleSprite("items/iron_shovel.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.IRON_HOE, new SimpleSprite("items/iron_hoe.ans")); //NEWWW + SPRITES_MAP.put(SPRITES.IRON_SWORD, new SimpleSprite("items/iron_sword.ans")); + SPRITES_MAP.put(SPRITES.IRON_PICKAXE, new SimpleSprite("items/iron_pickaxe.ans")); + 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")); //NEWWW - SPRITES_MAP.put(SPRITES.GOLDEN_PICKAXE, new SimpleSprite("items/golden_pickaxe.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.GOLDEN_AXE, new SimpleSprite("items/golden_axe.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.GOLDEN_SHOVEL, new SimpleSprite("items/golden_shovel.ans")); //NEWWW - SPRITES_MAP.put(SPRITES.GOLDEN_HOE, new SimpleSprite("items/golden_hoe.ans")); //NEWWW + 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")); + SPRITES_MAP.put(SPRITES.MILK_BUCKET, new SimpleSprite("items/milk_bucket.ans")); // Food SPRITES_MAP.put(SPRITES.ITEM_PORKCHOP, new SimpleSprite("items/porkchop.ans")); diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/BucketRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/BucketRecipe.java new file mode 100644 index 0000000..637cea3 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/BucketRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "iron_ingot", "_", "iron_ingot", + "_", "iron_ingot", "_", + "_", "_", "_" + }, + result = "bucket", + amount = 1 +) +public class BucketRecipe {} \ No newline at end of file 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/DiamondBlockRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondBlockRecipe.java new file mode 100644 index 0000000..50e3066 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondBlockRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "diamond", "diamond", "diamond", + "diamond", "diamond", "diamond", + "diamond", "diamond", "diamond" + }, + result = "diamond_block", + amount = 1 +) +public class DiamondBlockRecipe {} \ No newline at end of file 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/DiamondRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondRecipe.java new file mode 100644 index 0000000..aab018e --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "diamond_block", "_", "_", + "_", "_", "_", + "_", "_", "_" + }, + result = "diamond", + amount = 9 +) +public class DiamondRecipe {} \ No newline at end of file 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/crafting/recipes/GoldenHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoe2Recipe.java new file mode 100644 index 0000000..d708873 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoe2Recipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "gold_ingot", "gold_ingot", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "golden_hoe", + amount = 1 +) +public class GoldenHoe2Recipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoeRecipe.java new file mode 100644 index 0000000..cfcae25 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoeRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "gold_ingot", "gold_ingot", "_", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "golden_hoe", + amount = 1 +) +public class GoldenHoeRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoe2Recipe.java new file mode 100644 index 0000000..b658e71 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoe2Recipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "iron_ingot", "iron_ingot", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "iron_hoe", + amount = 1 +) +public class IronHoe2Recipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoeRecipe.java new file mode 100644 index 0000000..2f2a5dd --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoeRecipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "iron_ingot", "iron_ingot", "_", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "iron_hoe", + amount = 1 +) +public class IronHoeRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoe2Recipe.java new file mode 100644 index 0000000..06fe48e --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoe2Recipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "stone", "stone", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "stone_hoe", + amount = 1 +) +public class StoneHoe2Recipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoe2Recipe.java new file mode 100644 index 0000000..98b348c --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoe2Recipe.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.crafting.recipes; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "_", "oak_planks", "oak_planks", + "_", "stick", "_", + "_", "stick", "_" + }, + result = "wooden_hoe", + amount = 1 +) +public class WoodenHoe2Recipe {} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondBlock.java new file mode 100644 index 0000000..5f83a5a --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondBlock.java @@ -0,0 +1,16 @@ +package cz.jzitnik.game.entities.items.registry.blocks; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +import java.util.Arrays; + +@BlockRegistry("diamond_block") +public class DiamondBlock extends Block { + public DiamondBlock() { + super("diamond_block", SpriteLoader.SPRITES.DIAMOND_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList()); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondOreBlock.java new file mode 100644 index 0000000..a1cf88f --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondOreBlock.java @@ -0,0 +1,16 @@ +package cz.jzitnik.game.entities.items.registry.blocks; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +import java.util.Arrays; + +@BlockRegistry("diamond_ore") +public class DiamondOreBlock extends Block { + public DiamondOreBlock() { + super("diamond_ore", SpriteLoader.SPRITES.DIAMOND_ORE, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList()); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/BucketItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/BucketItem.java new file mode 100644 index 0000000..3efd230 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/BucketItem.java @@ -0,0 +1,13 @@ +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; + +@ItemRegistry("bucket") +public class BucketItem extends Item { + public BucketItem() { + super("bucket", "Bucket", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.BUCKET); + } +} 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/DiamondBlockItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondBlockItem.java new file mode 100644 index 0000000..a01f74d --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondBlockItem.java @@ -0,0 +1,13 @@ +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; + +@ItemRegistry("diamond_block") +public class DiamondBlockItem extends Item { + public DiamondBlockItem() { + super("diamond_block", "Diamond block", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_DIAMOND_BLOCK); + } +} 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/DiamondItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondItem.java new file mode 100644 index 0000000..672cf22 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondItem.java @@ -0,0 +1,13 @@ +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; + +@ItemRegistry("diamond") +public class DiamondItem extends Item { + public DiamondItem() { + super("diamond", "Diamond", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.DIAMOND); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondOreItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondOreItem.java new file mode 100644 index 0000000..e3c26d4 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondOreItem.java @@ -0,0 +1,13 @@ +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; + +@ItemRegistry("diamond_ore") +public class DiamondOreItem extends Item { + public DiamondOreItem() { + super("diamond_ore", "Diamond ore", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_DIAMOND_ORE); + } +} 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/java/cz/jzitnik/game/entities/items/registry/items/LavaBucketItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/LavaBucketItem.java new file mode 100644 index 0000000..7442442 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/LavaBucketItem.java @@ -0,0 +1,13 @@ +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; + +@ItemRegistry("lava_bucket") +public class LavaBucketItem extends Item { + public LavaBucketItem() { + super("lava_bucket", "Lava bucket", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.LAVA_BUCKET); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/MilkBucketItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/MilkBucketItem.java new file mode 100644 index 0000000..82aef38 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/MilkBucketItem.java @@ -0,0 +1,13 @@ +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; + +@ItemRegistry("milk_bucket") +public class MilkBucketItem extends Item { + public MilkBucketItem() { + super("milk_bucket", "Milk bucket", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.MILK_BUCKET); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WaterBucketItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WaterBucketItem.java new file mode 100644 index 0000000..6e3c909 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WaterBucketItem.java @@ -0,0 +1,13 @@ +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; + +@ItemRegistry("water_bucket") +public class WaterBucketItem extends Item { + public WaterBucketItem() { + super("water_bucket", "Water bucket", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.WATER_BUCKET); + } +} diff --git a/src/main/java/cz/jzitnik/game/smelting/Smelting.java b/src/main/java/cz/jzitnik/game/smelting/Smelting.java index c064dcb..2d9441e 100644 --- a/src/main/java/cz/jzitnik/game/smelting/Smelting.java +++ b/src/main/java/cz/jzitnik/game/smelting/Smelting.java @@ -17,6 +17,7 @@ public class Smelting { smeltingList.put("gold_ore", () -> ItemBlockSupplier.getItem("gold_ingot")); smeltingList.put("oak_log", () -> ItemBlockSupplier.getItem("coal")); smeltingList.put("beef", () -> ItemBlockSupplier.getItem("steak")); + smeltingList.put("diamond_ore", () -> ItemBlockSupplier.getItem("diamond")); } public static final HashMap fuelList = new HashMap<>(); @@ -31,5 +32,6 @@ public class Smelting { fuelList.put("wooden_shovel", 1.0); fuelList.put("wooden_hoe", 1.0); fuelList.put("stick", 0.5); + fuelList.put("lava_bucket", 100.0); } } diff --git a/src/main/resources/textures/diamond_block.ans b/src/main/resources/textures/diamond_block.ans new file mode 100644 index 0000000..70c5b47 --- /dev/null +++ b/src/main/resources/textures/diamond_block.ans @@ -0,0 +1,25 @@ +       +       +          +              +              +             +             +             +            +           +           +            +          +          +           +           +           +             +             +              +           +           +             +         +         diff --git a/src/main/resources/textures/diamond_ore.ans b/src/main/resources/textures/diamond_ore.ans new file mode 100644 index 0000000..ad938f4 --- /dev/null +++ b/src/main/resources/textures/diamond_ore.ans @@ -0,0 +1,25 @@ +            +            +           +             +             +              +             +             +                 +            +            +             +               +               +              +              +             +         +         +               +              +              +           +      +      diff --git a/src/main/resources/textures/items/bucket.ans b/src/main/resources/textures/items/bucket.ans new file mode 100644 index 0000000..654a0b2 --- /dev/null +++ b/src/main/resources/textures/items/bucket.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                  +                          +                          +                    +                    +                    +                  +                    +                    +                    +                      +                      +                       +                       +                       +                            +                            +                             +                                 +                                 +                                  +                                                   +                                                   diff --git a/src/main/resources/textures/items/diamond.ans b/src/main/resources/textures/items/diamond.ans new file mode 100644 index 0000000..afb8153 --- /dev/null +++ b/src/main/resources/textures/items/diamond.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                                   +                                      +                                      +                                     +                                +                                +                              +                              +                              +                       +                       +                       +                     +                     +                    +                            +                            +                            +                               +                               +                                  +                                                   +                                                   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_block.ans b/src/main/resources/textures/items/diamond_block.ans new file mode 100644 index 0000000..ebe8c93 --- /dev/null +++ b/src/main/resources/textures/items/diamond_block.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_ore.ans b/src/main/resources/textures/items/diamond_ore.ans new file mode 100644 index 0000000..d0f572f --- /dev/null +++ b/src/main/resources/textures/items/diamond_ore.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 @@ +                                          +                                          +                                          +                                        +                                        +                                          +                                        +                                        +                                        +                                   +                                   +                                 +                                    +                                    +                                      +                                      +                                           +                                      +                                      +                                 +                                   +                                   +                                            +                                          +                                          diff --git a/src/main/resources/textures/items/lava_bucket.ans b/src/main/resources/textures/items/lava_bucket.ans new file mode 100644 index 0000000..9ce0869 --- /dev/null +++ b/src/main/resources/textures/items/lava_bucket.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                  +                           +                           +                       +                        +                        +                        +                      +                      +                     +                      +                      +                        +                        +                       +                            +                            +                             +                                 +                                 +                                  +                                                   +                                                   diff --git a/src/main/resources/textures/items/milk_bucket.ans b/src/main/resources/textures/items/milk_bucket.ans new file mode 100644 index 0000000..80d7494 --- /dev/null +++ b/src/main/resources/textures/items/milk_bucket.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                  +                         +                         +                      +                  +                  +                   +                    +                    +                    +                      +                      +                       +                       +                       +                            +                            +                             +                                 +                                 +                                  +                                                   +                                                   diff --git a/src/main/resources/textures/items/water_bucket.ans b/src/main/resources/textures/items/water_bucket.ans new file mode 100644 index 0000000..bd2f762 --- /dev/null +++ b/src/main/resources/textures/items/water_bucket.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                  +                         +                         +                       +                        +                        +                    +                    +                    +                    +                      +                      +                       +                       +                       +                            +                            +                             +                                 +                                 +                                  +                                                   +