From 9553e21574edc9bc8ec50e4f1237104d2641cde3 Mon Sep 17 00:00:00 2001 From: Matt Low Date: Mon, 25 Mar 2013 14:48:34 -0600 Subject: [PATCH 1/3] Added 1.5 items --- src/net/milkbowl/vault/item/Items.java | 31 +++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/src/net/milkbowl/vault/item/Items.java b/src/net/milkbowl/vault/item/Items.java index ddfd21c..535a855 100644 --- a/src/net/milkbowl/vault/item/Items.java +++ b/src/net/milkbowl/vault/item/Items.java @@ -68,7 +68,7 @@ public class Items { items.add(new ItemInfo("Lapis Lazuli Block", new String[][]{{"lazu", "bl"}, {"blo", "lapi"}}, Material.LAPIS_BLOCK)); items.add(new ItemInfo("Dispenser", new String[][]{{"dispen"}}, Material.DISPENSER)); items.add(new ItemInfo("Sandstone", new String[][]{{"sand", "st"}}, Material.SANDSTONE)); - items.add(new ItemInfo("Decorative Sandstone", new String[][]{{"dec", "sand", "sto"}}, Material.SANDSTONE, (short) 1)); + items.add(new ItemInfo("Chiseled Sandstone", new String[][]{{"chis", "sand", "sto"}}, Material.SANDSTONE, (short) 1)); items.add(new ItemInfo("Smooth Sandstone", new String[][]{{"smoo", "sand", "sto"}}, Material.SANDSTONE, (short) 2)); items.add(new ItemInfo("Note Block", new String[][]{{"note"}}, Material.NOTE_BLOCK)); items.add(new ItemInfo("Bed Block", new String[][]{{"block", "bed"}}, Material.BED_BLOCK)); @@ -108,6 +108,7 @@ public class Items { items.add(new ItemInfo("Double Cobblestone Slab", new String[][]{{"doub", "slab", "cob", "sto"}, {"doub", "slab", "cob"}, {"doub", "step", "cob"}}, Material.DOUBLE_STEP, (short) 3)); items.add(new ItemInfo("Double Brick Slab", new String[][]{{"doub", "slab", "bri"}}, Material.DOUBLE_STEP, (short) 4)); items.add(new ItemInfo("Double Stone Brick Slab", new String[][]{{"doub", "slab", "smoo"}, {"doub", "slab", "sto", "bri"}}, Material.DOUBLE_STEP, (short) 5)); + items.add(new ItemInfo("Double Sandstone Slab", new String[][]{{"doub", "slab", "sand"}}, Material.DOUBLE_STEP, (short) 9)); items.add(new ItemInfo("Stone Slab", new String[][]{{"slab", "sto"}, {"slab"}, {"step", "ston"}}, Material.STEP)); items.add(new ItemInfo("Sandstone Slab", new String[][]{{"slab", "sand", "sto"}, {"step", "sand", "sto"}}, Material.STEP, (short) 1)); items.add(new ItemInfo("Wooden Stone Slab", new String[][]{{"slab", "woo"}, {"step", "woo"}}, Material.STEP, (short) 2)); @@ -138,9 +139,9 @@ public class Items { items.add(new ItemInfo("Redstone Ore", new String[][]{{"ore", "red"}, {"ore", "rs"}}, Material.REDSTONE_ORE)); items.add(new ItemInfo("Redstone Torch", new String[][]{{"torc", "red"}, {"torc", "rs"}}, Material.REDSTONE_TORCH_ON)); items.add(new ItemInfo("Stone Button", new String[][]{{"stone", "button"}, {"button"}}, Material.STONE_BUTTON)); - items.add(new ItemInfo("Snow Tile", new String[][]{{"tile", "snow"}, {"snow", "slab"}}, Material.SNOW)); + items.add(new ItemInfo("Snow", new String[][]{{"tile", "snow"}, {"snow", "slab"}, {"snow"}}, Material.SNOW)); items.add(new ItemInfo("Ice", new String[][]{{"ice"}}, Material.ICE)); - items.add(new ItemInfo("Snow Block", new String[][]{{"snow"}}, Material.SNOW_BLOCK)); + items.add(new ItemInfo("Snow Block", new String[][]{{"blo", "snow"}}, Material.SNOW_BLOCK)); items.add(new ItemInfo("Cactus", new String[][]{{"cact"}}, Material.CACTUS)); items.add(new ItemInfo("Clay Block", new String[][]{{"clay", "blo"}}, Material.CLAY)); items.add(new ItemInfo("Jukebox", new String[][]{{"jukeb"}}, Material.JUKEBOX)); @@ -161,7 +162,7 @@ public class Items { items.add(new ItemInfo("Melon Block", new String[][]{{"melon"}}, Material.MELON_BLOCK)); items.add(new ItemInfo("Mossy Stone Brick", new String[][]{{"moss", "sto", "bri"}, {"moss", "smoo", "bri"}, {"moss", "smoo"}, {"moss", "sto"}}, Material.SMOOTH_BRICK, (short) 1)); items.add(new ItemInfo("Cracked Stone Brick", new String[][]{{"cra", "sto", "bri"}, {"cra", "sto"}, {"cra", "smoo", "bri"}, {"cra", "smoo"}}, Material.SMOOTH_BRICK, (short) 2)); - items.add(new ItemInfo("Circle Stone Brick", new String[][]{{"circ", "sto", "bri"}, {"cir", "sto"}, {"cir", "smoo", "bri"}}, Material.SMOOTH_BRICK, (short) 3)); + items.add(new ItemInfo("Chiseled Stone Brick", new String[][]{{"chis", "sto", "bri"}, {"chis", "sto"}, {"chis", "smoo", "bri"}}, Material.SMOOTH_BRICK, (short) 3)); items.add(new ItemInfo("Brick Stairs", new String[][]{{"stair", "bri"}}, Material.BRICK_STAIRS)); items.add(new ItemInfo("Fence Gate", new String[][]{{"gate", "fen"}, {"gate"}}, Material.FENCE_GATE)); items.add(new ItemInfo("Vines", new String[][]{{"vine"}, {"ivy"}}, Material.VINE)); @@ -481,7 +482,27 @@ public class Items { items.add(new ItemInfo("Brown Firework Star", new String[][]{{"bro", "fire", "star"}}, Material.FIREWORK_CHARGE, (short) 13)); items.add(new ItemInfo("Green Firework Star", new String[][]{{"gre", "fire", "star"}}, Material.FIREWORK_CHARGE, (short) 14)); items.add(new ItemInfo("Red Firework Star", new String[][]{{"red", "fire", "star"}}, Material.FIREWORK_CHARGE, (short) 15)); - items.add(new ItemInfo("Block Firework Star", new String[][]{{"bla", "fire", "star"}}, Material.FIREWORK_CHARGE, (short) 16)); + items.add(new ItemInfo("Black Firework Star", new String[][]{{"bla", "fire", "star"}}, Material.FIREWORK_CHARGE, (short) 16)); + //1.5 Blocks & Items + items.add(new ItemInfo("Activator Rail", new String[][]{{"rail", "acti"}, {"trac", "acti"}, {"activ"}}, Material.ACTIVATOR_RAIL)); + items.add(new ItemInfo("Block of Redstone", new String[][]{{"blo", "red"}, {"blo", "rs"}}, Material.REDSTONE_BLOCK)); + items.add(new ItemInfo("Daylight Sensor", new String[][]{{"day", "sen"}, {"ligh", "sen"}}, Material.DAYLIGHT_DETECTOR)); + items.add(new ItemInfo("Dropper", new String[][]{{"drop"}}, Material.DROPPER)); + items.add(new ItemInfo("Hopper", new String[][]{{"hop", "item"}, {"hop"}}, Material.HOPPER)); + items.add(new ItemInfo("Explosive Minecart", new String[][]{{"cart", "tnt"}, {"cart", "exp"}}, Material.EXPLOSIVE_MINECART)); + items.add(new ItemInfo("Hopper Minecart", new String[][]{{"cart", "hop"}, {"hop"}}, Material.HOPPER_MINECART)); + items.add(new ItemInfo("Redstone Comparator", new String[][]{{"rs", "comp"}, {"red", "comp"}, {"compar"}}, Material.REDSTONE_COMPARATOR)); + items.add(new ItemInfo("Trapped Chest", new String[][]{{"tra", "ches"}}, Material.TRAPPED_CHEST)); + items.add(new ItemInfo("Nether Brick Item", new String[][]{{"neth", "bric", "it"}}, Material.NETHER_BRICK_ITEM)); + items.add(new ItemInfo("Nether Quartz", new String[][]{{"neth", "qua"}, {"qua"}}, Material.QUARTZ)); + items.add(new ItemInfo("Nether Quartz Ore", new String[][]{{"neth", "qua", "ore"}, {"qua", "ore"}}, Material.QUARTZ_ORE)); + items.add(new ItemInfo("Quartz Block", new String[][]{{"qua", "blo"}}, Material.QUARTZ_BLOCK)); + items.add(new ItemInfo("Quartz Slab", new String[][]{{"qua", "slab"}, {"qua", "step"}}, Material.STEP, (short) 7)); + items.add(new ItemInfo("Quartz Stairs", new String[][]{{"qua", "stair"}}, Material.QUARTZ_STAIRS)); + items.add(new ItemInfo("Chiseled Quartz", new String[][]{{"qua", "bric", "it"}}, Material.QUARTZ_BLOCK, (short) 1)); + items.add(new ItemInfo("Quartz Pillar", new String[][]{{"qua", "pil"}}, Material.QUARTZ_BLOCK, (short) 2)); + items.add(new ItemInfo("Weighted Gold Plate", new String[][]{{"wei", "plat", "gol"}, {"pres", "plat", "iro"}}, Material.GOLD_PLATE)); + items.add(new ItemInfo("Weighted Iron Plate", new String[][]{{"wei", "plat", "iro"}, {"pres", "plat", "iro"}}, Material.IRON_PLATE)); } public static ItemInfo itemById(int typeId) { From 194ef3f318d188039bf67f7148299eb617b01d98 Mon Sep 17 00:00:00 2001 From: Matt Low Date: Mon, 25 Mar 2013 14:55:50 -0600 Subject: [PATCH 2/3] oops, fixed Chiseled Quartz --- src/net/milkbowl/vault/item/Items.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/milkbowl/vault/item/Items.java b/src/net/milkbowl/vault/item/Items.java index 535a855..a33e5cb 100644 --- a/src/net/milkbowl/vault/item/Items.java +++ b/src/net/milkbowl/vault/item/Items.java @@ -499,7 +499,7 @@ public class Items { items.add(new ItemInfo("Quartz Block", new String[][]{{"qua", "blo"}}, Material.QUARTZ_BLOCK)); items.add(new ItemInfo("Quartz Slab", new String[][]{{"qua", "slab"}, {"qua", "step"}}, Material.STEP, (short) 7)); items.add(new ItemInfo("Quartz Stairs", new String[][]{{"qua", "stair"}}, Material.QUARTZ_STAIRS)); - items.add(new ItemInfo("Chiseled Quartz", new String[][]{{"qua", "bric", "it"}}, Material.QUARTZ_BLOCK, (short) 1)); + items.add(new ItemInfo("Chiseled Quartz", new String[][]{{"qua", "chis"}}, Material.QUARTZ_BLOCK, (short) 1)); items.add(new ItemInfo("Quartz Pillar", new String[][]{{"qua", "pil"}}, Material.QUARTZ_BLOCK, (short) 2)); items.add(new ItemInfo("Weighted Gold Plate", new String[][]{{"wei", "plat", "gol"}, {"pres", "plat", "iro"}}, Material.GOLD_PLATE)); items.add(new ItemInfo("Weighted Iron Plate", new String[][]{{"wei", "plat", "iro"}, {"pres", "plat", "iro"}}, Material.IRON_PLATE)); From 48fede60571a3471cbb042837e7aa38dbe3c338d Mon Sep 17 00:00:00 2001 From: Matt Low Date: Mon, 25 Mar 2013 14:58:58 -0600 Subject: [PATCH 3/3] why did you get left out?! --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8d2843..7e724dd 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.bukkit craftbukkit - 1.4.7-R1.0 + 1.5.1-R0.1-SNAPSHOT de.hydrox.bukkit.DroxPerms