diff --git a/items.py b/items.py index 4ab3912..5dd28ef 100644 --- a/items.py +++ b/items.py @@ -1,6 +1,8 @@ +import logging +logger = logging.getLogger(__file__) items_txt = """ -:version 24 +:version 27 # Blocks # ID NAME FILE CORDS DAMAGE @@ -25,9 +27,9 @@ items_txt = """ 17 Wood terrain.png 4,1 0 17 Dark_Wood terrain.png 4,7 1 17 Birch_Wood terrain.png 5,7 2 - 18 Leaves special.png 0,3 0 - 18 Dark_Leaves special.png 1,3 1 - 18 Birch_Leaves special.png 2,3 2 + 18 Leaves special.png 5,0 0 + 18 Dark_Leaves special.png 5,1 1 + 18 Birch_Leaves special.png 5,2 2 19 Sponge terrain.png 0,3 20 Glass terrain.png 1,3 21 Lapis_Lazuli_Ore terrain.png 0,10 @@ -40,8 +42,10 @@ items_txt = """ 28 Detector_Rail terrain.png 3,12 29 Sticky_Piston terrain.png 10,6 30 Cobweb terrain.png 11,0 - 31 Tall_Grass special.png 3,3 - 32 Desert_Shrub terrain.png 7,3 + 31 Dead_Bush terrain.png 7,3 0 + 31 Tall_Grass special.png 5,3 1 + 31 Fern special.png 4,5 2 + 32 Dead_Bush terrain.png 7,3 33 Piston terrain.png 11,6 34 Piston_(head) terrain.png 11,6 35 Wool terrain.png 0,4 0 @@ -70,19 +74,21 @@ items_txt = """ 43 Double_Sandstone_Slab terrain.png 0,12 1 43 Double_Wooden_Slab terrain.png 4,0 2 43 Double_Stone_Slab terrain.png 0,1 3 - 44 Stone_Slab special.png 0,0 0 + 44 Stone_Slab special.png 2,2 0 44 Sandstone_Slab special.png 1,2 1 - 44 Wooden_Slab special.png 2,2 2 - 44 Stone_Slab special.png 3,2 3 - 45 Brick terrain.png 7,0 + 44 Wooden_Slab special.png 3,0 2 + 44 Stone_Slab special.png 1,0 3 + 44 Bricks_Slab special.png 0,0 4 + 44 Stone_Bricks_Slab special.png 2,0 5 + 45 Bricks terrain.png 7,0 46 TNT terrain.png 8,0 47 Bookshelf terrain.png 3,2 48 Moss_Stone terrain.png 4,2 49 Obsidian terrain.png 5,2 50 Torch terrain.png 0,5 - 51 Fire special.png 1,0 + 51 Fire special.png 4,0 52 Monster_Spawner terrain.png 1,4 - 53 Wooden_Stairs special.png 3,0 + 53 Wooden_Stairs special.png 3,1 54 Chest terrain.png 11,1 55 Redstone_Dust terrain.png 4,5 56 Diamond_Ore terrain.png 2,3 @@ -96,36 +102,63 @@ items_txt = """ 64 Wooden_Door_Block terrain.png 1,6 65 Ladder terrain.png 3,5 66 Rail terrain.png 0,8 - 67 Stone_Stairs special.png 4,0 + 67 Stone_Stairs special.png 1,1 68 Wall_Sign terrain.png 4,0 69 Lever terrain.png 0,6 - 70 Stone_Pressure_Plate special.png 0,1 + 70 Stone_Pressure_Plate special.png 2,4 71 Iron_Door_Block terrain.png 2,6 - 72 Wooden_Pressure_Plate special.png 1,1 + 72 Wooden_Pressure_Plate special.png 3,4 73 Redstone_Ore terrain.png 3,3 74 Glowing_Redstone_Ore terrain.png 3,3 75 Redstone_Torch_(off) terrain.png 3,7 76 Redstone_Torch terrain.png 3,6 - 77 Button special.png 2,1 - 78 Snow_Layer special.png 3,1 + 77 Button special.png 2,3 + 78 Snow_Layer special.png 1,4 79 Ice terrain.png 3,4 80 Snow terrain.png 2,4 81 Cactus terrain.png 6,4 82 Clay terrain.png 8,4 - 83 Sugar_Cane terrain.png 9,4 + 83 Sugar_cane terrain.png 9,4 84 Jukebox terrain.png 10,4 - 85 Fence special.png 2,0 + 85 Fence special.png 3,2 86 Pumpkin terrain.png 7,7 87 Netherrack terrain.png 7,6 88 Soul_Sand terrain.png 8,6 89 Glowstone terrain.png 9,6 - 90 Portal special.png 4,1 + 90 Portal special.png 0,5 91 Jack-o'-lantern terrain.png 8,7 92 Cake special.png 0,2 93 Repeater_Block_(off) terrain.png 3,8 94 Repeater_Block terrain.png 3,9 95 Locked_Chest terrain.png 11,1 96 Trapdoor terrain.png 4,5 + 97 Silverfish_Block terrain.png 1,0 + 98 Stone_Bricks terrain.png 6,3 0 + 98 Mossy_Stone_Bricks terrain.png 4,6 1 + 98 Damaged_Stone_Bricks terrain.png 5,6 2 + 99 Brown_Mushroom_Block terrain.png 13,7 + 100 Red_Mushroom_Block terrain.png 14,7 + 101 Iron_Bars terrain.png 5,5 + 102 Glass_Pane special.png 1,3 + 103 Melon terrain.png 8,8 + 104 Pumpkin_Stem terrain.png 5,5 + 105 Melon_Stem terrain.png 5,5 + 106 Vines special.png 5,4 + 107 Fence_Gate special.png 3,3 + 108 Brick_Stairs special.png 0,1 + 109 Stone_Brick_Stairs special.png 2,1 + 110 Mycelium terrain.png 13,4 + 111 Lily_Pad special.png 4,4 + 112 Nether_Brick terrain.png 0,14 + 113 Nether_Brick_Fence special.png 4,2 + 114 Nether_Brick_Stairs special.png 4,1 + 115 Nether_Wart terrain.png 2,14 + 116 Enchantment_Table terrain.png 6,11 + 117 Brewing_Stand terrain.png 13,9 + 118 Cauldron terrain.png 10,9 + 119 Air_Portal special.png 1,5 + 120 Air_Portal_Frame terrain.png 15,9 + # Items # ID NAME FILE CORDS DAMAGE @@ -134,7 +167,7 @@ items_txt = """ 258 Iron_Axe items.png 2,7 +250 259 Flint_and_Steel items.png 5,0 +64 260 Apple items.png 10,0 x1 - 261 Bow items.png 5,1 + 261 Bow items.png 5,1 x1 262 Arrow items.png 5,2 263 Coal items.png 7,0 0 263 Charcoal items.png 7,0 1 @@ -193,8 +226,8 @@ items_txt = """ 316 Golden_Leggings items.png 4,2 +92 317 Golden_Boots items.png 4,3 +80 318 Flint items.png 6,0 - 319 Raw_Porkchop items.png 7,5 x1 - 320 Porkchop items.png 8,5 x1 + 319 Raw_Porkchop items.png 7,5 + 320 Cooked_Porkchop items.png 8,5 321 Painting items.png 10,1 322 Golden_Apple items.png 11,0 x1 323 Sign items.png 10,2 x1 @@ -212,19 +245,19 @@ items_txt = """ 335 Milk items.png 13,4 336 Brick items.png 6,1 337 Clay items.png 9,3 - 338 Sugar_Cane items.png 11,1 + 338 Sugar_Canes items.png 11,1 339 Paper items.png 10,3 340 Book items.png 11,3 341 Slimeball items.png 14,1 342 Minecart_with_Chest items.png 7,9 x1 343 Minecart_with_Furnace items.png 7,10 x1 344 Egg items.png 12,0 - 345 Compass items.png 6,3 x1 + 345 Compass items.png 6,3 (x1) 346 Fishing_Rod items.png 5,4 +64 - 347 Clock items.png 6,4 x1 + 347 Clock items.png 6,4 (x1) 348 Glowstone_Dust items.png 9,4 - 349 Raw_Fish items.png 9,5 x1 - 350 Cooked_Fish items.png 10,5 x1 + 349 Raw_Fish items.png 9,5 + 350 Cooked_Fish items.png 10,5 351 Ink_Sack items.png 14,4 0 351 Rose_Red items.png 14,5 1 351 Cactus_Green items.png 14,6 2 @@ -246,26 +279,69 @@ items_txt = """ 354 Cake items.png 13,1 x1 355 Bed items.png 13,2 x1 356 Redstone_Repeater items.png 6,5 - 357 Cookie items.png 12,5 x8 + 357 Cookie items.png 12,5 358 Map items.png 12,3 x1 359 Shears items.png 13,5 +238 -2256 Gold_Music_Disk items.png 0,15 x1 -2257 Green_Music_Disk items.png 1,15 x1 + 360 Melon items.png 13,6 + 361 Pumpkin_Seeds items.png 13,3 + 362 Melon_Seeds items.png 14,3 + 363 Raw_Beef items.png 9,6 + 364 Steak items.png 10,6 + 365 Raw_Chicken items.png 9,7 + 366 Cooked_Chicken items.png 10,7 + 367 Rotten_Flesh items.png 11,5 + 368 Ender_Pearl items.png 11,6 + 369 Blaze_Rod items.png 12,6 + 370 Ghast_Tear items.png 11,7 + 371 Gold_Nugget items.png 12,7 + 372 Nether_Wart items.png 13,7 + 373 Potion items.png 12,8 + 374 Glass_Bottle items.png 12,8 + 375 Spider_Eye items.png 11,8 + 376 Fermented_Spider_Eye items.png 10,8 + 377 Blaze_Powder items.png 13,9 + 378 Magma_Cream items.png 13,10 + 379 Brewing_Stand items.png 12,10 x1 + 380 Cauldron items.png 12,9 x1 + 381 Eye_of_Ender items.png 11,9 +2256 C418_-_13 items.png 0,15 x1 +2257 C418_-_cat items.png 1,15 x1 +2258 C418_-_blocks items.png 2,15 x1 +2259 C418_-_chirp items.png 3,15 x1 +2260 C418_-_far items.png 4,15 x1 +2261 C418_-_mall items.png 5,15 x1 +2262 C418_-_mellohi items.png 6,15 x1 +2263 C418_-_stal items.png 7,15 x1 +2264 C418_-_strad items.png 8,15 x1 +2265 C418_-_ward items.png 9,15 x1 +2266 C418_-_11 items.png 10,15 x1 -# Groups +# Groups # NAME ICON ITEMS -~ Blocks 2 1,2,3,12,24,44~1,13,82,4,48,67,44~3,17,5,53,44~2,47,20,44~0,49,79,80,78,7,45,19,87,88,30 -~ Plants 6 31,18,81,86,91,6,37,38,39,40,32 -~ Tools 257 269,270,271,290,273,274,275,291,256,257,258,292,277,278,279,293,284,285,286,294,259,346,359 -~ Weapons 267 268,272,267,276,283,261,262,332 -~ Armor 303 298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317 -~ Food 297 260,322,281,282,295,296,297,319,320,344,349,350,353,354,357 -~ Ores 56 16,15,14,56,73,21,263,265,266,264,42,41,57,22,89,348 -~ Special 54 8,10,90,58,54,61,23,25,46,52,84,2256,2257,51,50,85,321,323,324,330,96,355,325,326,327,335,345,347,358 -~ Items 341 280,287,288,289,334,341,318,337,336,338,339,340,352 -~ Movement 328 65,66,27,28,328,342,343,333,329 -~ Logic 76 331,76,356,69,70,72,77,33,29 -~ Wool 35 35,351 +# Column 1 +~ Natural 2 2,3,12,24,44~1,13,82,79,80,78 +~ Stone 1 1,4,48,67,44~3,98,109,44~5,44~0,45,108,44~4,101 +~ Wood 5 17,5,53,44~2,47,85,107,20,102,30 +~ Nether 87 87,88,89,348,112,114,113,372 +~ Ores 56 16,15,14,56,73,21,49,42,41,57,22,263~0,265,266,264 +~ Special 54 46,52,58,54,61,23,25,84,116,379,380,321,323,324,330,355,65,96 +~ Plants1 81 31~1,31~2,106,111,18,81,86,91,103,110 +~ Plants2 6 295,361,362,6,296,338,37,38,39,40,32 +~ Transport 328 66,27,28,328,342,343,333,329 +~ Logic 331 331,76,356,69,70,72,77,33,29 +~ Wool 35 35~0,35~8,35~7,35~15,35~14,35~12,35~1,35~4,35~5,35~13,35~11,35~3,35~9,35~10,35~2,35~6 +~ Dye 351 351~15,351~7,351~8,351~0,351~1,351~3,351~14,351~11,351~10,351~2,351~4,351~12,351~6,351~5,351~13,351~9 +# Column 2 +~ TierWood 299 298,299,300,301,269,270,271,290,268 +~ TierStone 303 302,303,304,305,273,274,275,291,272 +~ TierIron 307 306,307,308,309,256,257,258,292,267 +~ TierDiam 311 310,311,312,313,277,278,279,293,276 +~ TierGold 315 314,315,316,317,284,285,286,294,283 +~ Tools 261 50,261,262,259,346,359,345,347,358,325,326,327,335 +~ Food 297 260,322,282,297,360,319,320,363,364,365,366,349,350,354,357 +~ Items 318 280,281,318,337,336,353,339,340,332 +~ Drops 341 344,288,334,287,352,289,367,375,376,341,368,369,377,370,371,378,381 +~ Music 2257 2256,2257,2258,2259,2260,2261,2262,2263,2264,2265,2266 """ class ItemType (object): def __init__(self, id, name, imagefile=None, imagecoords=None, maxdamage=0, damagevalue=0, stacksize=64): @@ -291,8 +367,8 @@ class Items (object): with file(filename) as f: items_txt = f.read() except Exception, e: - print "Error reading items.txt: ", e; - print "Using internal data." + logger.info( "Error reading items.txt: %s", e) + logger.info( "Using internal data." ) items_txt = self.items_txt self.itemtypes = {};