X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FItems.java;h=690d5ac3c99b7e3a50f97dd72f64dc779ca15ca6;hb=0b8922bfbb2bbec067b532ecb7912f6afe02c4ef;hp=9987cbe080ccb1425b639b2c8239ade9ed1a1851;hpb=75e8bbe4c9dceaabd8bb7e7976ad9052cfb0a968;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/Items.java b/core/src/ru/deadsoftware/cavecraft/game/Items.java
index 9987cbe..690d5ac 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/Items.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/Items.java
@@ -2,162 +2,307 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.utils.ArrayMap;
 import ru.deadsoftware.cavecraft.game.objects.Block;
+import ru.deadsoftware.cavecraft.game.objects.Item;
+
+import java.util.ArrayList;
 
 public class Items {
 
     public static ArrayMap<String, Block> BLOCKS = new ArrayMap<String, Block>();
+    public static ArrayList<Item> ITEMS = new ArrayList<Item>();
 
     public static boolean isFluid(int bl) {
-        return (bl == 8 || bl == 9 || bl == 60 || bl == 61 || bl == 62 || bl == 63 || bl == 64 || bl == 65);
+        return (bl == 8 || bl == 9 || bl == 60 || bl == 61 || bl == 62 || bl == 63 || bl == 64 || bl == 65 || bl == 66 || bl == 67);
     }
 
     public static boolean isWater(int bl) {
-        return (bl == 8 || bl == 60 || bl == 61 || bl == 62);
+        return (bl == 8 || bl == 60 || bl == 61 || bl == 62 || bl == 63);
     }
 
     public static boolean isLava(int bl) {
-        return (bl == 9 || bl == 63 || bl == 64 || bl == 65);
+        return (bl == 9 || bl == 64 || bl == 65 || bl == 66 || bl == 67);
+    }
+
+    public static boolean isSlab(int bl) {
+        return (bl == 51 || bl == 53 || bl == 54 || bl == 55 || bl == 56 || bl == 58);
+    }
+
+    public static void loadItems() {
+        //0
+        ITEMS.add(null);
+        //1
+        ITEMS.add(new Item("Stone", 0, 0, 1));
+        //2
+        ITEMS.add(new Item("Grass", 1, 0, 2));
+        //3
+        ITEMS.add(new Item("Dirt", 2, 0, 3));
+        //4
+        ITEMS.add(new Item("Cobblestone", 3, 0, 4));
+        //5
+        ITEMS.add(new Item("Planks", 4, 0, 5));
+        //6
+        ITEMS.add(new Item("Sapling", 5, 0, 6));
+        //7
+        ITEMS.add(new Item("Bedrock", 6, 0, 7));
+        //8
+        ITEMS.add(new Item("Sand", 9, 0, 10));
+        //9
+        ITEMS.add(new Item("Gravel", 10, 0, 11));
+        //10
+        ITEMS.add(new Item("Golden Ore", 11, 0, 12));
+        //11
+        ITEMS.add(new Item("Iron Ore", 12, 0, 13));
+        //12
+        ITEMS.add(new Item("Coal Ore", 13, 0, 14));
+        //13
+        ITEMS.add(new Item("Wood", 14, 0, 15));
+        //14
+        ITEMS.add(new Item("Leaves", 15, 0, 16));
+        //15
+        ITEMS.add(new Item("Glass", 17, 0, 18));
+        //16
+        ITEMS.add(new Item("Lapis Ore", 18, 0, 19));
+        //17
+        ITEMS.add(new Item("Lapis Block", 19, 0, 20));
+        //18
+        ITEMS.add(new Item("Sandstone", 20, 0, 21));
+        //19
+        ITEMS.add(new Item("Cobweb", 24, 0, 25));
+        //20
+        ITEMS.add(new Item("Tall Grass", 25, 0, 26));
+        //21
+        ITEMS.add(new Item("Dead Bush", 26, 0, 27));
+        //22
+        ITEMS.add(new Item("Bricks", 27, 0, 28));
+        //23
+        ITEMS.add(new Item("Dandelion", 28, 0, 29));
+        //24
+        ITEMS.add(new Item("Rose", 29, 0, 30));
+        //25
+        ITEMS.add(new Item("Mushroom", 30, 0, 31));
+        //26
+        ITEMS.add(new Item("Mushroom", 31, 0, 32));
+        //27
+        ITEMS.add(new Item("White Wool", 32, 0, 33));
+        //28
+        ITEMS.add(new Item("Orange Wool", 33, 0, 34));
+        //29
+        ITEMS.add(new Item("Magenta Wool", 34, 0, 35));
+        //30
+        ITEMS.add(new Item("Light Blue Wool", 35, 0, 36));
+        //31
+        ITEMS.add(new Item("Yellow Wool", 36, 0, 37));
+        //32
+        ITEMS.add(new Item("Lime Wool", 37, 0, 38));
+        //33
+        ITEMS.add(new Item("Pink Wool", 38, 0, 39));
+        //34
+        ITEMS.add(new Item("Gray Wool", 39, 0, 40));
+        //35
+        ITEMS.add(new Item("Light Gray Wool", 40, 0, 41));
+        //36
+        ITEMS.add(new Item("Cyan Wool", 41, 0, 42));
+        //37
+        ITEMS.add(new Item("Purple Wool", 42, 0, 43));
+        //38
+        ITEMS.add(new Item("Blue Wool", 43, 0, 44));
+        //39
+        ITEMS.add(new Item("Brown Wool", 44, 0, 45));
+        //40
+        ITEMS.add(new Item("Green Wool", 45, 0, 46));
+        //41
+        ITEMS.add(new Item("Red Wool", 46, 0, 47));
+        //42
+        ITEMS.add(new Item("Black Wool", 47, 0, 48));
+        //43
+        ITEMS.add(new Item("Golden Block", 48, 0, 49));
+        //44
+        ITEMS.add(new Item("Iron Block", 49, 0, 50));
+        //45
+        ITEMS.add(new Item("Stone Slab", 50, 0, 51));
+        //46
+        ITEMS.add(new Item("Sandstone Slab", 52, 0, 53));
+        //47
+        ITEMS.add(new Item("Wooden Slab", 53, 0, 54));
+        //48
+        ITEMS.add(new Item("Cobblestone Slab", 54, 0, 55));
+        //49
+        ITEMS.add(new Item("Brick Slab", 55, 0, 56));
+        //50
+        ITEMS.add(new Item("Stone Brick", 64, 0, 57));
+        //51
+        ITEMS.add(new Item("Stone Brick Slab", 56, 0, 58));
+        //52
+        ITEMS.add(new Item("Cactus", 57, 0, 59));
+        //53
+        ITEMS.add(new Item("Obsidian", 65, 0, 68));
+        //54
+        ITEMS.add(new Item("Wooden Sword", 0, 1));
+        //55
+        ITEMS.add(new Item("Stone Sword", 1, 1));
+        //56
+        ITEMS.add(new Item("Iron Sword", 2, 1));
+        //57
+        ITEMS.add(new Item("Diamond Sword", 3, 1));
+        //58
+        ITEMS.add(new Item("Golden Sword", 4, 1));
+        //59
+        ITEMS.add(new Item("Wooden Shovel", 5, 1));
+        //60
+        ITEMS.add(new Item("Stone Shovel", 6, 1));
+        //61
+        ITEMS.add(new Item("Iron Shovel", 7, 1));
+        //62
+        ITEMS.add(new Item("Diamond Shovel", 8, 1));
+        //63
+        ITEMS.add(new Item("Golden Shovel", 9, 1));
+
     }
 
     public static void loadBlocks() {
         //0
         BLOCKS.put("none", null);
         //1
-        BLOCKS.put("stone", new Block(0));
+        BLOCKS.put("stone", new Block(0, 450, 4));
         //2
-        BLOCKS.put("grass", new Block(1));
+        BLOCKS.put("grass", new Block(1, 54, 3));
         //3
-        BLOCKS.put("dirt", new Block(2));
+        BLOCKS.put("dirt", new Block(2, 45, 3));
         //4
-        BLOCKS.put("cobblestone", new Block(3));
+        BLOCKS.put("cobblestone", new Block(3, 600, 4));
         //5
-        BLOCKS.put("planks", new Block(4));
+        BLOCKS.put("planks", new Block(4, 180, 5));
         //6
-        BLOCKS.put("sapling", new Block(5,false,false,true));
+        BLOCKS.put("sapling", new Block(5,0,6,false,false,true));
         //7
-        BLOCKS.put("bedrock", new Block(6));
+        BLOCKS.put("bedrock", new Block(6,-1,7));
         //8
-        BLOCKS.put("water", new Block(7,false,false,true));
+        BLOCKS.put("water", new Block(7,-1,0,false,false,true));
         //9
-        BLOCKS.put("lava", new Block(8,false,false,false));
+        BLOCKS.put("lava", new Block(8,-1,0,false,false,false));
         //10
-        BLOCKS.put("sand", new Block(9));
+        BLOCKS.put("sand", new Block(9, 45,8));
         //11
-        BLOCKS.put("gravel", new Block(10));
+        BLOCKS.put("gravel", new Block(10, 54,9));
         //12
-        BLOCKS.put("gold_ore", new Block(11));
+        BLOCKS.put("gold_ore", new Block(11, 900,10));
         //13
-        BLOCKS.put("iron_ore", new Block(12));
+        BLOCKS.put("iron_ore", new Block(12, 900,11));
         //14
-        BLOCKS.put("coal_ore", new Block(13));
+        BLOCKS.put("coal_ore", new Block(13, 900,0));
         //15
-        BLOCKS.put("log", new Block(14));
+        BLOCKS.put("log", new Block(14, 180,13));
         //16
-        BLOCKS.put("leaves", new Block(15));
+        BLOCKS.put("leaves", new Block(15, 21,0));
         //17
-        BLOCKS.put("sponge", new Block(16));
+        BLOCKS.put("sponge", new Block(16, 54,0));
         //18
-        BLOCKS.put("glass", new Block(17,true,false,true));
+        BLOCKS.put("glass", new Block(17, 27,0,true,false,true));
         //19
-        BLOCKS.put("lapis_ore", new Block(18));
+        BLOCKS.put("lapis_ore", new Block(18, 900,0));
         //20
-        BLOCKS.put("lapis_block", new Block(19));
+        BLOCKS.put("lapis_block", new Block(19, 900,17));
         //21
-        BLOCKS.put("sandstone", new Block(20));
+        BLOCKS.put("sandstone", new Block(20, 240,18));
         //22
-        BLOCKS.put("noteblock", new Block(21));
+        BLOCKS.put("noteblock", new Block(21, 75,0));
         //23
-        BLOCKS.put("bed_l", new Block(22,false,true,true));
+        BLOCKS.put("bed_l", new Block(22, 21,0,false,true,true));
         //24
-        BLOCKS.put("bed_r", new Block(23, false,true, true));
+        BLOCKS.put("bed_r", new Block(23, 21,0, false,true, true));
         //25
-        BLOCKS.put("cobweb", new Block(24,false,false,true));
+        BLOCKS.put("cobweb", new Block(24, 1200,0,false,false,true));
         //26
-        BLOCKS.put("tallgrass", new Block(25,false,false,true));
+        BLOCKS.put("tallgrass", new Block(25, 0,0,false,false,true));
         //27
-        BLOCKS.put("deadbush", new Block(26,false,false,true));
+        BLOCKS.put("deadbush", new Block(26, 0,0,false,false,true));
         //28
-        BLOCKS.put("brick_block", new Block(27));
+        BLOCKS.put("brick_block", new Block(27, 600,22));
         //29
-        BLOCKS.put("dandelion", new Block(28,false,false,true));
+        BLOCKS.put("dandelion", new Block(28, 0,23,false,false,true));
         //30
-        BLOCKS.put("rose", new Block(29,false,false,true));
+        BLOCKS.put("rose", new Block(29, 0,24,false,false,true));
         //31
-        BLOCKS.put("brown_mushroom", new Block(30,false,false,true));
+        BLOCKS.put("brown_mushroom", new Block(30, 0,25,false,false,true));
         //32
-        BLOCKS.put("red_mushroom", new Block(31,false,false,true));
+        BLOCKS.put("red_mushroom", new Block(31, 0,26,false,false,true));
         //33
-        BLOCKS.put("wool_while", new Block(32,true,false,false));
+        BLOCKS.put("wool_while", new Block(32, 75,27,true,false,false));
         //34
-        BLOCKS.put("wool_orange", new Block(33,true,false,false));
+        BLOCKS.put("wool_orange", new Block(33, 75,28,true,false,false));
         //35
-        BLOCKS.put("wool_magenta", new Block(34,true,false,false));
+        BLOCKS.put("wool_magenta", new Block(34, 75,29,true,false,false));
         //36
-        BLOCKS.put("wool_lightblue", new Block(35,true,false,false));
+        BLOCKS.put("wool_lightblue", new Block(35, 75,30,true,false,false));
         //37
-        BLOCKS.put("wool_yellow", new Block(36,true,false,false));
+        BLOCKS.put("wool_yellow", new Block(36, 75,31,true,false,false));
         //38
-        BLOCKS.put("wool_lime", new Block(37,true,false,false));
+        BLOCKS.put("wool_lime", new Block(37, 75,32,true,false,false));
         //39
-        BLOCKS.put("wool_pink", new Block(38,true,false,false));
+        BLOCKS.put("wool_pink", new Block(38, 75,33,true,false,false));
         //40
-        BLOCKS.put("wool_gray", new Block(39,true,false,false));
+        BLOCKS.put("wool_gray", new Block(39, 75,34,true,false,false));
         //41
-        BLOCKS.put("wool_lightgray", new Block(40,true,false,false));
+        BLOCKS.put("wool_lightgray", new Block(40, 75,35,true,false,false));
         //42
-        BLOCKS.put("wool_cyan", new Block(41,true,false,false));
+        BLOCKS.put("wool_cyan", new Block(41, 75,36,true,false,false));
         //43
-        BLOCKS.put("wool_purple", new Block(42,true,false,false));
+        BLOCKS.put("wool_purple", new Block(42, 75,37,true,false,false));
         //44
-        BLOCKS.put("wool_blue", new Block(43,true,false,false));
+        BLOCKS.put("wool_blue", new Block(43, 75,38,true,false,false));
         //45
-        BLOCKS.put("wool_brown", new Block(44,true,false,false));
+        BLOCKS.put("wool_brown", new Block(44, 75,39,true,false,false));
         //46
-        BLOCKS.put("wool_green", new Block(45,true,false,false));
+        BLOCKS.put("wool_green", new Block(45, 75,40,true,false,false));
         //47
-        BLOCKS.put("wool_red", new Block(46,true,false,false));
+        BLOCKS.put("wool_red", new Block(46, 75,41,true,false,false));
         //48
-        BLOCKS.put("wool_black", new Block(47,true,false,false));
+        BLOCKS.put("wool_black", new Block(47, 75,42,true,false,false));
         //49
-        BLOCKS.put("gold_block", new Block(48));
+        BLOCKS.put("gold_block", new Block(48, 900,43));
         //50
-        BLOCKS.put("iron_block", new Block(49));
+        BLOCKS.put("iron_block", new Block(49, 1500,44));
         //51
-        BLOCKS.put("stone_slab", new Block(0, 8, 16,8, 50, true, false, true));
+        BLOCKS.put("stone_slab", new Block(0, 8, 16,8, 50, 600,45, true, false, true));
         //52
-        BLOCKS.put("double_stone_slab", new Block(51));
+        BLOCKS.put("double_stone_slab", new Block(51, 600,45));
         //53
-        BLOCKS.put("sandstone_slab", new Block(0, 8, 16,8, 52, true, false, true));
+        BLOCKS.put("sandstone_slab", new Block(0, 8, 16,8, 52, 600,46, true, false, true));
         //54
-        BLOCKS.put("wooden_slab", new Block(0, 8, 16,8, 53, true, false, true));
+        BLOCKS.put("wooden_slab", new Block(0, 8, 16,8, 53, 180,47, true, false, true));
         //55
-        BLOCKS.put("cobblestone_slab", new Block(0, 8, 16,8, 54, true, false, true));
+        BLOCKS.put("cobblestone_slab", new Block(0, 8, 16,8, 54, 600,48, true, false, true));
         //56
-        BLOCKS.put("brick_slab", new Block(0, 8, 16,8, 55, true, false, true));
+        BLOCKS.put("brick_slab", new Block(0, 8, 16,8, 55, 600,49, true, false, true));
         //57
-        BLOCKS.put("stonebrick", new Block(64));
+        BLOCKS.put("stonebrick", new Block(64, 450,50));
         //58
-        BLOCKS.put("stone_brick_slab", new Block(0, 8, 16,8, 56, true, false, true));
+        BLOCKS.put("stone_brick_slab", new Block(0, 8, 16,8, 56, 450,51, true, false, true));
         //59
-        BLOCKS.put("cactus", new Block(1, 0, 14, 16, 57, true, false, true));
+        BLOCKS.put("cactus", new Block(1, 0, 14, 16, 57, 39,52, true, false, true));
         //60
-        BLOCKS.put("water_12", new Block(58,false,false,true));
+        BLOCKS.put("water_16", new Block(7, -1,0,false,false,true));
         //61
-        BLOCKS.put("water_8", new Block(59,false,false,true));
+        BLOCKS.put("water_12", new Block(58, -1,0,false,false,true));
         //62
-        BLOCKS.put("water_4", new Block(60,false,false,true));
+        BLOCKS.put("water_8", new Block(59, -1,0,false,false,true));
         //63
-        BLOCKS.put("lava_12", new Block(61,false,false,true));
+        BLOCKS.put("water_4", new Block(60, -1,0,false,false,true));
         //64
-        BLOCKS.put("lava_8", new Block(62,false,false,true));
+        BLOCKS.put("lava_16", new Block(8, -1,0,false,false,true));
         //65
-        BLOCKS.put("lava_4", new Block(63,false,false,true));
+        BLOCKS.put("lava_12", new Block(61, -1,0,false,false,true));
         //66
-        BLOCKS.put("obsidian", new Block(65));
+        BLOCKS.put("lava_8", new Block(62, -1,0,false,false,true));
+        //67
+        BLOCKS.put("lava_4", new Block(63, -1,0,false,false,true));
+        //68
+        BLOCKS.put("obsidian", new Block(65, 1500,53));
     }
 
     public static void load() {
         loadBlocks();
+        loadItems();
     }
 
 }