From 7646ac0833becd8f9424908ee8bc142b7b3999f8 Mon Sep 17 00:00:00 2001
From: fred-boy <fredboy@protonmail.com>
Date: Fri, 27 Sep 2019 20:16:21 +0700
Subject: [PATCH] Return tools

---
 android/assets/game_items.json                |  52 ++++++++++++++++++
 .../assets/textures/{ => blocks}/bed_l.png    | Bin
 .../assets/textures/{ => blocks}/bed_r.png    | Bin
 .../assets/textures/{ => blocks}/bedrock.png  | Bin
 .../textures/{ => blocks}/bookshelf.png       | Bin
 .../textures/{ => blocks}/brick_slab.png      | Bin
 .../assets/textures/{ => blocks}/bricks.png   | Bin
 .../assets/textures/{ => blocks}/cactus.png   | Bin
 android/assets/textures/{ => blocks}/cake.png | Bin
 android/assets/textures/{ => blocks}/clay.png | Bin
 .../textures/{ => blocks}/coal_block.png      | Bin
 .../assets/textures/{ => blocks}/coal_ore.png | Bin
 .../textures/{ => blocks}/cobblestone.png     | Bin
 .../{ => blocks}/cobblestone_mossy.png        | Bin
 .../{ => blocks}/cobblestone_slab.png         | Bin
 .../textures/{ => blocks}/crafting_table.png  | Bin
 .../textures/{ => blocks}/dandelion.png       | Bin
 .../assets/textures/{ => blocks}/deadbush.png | Bin
 .../textures/{ => blocks}/diamond_block.png   | Bin
 .../textures/{ => blocks}/diamond_ore.png     | Bin
 android/assets/textures/{ => blocks}/dirt.png | Bin
 .../{ => blocks}/double_stone_slab.png        | Bin
 .../textures/{ => blocks}/furnace_off.png     | Bin
 .../textures/{ => blocks}/furnace_on.png      | Bin
 .../assets/textures/{ => blocks}/glass.png    | Bin
 .../textures/{ => blocks}/gold_block.png      | Bin
 .../assets/textures/{ => blocks}/gold_ore.png | Bin
 .../assets/textures/{ => blocks}/grass.png    | Bin
 .../assets/textures/{ => blocks}/gravel.png   | Bin
 .../textures/{ => blocks}/iron_bars.png       | Bin
 .../textures/{ => blocks}/iron_block.png      | Bin
 .../assets/textures/{ => blocks}/iron_ore.png | Bin
 .../assets/textures/{ => blocks}/ladder.png   | Bin
 .../textures/{ => blocks}/lapis_block.png     | Bin
 .../textures/{ => blocks}/lapis_ore.png       | Bin
 android/assets/textures/{ => blocks}/lava.png | Bin
 .../assets/textures/{ => blocks}/lava_12.png  | Bin
 .../assets/textures/{ => blocks}/lava_16.png  | Bin
 .../assets/textures/{ => blocks}/lava_4.png   | Bin
 .../assets/textures/{ => blocks}/lava_8.png   | Bin
 .../assets/textures/{ => blocks}/leaves.png   | Bin
 android/assets/textures/{ => blocks}/log.png  | Bin
 .../textures/{ => blocks}/mushroom_brown.png  | Bin
 .../textures/{ => blocks}/mushroom_red.png    | Bin
 .../textures/{ => blocks}/noteblock.png       | Bin
 .../assets/textures/{ => blocks}/obsidian.png | Bin
 .../assets/textures/{ => blocks}/planks.png   | Bin
 android/assets/textures/{ => blocks}/rose.png | Bin
 android/assets/textures/{ => blocks}/sand.png | Bin
 .../textures/{ => blocks}/sandstone.png       | Bin
 .../textures/{ => blocks}/sandstone_slab.png  | Bin
 .../assets/textures/{ => blocks}/sapling.png  | Bin
 .../assets/textures/{ => blocks}/sponge.png   | Bin
 .../textures/{ => blocks}/sponge_wet.png      | Bin
 .../assets/textures/{ => blocks}/stone.png    | Bin
 .../textures/{ => blocks}/stone_slab.png      | Bin
 .../textures/{ => blocks}/stonebrick.png      | Bin
 .../textures/{ => blocks}/stonebrick_slab.png | Bin
 .../textures/{ => blocks}/tallgrass.png       | Bin
 .../assets/textures/{ => blocks}/water.png    | Bin
 .../assets/textures/{ => blocks}/water_12.png | Bin
 .../assets/textures/{ => blocks}/water_16.png | Bin
 .../assets/textures/{ => blocks}/water_4.png  | Bin
 .../assets/textures/{ => blocks}/water_8.png  | Bin
 android/assets/textures/{ => blocks}/web.png  | Bin
 .../textures/{ => blocks}/wooden_slab.png     | Bin
 android/assets/textures/{ => blocks}/wool.png | Bin
 .../textures/{ => blocks}/wool_black.png      | Bin
 .../textures/{ => blocks}/wool_blue.png       | Bin
 .../textures/{ => blocks}/wool_brown.png      | Bin
 .../textures/{ => blocks}/wool_cyan.png       | Bin
 .../textures/{ => blocks}/wool_gray.png       | Bin
 .../textures/{ => blocks}/wool_green.png      | Bin
 .../textures/{ => blocks}/wool_lightblue.png  | Bin
 .../textures/{ => blocks}/wool_lightgray.png  | Bin
 .../textures/{ => blocks}/wool_lime.png       | Bin
 .../textures/{ => blocks}/wool_magenta.png    | Bin
 .../textures/{ => blocks}/wool_orange.png     | Bin
 .../textures/{ => blocks}/wool_pink.png       | Bin
 .../textures/{ => blocks}/wool_purple.png     | Bin
 .../assets/textures/{ => blocks}/wool_red.png | Bin
 .../textures/{ => blocks}/wool_yellow.png     | Bin
 .../assets/textures/items/bucket_empty.png    | Bin 0 -> 286 bytes
 android/assets/textures/items/bucket_lava.png | Bin 0 -> 386 bytes
 android/assets/textures/items/bucket_milk.png | Bin 0 -> 318 bytes
 .../assets/textures/items/bucket_water.png    | Bin 0 -> 362 bytes
 .../assets/textures/items/diamond_shovel.png  | Bin 0 -> 261 bytes
 .../assets/textures/items/diamond_sword.png   | Bin 0 -> 312 bytes
 android/assets/textures/items/gold_shovel.png | Bin 0 -> 258 bytes
 android/assets/textures/items/gold_sword.png  | Bin 0 -> 295 bytes
 android/assets/textures/items/iron_shovel.png | Bin 0 -> 234 bytes
 android/assets/textures/items/iron_sword.png  | Bin 0 -> 265 bytes
 .../assets/textures/items/stone_shovel.png    | Bin 0 -> 251 bytes
 android/assets/textures/items/stone_sword.png | Bin 0 -> 288 bytes
 android/assets/textures/items/wood_shovel.png | Bin 0 -> 267 bytes
 android/assets/textures/items/wood_sword.png  | Bin 0 -> 296 bytes
 .../cavedroid/game/GameItems.java             |  28 ++++++++--
 .../cavedroid/game/GameRenderer.java          |   3 +-
 98 files changed, 76 insertions(+), 7 deletions(-)
 rename android/assets/textures/{ => blocks}/bed_l.png (100%)
 rename android/assets/textures/{ => blocks}/bed_r.png (100%)
 rename android/assets/textures/{ => blocks}/bedrock.png (100%)
 rename android/assets/textures/{ => blocks}/bookshelf.png (100%)
 rename android/assets/textures/{ => blocks}/brick_slab.png (100%)
 rename android/assets/textures/{ => blocks}/bricks.png (100%)
 rename android/assets/textures/{ => blocks}/cactus.png (100%)
 rename android/assets/textures/{ => blocks}/cake.png (100%)
 rename android/assets/textures/{ => blocks}/clay.png (100%)
 rename android/assets/textures/{ => blocks}/coal_block.png (100%)
 rename android/assets/textures/{ => blocks}/coal_ore.png (100%)
 rename android/assets/textures/{ => blocks}/cobblestone.png (100%)
 rename android/assets/textures/{ => blocks}/cobblestone_mossy.png (100%)
 rename android/assets/textures/{ => blocks}/cobblestone_slab.png (100%)
 rename android/assets/textures/{ => blocks}/crafting_table.png (100%)
 rename android/assets/textures/{ => blocks}/dandelion.png (100%)
 rename android/assets/textures/{ => blocks}/deadbush.png (100%)
 rename android/assets/textures/{ => blocks}/diamond_block.png (100%)
 rename android/assets/textures/{ => blocks}/diamond_ore.png (100%)
 rename android/assets/textures/{ => blocks}/dirt.png (100%)
 rename android/assets/textures/{ => blocks}/double_stone_slab.png (100%)
 rename android/assets/textures/{ => blocks}/furnace_off.png (100%)
 rename android/assets/textures/{ => blocks}/furnace_on.png (100%)
 rename android/assets/textures/{ => blocks}/glass.png (100%)
 rename android/assets/textures/{ => blocks}/gold_block.png (100%)
 rename android/assets/textures/{ => blocks}/gold_ore.png (100%)
 rename android/assets/textures/{ => blocks}/grass.png (100%)
 rename android/assets/textures/{ => blocks}/gravel.png (100%)
 rename android/assets/textures/{ => blocks}/iron_bars.png (100%)
 rename android/assets/textures/{ => blocks}/iron_block.png (100%)
 rename android/assets/textures/{ => blocks}/iron_ore.png (100%)
 rename android/assets/textures/{ => blocks}/ladder.png (100%)
 rename android/assets/textures/{ => blocks}/lapis_block.png (100%)
 rename android/assets/textures/{ => blocks}/lapis_ore.png (100%)
 rename android/assets/textures/{ => blocks}/lava.png (100%)
 rename android/assets/textures/{ => blocks}/lava_12.png (100%)
 rename android/assets/textures/{ => blocks}/lava_16.png (100%)
 rename android/assets/textures/{ => blocks}/lava_4.png (100%)
 rename android/assets/textures/{ => blocks}/lava_8.png (100%)
 rename android/assets/textures/{ => blocks}/leaves.png (100%)
 rename android/assets/textures/{ => blocks}/log.png (100%)
 rename android/assets/textures/{ => blocks}/mushroom_brown.png (100%)
 rename android/assets/textures/{ => blocks}/mushroom_red.png (100%)
 rename android/assets/textures/{ => blocks}/noteblock.png (100%)
 rename android/assets/textures/{ => blocks}/obsidian.png (100%)
 rename android/assets/textures/{ => blocks}/planks.png (100%)
 rename android/assets/textures/{ => blocks}/rose.png (100%)
 rename android/assets/textures/{ => blocks}/sand.png (100%)
 rename android/assets/textures/{ => blocks}/sandstone.png (100%)
 rename android/assets/textures/{ => blocks}/sandstone_slab.png (100%)
 rename android/assets/textures/{ => blocks}/sapling.png (100%)
 rename android/assets/textures/{ => blocks}/sponge.png (100%)
 rename android/assets/textures/{ => blocks}/sponge_wet.png (100%)
 rename android/assets/textures/{ => blocks}/stone.png (100%)
 rename android/assets/textures/{ => blocks}/stone_slab.png (100%)
 rename android/assets/textures/{ => blocks}/stonebrick.png (100%)
 rename android/assets/textures/{ => blocks}/stonebrick_slab.png (100%)
 rename android/assets/textures/{ => blocks}/tallgrass.png (100%)
 rename android/assets/textures/{ => blocks}/water.png (100%)
 rename android/assets/textures/{ => blocks}/water_12.png (100%)
 rename android/assets/textures/{ => blocks}/water_16.png (100%)
 rename android/assets/textures/{ => blocks}/water_4.png (100%)
 rename android/assets/textures/{ => blocks}/water_8.png (100%)
 rename android/assets/textures/{ => blocks}/web.png (100%)
 rename android/assets/textures/{ => blocks}/wooden_slab.png (100%)
 rename android/assets/textures/{ => blocks}/wool.png (100%)
 rename android/assets/textures/{ => blocks}/wool_black.png (100%)
 rename android/assets/textures/{ => blocks}/wool_blue.png (100%)
 rename android/assets/textures/{ => blocks}/wool_brown.png (100%)
 rename android/assets/textures/{ => blocks}/wool_cyan.png (100%)
 rename android/assets/textures/{ => blocks}/wool_gray.png (100%)
 rename android/assets/textures/{ => blocks}/wool_green.png (100%)
 rename android/assets/textures/{ => blocks}/wool_lightblue.png (100%)
 rename android/assets/textures/{ => blocks}/wool_lightgray.png (100%)
 rename android/assets/textures/{ => blocks}/wool_lime.png (100%)
 rename android/assets/textures/{ => blocks}/wool_magenta.png (100%)
 rename android/assets/textures/{ => blocks}/wool_orange.png (100%)
 rename android/assets/textures/{ => blocks}/wool_pink.png (100%)
 rename android/assets/textures/{ => blocks}/wool_purple.png (100%)
 rename android/assets/textures/{ => blocks}/wool_red.png (100%)
 rename android/assets/textures/{ => blocks}/wool_yellow.png (100%)
 create mode 100644 android/assets/textures/items/bucket_empty.png
 create mode 100644 android/assets/textures/items/bucket_lava.png
 create mode 100644 android/assets/textures/items/bucket_milk.png
 create mode 100644 android/assets/textures/items/bucket_water.png
 create mode 100644 android/assets/textures/items/diamond_shovel.png
 create mode 100644 android/assets/textures/items/diamond_sword.png
 create mode 100644 android/assets/textures/items/gold_shovel.png
 create mode 100644 android/assets/textures/items/gold_sword.png
 create mode 100644 android/assets/textures/items/iron_shovel.png
 create mode 100644 android/assets/textures/items/iron_sword.png
 create mode 100644 android/assets/textures/items/stone_shovel.png
 create mode 100644 android/assets/textures/items/stone_sword.png
 create mode 100644 android/assets/textures/items/wood_shovel.png
 create mode 100644 android/assets/textures/items/wood_sword.png

