X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FItems.java;h=db32ad13b5d25e7bb86f85672121ac6a99365c95;hb=1cc111dfe31e7f7098e01afeaa025e19f91aa624;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..db32ad1 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/Items.java +++ b/core/src/ru/deadsoftware/cavecraft/game/Items.java @@ -2,21 +2,151 @@ 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 BLOCKS = new ArrayMap(); + public static ArrayList ITEMS = new ArrayList(); 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)); + } public static void loadBlocks() { @@ -141,23 +271,28 @@ public class Items { //59 BLOCKS.put("cactus", new Block(1, 0, 14, 16, 57, true, false, true)); //60 - BLOCKS.put("water_12", new Block(58,false,false,true)); + BLOCKS.put("water_16", new Block(7,false,false,true)); //61 - BLOCKS.put("water_8", new Block(59,false,false,true)); + BLOCKS.put("water_12", new Block(58,false,false,true)); //62 - BLOCKS.put("water_4", new Block(60,false,false,true)); + BLOCKS.put("water_8", new Block(59,false,false,true)); //63 - BLOCKS.put("lava_12", new Block(61,false,false,true)); + BLOCKS.put("water_4", new Block(60,false,false,true)); //64 - BLOCKS.put("lava_8", new Block(62,false,false,true)); + BLOCKS.put("lava_16", new Block(8,false,false,true)); //65 - BLOCKS.put("lava_4", new Block(63,false,false,true)); + BLOCKS.put("lava_12", new Block(61,false,false,true)); //66 + BLOCKS.put("lava_8", new Block(62,false,false,true)); + //67 + BLOCKS.put("lava_4", new Block(63,false,false,true)); + //68 BLOCKS.put("obsidian", new Block(65)); } public static void load() { loadBlocks(); + loadItems(); } }