From 6035f1b1fc1ca527ff0eba91817fb83d41fede70 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Thu, 12 Dec 2013 19:00:14 +1300 Subject: [PATCH 01/14] test --- plugins/factoids.py | 4 ++-- plugins/{pyexec.py => python.py} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename plugins/{pyexec.py => python.py} (80%) diff --git a/plugins/factoids.py b/plugins/factoids.py index a6610b2..1d90e66 100644 --- a/plugins/factoids.py +++ b/plugins/factoids.py @@ -1,5 +1,5 @@ # Written by Scaevolus 2010 -from util import hook, http, text, execute +from util import hook, http, text, pyexec import string import re @@ -132,7 +132,7 @@ def factoid(inp, message=None, db=None, bot=None, action=None, conn=None, input= variables = 'input="""{}"""; nick="{}"; chan="{}"; bot_nick="{}";'.format(arguments.replace('"', '\\"'), input.nick, input.chan, input.conn.nick) - result = execute.eval_py(variables + code) + result = pyexec.eval_py(variables + code) else: result = data diff --git a/plugins/pyexec.py b/plugins/python.py similarity index 80% rename from plugins/pyexec.py rename to plugins/python.py index 98fecc2..5cdc524 100644 --- a/plugins/pyexec.py +++ b/plugins/python.py @@ -1,5 +1,5 @@ from util import hook -from util.execute import eval_py +from util.pyexec import eval_py @hook.command From 1f403bcd7a24475a82360146b46ec2ebc8ab21a5 Mon Sep 17 00:00:00 2001 From: Matt Anthony Date: Wed, 1 Jan 2014 17:53:37 -0500 Subject: [PATCH 02/14] Update recipes.txt Add all 1.6 and 1.7 blocks. --- plugins/data/recipes.txt | 62 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/plugins/data/recipes.txt b/plugins/data/recipes.txt index 14ce8cf..2b0e1db 100644 --- a/plugins/data/recipes.txt +++ b/plugins/data/recipes.txt @@ -1,7 +1,7 @@ //Minecraft Recipes List //Created by _303 //Obtained from https://github.com/ClouDev/CloudBot/blob/develop/plugins/data/recipes.txt -//Edited by _frozen +//Edited by CHCMATT for Minecraft version: 1.7.4 // //Summary of Use: Each column is seperated by a comma (,) and rows by a vertical bar (|). Order of Recipes & Categories taken from //www.minecraftwiki.net/wiki/Crafting for easier updating in the future (The Future!) @@ -21,7 +21,10 @@ 1x Block of Gold: Gold Ingot, Gold Ingot, Gold Ingot | Gold Ingot, Gold Ingot, Gold Ingot | Gold Ingot, Gold Ingot, Gold Ingot 1x Block of Iron: Iron Ingot, Iron Ingot, Iron Ingot | Iron Ingot, Iron Ingot, Iron Ingot | Iron Ingot, Iron Ingot, Iron Ingot 1x Block of Diamond: Diamond, Diamond, Diamond | Diamond, Diamond, Diamond | Diamond, Diamond, Diamond +1x Block of Coal: Coal, Coal, Coal | Coal, Coal, Coal | Coal, Coal, Coal +1x Block of Redstone: Redstone Dust, Redstone Dust, Redstone Dust | Redstone Dust, Redstone Dust, Redstone Dust | Redstone Dust, Redstone Dust, Redstone Dust 1x Lapis Lazuli Block: Lapis Lazuli, Lapis Lazuli, Lapis Lazuli | Lapis Lazuli, Lapis Lazuli, Lapis Lazuli | Lapis Lazuli, Lapis Lazuli, Lapis Lazuli +1x Emerald Block: Emerald, Emerald, Emerald | Emerald, Emerald, Emerald | Emerald, Emerald, Emerald 1x Glowstone: Glowstone Dust, Glowstone Dust | Glowstone Dust, Glowstone Dust 1x Wool: String, String | String, String 1x TNT: Gunpowder, Sand, Gunpowder | Sand, Gunpowder, Sand | Gunpowder, Sand, Gunpowder @@ -117,6 +120,7 @@ 6x Powered Rail: Gold Ingot, None, Gold Ingot | Gold Ingot, Stick, Gold Ingot | Gold Ingot, Redstone, Gold Ingot 6x Detector Rail: Iron Ingot, None, Iron Ingot | Iron Ingot, Pressure Plate, Iron Ingot | Iron Ingot, Redstone, Iron Ingot 1x Boat: Wooden Planks, None, Wooden Planks | Wooden Planks, Wooden Planks, Wooden Planks +1x Carrot On A Stick: Fishing Rod | None, Carrot // //Mechanism Recipes // @@ -125,7 +129,8 @@ 2x Trapdoor: Wooden Planks, Wooden Planks, Wooden Planks | Wooden Planks, Wooden Planks, Wooden Planks 1x Stone Pressure Plate: Stone, Stone 1x Wooden Pressure Plate: Wooden Planks, Wooden Planks -1x Button: Stone | Stone +1x Stone Button: Stone +1x Wooden Button: Wooden Planks 1x Redstone Torch: Redstone | Stick 1x Lever: Stick | Cobblestone 1x Note Block: Wooden Planks, Wooden Planks, Wooden Planks | Wooden Planks, Redstone, Wooden Planks | Wooden Planks, Wooden Planks, Wooden Planks @@ -133,8 +138,13 @@ 1x Dispenser: Cobblestone, Cobblestone, Cobblestone | Cobblestone, Bow, Cobblestone | Cobblestone, Redstone, Cobblestone 1x Redstone Repeater: Redstone Torch, Redstone, Redstone Torch | Stone, Stone, Stone 1x Piston: Wooden Planks, Wooden Planks, Wooden Planks | Cobblestone, Iron Ingot, Cobblestone | Cobblestone, Redstone, Cobblestone -1x Sticky Piston: none, slime ball, none | none, piston, none -1x Redstone Lamp: none, redstone dust, none | redstone dust, glowstone block, redstone | none, redstone dust, none +1x Sticky Piston: Slime Ball | Piston +1x Redstone Lamp: None, Redstone Dust, None | Redstone Dust, Glowstone Block, Redstone Dust | None, Redstone Dust, None +1x Trapped Chest: Chest, Tripwire Hook +1x Dropper: Cobblestone, Cobblestone, Cobblestone | Cobblestone, None, Cobblestone | Cobblestone, Redstone Dust, Cobblestone +1x Weighted Pressure Plate (Heavy): Iron Ingot, Iron Ingot +1x Weighted Pressure Plate (Light): Gold Ingot, Gold Ingot +2x Tripwire Hook: Iron Ingot | Stick | Wooden Planks // //Food Recipes // @@ -169,6 +179,11 @@ 9x Gold Nugget: Gold Ingot 1x Gold Ingot: Gold Nugget, Gold Nugget, Gold Nugget | Gold Nugget, Gold Nugget, Gold Nugget | Gold Nugget, Gold Nugget, Gold Nugget 1x Eye of Ender: Ender Pearl | Blaze Powder +1x Item Frame: Stick, Stick, Stick | Stick, Leather, Stick | Stick, Stick, Stick +1x Anvil: Block of Iron, Block of Iron, Block of Iron | None, Iron Ingot, None | Iron Ingot, Iron Ingot, Iron Ingot +1x Ender Chest: Obsidian, Obsidian, Obsidian | Osbidian, Eye of Ender, Obsidian | Obsidian, Obsidian, Obsidian +1x Flower Pot: Brick, None, Brick | None, Brick, None +2x Lead: None, String, String | None, Slime Ball, String | String, None, None // //Dye Recipes // @@ -214,4 +229,41 @@ 1x Fermented Spider Eye: Spider Eye | Brown Mushroom, Sugar 1x Glistering Melon: Melon Slice, Gold Nugget 9x Gold Nugget: Gold Ingot -1x Enchantment Table: None, Book, None | Diamond, Obsidian, Diamond | Obsidian, Obsidian, Obsidian \ No newline at end of file +1x Enchantment Table: None, Book, None | Diamond, Obsidian, Diamond | Obsidian, Obsidian, Obsidian +// +//Stained Glass Recipes +// +8x White Stained Glass: Glass, Glass, Glass | Glass, Bone Meal, Glass | Glass, Glass, Glass +8x Orange Stained Glass: Glass, Glass, Glass | Glass, Orange Dye, Glass | Glass, Glass, Glass +8x Magenta Stained Glass: Glass, Glass, Glass | Glass, Magenta Dye, Glass | Glass, Glass, Glass +8x Light Blue Stained Glass: Glass, Glass, Glass | Glass, Light Blue Dye, Glass | Glass, Glass, Glass +8x Yellow Stained Glass: Glass, Glass, Glass | Glass, Dandelion Yellow, Glass | Glass, Glass, Glass +8x Lime Stained Glass: Glass, Glass, Glass | Glass, Lime Dye, Glass | Glass, Glass, Glass +8x Pink Stained Glass: Glass, Glass, Glass | Glass, Pink Dye, Glass | Glass, Glass, Glass +8x Gray Stained Glass: Glass, Glass, Glass | Glass, Gray Dye, Glass | Glass, Glass, Glass +8x Light Gray Stained Glass: Glass, Glass, Glass | Glass, Light Gray Dye, Glass | Glass, Glass, Glass +8x Cyan Stained Glass: Glass, Glass, Glass | Glass, Cyan Dye, Glass | Glass, Glass, Glass +8x Purple Stained Glass: Glass, Glass, Glass | Glass, Purple Dye, Glass | Glass, Glass, Glass +8x Blue Stained Glass: Glass, Glass, Glass | Glass, Lapis Lazuli, Glass | Glass, Glass, Glass +8x Brown Stained Glass: Glass, Glass, Glass | Glass, Cocoa Beans, Glass | Glass, Glass, Glass +8x Green Stained Glass: Glass, Glass, Glass | Glass, Cactus Green, Glass | Glass, Glass, Glass +8x Red Stained Glass: Glass, Glass, Glass | Glass, Rose Red, Glass | Glass, Glass, Glass +8x Black Stained Glass: Glass, Glass, Glass | Glass, Inc Sac, Glass | Glass, Glass, Glass +// +//Stained Glass Panes +// +16x White Stained Glass Panes: White Stained Glass, White Stained Glass, White Stained Glass | White Stained Glass, White Stained Glass, White Stained Glass +16x Orange Stained Glass Panes: Orange Stained Glass, Orange Stained Glass, Orange Stained Glass | Orange Stained Glass, Orange Stained Glass, Orange Stained Glass +16x Magenta Stained Glass Panes: Magenta Stained Glass, Magenta Stained Glass, Magenta Stained Glass | Magenta Stained Glass, Magenta Stained Glass, Magenta Stained Glass +16x Light Blue Stained Glass Panes: Light Blue Stained Glass, Light Blue Stained Glass, Light Blue Stained Glass | Light Blue Stained Glass, Light Blue Stained Glass, Light Blue Stained Glass +16x Yellow Stained Glass Panes: Yellow Stained Glass, Yellow Stained Glass, Yellow Stained Glass | Yellow Stained Glass, Yellow Stained Glass, Yellow Stained Glass +16x Lime Stained Glass Panes: Lime Stained Glass, Lime Stained Glass, Lime Stained Glass | Lime Stained Glass, Lime Stained Glass, Lime Stained Glass +16x Pink Stained Glass Panes: Pink Stained Glass, Pink Stained Glass, Pink Stained Glass | Pink Stained Glass, Pink Stained Glass, Pink Stained Glass +16x Gray Stained Glass Panes: Gray Stained Glass, Gray Stained Glass, Gray Stained Glass | Gray Stained Glass, Gray Stained Glass, Gray Stained Glass +16x Light Gray Stained Glass Panes: Light Gray Stained Glass, Light Gray Stained Glass, Light Gray Stained Glass | Light Gray Stained Glass, Light Gray Stained Glass, Light Gray Stained Glass +16x Cyan Stained Glass Panes: Cyan Stained Glass, Cyan Stained Glass, Cyan Stained Glass | Cyan Stained Glass, Cyan Stained Glass, Cyan Stained Glass +16x Purple Stained Glass Panes: Purple Stained Glass, Purple Stained Glass, Purple Stained Glass | Purple Stained Glass, Purple Stained Glass, Purple Stained Glass +16x Blue Stained Glass Panes: Blue Stained Glass, Blue Stained Glass, Blue Stained Glass | Blue Stained Glass, Blue Stained Glass, Blue Stained Glass +16x Brown Stained Glass Panes: Brown Stained Glass, Brown Stained Glass, Brown Stained Glass | Brown Stained Glass, Brown Stained Glass, Brown Stained Glass +16x Green Stained Glass Panes: Green Stained Glass, Green Stained Glass, Green Stained Glass | Green Stained Glass, Green Stained Glass, Green Stained Glass +16x Black Stained Glass Panes: Black Stained Glass, Black Stained Glass, Black Stained Glass | Black Stained Glass, Black Stained Glass, Black Stained Glass From 1febd1362d8b74a03dfb7c985aa7faaff2e7c705 Mon Sep 17 00:00:00 2001 From: Nathan Blaney Date: Sat, 4 Jan 2014 15:19:49 +1100 Subject: [PATCH 03/14] Added pycrypto requirement --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index ae3c175..94832f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ lxml==3.1beta1 pyenchant==1.6.5 pydns>=2.3.6 BeautifulSoup4 +pycrypto From d17234828c58620672dc3339338762fd55139070 Mon Sep 17 00:00:00 2001 From: Matt Anthony Date: Sun, 12 Jan 2014 17:36:59 -0500 Subject: [PATCH 04/14] Update itemids.txt to Snapshot 14w02c Remove ALL items and re-add EVERYTHING up to Snapshot 14w02c. --- plugins/data/itemids.txt | 1157 ++++++++++++++++++++------------------ 1 file changed, 620 insertions(+), 537 deletions(-) diff --git a/plugins/data/itemids.txt b/plugins/data/itemids.txt index b4d991e..4f0ce1d 100644 --- a/plugins/data/itemids.txt +++ b/plugins/data/itemids.txt @@ -1,537 +1,620 @@ -1 Stone -2 Grass -3 Dirt -4 Cobblestone -5 Wooden Plank (Oak) -5:1 Wooden Plank (Spruce) -5:2 Wooden Plank (Birch) -5:3 Wooden Plank (Jungle) -6 Sapling (Oak) -6:1 Sapling (Spruce) -6:2 Sapling (Birch) -6:3 Sapling (Jungle) -7 Bedrock -8 Water -9 Water (No Spread) -10 Lava -11 Lava (No Spread) -12 Sand -13 Gravel -14 Gold Ore -15 Iron Ore -16 Coal Ore -17 Wood (Oak) -17:1 Wood (Spruce) -17:2 Wood (Birch) -17:3 Wood (Jungle) -18 Leaves (Oak) -18:1 Leaves (Spruce) -18:2 Leaves (Birch) -18:3 Leaves (Jungle) -19 Sponge -20 Glass -21 Lapis Lazuli Ore -22 Lapis Lazuli Block -23 Dispenser -24 Sandstone -24:1 Sandstone (Chiseled) -24:2 Sandstone (Smooth) -25 Note Block -26 Bed (Block) -27 Powered Rail -28 Detector Rail -29 Sticky Piston -30 Cobweb -31 Tall Grass (Dead Shrub) -31:1 Tall Grass -31:2 Tall Grass (Fern) -32 Dead Shrub -33 Piston -34 Piston (Head) -35 Wool -35:1 Orange Wool -35:2 Magenta Wool -35:3 Light Blue Wool -35:4 Yellow Wool -35:5 Lime Wool -35:6 Pink Wool -35:7 Gray Wool -35:8 Light Gray Wool -35:9 Cyan Wool -35:10 Purple Wool -35:11 Blue Wool -35:12 Brown Wool -35:13 Green Wool -35:14 Red Wool -35:15 Black Wool -36 Piston (Moving) -37 Dandelion -38 Rose -39 Brown Mushroom -40 Red Mushroom -41 Block of Gold -42 Block of Iron -43 Stone Slab (Double) -43:1 Sandstone Slab (Double) -43:2 Wooden Slab (Double) -43:3 Cobblestone Slab (Double) -43:4 Brick Slab (Double) -43:5 Stone Brick Slab (Double) -43:6 Nether Brick Slab (Double) -43:7 Quartz Slab (Double) -43:8 Smooth Stone Slab (Double) -43:9 Smooth Sandstone Slab (Double) -44 Stone Slab -44:1 Sandstone Slab -44:2 Wooden Slab -44:3 Cobblestone Slab -44:4 Brick Slab -44:5 Stone Brick Slab -44:6 Nether Brick Slab -44:7 Quartz Slab -45 Brick -46 TNT -47 Bookcase -48 Moss Stone -49 Obsidian -50 Torch -51 Fire -52 Mob Spawner -53 Wooden Stairs (Oak) -54 Chest -55 Redstone Wire -56 Diamond Ore -57 Block of Diamond -58 Workbench -59 Wheat (Crop) -60 Farmland -61 Furnace -62 Furnace (Smelting) -63 Sign (Block) -64 Wood Door (Block) -65 Ladder -66 Rail -67 Cobblestone Stairs -68 Sign (Wall Block) -69 Lever -70 Stone Pressure Plate -71 Iron Door (Block) -72 Wooden Pressure Plate -73 Redstone Ore -74 Redstone Ore (Glowing) -75 Redstone Torch (Off) -76 Redstone Torch -77 Button (Stone) -78 Snow -79 Ice -80 Snow Block -81 Cactus -82 Clay Block -83 Sugar Cane (Block) -84 Jukebox -85 Fence -86 Pumpkin -87 Netherrack -88 Soul Sand -89 Glowstone -90 Portal -91 Jack-O-Lantern -92 Cake (Block) -93 Redstone Repeater (Block Off) -94 Redstone Repeater (Block On) -95 Locked Chest -96 Trapdoor -97 Silverfish Stone -97:1 Silverfish Cobblestone -97:2 Silverfish Stone Brick -98 Stone Bricks -98:1 Mossy Stone Bricks -98:2 Cracked Stone Bricks -98:3 Chiseled Stone Brick -99 Brown Mushroom (Block) -100 Red Mushroom (Block) -101 Iron Bars -102 Glass Pane -103 Melon (Block) -104 Pumpkin Vine -105 Melon Vine -106 Vines -107 Fence Gate -108 Brick Stairs -109 Stone Brick Stairs -110 Mycelium -111 Lily Pad -112 Nether Brick -113 Nether Brick Fence -114 Nether Brick Stairs -115 Nether Wart -116 Enchantment Table -117 Brewing Stand (Block) -118 Cauldron (Block) -119 End Portal -120 End Portal Frame -121 End Stone -122 Dragon Egg -123 Redstone Lamp -124 Redstone Lamp (On) -125 Oak-Wood Slab (Double) -125:1 Spruce-Wood Slab (Double) -125:2 Birch-Wood Slab (Double) -125:3 Jungle-Wood Slab (Double) -126 Oak-Wood Slab -126:1 Spruce-Wood Slab -126:2 Birch-Wood Slab -126:3 Jungle-Wood Slab -127 Coca Plant -128 Sandstone Stairs -129 Emerald Ore -130 Ender Chest -131 Tripwire Hook -132 Tripwire -133 Block of Emerald -134 Wooden Stairs (Spruce) -135 Wooden Stairs (Birch) -136 Wooden Stairs (Jungle) -137 Command Block -138 Beacon -139 Cobblestone Wall -139:1 Mossy Cobblestone Wall -140 Flower Pot (Block) -141 Carrot (Crop) -142 Potatoes (Crop) -143 Button (Wood) -144 Head Block (Skeleton) -144:1 Head Block (Wither) -144:2 Head Block (Zombie) -144:3 Head Block (Steve) -144:4 Head Block (Creeper) -145 Anvil -145:1 Anvil (Slightly Damaged) -145:2 Anvil (Very Damaged) -146 Trapped Chest -147 Weighted Pressure Plate (Light) -148 Weighted Pressure Plate (Heavy) -149 Redstone Comparator (Off) -150 Redstone Comparator (On) -151 Daylight Sensor -152 Block of Redstone -153 Nether Quartz Ore -154 Hopper -155 Quartz Block -155:1 Chiseled Quartz Block -155:2 Pillar Quartz Block -156 Quartz Stairs -157 Activator Rail -158 Dropper -159 Stained Clay (White) -159:1 Stained Clay (Orange) -159:2 Stained Clay (Magenta) -159:3 Stained Clay (Light Blue) -159:4 Stained Clay (Yellow) -159:5 Stained Clay (Lime) -159:6 Stained Clay (Pink) -159:7 Stained Clay (Gray) -159:8 Stained Clay (Light Gray) -159:9 Stained Clay (Cyan) -159:10 Stained Clay (Purple) -159:11 Stained Clay (Blue) -159:12 Stained Clay (Brown) -159:13 Stained Clay (Green) -159:14 Stained Clay (Red) -159:15 Stained Clay (Black) -170 Hay Bale -171 Carpet (White) -171:1 Carpet (Orange) -171:2 Carpet (Magenta) -171:3 Carpet (Light Blue) -171:4 Carpet (Yellow) -171:5 Carpet (Lime) -171:6 Carpet (Pink) -171:7 Carpet (Grey) -171:8 Carpet (Light Gray) -171:9 Carpet (Cyan) -171:10 Carpet (Purple) -171:11 Carpet (Blue) -171:12 Carpet (Brown) -171:13 Carpet (Green) -171:14 Carpet (Red) -171:15 Carpet (Black) -172 Hardened Clay -173 Block of Coal -256 Iron Shovel -257 Iron Pickaxe -258 Iron Axe -259 Flint and Steel -260 Apple -261 Bow -262 Arrow -263 Coal -263:1 Charcoal -264 Diamond Gem -265 Iron Ingot -266 Gold Ingot -267 Iron Sword -268 Wooden Sword -269 Wooden Shovel -270 Wooden Pickaxe -271 Wooden Axe -272 Stone Sword -273 Stone Shovel -274 Stone Pickaxe -275 Stone Axe -276 Diamond Sword -277 Diamond Shovel -278 Diamond Pickaxe -279 Diamond Axe -280 Stick -281 Bowl -282 Mushroom Stew -283 Gold Sword -284 Gold Shovel -285 Gold Pickaxe -286 Gold Axe -287 String -288 Feather -289 Gunpowder -290 Wooden Hoe -291 Stone Hoe -292 Iron Hoe -293 Diamond Hoe -294 Gold Hoe -295 Wheat Seeds -296 Wheat -297 Bread -298 Leather Helmet -299 Leather Chestplate -300 Leather Leggings -301 Leather Boots -302 Chainmail Helmet -303 Chainmail Chestplate -304 Chainmail Leggings -305 Chainmail Boots -306 Iron Helmet -307 Iron Chestplate -308 Iron Leggings -309 Iron Boots -310 Diamond Helmet -311 Diamond Chestplate -312 Diamond Leggings -313 Diamond Boots -314 Gold Helmet -315 Gold Chestplate -316 Gold Leggings -317 Gold Boots -318 Flint -319 Raw Porkchop -320 Cooked Porkchop -321 Painting -322 Golden Apple -322:1 Enchanted Golden Apple -323 Sign -324 Wooden Door -325 Bucket -326 Bucket (Water) -327 Bucket (Lava) -328 Minecart -329 Saddle -330 Iron Door -331 Redstone Dust -332 Snowball -333 Boat -334 Leather -335 Bucket (Milk) -336 Clay Brick -337 Clay -338 Sugar Cane -339 Paper -340 Book -341 Slime Ball -342 Storage Minecart -343 Powered Minecart -344 Egg -345 Compass -346 Fishing Rod -347 Watch -348 Glowstone Dust -349 Raw Fish -350 Cooked Fish -351 Ink Sack -351:1 Rose Red Dye -351:2 Cactus Green Dye -351:3 Coca Bean -351:4 Lapis Lazuli -351:5 Purple Dye -351:6 Cyan Dye -351:7 Light Gray Dye -351:8 Gray Dye -351:9 Pink Dye -351:10 Lime Dye -351:11 Dandelion Yellow Dye -351:12 Light Blue Dye -351:13 Magenta Dye -351:14 Orange Dye -351:15 Bone Meal -352 Bone -353 Sugar -354 Cake -355 Bed -356 Redstone Repeater -357 Cookie -358 Map -359 Shears -360 Melon (Slice) -361 Pumpkin Seeds -362 Melon Seeds -363 Raw Beef -364 Steak -365 Raw Chicken -366 Cooked Chicken -367 Rotten Flesh -368 Ender Pearl -369 Blaze Rod -370 Ghast Tear -371 Gold Nugget -372 Nether Wart Seeds -373 Water Bottle -373:16 Awkward Potion -373:32 Thick Potion -373:64 Mundane Potion -373:8193 Regeneration Potion (0:45) -373:8194 Swiftness Potion (3:00) -373:8195 Fire Resistance Potion (3:00) -373:8196 Poison Potion (0:45) -373:8197 Healing Potion -373:8198 Night Vision Potion (3:00) -373:8200 Weakness Potion (1:30) -373:8201 Strength Potion (3:00) -373:8202 Slowness Potion (1:30) -373:8204 Harming Potion -373:8206 Invisibility Potion (3:00) -373:8225 Regeneration Potion II (0:22) -373:8226 Swiftness Potion II (1:30) -373:8228 Poison Potion II (0:22) -373:8229 Healing Potion II -373:8233 Strength Potion II (1:30) -373:8236 Harming Potion II -373:8257 Regeneration Potion (2:00) -373:8258 Swiftness Potion (8:00) -373:8259 Fire Resistance Potion (8:00) -373:8260 Poison Potion (2:00) -373:8262 Night Vision Potion (8:00) -373:8264 Weakness Potion (4:00) -373:8265 Strength Potion (8:00) -373:8266 Slowness Potion (4:00) -373:8270 Invisibility Potion (8:00) -373:8289 Regeneration Potion II (1:00) -373:8290 Swiftness Potion II (4:00) -373:8292 Poison Potion II (1:00) -373:8297 Strength Potion II (4:00) -373:16385 Regeneration Splash (0:33) -373:16386 Swiftness Splash (2:15) -373:16387 Fire Resistance Splash (2:15) -373:16388 Poison Splash (0:33) -373:16389 Healing Splash -373:16390 Night Vision Splash (2:15) -373:16392 Weakness Splash (1:07) -373:16393 Strength Splash (2:15) -373:16394 Slowness Splash (1:07) -373:16396 Harming Splash -373:16398 Invisibility Splash (2:15) -373:16417 Regeneration Splash II (0:16) -373:16418 Swiftness Splash II (1:07) -373:16420 Poison Splash II (0:16) -373:16421 Healing Splash II -373:16425 Strength Splash II (1:07) -373:16428 Harming Splash II -373:16449 Regeneration Splash (1:30) -373:16450 Swiftness Splash (6:00) -373:16451 Fire Resistance Splash (6:00) -373:16452 Poison Splash (1:30) -373:16454 Night Vision Splash (6:00) -373:16456 Weakness Splash (3:00) -373:16457 Strength Splash (6:00) -373:16458 Slowness Splash (3:00) -373:16462 Invisibility Splash (6:00) -373:16481 Regeneration Splash II (0:45) -373:16482 Swiftness Splash II (3:00) -373:16484 Poison Splash II (0:45) -373:16489 Strength Splash II (3:00) -374 Glass Bottle -375 Spider Eye -376 Fermented Spider Eye -377 Blaze Powder -378 Magma Cream -379 Brewing Stand -380 Cauldron -381 Eye of Ender -382 Glistering Melon (Slice) -383:50 Spawn Egg (Creeper) -383:51 Spawn Egg (Skeleton) -383:52 Spawn Egg (Spider) -383:54 Spawn Egg (Zombie) -383:55 Spawn Egg (Slime) -383:56 Spawn Egg (Ghast) -383:57 Spawn Egg (Zombie Pigmen) -383:58 Spawn Egg (Endermen) -383:59 Spawn Egg (Cave Spider) -383:60 Spawn Egg (Silverfish) -383:61 Spawn Egg (Blaze) -383:62 Spawn Egg (Magma Cube) -383:65 Spawn Egg (Bat) -383:66 Spawn Egg (Witch) -383:90 Spawn Egg (Pig) -383:91 Spawn Egg (Sheep) -383:92 Spawn Egg (Cow) -383:93 Spawn Egg (Chicken) -383:94 Spawn Egg (Squid) -383:95 Spawn Egg (Wolf) -383:96 Spawn Egg (Mooshroom) -383:98 Spawn Egg (Ocelot) -383:100 Spawn Egg (Horse) -383:120 Spawn Egg (Villager) -384 Bottle of Enchanting -385 Fire Charge -386 Book and Quill -387 Written Book -388 Emerald -389 Item Frame -390 Flower Pot -391 Carrot -392 Potato -393 Baked Potato -394 Poisonous Potato -395 Empty Map -396 Golden Carrot -397 Head (Skeleton) -397:1 Head (Wither) -397:2 Head (Zombie) -397:3 Head (Steve) -397:4 Head (Creeper) -398 Carrot on a Stick -399 Nether Star -400 Pumpkin Pie -401 Firework Rocket -402 Firework Star -403 Enchanted Book -404 Redstone Comparator -405 Nether Brick (Item) -406 Nether Quartz -407 TNT Minecart -408 Hopper Minecart -417 Iron Horse Armor -418 Gold Horse Armor -419 Diamond Horse Armor -420 Lead -421 Name Tag -2256 Music Disk (13) -2257 Music Disk (Cat) -2258 Music Disk (Blocks) -2259 Music Disk (Chirp) -2260 Music Disk (Far) -2261 Music Disk (Mall) -2262 Music Disk (Mellohi) -2263 Music Disk (Stal) -2264 Music Disk (Strad) -2265 Music Disk (Ward) -2266 Music Disk (11) -2267 Music Disk (Wait) + 1 Stone + 1:1 Granite + 1:2 Polished Granite + 1:3 Diorite + 1:4 Polished Diorite + 1:5 Andesite + 1:6 Polished Andesite + 2 Grass + 3 Dirt + 3:1 Dirt (No Grass) + 3:2 Podzol + 4 Cobblestone + 5 Wooden Plank (Oak) + 5:1 Wooden Plank (Spruce) + 5:2 Wooden Plank (Birch) + 5:3 Wooden Plank (Jungle) + 5:4 Wooden Plank (Acacia) + 5:5 Wooden Plank (Dark Oak) + 6 Sapling (Oak) + 6:1 Sapling (Spruce) + 6:2 Sapling (Birch) + 6:3 Sapling (Jungle) + 6:4 Sapling (Acacia) + 6:5 Sapling (Dark Oak) + 7 Bedrock + 8 Water + 9 Water (No Spread) + 10 Lava + 11 Lava (No Spread) + 12 Sand + 12:1 Red Sand + 13 Gravel + 14 Gold Ore + 15 Iron Ore + 16 Coal Ore + 17 Wood (Oak) + 17:1 Wood (Spruce) + 17:2 Wood (Birch) + 17:3 Wood (Jungle) + 17:4 Wood (Oak 4) + 17:5 Wood (Oak 5) + 18 Leaves (Oak) + 18:1 Leaves (Spruce) + 18:2 Leaves (Birch) + 18:3 Leaves (Jungle) + 19 Sponge + 20 Glass + 21 Lapis Lazuli Ore + 22 Lapis Lazuli Block + 23 Dispenser + 24 Sandstone + 24:1 Sandstone (Chiseled) + 24:2 Sandstone (Smooth) + 25 Note Block + 26 Bed (Block) + 27 Rail (Powered) + 28 Rail (Detector) + 29 Sticky Piston + 30 Cobweb + 31 Tall Grass (Dead Shrub) + 31:1 Tall Grass + 31:2 Tall Grass (Fern) + 32 Dead Shrub + 33 Piston + 34 Piston (Head) + 35 Wool + 35:1 Orange Wool + 35:2 Magenta Wool + 35:3 Light Blue Wool + 35:4 Yellow Wool + 35:5 Lime Wool + 35:6 Pink Wool + 35:7 Gray Wool + 35:8 Light Gray Wool + 35:9 Cyan Wool + 35:10 Purple Wool + 35:11 Blue Wool + 35:12 Brown Wool + 35:13 Green Wool + 35:14 Red Wool + 35:15 Black Wool + 36 Piston (Moving) + 37 Dandelion + 38 Poppy + 38:1 Blue Orchid + 38:2 Allium + 38:4 Red Tulip + 38:5 Orange Tulip + 38:6 White Tulip + 38:7 Pink Tulip + 38:8 Oxeye Daisy + 39 Brown Mushroom + 40 Red Mushroom + 41 Block of Gold + 42 Block of Iron + 43 Stone Slab (Double) + 43:1 Sandstone Slab (Double) + 43:2 Wooden Slab (Double) + 43:3 Cobblestone Slab (Double) + 43:4 Brick Slab (Double) + 43:5 Stone Brick Slab (Double) + 43:6 Nether Brick Slab (Double) + 43:7 Quartz Slab (Double) + 43:8 Smooth Stone Slab (Double) + 43:9 Smooth Sandstone Slab (Double) + 44 Stone Slab + 44:1 Sandstone Slab + 44:2 Wooden Slab + 44:3 Cobblestone Slab + 44:4 Brick Slab + 44:5 Stone Brick Slab + 44:6 Nether Brick Slab + 44:7 Quartz Slab + 45 Brick + 46 TNT + 47 Bookshelf + 48 Moss Stone + 49 Obsidian + 50 Torch + 51 Fire + 52 Mob Spawner + 53 Wooden Stairs (Oak) + 54 Chest + 55 Redstone Wire + 56 Diamond Ore + 57 Block of Diamond + 58 Workbench + 59 Wheat (Crop) + 60 Farmland + 61 Furnace + 62 Furnace (Smelting) + 63 Sign (Block) + 64 Wood Door (Block) + 65 Ladder + 66 Rail + 67 Cobblestone Stairs + 68 Sign (Wall Block) + 69 Lever + 70 Stone Pressure Plate + 71 Iron Door (Block) + 72 Wooden Pressure Plate + 73 Redstone Ore + 74 Redstone Ore (Glowing) + 75 Redstone Torch (Off) + 76 Redstone Torch + 77 Button (Stone) + 78 Snow + 79 Ice + 80 Snow Block + 81 Cactus + 82 Clay Block + 83 Sugar Cane (Block) + 84 Jukebox + 85 Fence + 86 Pumpkin + 87 Netherrack + 88 Soul Sand + 89 Glowstone + 90 Portal + 91 Jack-O-Lantern + 92 Cake (Block) + 93 Redstone Repeater (Block Off) + 94 Redstone Repeater (Block On) + 95 Stained Glass (White) + 95:1 Stained Glass (Orange) + 95:2 Stained Glass (Magenta) + 95:3 Stained Glass (Light Blue) + 95:4 Stained Glass (Yellow) + 95:5 Stained Glass (Lime) + 95:6 Stained Glass (Pink) + 95:7 Stained Glass (Gray) + 95:8 Stained Glass (Light Grey) + 95:9 Stained Glass (Cyan) + 95:10 Stained Glass (Purple) + 95:11 Stained Glass (Blue) + 95:12 Stained Glass (Brown) + 95:13 Stained Glass (Green) + 95:14 Stained Glass (Red) + 95:15 Stained Glass (Black) + 96 Trapdoor + 97 Monster Egg (Stone) + 97:1 Monster Egg (Cobblestone) + 97:2 Monster Egg (Stone Brick) + 97:3 Monster Egg (Mossy Stone Brick) + 97:4 Monster Egg (Cracked Stone) + 97:5 Monster Egg (Chiseled Stone) + 98 Stone Bricks + 98:1 Mossy Stone Bricks + 98:2 Cracked Stone Bricks + 98:3 Chiseled Stone Brick + 99 Brown Mushroom (Block) + 100 Red Mushroom (Block) + 101 Iron Bars + 102 Glass Pane + 103 Melon (Block) + 104 Pumpkin Vine + 105 Melon Vine + 106 Vines + 107 Fence Gate + 108 Brick Stairs + 109 Stone Brick Stairs + 110 Mycelium + 111 Lily Pad + 112 Nether Brick + 113 Nether Brick Fence + 114 Nether Brick Stairs + 115 Nether Wart + 116 Enchantment Table + 117 Brewing Stand (Block) + 118 Cauldron (Block) + 119 End Portal + 120 End Portal Frame + 121 End Stone + 122 Dragon Egg + 123 Redstone Lamp + 124 Redstone Lamp (On) + 125 Oak-Wood Slab (Double) + 125:1 Spruce-Wood Slab (Double) + 125:2 Birch-Wood Slab (Double) + 125:3 Jungle-Wood Slab (Double) + 125:4 Acacia Wood Slab (Double) + 125:5 Dark Oak Wood Slab (Double) + 126 Oak-Wood Slab + 126:1 Spruce-Wood Slab + 126:2 Birch-Wood Slab + 126:3 Jungle-Wood Slab + 126:4 Acacia Wood Slab + 126:5 Dark Oak Wood Slab + 127 Cocoa Plant + 128 Sandstone Stairs + 129 Emerald Ore + 130 Ender Chest + 131 Tripwire Hook + 132 Tripwire + 133 Block of Emerald + 134 Wooden Stairs (Spruce) + 135 Wooden Stairs (Birch) + 136 Wooden Stairs (Jungle) + 137 Command Block + 138 Beacon + 139 Cobblestone Wall + 139:1 Mossy Cobblestone Wall + 140 Flower Pot (Block) + 141 Carrot (Crop) + 142 Potatoes (Crop) + 143 Button (Wood) + 144 Head Block (Skeleton) + 144:1 Head Block (Wither) + 144:2 Head Block (Zombie) + 144:3 Head Block (Steve) + 144:4 Head Block (Creeper) + 145 Anvil + 145:1 Anvil (Slightly Damaged) + 145:2 Anvil (Very Damaged) + 146 Trapped Chest + 147 Weighted Pressure Plate (Light) + 148 Weighted Pressure Plate (Heavy) + 149 Redstone Comparator (Off) + 150 Redstone Comparator (On) + 151 Daylight Sensor + 152 Block of Redstone + 153 Nether Quartz Ore + 154 Hopper + 155 Quartz Block + 155:1 Chiseled Quartz Block + 155:2 Pillar Quartz Block + 156 Quartz Stairs + 157 Rail (Activator) + 158 Dropper + 159 Stained Clay (White) + 159:1 Stained Clay (Orange) + 159:2 Stained Clay (Magenta) + 159:3 Stained Clay (Light Blue) + 159:4 Stained Clay (Yellow) + 159:5 Stained Clay (Lime) + 159:6 Stained Clay (Pink) + 159:7 Stained Clay (Gray) + 159:8 Stained Clay (Light Gray) + 159:9 Stained Clay (Cyan) + 159:10 Stained Clay (Purple) + 159:11 Stained Clay (Blue) + 159:12 Stained Clay (Brown) + 159:13 Stained Clay (Green) + 159:14 Stained Clay (Red) + 159:15 Stained Clay (Black) + 160 Stained Glass Pane (White) + 160:1 Stained Glass Pane (Orange) + 160:2 Stained Glass Pane (Magenta) + 160:3 Stained Glass Pane (Light Blue) + 160:4 Stained Glass Pane (Yellow) + 160:5 Stained Glass Pane (Lime) + 160:6 Stained Glass Pane (Pink) + 160:7 Stained Glass Pane (Gray) + 160:8 Stained Glass Pane (Light Gray) + 160:9 Stained Glass Pane (Cyan) + 160:10 Stained Glass Pane (Purple) + 160:11 Stained Glass Pane (Blue) + 160:12 Stained Glass Pane (Brown) + 160:13 Stained Glass Pane (Green) + 160:14 Stained Glass Pane (Red) + 160:15 Stained Glass Pane (Black) + 162 Wood (Acacia Oak) + 162:1 Wood (Dark Oak) + 163 Wooden Stairs (Acacia) + 164 Wooden Stairs (Dark Oak) + 165 Slime Block + 170 Hay Bale + 171 Carpet (White) + 171:1 Carpet (Orange) + 171:2 Carpet (Magenta) + 171:3 Carpet (Light Blue) + 171:4 Carpet (Yellow) + 171:5 Carpet (Lime) + 171:6 Carpet (Pink) + 171:7 Carpet (Grey) + 171:8 Carpet (Light Gray) + 171:9 Carpet (Cyan) + 171:10 Carpet (Purple) + 171:11 Carpet (Blue) + 171:12 Carpet (Brown) + 171:13 Carpet (Green) + 171:14 Carpet (Red) + 171:15 Carpet (Black) + 172 Hardened Clay + 173 Block of Coal + 174 Packed Ice + 175 Sunflower + 175:1 Lilac + 175:2 Double Tallgrass + 175:3 Large Fern + 175:4 Rose Bush + 175:5 Peony + 256 Iron Shovel + 257 Iron Pickaxe + 258 Iron Axe + 259 Flint and Steel + 260 Apple + 261 Bow + 262 Arrow + 263 Coal + 263:1 Charcoal + 264 Diamond Gem + 265 Iron Ingot + 266 Gold Ingot + 267 Iron Sword + 268 Wooden Sword + 269 Wooden Shovel + 270 Wooden Pickaxe + 271 Wooden Axe + 272 Stone Sword + 273 Stone Shovel + 274 Stone Pickaxe + 275 Stone Axe + 276 Diamond Sword + 277 Diamond Shovel + 278 Diamond Pickaxe + 279 Diamond Axe + 280 Stick + 281 Bowl + 282 Mushroom Stew + 283 Gold Sword + 284 Gold Shovel + 285 Gold Pickaxe + 286 Gold Axe + 287 String + 288 Feather + 289 Gunpowder + 290 Wooden Hoe + 291 Stone Hoe + 292 Iron Hoe + 293 Diamond Hoe + 294 Gold Hoe + 295 Wheat Seeds + 296 Wheat + 297 Bread + 298 Leather Helmet + 299 Leather Chestplate + 300 Leather Leggings + 301 Leather Boots + 302 Chainmail Helmet + 303 Chainmail Chestplate + 304 Chainmail Leggings + 305 Chainmail Boots + 306 Iron Helmet + 307 Iron Chestplate + 308 Iron Leggings + 309 Iron Boots + 310 Diamond Helmet + 311 Diamond Chestplate + 312 Diamond Leggings + 313 Diamond Boots + 314 Gold Helmet + 315 Gold Chestplate + 316 Gold Leggings + 317 Gold Boots + 318 Flint + 319 Raw Porkchop + 320 Cooked Porkchop + 321 Painting + 322 Golden Apple + 322:1 Enchanted Golden Apple + 323 Sign + 324 Wooden Door + 325 Bucket + 326 Bucket (Water) + 327 Bucket (Lava) + 328 Minecart + 329 Saddle + 330 Iron Door + 331 Redstone Dust + 332 Snowball + 333 Boat + 334 Leather + 335 Bucket (Milk) + 336 Clay Brick + 337 Clay + 338 Sugar Cane + 339 Paper + 340 Book + 341 Slime Ball + 342 Minecart (Storage) + 343 Minecart (Powered) + 344 Egg + 345 Compass + 346 Fishing Rod + 347 Watch + 348 Glowstone Dust + 349 Raw Fish + 349:1 Raw Salmon + 349:2 Clownfish + 349:3 Pufferfish + 350 Cooked Fish + 350:1 Cooked Salmon + 350:2 Clownfish + 350:3 Pufferfish + 351 Ink Sack + 351:1 Rose Red Dye + 351:2 Cactus Green Dye + 351:3 Cocoa Bean + 351:4 Lapis Lazuli + 351:5 Purple Dye + 351:6 Cyan Dye + 351:7 Light Gray Dye + 351:8 Gray Dye + 351:9 Pink Dye + 351:10 Lime Dye + 351:11 Dandelion Yellow Dye + 351:12 Light Blue Dye + 351:13 Magenta Dye + 351:14 Orange Dye + 351:15 Bone Meal + 352 Bone + 353 Sugar + 354 Cake + 355 Bed + 356 Redstone Repeater + 357 Cookie + 358 Map + 359 Shears + 360 Melon (Slice) + 361 Pumpkin Seeds + 362 Melon Seeds + 363 Raw Beef + 364 Steak + 365 Raw Chicken + 366 Cooked Chicken + 367 Rotten Flesh + 368 Ender Pearl + 369 Blaze Rod + 370 Ghast Tear + 371 Gold Nugget + 372 Nether Wart Seeds + 373 Water Bottle + 373:16 Awkward Potion + 373:32 Thick Potion + 373:64 Mundane Potion + 373:8193 Regeneration Potion (0:45) + 373:8194 Swiftness Potion (3:00) + 373:8195 Fire Resistance Potion (3:00) + 373:8196 Poison Potion (0:45) + 373:8197 Healing Potion + 373:8198 Night Vision Potion (3:00) + 373:8200 Weakness Potion (1:30) + 373:8201 Strength Potion (3:00) + 373:8202 Slowness Potion (1:30) + 373:8204 Harming Potion + 373:8205 Water Breathing Potion (3:00) + 373:8206 Invisibility Potion (3:00) + 373:8225 Regeneration Potion II (0:22) + 373:8226 Swiftness Potion II (1:30) + 373:8228 Poison Potion II (0:22) + 373:8229 Healing Potion II + 373:8233 Strength Potion II (1:30) + 373:8236 Harming Potion II + 373:8257 Regeneration Potion (2:00) + 373:8258 Swiftness Potion (8:00) + 373:8259 Fire Resistance Potion (8:00) + 373:8260 Poison Potion (2:00) + 373:8262 Night Vision Potion (8:00) + 373:8264 Weakness Potion (4:00) + 373:8265 Strength Potion (8:00) + 373:8266 Slowness Potion (4:00) + 373:8269 Water Breathing Potion (8:00) + 373:8270 Invisibility Potion (8:00) + 373:8289 Regeneration Potion II (1:00) + 373:8290 Swiftness Potion II (4:00) + 373:8292 Poison Potion II (1:00) + 373:8297 Strength Potion II (4:00) + 373:16385 Regeneration Splash (0:33) + 373:16386 Swiftness Splash (2:15) + 373:16387 Fire Resistance Splash (2:15) + 373:16388 Poison Splash (0:33) + 373:16389 Healing Splash + 373:16390 Night Vision Splash (2:15) + 373:16392 Weakness Splash (1:07) + 373:16393 Strength Splash (2:15) + 373:16394 Slowness Splash (1:07) + 373:16396 Harming Splash + 373:16397 Breathing Splash (2:15) + 373:16398 Invisibility Splash (2:15) + 373:16417 Regeneration Splash II (0:16) + 373:16418 Swiftness Splash II (1:07) + 373:16420 Poison Splash II (0:16) + 373:16421 Healing Splash II + 373:16425 Strength Splash II (1:07) + 373:16428 Harming Splash II + 373:16449 Regeneration Splash (1:30) + 373:16450 Swiftness Splash (6:00) + 373:16451 Fire Resistance Splash (6:00) + 373:16452 Poison Splash (1:30) + 373:16454 Night Vision Splash (6:00) + 373:16456 Weakness Splash (3:00) + 373:16457 Strength Splash (6:00) + 373:16458 Slowness Splash (3:00) + 373:16461 Breathing Splash (6:00) + 373:16462 Invisibility Splash (6:00) + 373:16481 Regeneration Splash II (0:45) + 373:16482 Swiftness Splash II (3:00) + 373:16484 Poison Splash II (0:45) + 373:16489 Strength Splash II (3:00) + 374 Glass Bottle + 375 Spider Eye + 376 Fermented Spider Eye + 377 Blaze Powder + 378 Magma Cream + 379 Brewing Stand + 380 Cauldron + 381 Eye of Ender + 382 Glistering Melon (Slice) + 383:50 Spawn Egg (Creeper) + 383:51 Spawn Egg (Skeleton) + 383:52 Spawn Egg (Spider) + 383:54 Spawn Egg (Zombie) + 383:55 Spawn Egg (Slime) + 383:56 Spawn Egg (Ghast) + 383:57 Spawn Egg (Zombie Pigmen) + 383:58 Spawn Egg (Endermen) + 383:59 Spawn Egg (Cave Spider) + 383:60 Spawn Egg (Silverfish) + 383:61 Spawn Egg (Blaze) + 383:62 Spawn Egg (Magma Cube) + 383:65 Spawn Egg (Bat) + 383:66 Spawn Egg (Witch) + 383:90 Spawn Egg (Pig) + 383:91 Spawn Egg (Sheep) + 383:92 Spawn Egg (Cow) + 383:93 Spawn Egg (Chicken) + 383:94 Spawn Egg (Squid) + 383:95 Spawn Egg (Wolf) + 383:96 Spawn Egg (Mooshroom) + 383:98 Spawn Egg (Ocelot) + 383:100 Spawn Egg (Horse) + 383:120 Spawn Egg (Villager) + 384 Bottle of Enchanting + 385 Fire Charge + 386 Book and Quill + 387 Written Book + 388 Emerald + 389 Item Frame + 390 Flower Pot + 391 Carrot + 392 Potato + 393 Baked Potato + 394 Poisonous Potato + 395 Empty Map + 396 Golden Carrot + 397 Head (Skeleton) + 397:1 Head (Wither) + 397:2 Head (Zombie) + 397:3 Head (Steve) + 397:4 Head (Creeper) + 398 Carrot on a Stick + 399 Nether Star + 400 Pumpkin Pie + 401 Firework Rocket + 402 Firework Star + 403 Enchanted Book + 404 Redstone Comparator + 405 Nether Brick (Item) + 406 Nether Quartz + 407 Minecart (TNT) + 408 Minecart (Hopper) + 417 Iron Horse Armor + 418 Gold Horse Armor + 419 Diamond Horse Armor + 420 Lead + 421 Name Tag + 422 Minecart (Command Block) + 2256 Music Disk (13) + 2257 Music Disk (Cat) + 2258 Music Disk (Blocks) + 2259 Music Disk (Chirp) + 2260 Music Disk (Far) + 2261 Music Disk (Mall) + 2262 Music Disk (Mellohi) + 2263 Music Disk (Stal) + 2264 Music Disk (Strad) + 2265 Music Disk (Ward) + 2266 Music Disk (11) + 2267 Music Disk (Wait) From a8bf157ced1a177709e5aed833dfe89bd74e777e Mon Sep 17 00:00:00 2001 From: thenoodle68 Date: Sat, 28 Dec 2013 12:20:31 +0800 Subject: [PATCH 05/14] Mark Harmon GLORY TO MARK HARMON --- plugins/mark.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 plugins/mark.py diff --git a/plugins/mark.py b/plugins/mark.py new file mode 100644 index 0000000..3d186d7 --- /dev/null +++ b/plugins/mark.py @@ -0,0 +1,24 @@ +import random +from util import hook, text + +@hook.command('8ball') +def eightball(input, action=None): + """mark -- Spreads the glory of Mark Harmon""" + responses = [ + "Praise our lord Mark Harmon", + "Have you considered joining the Church of Mark Harmon?", + "M A R K H A R M O N", + "Did you know, Mark Harmon used to be a lifeguard?", + "Mark Harmon is our guide in these dark times.", + "Why not donate to the Church of Mark Harmon and help further our cause?", + "MERK HERMERN", + "Mark Harmon can cut through a hot knife with butter.", + "Mark Harmon can win a game of connect four in only three moves." + "PRAISE MARK HARMON", + "GLORY TO OUR LORD", + "Become a Mark Harmoner today and promote Mark Harmony!", + "The Church of Mark Harmon choir can achieve perfect Mark Harmony." + "Mark!" + ] + + return random.choice(responses) From 62a92b104b8b8d83be2c952364c28b30d23c5ff5 Mon Sep 17 00:00:00 2001 From: thenoodle68 Date: Sat, 28 Dec 2013 12:22:32 +0800 Subject: [PATCH 06/14] whoops --- plugins/mark.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/mark.py b/plugins/mark.py index 3d186d7..70dd954 100644 --- a/plugins/mark.py +++ b/plugins/mark.py @@ -1,8 +1,8 @@ import random from util import hook, text -@hook.command('8ball') -def eightball(input, action=None): +@hook.command('mark') +def mark(input): """mark -- Spreads the glory of Mark Harmon""" responses = [ "Praise our lord Mark Harmon", From 0ae8d3d5f9184ad1ad1a84565516976826c4cc5b Mon Sep 17 00:00:00 2001 From: Nathan Blaney Date: Mon, 13 Jan 2014 20:11:01 +1100 Subject: [PATCH 07/14] Much better --- plugins/mark.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/mark.py b/plugins/mark.py index 70dd954..742493e 100644 --- a/plugins/mark.py +++ b/plugins/mark.py @@ -1,7 +1,8 @@ import random from util import hook, text -@hook.command('mark') +@hook.command('harmon') +@hook.command def mark(input): """mark -- Spreads the glory of Mark Harmon""" responses = [ From c5765cc5f690bb3c262628d549b117c725317f77 Mon Sep 17 00:00:00 2001 From: Dabo Ross Date: Mon, 13 Jan 2014 19:10:43 -0800 Subject: [PATCH 08/14] Add support for multiple channels to .join and .leave --- plugins/admin.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/plugins/admin.py b/plugins/admin.py index 37601b1..7813b64 100644 --- a/plugins/admin.py +++ b/plugins/admin.py @@ -138,8 +138,11 @@ def clearlogs(inp, input=None): @hook.command(permissions=["botcontrol"]) def join(inp, conn=None, notice=None): """join -- Joins .""" - notice("Attempting to join {}...".format(inp)) - conn.join(inp) + for target in inp.split(" "): + if not target.startswith("#"): + target = "#{}".format(target) + notice("Attempting to join {}...".format(target)) + conn.join(target) @hook.command(autohelp=False, permissions=["botcontrol"]) @@ -148,11 +151,14 @@ def part(inp, conn=None, chan=None, notice=None): If [channel] is blank the bot will leave the channel the command was used in.""" if inp: - target = inp + targets = inp else: - target = chan - notice("Attempting to leave {}...".format(target)) - conn.part(target) + targets = chan + for target in targets.split(" "): + if not target.startswith("#"): + target = "#{}".format(target) + notice("Attempting to leave {}...".format(target)) + conn.part(target) @hook.command(autohelp=False, permissions=["botcontrol"]) From aecf61746fc9bb5d37276e7266e65b7f172e20bb Mon Sep 17 00:00:00 2001 From: Dabo Ross Date: Mon, 13 Jan 2014 23:10:17 -0800 Subject: [PATCH 09/14] Fix correction to actually work, and change format --- plugins/correction.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/correction.py b/plugins/correction.py index 517c6e3..db370fa 100644 --- a/plugins/correction.py +++ b/plugins/correction.py @@ -17,10 +17,10 @@ def correction(inp, message=None, input=None, notice=None, db=None): replace = splitinput[2] if find in last_message[1]: if "\x01ACTION" in last_message[1]: - message = last_message[1].replace("\x01ACTION ", "/me ").replace("\x01", "") + msg = last_message[1].replace("\x01ACTION ", "/me ").replace("\x01", "") else: - message = last_message[1] - message(u"{} meant to say: {}".format(message.replace(find, "\x02" + replace + "\x02"), nick)) + msg = last_message[1] + message(u"Correction, <{}> {}".format(nick, msg.replace(find, "\x02" + replace + "\x02"))) else: notice(u"{} can't be found in your last message".format(find)) else: From 8b6647f5211549bd644fc72bffd8d525eb01f4d3 Mon Sep 17 00:00:00 2001 From: Dabo Ross Date: Mon, 13 Jan 2014 23:16:35 -0800 Subject: [PATCH 10/14] Don't assume that data has any elements --- plugins/twitch.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/twitch.py b/plugins/twitch.py index 842057d..3e4e248 100644 --- a/plugins/twitch.py +++ b/plugins/twitch.py @@ -92,8 +92,9 @@ def twitch_lookup(location): views = views + "s" if not views[0:2] == "1 " else views return h.unescape(fmt.format(title, channel, playing, views)) else: - data = http.get_json("http://api.justin.tv/api/stream/list.json?channel=" + channel)[0] - if data: + data = http.get_json("http://api.justin.tv/api/stream/list.json?channel=" + channel) + if data and len(data) >= 1: + data = data[0] title = data['title'] playing = data['meta_game'] viewers = "\x033\x02Online now!\x02\x0f " + str(data["channel_count"]) + " viewer" @@ -102,7 +103,10 @@ def twitch_lookup(location): print viewers return h.unescape(fmt.format(title, channel, playing, viewers)) else: - data = http.get_json("https://api.twitch.tv/kraken/channels/" + channel) + try: + data = http.get_json("https://api.twitch.tv/kraken/channels/" + channel) + except: + return title = data['status'] playing = data['game'] viewers = "\x034\x02Offline\x02\x0f" From 728ab6f60b099b4c0b971005e4375275c1f3c628 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Thu, 23 Jan 2014 14:00:19 +1300 Subject: [PATCH 11/14] Update slaps.json --- plugins/data/slaps.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/data/slaps.json b/plugins/data/slaps.json index 7192a43..8e97e87 100644 --- a/plugins/data/slaps.json +++ b/plugins/data/slaps.json @@ -29,6 +29,8 @@ "diamond sword", "baguette", "physics textbook", + "toaster", + "portrait of Mark Harmon", "television", "mau5head", "five ton truck", From af8b07d20b16b9189c14e010f3d2df8d5da61f94 Mon Sep 17 00:00:00 2001 From: Nathan Blaney Date: Sat, 25 Jan 2014 16:28:16 +1100 Subject: [PATCH 12/14] Mark now works with out an input --- plugins/mark.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/mark.py b/plugins/mark.py index 742493e..9012dcc 100644 --- a/plugins/mark.py +++ b/plugins/mark.py @@ -1,9 +1,9 @@ import random from util import hook, text -@hook.command('harmon') -@hook.command -def mark(input): +@hook.command('harmon', autohelp=False) +@hook.command(autohelp=False) +def mark(inp): """mark -- Spreads the glory of Mark Harmon""" responses = [ "Praise our lord Mark Harmon", From fa66cf3c877ec33c4de96f2f86f564662f4b2018 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Tue, 11 Feb 2014 17:02:52 +1300 Subject: [PATCH 13/14] simplified code --- plugins/newegg.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/newegg.py b/plugins/newegg.py index 87242dc..0a88286 100644 --- a/plugins/newegg.py +++ b/plugins/newegg.py @@ -86,8 +86,7 @@ def newegg(inp): # get the first result if r["ProductListItems"]: - item = r["ProductListItems"][0] - return format_item(item) + return format_item(r["ProductListItems"][0]) else: return "No results found." From afdf5ccfe9f83c1239ed993fbe0f07dd1eb1b82f Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Tue, 11 Feb 2014 17:04:21 +1300 Subject: [PATCH 14/14] Revamped and re-added scene search command from Skybot --- plugins/pre.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 plugins/pre.py diff --git a/plugins/pre.py b/plugins/pre.py new file mode 100644 index 0000000..80aa77f --- /dev/null +++ b/plugins/pre.py @@ -0,0 +1,37 @@ +from util import hook, http, timesince +import datetime + + +@hook.command("scene") +@hook.command +def pre(inp): + 'pre -- searches scene releases using orlydb.com' + + try: + h = http.get_html("http://orlydb.com/", q=inp) + except http.HTTPError as e: + return 'Unable to fetch results: {}'.format(e) + + results = h.xpath("//div[@id='releases']/div/span[@class='release']/..") + + if not results: + return "No results found." + + result = results[0] + + date = result.xpath("span[@class='timestamp']/text()")[0] + section = result.xpath("span[@class='section']//text()")[0] + name = result.xpath("span[@class='release']/text()")[0] + + # parse date/time + date = datetime.datetime.strptime(date, "%Y-%m-%d %H:%M:%S") + date_string = date.strftime("%d %b %Y") + since = timesince.timesince(date) + + size = result.xpath("span[@class='inforight']//text()") + if size: + size = ' - ' + size[0].split()[0] + else: + size = '' + + return '{} - {}{} - {} ({} ago)'.format(section, name, size, date_string, since)