From: fredboy Date: Sun, 12 May 2024 08:40:01 +0000 (+0700) Subject: Update assets structure X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=73cbf2cd2291283e1affe323783668d5ccc7fd66;p=cavedroid.git Update assets structure --- diff --git a/android/assets/joy_stick.png b/android/assets/joy_stick.png index 0d75f67..525dd7f 100644 Binary files a/android/assets/joy_stick.png and b/android/assets/joy_stick.png differ diff --git a/android/assets/json/texture_regions.json b/android/assets/json/texture_regions.json index 1042b61..3c6e7af 100644 --- a/android/assets/json/texture_regions.json +++ b/android/assets/json/texture_regions.json @@ -48,7 +48,7 @@ "h": 26 } }, - "allitems": { + "pp/allitems": { "creative": { "w": 176, "h": 136 @@ -60,19 +60,19 @@ "h": 15 } }, - "inventory": { + "pp/inventory": { "survival": { "w": 176, "h": 166 } }, - "crafting_table": { + "pp/crafting_table": { "crafting_table": { "w": 176, "h": 166 } }, - "furnace": { + "pp/furnace": { "furnace": { "w": 176, "h": 166 @@ -89,13 +89,13 @@ "h": 14 } }, - "chest": { + "pp/chest": { "chest": { "w": 176, "h": 168 } }, - "buttons": { + "pp/buttons": { "button_0": { "w": 200, "h": 20 @@ -111,7 +111,7 @@ "h": 20 } }, - "gui": { + "pp/gui": { "hotbar": { "y": 16, "w": 182, @@ -127,10 +127,10 @@ "h": 16 } }, - "shade": {}, + "pp/shade": {}, "gamelogo": {}, - "background": {}, - "health":{ + "pp/background": {}, + "pp/health":{ "heart_whole": { "w": 9 }, diff --git a/android/assets/allitems.png b/android/assets/pp/allitems.png similarity index 100% rename from android/assets/allitems.png rename to android/assets/pp/allitems.png diff --git a/android/assets/background.png b/android/assets/pp/background.png similarity index 100% rename from android/assets/background.png rename to android/assets/pp/background.png diff --git a/android/assets/background_top.png b/android/assets/pp/background_top.png similarity index 100% rename from android/assets/background_top.png rename to android/assets/pp/background_top.png diff --git a/android/assets/break.png b/android/assets/pp/break.png similarity index 100% rename from android/assets/break.png rename to android/assets/pp/break.png diff --git a/android/assets/buttons.png b/android/assets/pp/buttons.png similarity index 100% rename from android/assets/buttons.png rename to android/assets/pp/buttons.png diff --git a/android/assets/chest.png b/android/assets/pp/chest.png similarity index 100% rename from android/assets/chest.png rename to android/assets/pp/chest.png diff --git a/android/assets/chest_large.png b/android/assets/pp/chest_large.png similarity index 100% rename from android/assets/chest_large.png rename to android/assets/pp/chest_large.png diff --git a/android/assets/crafting_table.png b/android/assets/pp/crafting_table.png similarity index 100% rename from android/assets/crafting_table.png rename to android/assets/pp/crafting_table.png diff --git a/android/assets/furnace.png b/android/assets/pp/furnace.png similarity index 100% rename from android/assets/furnace.png rename to android/assets/pp/furnace.png diff --git a/android/assets/gui.png b/android/assets/pp/gui.png similarity index 100% rename from android/assets/gui.png rename to android/assets/pp/gui.png diff --git a/android/assets/health.png b/android/assets/pp/health.png similarity index 100% rename from android/assets/health.png rename to android/assets/pp/health.png diff --git a/android/assets/inventory.png b/android/assets/pp/inventory.png similarity index 100% rename from android/assets/inventory.png rename to android/assets/pp/inventory.png diff --git a/android/assets/mobs/char/0_0.png b/android/assets/pp/mobs/char/0_0.png similarity index 100% rename from android/assets/mobs/char/0_0.png rename to android/assets/pp/mobs/char/0_0.png diff --git a/android/assets/mobs/char/0_1.png b/android/assets/pp/mobs/char/0_1.png similarity index 100% rename from android/assets/mobs/char/0_1.png rename to android/assets/pp/mobs/char/0_1.png diff --git a/android/assets/mobs/char/0_2.png b/android/assets/pp/mobs/char/0_2.png similarity index 100% rename from android/assets/mobs/char/0_2.png rename to android/assets/pp/mobs/char/0_2.png diff --git a/android/assets/mobs/char/0_3.png b/android/assets/pp/mobs/char/0_3.png similarity index 100% rename from android/assets/mobs/char/0_3.png rename to android/assets/pp/mobs/char/0_3.png diff --git a/android/assets/mobs/char/1_0.png b/android/assets/pp/mobs/char/1_0.png similarity index 100% rename from android/assets/mobs/char/1_0.png rename to android/assets/pp/mobs/char/1_0.png diff --git a/android/assets/mobs/char/1_1.png b/android/assets/pp/mobs/char/1_1.png similarity index 100% rename from android/assets/mobs/char/1_1.png rename to android/assets/pp/mobs/char/1_1.png diff --git a/android/assets/mobs/char/1_2.png b/android/assets/pp/mobs/char/1_2.png similarity index 100% rename from android/assets/mobs/char/1_2.png rename to android/assets/pp/mobs/char/1_2.png diff --git a/android/assets/mobs/char/1_3.png b/android/assets/pp/mobs/char/1_3.png similarity index 100% rename from android/assets/mobs/char/1_3.png rename to android/assets/pp/mobs/char/1_3.png diff --git a/android/assets/mobs/pig/0_0.png b/android/assets/pp/mobs/pig/0_0.png similarity index 100% rename from android/assets/mobs/pig/0_0.png rename to android/assets/pp/mobs/pig/0_0.png diff --git a/android/assets/mobs/pig/0_1.png b/android/assets/pp/mobs/pig/0_1.png similarity index 100% rename from android/assets/mobs/pig/0_1.png rename to android/assets/pp/mobs/pig/0_1.png diff --git a/android/assets/mobs/pig/1_0.png b/android/assets/pp/mobs/pig/1_0.png similarity index 100% rename from android/assets/mobs/pig/1_0.png rename to android/assets/pp/mobs/pig/1_0.png diff --git a/android/assets/mobs/pig/1_1.png b/android/assets/pp/mobs/pig/1_1.png similarity index 100% rename from android/assets/mobs/pig/1_1.png rename to android/assets/pp/mobs/pig/1_1.png diff --git a/android/assets/shade.png b/android/assets/pp/shade.png similarity index 100% rename from android/assets/shade.png rename to android/assets/pp/shade.png diff --git a/android/assets/textures/blocks/bed_l.png b/android/assets/pp/textures/blocks/bed_l.png similarity index 100% rename from android/assets/textures/blocks/bed_l.png rename to android/assets/pp/textures/blocks/bed_l.png diff --git a/android/assets/textures/blocks/bed_r.png b/android/assets/pp/textures/blocks/bed_r.png similarity index 100% rename from android/assets/textures/blocks/bed_r.png rename to android/assets/pp/textures/blocks/bed_r.png diff --git a/android/assets/textures/blocks/bedrock.png b/android/assets/pp/textures/blocks/bedrock.png similarity index 100% rename from android/assets/textures/blocks/bedrock.png rename to android/assets/pp/textures/blocks/bedrock.png diff --git a/android/assets/textures/blocks/bookshelf.png b/android/assets/pp/textures/blocks/bookshelf.png similarity index 100% rename from android/assets/textures/blocks/bookshelf.png rename to android/assets/pp/textures/blocks/bookshelf.png diff --git a/android/assets/textures/blocks/bricks.png b/android/assets/pp/textures/blocks/bricks.png similarity index 100% rename from android/assets/textures/blocks/bricks.png rename to android/assets/pp/textures/blocks/bricks.png diff --git a/android/assets/textures/blocks/cactus.png b/android/assets/pp/textures/blocks/cactus.png similarity index 100% rename from android/assets/textures/blocks/cactus.png rename to android/assets/pp/textures/blocks/cactus.png diff --git a/android/assets/textures/blocks/cake.png b/android/assets/pp/textures/blocks/cake.png similarity index 100% rename from android/assets/textures/blocks/cake.png rename to android/assets/pp/textures/blocks/cake.png diff --git a/android/assets/textures/blocks/chest.png b/android/assets/pp/textures/blocks/chest.png similarity index 100% rename from android/assets/textures/blocks/chest.png rename to android/assets/pp/textures/blocks/chest.png diff --git a/android/assets/textures/blocks/clay.png b/android/assets/pp/textures/blocks/clay.png similarity index 100% rename from android/assets/textures/blocks/clay.png rename to android/assets/pp/textures/blocks/clay.png diff --git a/android/assets/textures/blocks/coal_block.png b/android/assets/pp/textures/blocks/coal_block.png similarity index 100% rename from android/assets/textures/blocks/coal_block.png rename to android/assets/pp/textures/blocks/coal_block.png diff --git a/android/assets/textures/blocks/coal_ore.png b/android/assets/pp/textures/blocks/coal_ore.png similarity index 100% rename from android/assets/textures/blocks/coal_ore.png rename to android/assets/pp/textures/blocks/coal_ore.png diff --git a/android/assets/textures/blocks/cobblestone.png b/android/assets/pp/textures/blocks/cobblestone.png similarity index 100% rename from android/assets/textures/blocks/cobblestone.png rename to android/assets/pp/textures/blocks/cobblestone.png diff --git a/android/assets/textures/blocks/cobblestone_mossy.png b/android/assets/pp/textures/blocks/cobblestone_mossy.png similarity index 100% rename from android/assets/textures/blocks/cobblestone_mossy.png rename to android/assets/pp/textures/blocks/cobblestone_mossy.png diff --git a/android/assets/textures/blocks/crafting_table.png b/android/assets/pp/textures/blocks/crafting_table.png similarity index 100% rename from android/assets/textures/blocks/crafting_table.png rename to android/assets/pp/textures/blocks/crafting_table.png diff --git a/android/assets/textures/blocks/dandelion.png b/android/assets/pp/textures/blocks/dandelion.png similarity index 100% rename from android/assets/textures/blocks/dandelion.png rename to android/assets/pp/textures/blocks/dandelion.png diff --git a/android/assets/textures/blocks/deadbush.png b/android/assets/pp/textures/blocks/deadbush.png similarity index 100% rename from android/assets/textures/blocks/deadbush.png rename to android/assets/pp/textures/blocks/deadbush.png diff --git a/android/assets/textures/blocks/diamond_block.png b/android/assets/pp/textures/blocks/diamond_block.png similarity index 100% rename from android/assets/textures/blocks/diamond_block.png rename to android/assets/pp/textures/blocks/diamond_block.png diff --git a/android/assets/textures/blocks/diamond_ore.png b/android/assets/pp/textures/blocks/diamond_ore.png similarity index 100% rename from android/assets/textures/blocks/diamond_ore.png rename to android/assets/pp/textures/blocks/diamond_ore.png diff --git a/android/assets/textures/blocks/dirt.png b/android/assets/pp/textures/blocks/dirt.png similarity index 100% rename from android/assets/textures/blocks/dirt.png rename to android/assets/pp/textures/blocks/dirt.png diff --git a/android/assets/textures/blocks/furnace.png b/android/assets/pp/textures/blocks/furnace.png similarity index 100% rename from android/assets/textures/blocks/furnace.png rename to android/assets/pp/textures/blocks/furnace.png diff --git a/android/assets/textures/blocks/glass.png b/android/assets/pp/textures/blocks/glass.png similarity index 100% rename from android/assets/textures/blocks/glass.png rename to android/assets/pp/textures/blocks/glass.png diff --git a/android/assets/textures/blocks/gold_block.png b/android/assets/pp/textures/blocks/gold_block.png similarity index 100% rename from android/assets/textures/blocks/gold_block.png rename to android/assets/pp/textures/blocks/gold_block.png diff --git a/android/assets/textures/blocks/gold_ore.png b/android/assets/pp/textures/blocks/gold_ore.png similarity index 100% rename from android/assets/textures/blocks/gold_ore.png rename to android/assets/pp/textures/blocks/gold_ore.png diff --git a/android/assets/textures/blocks/grass.png b/android/assets/pp/textures/blocks/grass.png similarity index 100% rename from android/assets/textures/blocks/grass.png rename to android/assets/pp/textures/blocks/grass.png diff --git a/android/assets/textures/blocks/grass_snowed.png b/android/assets/pp/textures/blocks/grass_snowed.png similarity index 100% rename from android/assets/textures/blocks/grass_snowed.png rename to android/assets/pp/textures/blocks/grass_snowed.png diff --git a/android/assets/textures/blocks/gravel.png b/android/assets/pp/textures/blocks/gravel.png similarity index 100% rename from android/assets/textures/blocks/gravel.png rename to android/assets/pp/textures/blocks/gravel.png diff --git a/android/assets/textures/blocks/iron_bars.png b/android/assets/pp/textures/blocks/iron_bars.png similarity index 100% rename from android/assets/textures/blocks/iron_bars.png rename to android/assets/pp/textures/blocks/iron_bars.png diff --git a/android/assets/textures/blocks/iron_block.png b/android/assets/pp/textures/blocks/iron_block.png similarity index 100% rename from android/assets/textures/blocks/iron_block.png rename to android/assets/pp/textures/blocks/iron_block.png diff --git a/android/assets/textures/blocks/iron_ore.png b/android/assets/pp/textures/blocks/iron_ore.png similarity index 100% rename from android/assets/textures/blocks/iron_ore.png rename to android/assets/pp/textures/blocks/iron_ore.png diff --git a/android/assets/textures/blocks/ladder.png b/android/assets/pp/textures/blocks/ladder.png similarity index 100% rename from android/assets/textures/blocks/ladder.png rename to android/assets/pp/textures/blocks/ladder.png diff --git a/android/assets/textures/blocks/lapis_block.png b/android/assets/pp/textures/blocks/lapis_block.png similarity index 100% rename from android/assets/textures/blocks/lapis_block.png rename to android/assets/pp/textures/blocks/lapis_block.png diff --git a/android/assets/textures/blocks/lapis_ore.png b/android/assets/pp/textures/blocks/lapis_ore.png similarity index 100% rename from android/assets/textures/blocks/lapis_ore.png rename to android/assets/pp/textures/blocks/lapis_ore.png diff --git a/android/assets/textures/blocks/lava_flow.png b/android/assets/pp/textures/blocks/lava_flow.png similarity index 100% rename from android/assets/textures/blocks/lava_flow.png rename to android/assets/pp/textures/blocks/lava_flow.png diff --git a/android/assets/textures/blocks/lava_still.png b/android/assets/pp/textures/blocks/lava_still.png similarity index 100% rename from android/assets/textures/blocks/lava_still.png rename to android/assets/pp/textures/blocks/lava_still.png diff --git a/android/assets/textures/blocks/leaves_oak.png b/android/assets/pp/textures/blocks/leaves_oak.png similarity index 100% rename from android/assets/textures/blocks/leaves_oak.png rename to android/assets/pp/textures/blocks/leaves_oak.png diff --git a/android/assets/textures/blocks/leaves_spruce.png b/android/assets/pp/textures/blocks/leaves_spruce.png similarity index 100% rename from android/assets/textures/blocks/leaves_spruce.png rename to android/assets/pp/textures/blocks/leaves_spruce.png diff --git a/android/assets/textures/blocks/log_birch.png b/android/assets/pp/textures/blocks/log_birch.png similarity index 100% rename from android/assets/textures/blocks/log_birch.png rename to android/assets/pp/textures/blocks/log_birch.png diff --git a/android/assets/textures/blocks/log_oak.png b/android/assets/pp/textures/blocks/log_oak.png similarity index 100% rename from android/assets/textures/blocks/log_oak.png rename to android/assets/pp/textures/blocks/log_oak.png diff --git a/android/assets/textures/blocks/log_spruce.png b/android/assets/pp/textures/blocks/log_spruce.png similarity index 100% rename from android/assets/textures/blocks/log_spruce.png rename to android/assets/pp/textures/blocks/log_spruce.png diff --git a/android/assets/textures/blocks/mushroom_brown.png b/android/assets/pp/textures/blocks/mushroom_brown.png similarity index 100% rename from android/assets/textures/blocks/mushroom_brown.png rename to android/assets/pp/textures/blocks/mushroom_brown.png diff --git a/android/assets/textures/blocks/mushroom_red.png b/android/assets/pp/textures/blocks/mushroom_red.png similarity index 100% rename from android/assets/textures/blocks/mushroom_red.png rename to android/assets/pp/textures/blocks/mushroom_red.png diff --git a/android/assets/textures/blocks/noteblock.png b/android/assets/pp/textures/blocks/noteblock.png similarity index 100% rename from android/assets/textures/blocks/noteblock.png rename to android/assets/pp/textures/blocks/noteblock.png diff --git a/android/assets/textures/blocks/obsidian.png b/android/assets/pp/textures/blocks/obsidian.png similarity index 100% rename from android/assets/textures/blocks/obsidian.png rename to android/assets/pp/textures/blocks/obsidian.png diff --git a/android/assets/textures/blocks/planks_birch.png b/android/assets/pp/textures/blocks/planks_birch.png similarity index 100% rename from android/assets/textures/blocks/planks_birch.png rename to android/assets/pp/textures/blocks/planks_birch.png diff --git a/android/assets/textures/blocks/planks_oak.png b/android/assets/pp/textures/blocks/planks_oak.png similarity index 100% rename from android/assets/textures/blocks/planks_oak.png rename to android/assets/pp/textures/blocks/planks_oak.png diff --git a/android/assets/textures/blocks/planks_spruce.png b/android/assets/pp/textures/blocks/planks_spruce.png similarity index 100% rename from android/assets/textures/blocks/planks_spruce.png rename to android/assets/pp/textures/blocks/planks_spruce.png diff --git a/android/assets/textures/blocks/rose.png b/android/assets/pp/textures/blocks/rose.png similarity index 100% rename from android/assets/textures/blocks/rose.png rename to android/assets/pp/textures/blocks/rose.png diff --git a/android/assets/textures/blocks/sand.png b/android/assets/pp/textures/blocks/sand.png similarity index 100% rename from android/assets/textures/blocks/sand.png rename to android/assets/pp/textures/blocks/sand.png diff --git a/android/assets/textures/blocks/sandstone.png b/android/assets/pp/textures/blocks/sandstone.png similarity index 100% rename from android/assets/textures/blocks/sandstone.png rename to android/assets/pp/textures/blocks/sandstone.png diff --git a/android/assets/textures/blocks/sapling_birch.png b/android/assets/pp/textures/blocks/sapling_birch.png similarity index 100% rename from android/assets/textures/blocks/sapling_birch.png rename to android/assets/pp/textures/blocks/sapling_birch.png diff --git a/android/assets/textures/blocks/sapling_oak.png b/android/assets/pp/textures/blocks/sapling_oak.png similarity index 100% rename from android/assets/textures/blocks/sapling_oak.png rename to android/assets/pp/textures/blocks/sapling_oak.png diff --git a/android/assets/textures/blocks/sapling_spruce.png b/android/assets/pp/textures/blocks/sapling_spruce.png similarity index 100% rename from android/assets/textures/blocks/sapling_spruce.png rename to android/assets/pp/textures/blocks/sapling_spruce.png diff --git a/android/assets/textures/blocks/snow.png b/android/assets/pp/textures/blocks/snow.png similarity index 100% rename from android/assets/textures/blocks/snow.png rename to android/assets/pp/textures/blocks/snow.png diff --git a/android/assets/textures/blocks/sponge.png b/android/assets/pp/textures/blocks/sponge.png similarity index 100% rename from android/assets/textures/blocks/sponge.png rename to android/assets/pp/textures/blocks/sponge.png diff --git a/android/assets/textures/blocks/sponge_wet.png b/android/assets/pp/textures/blocks/sponge_wet.png similarity index 100% rename from android/assets/textures/blocks/sponge_wet.png rename to android/assets/pp/textures/blocks/sponge_wet.png diff --git a/android/assets/textures/blocks/stone.png b/android/assets/pp/textures/blocks/stone.png similarity index 100% rename from android/assets/textures/blocks/stone.png rename to android/assets/pp/textures/blocks/stone.png diff --git a/android/assets/textures/blocks/stone_slab.png b/android/assets/pp/textures/blocks/stone_slab.png similarity index 100% rename from android/assets/textures/blocks/stone_slab.png rename to android/assets/pp/textures/blocks/stone_slab.png diff --git a/android/assets/textures/blocks/stonebrick.png b/android/assets/pp/textures/blocks/stonebrick.png similarity index 100% rename from android/assets/textures/blocks/stonebrick.png rename to android/assets/pp/textures/blocks/stonebrick.png diff --git a/android/assets/textures/blocks/tallgrass.png b/android/assets/pp/textures/blocks/tallgrass.png similarity index 100% rename from android/assets/textures/blocks/tallgrass.png rename to android/assets/pp/textures/blocks/tallgrass.png diff --git a/android/assets/textures/blocks/water_flow.png b/android/assets/pp/textures/blocks/water_flow.png similarity index 100% rename from android/assets/textures/blocks/water_flow.png rename to android/assets/pp/textures/blocks/water_flow.png diff --git a/android/assets/textures/blocks/water_still.png b/android/assets/pp/textures/blocks/water_still.png similarity index 100% rename from android/assets/textures/blocks/water_still.png rename to android/assets/pp/textures/blocks/water_still.png diff --git a/android/assets/textures/blocks/web.png b/android/assets/pp/textures/blocks/web.png similarity index 100% rename from android/assets/textures/blocks/web.png rename to android/assets/pp/textures/blocks/web.png diff --git a/android/assets/textures/blocks/wool_colored_black.png b/android/assets/pp/textures/blocks/wool_colored_black.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_black.png rename to android/assets/pp/textures/blocks/wool_colored_black.png diff --git a/android/assets/textures/blocks/wool_colored_blue.png b/android/assets/pp/textures/blocks/wool_colored_blue.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_blue.png rename to android/assets/pp/textures/blocks/wool_colored_blue.png diff --git a/android/assets/textures/blocks/wool_colored_brown.png b/android/assets/pp/textures/blocks/wool_colored_brown.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_brown.png rename to android/assets/pp/textures/blocks/wool_colored_brown.png diff --git a/android/assets/textures/blocks/wool_colored_cyan.png b/android/assets/pp/textures/blocks/wool_colored_cyan.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_cyan.png rename to android/assets/pp/textures/blocks/wool_colored_cyan.png diff --git a/android/assets/textures/blocks/wool_colored_gray.png b/android/assets/pp/textures/blocks/wool_colored_gray.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_gray.png rename to android/assets/pp/textures/blocks/wool_colored_gray.png diff --git a/android/assets/textures/blocks/wool_colored_green.png b/android/assets/pp/textures/blocks/wool_colored_green.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_green.png rename to android/assets/pp/textures/blocks/wool_colored_green.png diff --git a/android/assets/textures/blocks/wool_colored_light_blue.png b/android/assets/pp/textures/blocks/wool_colored_light_blue.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_light_blue.png rename to android/assets/pp/textures/blocks/wool_colored_light_blue.png diff --git a/android/assets/textures/blocks/wool_colored_lime.png b/android/assets/pp/textures/blocks/wool_colored_lime.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_lime.png rename to android/assets/pp/textures/blocks/wool_colored_lime.png diff --git a/android/assets/textures/blocks/wool_colored_magenta.png b/android/assets/pp/textures/blocks/wool_colored_magenta.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_magenta.png rename to android/assets/pp/textures/blocks/wool_colored_magenta.png diff --git a/android/assets/textures/blocks/wool_colored_orange.png b/android/assets/pp/textures/blocks/wool_colored_orange.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_orange.png rename to android/assets/pp/textures/blocks/wool_colored_orange.png diff --git a/android/assets/textures/blocks/wool_colored_pink.png b/android/assets/pp/textures/blocks/wool_colored_pink.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_pink.png rename to android/assets/pp/textures/blocks/wool_colored_pink.png diff --git a/android/assets/textures/blocks/wool_colored_purple.png b/android/assets/pp/textures/blocks/wool_colored_purple.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_purple.png rename to android/assets/pp/textures/blocks/wool_colored_purple.png diff --git a/android/assets/textures/blocks/wool_colored_red.png b/android/assets/pp/textures/blocks/wool_colored_red.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_red.png rename to android/assets/pp/textures/blocks/wool_colored_red.png diff --git a/android/assets/textures/blocks/wool_colored_silver.png b/android/assets/pp/textures/blocks/wool_colored_silver.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_silver.png rename to android/assets/pp/textures/blocks/wool_colored_silver.png diff --git a/android/assets/textures/blocks/wool_colored_white.png b/android/assets/pp/textures/blocks/wool_colored_white.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_white.png rename to android/assets/pp/textures/blocks/wool_colored_white.png diff --git a/android/assets/textures/blocks/wool_colored_yellow.png b/android/assets/pp/textures/blocks/wool_colored_yellow.png similarity index 100% rename from android/assets/textures/blocks/wool_colored_yellow.png rename to android/assets/pp/textures/blocks/wool_colored_yellow.png diff --git a/android/assets/textures/items/bed.png b/android/assets/pp/textures/items/bed.png similarity index 100% rename from android/assets/textures/items/bed.png rename to android/assets/pp/textures/items/bed.png diff --git a/android/assets/textures/items/bucket_empty.png b/android/assets/pp/textures/items/bucket_empty.png similarity index 100% rename from android/assets/textures/items/bucket_empty.png rename to android/assets/pp/textures/items/bucket_empty.png diff --git a/android/assets/textures/items/bucket_lava.png b/android/assets/pp/textures/items/bucket_lava.png similarity index 100% rename from android/assets/textures/items/bucket_lava.png rename to android/assets/pp/textures/items/bucket_lava.png diff --git a/android/assets/textures/items/bucket_milk.png b/android/assets/pp/textures/items/bucket_milk.png similarity index 100% rename from android/assets/textures/items/bucket_milk.png rename to android/assets/pp/textures/items/bucket_milk.png diff --git a/android/assets/textures/items/bucket_water.png b/android/assets/pp/textures/items/bucket_water.png similarity index 100% rename from android/assets/textures/items/bucket_water.png rename to android/assets/pp/textures/items/bucket_water.png diff --git a/android/assets/textures/items/charcoal.png b/android/assets/pp/textures/items/charcoal.png similarity index 100% rename from android/assets/textures/items/charcoal.png rename to android/assets/pp/textures/items/charcoal.png diff --git a/android/assets/textures/items/coal.png b/android/assets/pp/textures/items/coal.png similarity index 100% rename from android/assets/textures/items/coal.png rename to android/assets/pp/textures/items/coal.png diff --git a/android/assets/textures/items/diamond.png b/android/assets/pp/textures/items/diamond.png similarity index 100% rename from android/assets/textures/items/diamond.png rename to android/assets/pp/textures/items/diamond.png diff --git a/android/assets/textures/items/diamond_axe.png b/android/assets/pp/textures/items/diamond_axe.png similarity index 100% rename from android/assets/textures/items/diamond_axe.png rename to android/assets/pp/textures/items/diamond_axe.png diff --git a/android/assets/textures/items/diamond_hoe.png b/android/assets/pp/textures/items/diamond_hoe.png similarity index 100% rename from android/assets/textures/items/diamond_hoe.png rename to android/assets/pp/textures/items/diamond_hoe.png diff --git a/android/assets/textures/items/diamond_pickaxe.png b/android/assets/pp/textures/items/diamond_pickaxe.png similarity index 100% rename from android/assets/textures/items/diamond_pickaxe.png rename to android/assets/pp/textures/items/diamond_pickaxe.png diff --git a/android/assets/textures/items/diamond_shovel.png b/android/assets/pp/textures/items/diamond_shovel.png similarity index 100% rename from android/assets/textures/items/diamond_shovel.png rename to android/assets/pp/textures/items/diamond_shovel.png diff --git a/android/assets/textures/items/diamond_sword.png b/android/assets/pp/textures/items/diamond_sword.png similarity index 100% rename from android/assets/textures/items/diamond_sword.png rename to android/assets/pp/textures/items/diamond_sword.png diff --git a/android/assets/textures/items/gold_axe.png b/android/assets/pp/textures/items/gold_axe.png similarity index 100% rename from android/assets/textures/items/gold_axe.png rename to android/assets/pp/textures/items/gold_axe.png diff --git a/android/assets/textures/items/gold_hoe.png b/android/assets/pp/textures/items/gold_hoe.png similarity index 100% rename from android/assets/textures/items/gold_hoe.png rename to android/assets/pp/textures/items/gold_hoe.png diff --git a/android/assets/textures/items/gold_ingot.png b/android/assets/pp/textures/items/gold_ingot.png similarity index 100% rename from android/assets/textures/items/gold_ingot.png rename to android/assets/pp/textures/items/gold_ingot.png diff --git a/android/assets/textures/items/gold_pickaxe.png b/android/assets/pp/textures/items/gold_pickaxe.png similarity index 100% rename from android/assets/textures/items/gold_pickaxe.png rename to android/assets/pp/textures/items/gold_pickaxe.png diff --git a/android/assets/textures/items/gold_shovel.png b/android/assets/pp/textures/items/gold_shovel.png similarity index 100% rename from android/assets/textures/items/gold_shovel.png rename to android/assets/pp/textures/items/gold_shovel.png diff --git a/android/assets/textures/items/gold_sword.png b/android/assets/pp/textures/items/gold_sword.png similarity index 100% rename from android/assets/textures/items/gold_sword.png rename to android/assets/pp/textures/items/gold_sword.png diff --git a/android/assets/textures/items/iron_axe.png b/android/assets/pp/textures/items/iron_axe.png similarity index 100% rename from android/assets/textures/items/iron_axe.png rename to android/assets/pp/textures/items/iron_axe.png diff --git a/android/assets/textures/items/iron_hoe.png b/android/assets/pp/textures/items/iron_hoe.png similarity index 100% rename from android/assets/textures/items/iron_hoe.png rename to android/assets/pp/textures/items/iron_hoe.png diff --git a/android/assets/textures/items/iron_ingot.png b/android/assets/pp/textures/items/iron_ingot.png similarity index 100% rename from android/assets/textures/items/iron_ingot.png rename to android/assets/pp/textures/items/iron_ingot.png diff --git a/android/assets/textures/items/iron_pickaxe.png b/android/assets/pp/textures/items/iron_pickaxe.png similarity index 100% rename from android/assets/textures/items/iron_pickaxe.png rename to android/assets/pp/textures/items/iron_pickaxe.png diff --git a/android/assets/textures/items/iron_shovel.png b/android/assets/pp/textures/items/iron_shovel.png similarity index 100% rename from android/assets/textures/items/iron_shovel.png rename to android/assets/pp/textures/items/iron_shovel.png diff --git a/android/assets/textures/items/iron_sword.png b/android/assets/pp/textures/items/iron_sword.png similarity index 100% rename from android/assets/textures/items/iron_sword.png rename to android/assets/pp/textures/items/iron_sword.png diff --git a/android/assets/textures/items/lapis_lazuli.png b/android/assets/pp/textures/items/lapis_lazuli.png similarity index 100% rename from android/assets/textures/items/lapis_lazuli.png rename to android/assets/pp/textures/items/lapis_lazuli.png diff --git a/android/assets/textures/items/shears.png b/android/assets/pp/textures/items/shears.png similarity index 100% rename from android/assets/textures/items/shears.png rename to android/assets/pp/textures/items/shears.png diff --git a/android/assets/textures/items/snowball.png b/android/assets/pp/textures/items/snowball.png similarity index 100% rename from android/assets/textures/items/snowball.png rename to android/assets/pp/textures/items/snowball.png diff --git a/android/assets/textures/items/spawn_egg.png b/android/assets/pp/textures/items/spawn_egg.png similarity index 100% rename from android/assets/textures/items/spawn_egg.png rename to android/assets/pp/textures/items/spawn_egg.png diff --git a/android/assets/textures/items/stick.png b/android/assets/pp/textures/items/stick.png similarity index 100% rename from android/assets/textures/items/stick.png rename to android/assets/pp/textures/items/stick.png diff --git a/android/assets/textures/items/stone_axe.png b/android/assets/pp/textures/items/stone_axe.png similarity index 100% rename from android/assets/textures/items/stone_axe.png rename to android/assets/pp/textures/items/stone_axe.png diff --git a/android/assets/textures/items/stone_hoe.png b/android/assets/pp/textures/items/stone_hoe.png similarity index 100% rename from android/assets/textures/items/stone_hoe.png rename to android/assets/pp/textures/items/stone_hoe.png diff --git a/android/assets/textures/items/stone_pickaxe.png b/android/assets/pp/textures/items/stone_pickaxe.png similarity index 100% rename from android/assets/textures/items/stone_pickaxe.png rename to android/assets/pp/textures/items/stone_pickaxe.png diff --git a/android/assets/textures/items/stone_shovel.png b/android/assets/pp/textures/items/stone_shovel.png similarity index 100% rename from android/assets/textures/items/stone_shovel.png rename to android/assets/pp/textures/items/stone_shovel.png diff --git a/android/assets/textures/items/stone_sword.png b/android/assets/pp/textures/items/stone_sword.png similarity index 100% rename from android/assets/textures/items/stone_sword.png rename to android/assets/pp/textures/items/stone_sword.png diff --git a/android/assets/textures/items/wood_axe.png b/android/assets/pp/textures/items/wood_axe.png similarity index 100% rename from android/assets/textures/items/wood_axe.png rename to android/assets/pp/textures/items/wood_axe.png diff --git a/android/assets/textures/items/wood_hoe.png b/android/assets/pp/textures/items/wood_hoe.png similarity index 100% rename from android/assets/textures/items/wood_hoe.png rename to android/assets/pp/textures/items/wood_hoe.png diff --git a/android/assets/textures/items/wood_pickaxe.png b/android/assets/pp/textures/items/wood_pickaxe.png similarity index 100% rename from android/assets/textures/items/wood_pickaxe.png rename to android/assets/pp/textures/items/wood_pickaxe.png diff --git a/android/assets/textures/items/wood_shovel.png b/android/assets/pp/textures/items/wood_shovel.png similarity index 100% rename from android/assets/textures/items/wood_shovel.png rename to android/assets/pp/textures/items/wood_shovel.png diff --git a/android/assets/textures/items/wood_sword.png b/android/assets/pp/textures/items/wood_sword.png similarity index 100% rename from android/assets/textures/items/wood_sword.png rename to android/assets/pp/textures/items/wood_sword.png diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java index ffc253f..71cad7a 100644 --- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java +++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java @@ -79,14 +79,14 @@ public class Assets { for (int i = 0; i < sprite.length; i++) { for (int j = 0; j < sprite[i].length; j++) { sprite[i][j] = flippedSprite(loadTexture( - assetLoader.getAssetHandle("mobs/" + mob + "/" + i + "_" + j + ".png"))); + assetLoader.getAssetHandle("pp/mobs/" + mob + "/" + i + "_" + j + ".png"))); sprite[i][j].setOrigin(sprite[i][j].getWidth() / 2, 0); } } } private static void loadBlockDamage(AssetLoader assetLoader) { - final Texture blockDamageTexture = loadTexture(assetLoader.getAssetHandle("break.png")); + final Texture blockDamageTexture = loadTexture(assetLoader.getAssetHandle("pp/break.png")); for (int i = 0; i < BLOCK_DAMAGE_STAGES; i++) { blockDamageSprites[i] = new Sprite(flippedRegion(blockDamageTexture, i * 16, 0, 16, 16)); } @@ -106,9 +106,10 @@ public class Assets { JsonValue json = jsonReader.parse(assetLoader.getAssetHandle("json/texture_regions.json")); for (JsonValue file = json.child(); file != null; file = file.next()) { Texture texture = loadTexture(assetLoader.getAssetHandle(file.name() + ".png")); + final String[] pathSegments = file.name().split("/"); + final String name = pathSegments[pathSegments.length - 1]; if (file.size == 0) { - textureRegions.put(file.name(), - flippedRegion(texture, 0, 0, texture.getWidth(), texture.getHeight())); + textureRegions.put(name, flippedRegion(texture, 0, 0, texture.getWidth(), texture.getHeight())); } else { for (JsonValue key = file.child(); key != null; key = key.next()) { int x = getIntFromJson(key, "x", 0); @@ -171,11 +172,11 @@ public class Assets { } public static Texture resolveItemTexture(AssetLoader assetLoader, String textureName) { - return resolveTexture(assetLoader, textureName, "textures/items", itemTextures); + return resolveTexture(assetLoader, textureName, "pp/textures/items", itemTextures); } public static Texture resolveBlockTexture(AssetLoader assetLoader, String textureName) { - return resolveTexture(assetLoader, textureName, "textures/blocks", blockTextures); + return resolveTexture(assetLoader, textureName, "pp/textures/blocks", blockTextures); } private static void loadAllPngsFromDirInto(FileHandle dir, Map loadInto) { @@ -185,12 +186,12 @@ public class Assets { } private static void loadItems(AssetLoader assetLoader) { - final FileHandle itemsDir = assetLoader.getAssetHandle("textures/items"); + final FileHandle itemsDir = assetLoader.getAssetHandle("pp/textures/items"); loadAllPngsFromDirInto(itemsDir, itemTextures); } private static void loadBlocks(AssetLoader assetLoader) { - final FileHandle blocksDir = assetLoader.getAssetHandle("textures/blocks"); + final FileHandle blocksDir = assetLoader.getAssetHandle("pp/textures/blocks"); loadAllPngsFromDirInto(blocksDir, blockTextures); }