diff --git a/android/assets/game_items.json b/android/assets/game_items.json
index 0bc31cc..b539082 100644
--- a/android/assets/game_items.json
+++ b/android/assets/game_items.json
@@ -550,6 +550,58 @@
     "obsidian": {
       "name": "Obsidian",
       "type": "block"
+    },
+    "wood_sword": {
+      "name": "Wooden Sword",
+      "type": "tool"
+    },
+    "stone_sword": {
+      "name": "Stone Sword",
+      "type": "tool"
+    },
+    "iron_sword": {
+      "name": "Iron Sword",
+      "type": "tool"
+    },
+    "diamond_sword": {
+      "name": "Diamond Sword",
+      "type": "tool"
+    },
+    "gold_sword": {
+      "name": "Golden Sword",
+      "type": "tool"
+    },
+    "wood_shovel": {
+      "name": "Wooden Shovel",
+      "type": "tool"
+    },
+    "stone_shovel": {
+      "name": "Stone Shovel",
+      "type": "tool"
+    },
+    "iron_shovel": {
+      "name": "Iron Shovel",
+      "type": "tool"
+    },
+    "diamond_shovel": {
+      "name": "Diamond Shovel",
+      "type": "tool"
+    },
+    "gold_shovel": {
+      "name": "Golden Shovel",
+      "type": "tool"
+    },
+    "bucket_empty": {
+      "name": "Empty Bucket",
+      "type": "tool"
+    },
+    "bucket_water": {
+      "name": "Water Bucket",
+      "type": "tool"
+    },
+    "bucket_lava": {
+      "name": "Lava Bucket",
+      "type": "tool"
     }
   }
 }
