chore: Minor Changes

src/main/java/cz/jzitnik/game/SpriteLoader.java

@@ -9,56 +9,104 @@ import java.util.HashMap;
 
 public class SpriteLoader {
     public enum SPRITES {
+        // BLOCKS
+
+        // Blocks
         AIR,
         DIRT,
         GRASS,
-        STEVE,
         STONE,
         BEDROCK,
-        BREAKING,
         COBBLESTONE,
-        FURNACE,
         WOOL,
-
-        CHEST,
-        CRAFTING_TABLE,
-        COAL_ORE,
-
         OAK_LOG,
         OAK_LEAF,
         OAK_PLANKS,
         OAK_DOOR,
 
-        WOODEN_PICKAXE,
+        // Ores
-        STONE_PICKAXE,
+        COAL_ORE,
-        WOODEN_AXE,
+        IRON_ORE, // NEWW
-        STONE_AXE,
+        GOLD_ORE, //NEWW
-        WOODEN_SHOVEL,
+        // Add Coal Block
-        STONE_SHOVEL,
+        IRON_BLOCK, // NEWW
+        GOLD_BLOCK, // NEWW
 
-        // Items
+        // Work
-        ITEM_DIRT,
+        FURNACE,
-        ITEM_OAK_LOG,
+        CHEST,
-        ITEM_OAK_PLANKS,
+        CRAFTING_TABLE,
-        ITEM_STICK,
-        ITEM_COBBLESTONE,
-        ITEM_STONE,
-        ITEM_FURNACE,
-        ITEM_OAK_DOOR,
-        ITEM_WOOL,
-
-        ITEM_CRAFTING_TABLE,
-        ITEM_CHEST,
-
-        HEART,
-        HUNGER,
 
+        // ENTITIES
+        STEVE,
         PIG,
         SHEEP,
 
+        // UI
+        BREAKING,
+        HEART,
+        HUNGER,
+
+        // ITEMS
+
+        // Items
+        ITEM_STICK,
+
+        // Block Items
+        ITEM_DIRT,
+        ITEM_OAK_LOG,
+        ITEM_OAK_PLANKS,
+        ITEM_COBBLESTONE,
+        ITEM_STONE,
+        ITEM_OAK_DOOR,
+        ITEM_WOOL,
+
+        // Ore Items
+        ITEM_COAL_ORE,//NEWWW
+        ITEM_IRON_ORE, //NEWWW
+        ITEM_GOLD_ORE, // NEWW
+
+        // Add Item Coal Block
+        ITEM_IRON_BLOCK, //NEWWW
+        ITEM_GOLD_BLOCK, // NEWW
+
+        COAL, // NEWW
+        ITEM_IRON_INGOT, //NEWW
+        ITEM_GOLD_INGOT, // NEWW
+
+        // Work Items
+        ITEM_CRAFTING_TABLE,
+        ITEM_CHEST,
+        ITEM_FURNACE,
+
+        // Weapons
+        WOODEN_SWORD, //NEWWW
+        WOODEN_PICKAXE,
+        WOODEN_AXE,
+        WOODEN_SHOVEL,
+        WOODEN_HOE, //NEWW
+
+        STONE_SWORD,//NEWWW
+        STONE_PICKAXE,
+        STONE_AXE,
+        STONE_SHOVEL,
+        STONE_HOE, //NEWW
+
+        IRON_SWORD, //NEWWW
+        IRON_PICKAXE, //NEWWW
+        IRON_AXE, // NEWW
+        IRON_SHOVEL, //NEWWW
+        IRON_HOE, // NEWWW
+
+        GOLDEN_SWORD, // NEWW
+        GOLDEN_PICKAXE, // NEWWW
+        GOLDEN_AXE, //NEWWW
+        GOLDEN_SHOVEL, //NEWWW
+        GOLDEN_HOE, // NEWW
+
+        // Food
         ITEM_PORKCHOP,
         ITEM_COOKED_PORKCHOP,
-
         ITEM_MUTTON,
         ITEM_COOKED_MUTTON,
     }
@@ -66,52 +114,114 @@ public class SpriteLoader {
     public static final HashMap<SPRITES, Sprite> SPRITES_MAP = new HashMap<>();
 
     static {
+        // BLOCKS
+
+        // Block
         SPRITES_MAP.put(SPRITES.AIR, new Air());
         SPRITES_MAP.put(SPRITES.DIRT, new SimpleSprite("dirt.ans"));
         SPRITES_MAP.put(SPRITES.GRASS, new SimpleSprite("grass.ans"));
         SPRITES_MAP.put(SPRITES.STONE, new SimpleSprite("stone.ans"));
-        SPRITES_MAP.put(SPRITES.STEVE, new Steve());
         SPRITES_MAP.put(SPRITES.BEDROCK, new SimpleSprite("bedrock.ans"));
-        SPRITES_MAP.put(SPRITES.BREAKING, new Breaking());
         SPRITES_MAP.put(SPRITES.OAK_LOG, new SimpleSprite("oak_log.ans"));
         SPRITES_MAP.put(SPRITES.OAK_LEAF, new SimpleSprite("oak_leaf.ans"));
         SPRITES_MAP.put(SPRITES.OAK_PLANKS, new SimpleSprite("oak_planks.ans"));
-        SPRITES_MAP.put(SPRITES.CRAFTING_TABLE, new SimpleSprite("crafting_table.ans"));
-        SPRITES_MAP.put(SPRITES.CHEST, new SimpleSprite("chest.ans"));
-        SPRITES_MAP.put(SPRITES.COBBLESTONE, new SimpleSprite("cobblestone.ans"));
-        SPRITES_MAP.put(SPRITES.FURNACE, new Furnace());
-        SPRITES_MAP.put(SPRITES.COAL_ORE, new SimpleSprite("coal_ore.ans"));
         SPRITES_MAP.put(SPRITES.OAK_DOOR, new OakDoor());
         SPRITES_MAP.put(SPRITES.WOOL, new Wool());
+        SPRITES_MAP.put(SPRITES.COBBLESTONE, new SimpleSprite("cobblestone.ans"));
 
-        SPRITES_MAP.put(SPRITES.WOODEN_PICKAXE, new SimpleSprite("items/wooden_pickaxe.ans"));
+        // Ores
-        SPRITES_MAP.put(SPRITES.STONE_PICKAXE, new SimpleSprite("items/stone_pickaxe.ans"));
+        SPRITES_MAP.put(SPRITES.COAL_ORE, new SimpleSprite("coal_ore.ans"));
-        SPRITES_MAP.put(SPRITES.WOODEN_AXE, new SimpleSprite("items/wooden_axe.ans"));
+        SPRITES_MAP.put(SPRITES.IRON_ORE, new SimpleSprite("iron_ore.ans")); //NEWW
-        SPRITES_MAP.put(SPRITES.STONE_AXE, new SimpleSprite("items/stone_axe.ans"));
+        SPRITES_MAP.put(SPRITES.GOLD_ORE, new SimpleSprite("gold_ore.ans")); //NEWW
-        SPRITES_MAP.put(SPRITES.WOODEN_SHOVEL, new SimpleSprite("items/wooden_shovel.ans"));
-        SPRITES_MAP.put(SPRITES.STONE_SHOVEL, new SimpleSprite("items/stone_shovel.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_DIRT, new SimpleSprite("items/dirt.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_OAK_LOG, new SimpleSprite("items/oak_log.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_OAK_PLANKS, new SimpleSprite("items/oak_planks.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_STICK, new SimpleSprite("items/stick.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_CRAFTING_TABLE, new SimpleSprite("items/crafting_table.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_COBBLESTONE, new SimpleSprite("items/cobblestone.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_STONE, new SimpleSprite("items/stone.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_CHEST, new SimpleSprite("items/chest.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_FURNACE, new SimpleSprite("items/furnace.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_OAK_DOOR, new SimpleSprite("oak_door/items/oak_door.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_PORKCHOP, new SimpleSprite("items/porkchop.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_COOKED_PORKCHOP, new SimpleSprite("items/cooked_porkchop.ans"));
-        SPRITES_MAP.put(SPRITES.ITEM_WOOL, new WoolItem());
 
-        SPRITES_MAP.put(SPRITES.ITEM_MUTTON, new SimpleSprite("items/mutton.ans"));
+        // Add Coal block
-        SPRITES_MAP.put(SPRITES.ITEM_COOKED_MUTTON, new SimpleSprite("items/cooked_mutton.ans"));
+        SPRITES_MAP.put(SPRITES.IRON_BLOCK, new SimpleSprite("iron_block.ans")); //NEWW
+        SPRITES_MAP.put(SPRITES.GOLD_BLOCK, new SimpleSprite("gold_block.ans")); //NEWW
 
+        // Work
+        SPRITES_MAP.put(SPRITES.CRAFTING_TABLE, new SimpleSprite("crafting_table.ans"));
+        SPRITES_MAP.put(SPRITES.FURNACE, new Furnace());
+        SPRITES_MAP.put(SPRITES.CHEST, new SimpleSprite("chest.ans"));
+
+        // ENTITIES
+        SPRITES_MAP.put(SPRITES.STEVE, new Steve());
+        SPRITES_MAP.put(SPRITES.PIG, new Pig());
+        SPRITES_MAP.put(SPRITES.SHEEP, new Sheep());
+
+        // UI
+        SPRITES_MAP.put(SPRITES.BREAKING, new Breaking());
         SPRITES_MAP.put(SPRITES.HEART, new Heart());
         SPRITES_MAP.put(SPRITES.HUNGER, new Hunger());
 
-        SPRITES_MAP.put(SPRITES.PIG, new Pig());
+        // ITEMS
-        SPRITES_MAP.put(SPRITES.SHEEP, new Sheep());
+
+        // Items
+        SPRITES_MAP.put(SPRITES.ITEM_STICK, new SimpleSprite("items/stick.ans"));
+
+        // Block Items
+        SPRITES_MAP.put(SPRITES.ITEM_DIRT, new SimpleSprite("items/dirt.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_OAK_LOG, new SimpleSprite("items/oak_log.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_OAK_PLANKS, new SimpleSprite("items/oak_planks.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_COBBLESTONE, new SimpleSprite("items/cobblestone.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_STONE, new SimpleSprite("items/stone.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_OAK_DOOR, new SimpleSprite("oak_door/items/oak_door.ans"));
+        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
+
+        // Add Item Coal Block
+        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.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
+
+        // Work Items
+        SPRITES_MAP.put(SPRITES.ITEM_CRAFTING_TABLE, new SimpleSprite("items/crafting_table.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_CHEST, new SimpleSprite("items/chest.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_FURNACE, new SimpleSprite("items/furnace.ans"));
+
+        // Weapons
+        SPRITES_MAP.put(SPRITES.WOODEN_SWORD, new SimpleSprite("items/wooden_sword.ans")); //NEWWW
+        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.STONE_SWORD, new SimpleSprite("items/wooden_sword.ans")); //NEWWW
+        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.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.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
+
+        // Food
+        SPRITES_MAP.put(SPRITES.ITEM_PORKCHOP, new SimpleSprite("items/porkchop.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_COOKED_PORKCHOP, new SimpleSprite("items/cooked_porkchop.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_MUTTON, new SimpleSprite("items/mutton.ans"));
+        SPRITES_MAP.put(SPRITES.ITEM_COOKED_MUTTON, new SimpleSprite("items/cooked_mutton.ans"));
+
+
+
+
+
+
+
     }
 
     public static SpriteList<SPRITES> load() {