\ No newline at end of file
diff --git a/android/assets/textures/bed_l.png b/android/assets/textures/blocks/bed_l.png
similarity index 100%
rename from android/assets/textures/bed_l.png
rename to android/assets/textures/blocks/bed_l.png
diff --git a/android/assets/textures/bed_r.png b/android/assets/textures/blocks/bed_r.png
similarity index 100%
rename from android/assets/textures/bed_r.png
rename to android/assets/textures/blocks/bed_r.png
diff --git a/android/assets/textures/bedrock.png b/android/assets/textures/blocks/bedrock.png
similarity index 100%
rename from android/assets/textures/bedrock.png
rename to android/assets/textures/blocks/bedrock.png
diff --git a/android/assets/textures/bookshelf.png b/android/assets/textures/blocks/bookshelf.png
similarity index 100%
rename from android/assets/textures/bookshelf.png
rename to android/assets/textures/blocks/bookshelf.png
diff --git a/android/assets/textures/brick_slab.png b/android/assets/textures/blocks/brick_slab.png
similarity index 100%
rename from android/assets/textures/brick_slab.png
rename to android/assets/textures/blocks/brick_slab.png
diff --git a/android/assets/textures/bricks.png b/android/assets/textures/blocks/bricks.png
similarity index 100%
rename from android/assets/textures/bricks.png
rename to android/assets/textures/blocks/bricks.png
diff --git a/android/assets/textures/cactus.png b/android/assets/textures/blocks/cactus.png
similarity index 100%
rename from android/assets/textures/cactus.png
rename to android/assets/textures/blocks/cactus.png
diff --git a/android/assets/textures/cake.png b/android/assets/textures/blocks/cake.png
similarity index 100%
rename from android/assets/textures/cake.png
rename to android/assets/textures/blocks/cake.png
diff --git a/android/assets/textures/clay.png b/android/assets/textures/blocks/clay.png
similarity index 100%
rename from android/assets/textures/clay.png
rename to android/assets/textures/blocks/clay.png
diff --git a/android/assets/textures/coal_block.png b/android/assets/textures/blocks/coal_block.png
similarity index 100%
rename from android/assets/textures/coal_block.png
rename to android/assets/textures/blocks/coal_block.png
diff --git a/android/assets/textures/coal_ore.png b/android/assets/textures/blocks/coal_ore.png
similarity index 100%
rename from android/assets/textures/coal_ore.png
rename to android/assets/textures/blocks/coal_ore.png
diff --git a/android/assets/textures/cobblestone.png b/android/assets/textures/blocks/cobblestone.png
similarity index 100%
rename from android/assets/textures/cobblestone.png
rename to android/assets/textures/blocks/cobblestone.png
diff --git a/android/assets/textures/cobblestone_mossy.png b/android/assets/textures/blocks/cobblestone_mossy.png
similarity index 100%
rename from android/assets/textures/cobblestone_mossy.png
rename to android/assets/textures/blocks/cobblestone_mossy.png
diff --git a/android/assets/textures/cobblestone_slab.png b/android/assets/textures/blocks/cobblestone_slab.png
similarity index 100%
rename from android/assets/textures/cobblestone_slab.png
rename to android/assets/textures/blocks/cobblestone_slab.png
diff --git a/android/assets/textures/crafting_table.png b/android/assets/textures/blocks/crafting_table.png
similarity index 100%
rename from android/assets/textures/crafting_table.png
rename to android/assets/textures/blocks/crafting_table.png
diff --git a/android/assets/textures/dandelion.png b/android/assets/textures/blocks/dandelion.png
similarity index 100%
rename from android/assets/textures/dandelion.png
rename to android/assets/textures/blocks/dandelion.png
diff --git a/android/assets/textures/deadbush.png b/android/assets/textures/blocks/deadbush.png
similarity index 100%
rename from android/assets/textures/deadbush.png
rename to android/assets/textures/blocks/deadbush.png
diff --git a/android/assets/textures/diamond_block.png b/android/assets/textures/blocks/diamond_block.png
similarity index 100%
rename from android/assets/textures/diamond_block.png
rename to android/assets/textures/blocks/diamond_block.png
diff --git a/android/assets/textures/diamond_ore.png b/android/assets/textures/blocks/diamond_ore.png
similarity index 100%
rename from android/assets/textures/diamond_ore.png
rename to android/assets/textures/blocks/diamond_ore.png
diff --git a/android/assets/textures/dirt.png b/android/assets/textures/blocks/dirt.png
similarity index 100%
rename from android/assets/textures/dirt.png
rename to android/assets/textures/blocks/dirt.png
diff --git a/android/assets/textures/double_stone_slab.png b/android/assets/textures/blocks/double_stone_slab.png
similarity index 100%
rename from android/assets/textures/double_stone_slab.png
rename to android/assets/textures/blocks/double_stone_slab.png
diff --git a/android/assets/textures/furnace_off.png b/android/assets/textures/blocks/furnace_off.png
similarity index 100%
rename from android/assets/textures/furnace_off.png
rename to android/assets/textures/blocks/furnace_off.png
diff --git a/android/assets/textures/furnace_on.png b/android/assets/textures/blocks/furnace_on.png
similarity index 100%
rename from android/assets/textures/furnace_on.png
rename to android/assets/textures/blocks/furnace_on.png
diff --git a/android/assets/textures/glass.png b/android/assets/textures/blocks/glass.png
similarity index 100%
rename from android/assets/textures/glass.png
rename to android/assets/textures/blocks/glass.png
diff --git a/android/assets/textures/gold_block.png b/android/assets/textures/blocks/gold_block.png
similarity index 100%
rename from android/assets/textures/gold_block.png
rename to android/assets/textures/blocks/gold_block.png
diff --git a/android/assets/textures/gold_ore.png b/android/assets/textures/blocks/gold_ore.png
similarity index 100%
rename from android/assets/textures/gold_ore.png
rename to android/assets/textures/blocks/gold_ore.png
diff --git a/android/assets/textures/grass.png b/android/assets/textures/blocks/grass.png
similarity index 100%
rename from android/assets/textures/grass.png
rename to android/assets/textures/blocks/grass.png
diff --git a/android/assets/textures/gravel.png b/android/assets/textures/blocks/gravel.png
similarity index 100%
rename from android/assets/textures/gravel.png
rename to android/assets/textures/blocks/gravel.png
diff --git a/android/assets/textures/iron_bars.png b/android/assets/textures/blocks/iron_bars.png
similarity index 100%
rename from android/assets/textures/iron_bars.png
rename to android/assets/textures/blocks/iron_bars.png
diff --git a/android/assets/textures/iron_block.png b/android/assets/textures/blocks/iron_block.png
similarity index 100%
rename from android/assets/textures/iron_block.png
rename to android/assets/textures/blocks/iron_block.png
diff --git a/android/assets/textures/iron_ore.png b/android/assets/textures/blocks/iron_ore.png
similarity index 100%
rename from android/assets/textures/iron_ore.png
rename to android/assets/textures/blocks/iron_ore.png
diff --git a/android/assets/textures/ladder.png b/android/assets/textures/blocks/ladder.png
similarity index 100%
rename from android/assets/textures/ladder.png
rename to android/assets/textures/blocks/ladder.png
diff --git a/android/assets/textures/lapis_block.png b/android/assets/textures/blocks/lapis_block.png
similarity index 100%
rename from android/assets/textures/lapis_block.png
rename to android/assets/textures/blocks/lapis_block.png
diff --git a/android/assets/textures/lapis_ore.png b/android/assets/textures/blocks/lapis_ore.png
similarity index 100%
rename from android/assets/textures/lapis_ore.png
rename to android/assets/textures/blocks/lapis_ore.png
diff --git a/android/assets/textures/lava.png b/android/assets/textures/blocks/lava.png
similarity index 100%
rename from android/assets/textures/lava.png
rename to android/assets/textures/blocks/lava.png
diff --git a/android/assets/textures/lava_12.png b/android/assets/textures/blocks/lava_12.png
similarity index 100%
rename from android/assets/textures/lava_12.png
rename to android/assets/textures/blocks/lava_12.png
diff --git a/android/assets/textures/lava_16.png b/android/assets/textures/blocks/lava_16.png
similarity index 100%
rename from android/assets/textures/lava_16.png
rename to android/assets/textures/blocks/lava_16.png
diff --git a/android/assets/textures/lava_4.png b/android/assets/textures/blocks/lava_4.png
similarity index 100%
rename from android/assets/textures/lava_4.png
rename to android/assets/textures/blocks/lava_4.png
diff --git a/android/assets/textures/lava_8.png b/android/assets/textures/blocks/lava_8.png
similarity index 100%
rename from android/assets/textures/lava_8.png
rename to android/assets/textures/blocks/lava_8.png
diff --git a/android/assets/textures/leaves.png b/android/assets/textures/blocks/leaves.png
similarity index 100%
rename from android/assets/textures/leaves.png
rename to android/assets/textures/blocks/leaves.png
diff --git a/android/assets/textures/log.png b/android/assets/textures/blocks/log.png
similarity index 100%
rename from android/assets/textures/log.png
rename to android/assets/textures/blocks/log.png
diff --git a/android/assets/textures/mushroom_brown.png b/android/assets/textures/blocks/mushroom_brown.png
similarity index 100%
rename from android/assets/textures/mushroom_brown.png
rename to android/assets/textures/blocks/mushroom_brown.png
diff --git a/android/assets/textures/mushroom_red.png b/android/assets/textures/blocks/mushroom_red.png
similarity index 100%
rename from android/assets/textures/mushroom_red.png
rename to android/assets/textures/blocks/mushroom_red.png
diff --git a/android/assets/textures/noteblock.png b/android/assets/textures/blocks/noteblock.png
similarity index 100%
rename from android/assets/textures/noteblock.png
rename to android/assets/textures/blocks/noteblock.png
diff --git a/android/assets/textures/obsidian.png b/android/assets/textures/blocks/obsidian.png
similarity index 100%
rename from android/assets/textures/obsidian.png
rename to android/assets/textures/blocks/obsidian.png
diff --git a/android/assets/textures/planks.png b/android/assets/textures/blocks/planks.png
similarity index 100%
rename from android/assets/textures/planks.png
rename to android/assets/textures/blocks/planks.png
diff --git a/android/assets/textures/rose.png b/android/assets/textures/blocks/rose.png
similarity index 100%
rename from android/assets/textures/rose.png
rename to android/assets/textures/blocks/rose.png
diff --git a/android/assets/textures/sand.png b/android/assets/textures/blocks/sand.png
similarity index 100%
rename from android/assets/textures/sand.png
rename to android/assets/textures/blocks/sand.png
diff --git a/android/assets/textures/sandstone.png b/android/assets/textures/blocks/sandstone.png
similarity index 100%
rename from android/assets/textures/sandstone.png
rename to android/assets/textures/blocks/sandstone.png
diff --git a/android/assets/textures/sandstone_slab.png b/android/assets/textures/blocks/sandstone_slab.png
similarity index 100%
rename from android/assets/textures/sandstone_slab.png
rename to android/assets/textures/blocks/sandstone_slab.png
diff --git a/android/assets/textures/sapling.png b/android/assets/textures/blocks/sapling.png
similarity index 100%
rename from android/assets/textures/sapling.png
rename to android/assets/textures/blocks/sapling.png
diff --git a/android/assets/textures/sponge.png b/android/assets/textures/blocks/sponge.png
similarity index 100%
rename from android/assets/textures/sponge.png
rename to android/assets/textures/blocks/sponge.png
diff --git a/android/assets/textures/sponge_wet.png b/android/assets/textures/blocks/sponge_wet.png
similarity index 100%
rename from android/assets/textures/sponge_wet.png
rename to android/assets/textures/blocks/sponge_wet.png
diff --git a/android/assets/textures/stone.png b/android/assets/textures/blocks/stone.png
similarity index 100%
rename from android/assets/textures/stone.png
rename to android/assets/textures/blocks/stone.png
diff --git a/android/assets/textures/stone_slab.png b/android/assets/textures/blocks/stone_slab.png
similarity index 100%
rename from android/assets/textures/stone_slab.png
rename to android/assets/textures/blocks/stone_slab.png
diff --git a/android/assets/textures/stonebrick.png b/android/assets/textures/blocks/stonebrick.png
similarity index 100%
rename from android/assets/textures/stonebrick.png
rename to android/assets/textures/blocks/stonebrick.png
diff --git a/android/assets/textures/stonebrick_slab.png b/android/assets/textures/blocks/stonebrick_slab.png
similarity index 100%
rename from android/assets/textures/stonebrick_slab.png
rename to android/assets/textures/blocks/stonebrick_slab.png
diff --git a/android/assets/textures/tallgrass.png b/android/assets/textures/blocks/tallgrass.png
similarity index 100%
rename from android/assets/textures/tallgrass.png
rename to android/assets/textures/blocks/tallgrass.png
diff --git a/android/assets/textures/water.png b/android/assets/textures/blocks/water.png
similarity index 100%
rename from android/assets/textures/water.png
rename to android/assets/textures/blocks/water.png
diff --git a/android/assets/textures/water_12.png b/android/assets/textures/blocks/water_12.png
similarity index 100%
rename from android/assets/textures/water_12.png
rename to android/assets/textures/blocks/water_12.png
diff --git a/android/assets/textures/water_16.png b/android/assets/textures/blocks/water_16.png
similarity index 100%
rename from android/assets/textures/water_16.png
rename to android/assets/textures/blocks/water_16.png
diff --git a/android/assets/textures/water_4.png b/android/assets/textures/blocks/water_4.png
similarity index 100%
rename from android/assets/textures/water_4.png
rename to android/assets/textures/blocks/water_4.png
diff --git a/android/assets/textures/water_8.png b/android/assets/textures/blocks/water_8.png
similarity index 100%
rename from android/assets/textures/water_8.png
rename to android/assets/textures/blocks/water_8.png
diff --git a/android/assets/textures/web.png b/android/assets/textures/blocks/web.png
similarity index 100%
rename from android/assets/textures/web.png
rename to android/assets/textures/blocks/web.png
diff --git a/android/assets/textures/wooden_slab.png b/android/assets/textures/blocks/wooden_slab.png
similarity index 100%
rename from android/assets/textures/wooden_slab.png
rename to android/assets/textures/blocks/wooden_slab.png
diff --git a/android/assets/textures/wool.png b/android/assets/textures/blocks/wool.png
similarity index 100%
rename from android/assets/textures/wool.png
rename to android/assets/textures/blocks/wool.png
diff --git a/android/assets/textures/wool_black.png b/android/assets/textures/blocks/wool_black.png
similarity index 100%
rename from android/assets/textures/wool_black.png
rename to android/assets/textures/blocks/wool_black.png
diff --git a/android/assets/textures/wool_blue.png b/android/assets/textures/blocks/wool_blue.png
similarity index 100%
rename from android/assets/textures/wool_blue.png
rename to android/assets/textures/blocks/wool_blue.png
diff --git a/android/assets/textures/wool_brown.png b/android/assets/textures/blocks/wool_brown.png
similarity index 100%
rename from android/assets/textures/wool_brown.png
rename to android/assets/textures/blocks/wool_brown.png
diff --git a/android/assets/textures/wool_cyan.png b/android/assets/textures/blocks/wool_cyan.png
similarity index 100%
rename from android/assets/textures/wool_cyan.png
rename to android/assets/textures/blocks/wool_cyan.png
diff --git a/android/assets/textures/wool_gray.png b/android/assets/textures/blocks/wool_gray.png
similarity index 100%
rename from android/assets/textures/wool_gray.png
rename to android/assets/textures/blocks/wool_gray.png
diff --git a/android/assets/textures/wool_green.png b/android/assets/textures/blocks/wool_green.png
similarity index 100%
rename from android/assets/textures/wool_green.png
rename to android/assets/textures/blocks/wool_green.png
diff --git a/android/assets/textures/wool_lightblue.png b/android/assets/textures/blocks/wool_lightblue.png
similarity index 100%
rename from android/assets/textures/wool_lightblue.png
rename to android/assets/textures/blocks/wool_lightblue.png
diff --git a/android/assets/textures/wool_lightgray.png b/android/assets/textures/blocks/wool_lightgray.png
similarity index 100%
rename from android/assets/textures/wool_lightgray.png
rename to android/assets/textures/blocks/wool_lightgray.png
diff --git a/android/assets/textures/wool_lime.png b/android/assets/textures/blocks/wool_lime.png
similarity index 100%
rename from android/assets/textures/wool_lime.png
rename to android/assets/textures/blocks/wool_lime.png
diff --git a/android/assets/textures/wool_magenta.png b/android/assets/textures/blocks/wool_magenta.png
similarity index 100%
rename from android/assets/textures/wool_magenta.png
rename to android/assets/textures/blocks/wool_magenta.png
diff --git a/android/assets/textures/wool_orange.png b/android/assets/textures/blocks/wool_orange.png
similarity index 100%
rename from android/assets/textures/wool_orange.png
rename to android/assets/textures/blocks/wool_orange.png
diff --git a/android/assets/textures/wool_pink.png b/android/assets/textures/blocks/wool_pink.png
similarity index 100%
rename from android/assets/textures/wool_pink.png
rename to android/assets/textures/blocks/wool_pink.png
diff --git a/android/assets/textures/wool_purple.png b/android/assets/textures/blocks/wool_purple.png
similarity index 100%
rename from android/assets/textures/wool_purple.png
rename to android/assets/textures/blocks/wool_purple.png
diff --git a/android/assets/textures/wool_red.png b/android/assets/textures/blocks/wool_red.png
similarity index 100%
rename from android/assets/textures/wool_red.png
rename to android/assets/textures/blocks/wool_red.png
diff --git a/android/assets/textures/wool_yellow.png b/android/assets/textures/blocks/wool_yellow.png
similarity index 100%
rename from android/assets/textures/wool_yellow.png
rename to android/assets/textures/blocks/wool_yellow.png
diff --git a/android/assets/textures/items/bucket_empty.png b/android/assets/textures/items/bucket_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..5afe77b463ba4865b1e529ef8fa6784837830258
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002xNkl<ZIE}57
zF^+{G6h)7d>FoRqupzOvv1Ey?!GfjGNke5~^0ok-^-KjLN-~-JxfR}U&wD%&-c;8z
zmu2~C`QH1-{>sQftu;!i;t#_BfHCF)>aJm}H2^Wj5`Mj2Wv!G#L~za($mg|#7$fI-
zmhZmrt9C`Cf<FNJz5_6hV+GA!IOn*l0$6JaA(XS;m1ncAYa0MC&okCq073`=q?8bm
zCiJ6aPSe!f3_my01muc;Q3cqx?bkp`sSWVncX`UkaWunufY*ogn8E!R_lkE_0PlTg
kjCnvrq*)#Q;b(eV-*A0t$U8u36951J07*qoM6N<$f(zV#KmY&$

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/bucket_lava.png b/android/assets/textures/items/bucket_lava.png
new file mode 100644
index 0000000000000000000000000000000000000000..97b84f8a2e23cdae7e91a1477081fba20b4198ae
GIT binary patch
literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003=Nkl<ZIE}57
zu}i~16o<dmPC}Os#-&>zOA9wx!CA;q5CjLo(ajE>Itn^C+Qq>^gl+}FN~z#*xMe8h
zI&^ReWb4uhje~zc9ZEwlIdP~D4(@)u-}l}<?qI{POk%xWUzl{IR4!i=R>qgpZQj2R
zuuEG2?8rU<7hk0u$XYiy8;8_J19ors09eTBGRdp3kW*qA^XZ*%^(0eBalM1uXn^h6
zsoC->+TI3`eV~+j3hRLA{F=w%oLPIEYP0q@1;sKZIBsb(&^i!8K=YE<`x_X}my04t
z?J>4z)2lXcGD9q8&Iln856=KhCKCXHBw>GW2URGS%UXUR3jlCkH>dTg4O6NPSXDH|
z*~i=8fFKBd1*|$qlEe&9N?E?|0}zIx5#l%w-ELQVNVyqguaT{o4Go}_vO1kk4iZI?
gu{!+2XWBS^0Ok;RJA*t>OaK4?07*qoM6N<$f<ptKcK`qY

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/bucket_milk.png b/android/assets/textures/items/bucket_milk.png
new file mode 100644
index 0000000000000000000000000000000000000000..4208fb6aa01b776445ee2ab1ee9c95980b7b7814
GIT binary patch
literal 318
zcmV-E0m1%>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00036Nkl<ZIE}57
zu}Z}-6o$Xboy4j507VL2d*Np6lvi*STzvwc!J)Hbg{<`{x-}KDT%izrgiPWZ2We^3
z$VIOI6b}FYos&ZXXDW#mg%Cbg*IIA<yI4?42|$)*q2Gs~86br4Qc4cDckGLdo2$z?
z_3`-y!1bYGXcd6pOe2Kw?Qry`)DB0#ykfEhOy|ev7xu-^_|qh>Z|^)k+;8@=+JRCE
zW6a99R8>{vc}~+bb8Q!z%CbZ$1%NRI0OuUm+9>oQRxFAlY6eKt^moA2@h@5d`o2FI
zaL&a6TI;0iIsnFTjE1KLF5kdr2jMlsj-gfnt#wk@^#)?Cjdq8B_)KT(8~Rd+$tK>~
QmH+?%07*qoM6N<$g2yqBSpWb4

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/bucket_water.png b/android/assets/textures/items/bucket_water.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6cb934fe915b9928154479de31facd5cac26ae3
GIT binary patch
literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003oNkl<ZIE}57
zKTE?v7{-4Qv8Z6q2oZ$B6$-`Dp-aY2`3iON6ZFGmcFd5meuYfkddp3QO2jR0XDf)*
zrA{sRb1G7w={TPE_wqd4!Jcw#mq8G0Z1+m3hX2qu7=|GLQp&o2QwQx1K@e=hFl3sI
zIX!OSU-~SUD*!&%YXIIq*4$j*lcwnoa!|%kvoRgnX3&@T7bghe0x;-Hj#@1`vduIb
ze;>gsCaem0zPjUFoFRmZ5H62TFT5__a2{^)e(E4e613Jt(F6)um2!H(Xf&eR?Gnea
z9RM&K4oQ*(0If9u#u)NEuUlz!uvM?uvzh@suNtBP*lzrbDuDTX{_B7-#tu+QIkVXe
zfW=~A9o`mLen^cD>M`mY>#6{hQce^_4M?8n*6r{QpJ{J>0hmK?KM;WG%>V!Z07*qo
IM6N<$f}@j}umAu6

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/diamond_shovel.png b/android/assets/textures/items/diamond_shovel.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d50c0cf0090afc23dc3f5113af49487f7ca28eb
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`XFOdTLo9le6C^SYcyuM%Rd4>!
z0|ax-_Zjc0shp{@m#5}i+W+48`Tz3&{Q6S=)pzs1?(WzB(i4C{F>LdzSu1($-`S-6
z`20(jxqqqRVfGa=!YgM*y0iv7;gtID@`0wCVZQ#3G(OSFHgzk{BkhgLXTJD<uH@@~
zsiHd|W7~euO*sp)@rKFck~W}ZeI=(~8?*R5qdOH}rf$)2-YzMBz+h&`?1x-7XI=gq
z8yFZ^NN^dRx&N;vBYm-p^2%9;4Q(>!f&Z3iF)#=##~+&XPq829F9uInKbLh*2~7Zu
CBW>gW

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/diamond_sword.png b/android/assets/textures/items/diamond_sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..344ed9cf4ea3c1f552f960305c8b2cbe69b5a685
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`|2<tCLo9leQxup#+?@Sa-CaIr
z^T*eh|8MPI|5IOY-S7FGA!k=*FEjeH<MV_@XV-Z(vwP#`{{zZ+?=gR|c;@+gZ|tjH
z2rZUW6}TDt<Y8coT!MeeB#F3vd(L#^F>v>MeEC4r&5o_@KhwQFo;l|G{!dqQGH&Be
zcrd@8EpV2kgoK2F%8xf^|8ZAX8`bQu>~G9G&AVroVa$U}wO{sK|5*>8zn9B1=am=F
z{~8mCjy@xQ<BR|2zI^rH^vRC@#s&rk9o?`0iHl$Vt3OMo%lw{X;zGHj|C=5jXx+|Z
zE?4VXXyjw;w;trL>94iabxRc)#m-6Jm#n*Y!>uol4FnjfH&3;iqj5SG7!(Yiu6{1-
HoD!M<!tset

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/gold_shovel.png b/android/assets/textures/items/gold_shovel.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9afbd0b5eef2c5201ef06c2bc7688e508cb81d3
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Cp}#pLo9le6C^SYcyuL6N1y%A
z0|f8y*Cy?#`l{(!C7F|B`hS0w_`m;GcYpX_{A}mH>({3JJAVKOT-H1*mHsLrXaDQu
zhRnm(Z2K7$cgQ$0PcWTt|9$Gg3mvmnrW+doLB*`jfAfvcfBk=xoAH1AUha15`59;D
zzI^rH^vMp*%V&TlHTW8zTk*j}_^-bH!IK3K4n?;~_wSn|miof%F|&l)<SgTu#^p0#
z)UyEryR%~3&)f3_-sVgxaafhcvq15<@09&3xfp6Zlk$D5PaFk$iow&>&t;ucLK6U`
Cc5&$d

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/gold_sword.png b/android/assets/textures/items/gold_sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6176ec130a81ada7b8cf1af33cb95491dfcfa50
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`?>t=`Lo9leQxuqQ+{pT;?k*qm
zd3E{2|L5a4eym@s`*(h4$l2FsuMBPKzD#xu>zi9MJAN<sf1r%-9`hHAZypQ#Y+v<4
zXtAWKfUJz`!@w4~guZR=66@k>Pj%!maQ75G`B3V{#@6<qv(t#@{ry@cFXJ}u1O<bL
znHpz#fIvdXY}>5=!a}JMayCCsZm4@3yJwbR%!5p|U-9lAw4LkUo3gR8mbD#7NM&;h
zJl3@4=D~oD#DCw^dCcW%Q{TK#{lWj4kD2*!eT-gWW9zOx55jk(v9YnGEPw280y6md
onPOGlQbk6$l-?F59%%-K<!N(M{s*qH0s5T5)78&qol`;+0JX7q2LJ#7

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/iron_shovel.png b/android/assets/textures/items/iron_shovel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed1d44b11816fdeb85d372ea98be5d1f4232ee64
GIT binary patch
literal 234
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$DedLo9laPEzDM<RIW`ZxQ6a
z>E$Y=l}AIu*Sz$!;9mYfqC@H#TSwPQ)s8TQi}J3MgA}YATb4gRJO3olhy1i@j|7+)
z7i3D6#HJSsIz3<(T=;!nT4boEl8U9tjN>OtV;AQ}f2r*^@%5d|%&_WEpv#I?i@#)4
zZjUuSKk0o6Lxt*oTh~yFb$^(SUly&}chm3NoIjnO>DiwG0z~^50`jKakk`AI-2d-@
imj8*(Dp~L67qKtqD7c{R?D!Dqcm_{bKbLh*2~7Z20bGax

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/iron_sword.png b/android/assets/textures/items/iron_sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..6473327d45ec9f57ad9eb26042c354f5644774f8
GIT binary patch
literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002cNkl<ZIE~ej
zEe^s!5QSfnMUzYos>zbnbAmCo-9sRHi#jgQTl54q90Aj0i$v8R(GLaLmY*&-#_evt
z*>B!N_@Pvlzi<zjB%N~<k?$J$Fv;&4`~j@0oTeKBFZ_cs=CLAGW!tvs`yR#^BuRo{
z7@}F-x~?fA!80#jU0Q2{e|~yURTf2ouItb=&8+swAm6T-#wS!&g)GZptwr$4^6iTI
zo#AG^BmjsAMTBKpe#{`cr=G?q9F7;b^L3<rhu@CkCm*CbHSodNJ-?_MskyLk$n5Kj
P00000NkvXXu0mjfVFYxZ

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/stone_shovel.png b/android/assets/textures/items/stone_shovel.png
new file mode 100644
index 0000000000000000000000000000000000000000..78cf790f95928e7496fedb6faed3f809d3efb046
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002ONkl<ZIE}@U
zF$%&^42Hjoi_fV-p-|A#t}dNjGxijMhv@DR+QnnIdV@MTi-osHC%eY2pjCMf1phVp
zlKe^F-wJ$^MMMGWy2e@?coh&4&GQ_9rfDe45^HTR_JP~BrRzG9B<W)#U)UJ)6nC;9
zS)`e4F~$&vAw^O2J8*(`o291nsa92`aU81?_zDBOgFlWTS)_}2!tr$De7Sp_d(iot
z29<p~_X(0k3b0<y*dMOWV?X_YFFa5>pE~*esUF-vTFHX^f$;zU002ovPDHLkV1hn7
BZ9xD4

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/stone_sword.png b/android/assets/textures/items/stone_sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..c20ed6e44bf974167ee9e9b5f8df0804df437f06
GIT binary patch
literal 288
zcmV+*0pI?KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002zNkl<ZIE|f<
zA&$c^5JkV+4JvY^N`tmwK=%YafLUN@F3?+q?_DefnninqEvdA)$fPkUo+4MVvPrFc
zG+^GJKVM;ms;ZJWZ`Z(eU4w|wbsaWq;1B||)&Kyt7H-=X-g}j0Fb8KPSb`IS*sOC-
z<-!2c61CPZqZ~LfaL%a^0+<;@lm$-`L>XhU;G~1`-^`3*7|{3qB0Nb@o%V7luCUgk
zEK3+;KtwVJr<YHA`92@z>vJanKtw`B(lm`MnW)(Mp}6Aba>w88kwlL0+$$ddz|64r
m7v4W6OYb^R<9P3u|I-uu9glC-;gwea0000<MNUMnLSTY5pL%Ej

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/wood_shovel.png b/android/assets/textures/items/wood_shovel.png
new file mode 100644
index 0000000000000000000000000000000000000000..32cb69a8f500dc89b5bec5394fda435d701ab6a5
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`mpok@Lo9le6C^SYcyuKd`!@dP
z0RsK||C1^{Jd#%SWSf!A_2>I`!Q=!WsQC3v{qVKN>m}v({5W>Psq5MI`Sr#%zkl{S
zMzzT59d}ukrdJlC>r#2}vd@?OlT5^!#jS;#74)?auQ}`gAkpCh>%6o@|7CevCBDt8
zZC*H2W486>tN*i46#h>K8Xhp=!LR;xY|A}Cik_-kNb<#0oGy5LF?`Y@>BDI?42M&K
za@({&m<azpf8fA@2MHQS4C;RiFPhsc#Jwcz7=u*N9haZ8S1~ZWF^+t@dq(>&pzjzw
MUHx3vIVCg!0A9Frt^fc4

literal 0
HcmV?d00001

diff --git a/android/assets/textures/items/wood_sword.png b/android/assets/textures/items/wood_sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fcabc1a421b35cc5b0d7ee2efa3ab5c258ff46d
GIT binary patch
literal 296
zcmV+@0oVSCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002*Nkl<ZIE|f<
zv1-Cl7)H;nv5-KD3bi4Fm4Jw&i!KgboqRu+JcNV3LD5~bTM-8ZG0~ud3b)gh1e<ut
zH{Ic$kMn<m9O<@7QoRd#;6bm-NBNc6^2kdbIEb#4?IHjoFFYKr`Q4m_RzVu9Wsn6Y
z3e>XGMJRM(AUR^mHtt0_aH3$k2t^p(@LZF+V`;$;1}e>(r3EK8h~MqGCj02h&+42B
zKN$2o@3P%^<9mLfVi#%FEb5LW(_jE24u7>P_~W~>RObLP&BRcve>x`qc+GNk5<p!2
uxq;`JOlG@(?|rs`u?;S4gG<(*%=`g3PmfB#q!X_I0000<MNUMnLSTY$v4N@p

literal 0
HcmV?d00001

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 87bb3d6..61b3af7 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -113,11 +113,26 @@ public class GameItems {
             boolean fluid = (block.has("fluid") && block.getBoolean("fluid"));
             String meta = (block.has("meta") ? block.getString("meta") : "");
             String texture = (block.has("texture") ? block.getString("texture") : key);
+            Sprite sprite = key.equals("none") ? null :
+                    new Sprite(new Texture(Gdx.files.internal("textures/blocks/" + texture + ".png")));
+            Block newBlock = new Block(
+                    left,
+                    top,
+                    right,
+                    bottom,
+                    hp,
+                    drop,
+                    collision,
+                    background,
+                    transparent,
+                    blockRequired,
+                    fluid,
+                    meta,
+                    sprite
+            );
+
             blocksIds.put(key, blocks.size);
-            blocks.put(key, new Block(left, top, right, bottom, hp, drop, collision,
-                    background, transparent, blockRequired, fluid, meta,
-                    key.equals("none") ? null :
-                            new Sprite(new Texture(Gdx.files.internal("textures/" + texture + ".png")))));
+            blocks.put(key, newBlock);
             block = block.next();
         }
         while (item != null) {
@@ -125,9 +140,10 @@ public class GameItems {
             String name = (item.has("name") ? item.getString("name") : key);
             String type = (item.has("type") ? item.getString("type") : "item");
             String texture = (item.has("texture") ? item.getString("texture") : key);
+            Sprite sprite = type.equals("block") ? null :
+                    new Sprite(new Texture(Gdx.files.internal("textures/items/" + texture + ".png")));
             itemsIds.put(key, items.size);
-            items.put(key, new Item(name, type, type.equals("block") ? null :
-                    new Sprite(new Texture(Gdx.files.internal("textures/" + texture + ".png")))));
+            items.put(key, new Item(name, type, sprite));
             item = item.next();
         }
     }
diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 9e54c9a..252e77f 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
@@ -241,7 +241,8 @@ public class GameRenderer extends Renderer {
             drawString("Mobs: " + GP.mobs.size(), 0, 50);
             drawString("Drops: " + GP.drops.size(), 0, 60);
             drawString("Block: " + GameItems.getBlockKey(GP.world.getForeMap(GP.curX, GP.curY)), 0, 70);
-            drawString("Game mode: " + GP.player.gameMode, 0, 80);
+            drawString("Hand: " + GameItems.getItemKey(GP.player.inv[GP.player.invSlot]), 0, 80);
+            drawString("Game mode: " + GP.player.gameMode, 0, 90);
         }
         spriter.end();
 
-- 
2.29.2