diff --git a/items.py b/items.py index 326a275..eccfbc4 100644 --- a/items.py +++ b/items.py @@ -2,7 +2,8 @@ from logging import getLogger logger = getLogger(__file__) items_txt = """ -:version 27 +:version 31 +:mc-version Minecraft 1.2.4 # Blocks # ID NAME FILE CORDS DAMAGE @@ -10,10 +11,14 @@ items_txt = """ 2 Grass terrain.png 3,0 3 Dirt terrain.png 2,0 4 Cobblestone terrain.png 0,1 - 5 Wooden_Planks terrain.png 4,0 + 5 Wooden_Planks terrain.png 4,0 0 + 5 Dark_Wooden_Planks terrain.png 6,12 1 + 5 Birch_Wooden_Planks terrain.png 6,13 2 + 5 Jungle_Wooden_Planks terrain.png 7,12 3 6 Sapling terrain.png 15,0 0 6 Spruce_Sapling terrain.png 15,3 1 6 Birch_Sapling terrain.png 15,4 2 + 6 Jungle_Sapling terrain.png 14,1 3 7 Bedrock terrain.png 1,1 8 Water terrain.png 15,13 9 Still_Water terrain.png 15,13 @@ -27,15 +32,19 @@ 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 + 17 Jungle_Wood terrain.png 9,9 3 18 Leaves special.png 5,0 0 18 Dark_Leaves special.png 5,1 1 18 Birch_Leaves special.png 5,2 2 + 18 Jungle_Leaves special.png 5,3 3 19 Sponge terrain.png 0,3 20 Glass terrain.png 1,3 21 Lapis_Lazuli_Ore terrain.png 0,10 22 Lapis_Lazuli_Block terrain.png 0,9 23 Dispenser terrain.png 14,2 - 24 Sandstone terrain.png 0,12 + 24 Sandstone terrain.png 0,12 0 + 24 Decorative_Sandstone terrain.png 5,14 1 + 24 Smooth_Sandstone terrain.png 6,14 2 25 Note_Block terrain.png 10,4 26 Bed_Block terrain.png 6,8 27 Powered_Rail terrain.png 3,10 @@ -43,8 +52,8 @@ items_txt = """ 29 Sticky_Piston terrain.png 10,6 30 Cobweb terrain.png 11,0 31 Dead_Bush terrain.png 7,3 0 - 31 Tall_Grass special.png 5,3 1 - 31 Fern special.png 4,5 2 + 31 Tall_Grass special.png 6,0 1 + 31 Fern special.png 6,1 2 32 Dead_Bush terrain.png 7,3 33 Piston terrain.png 11,6 34 Piston_(head) terrain.png 11,6 @@ -93,7 +102,7 @@ items_txt = """ 55 Redstone_Dust terrain.png 4,5 56 Diamond_Ore terrain.png 2,3 57 Block_of_Diamond terrain.png 8,1 - 58 Workbench terrain.png 12,3 + 58 Workbench terrain.png 12,3 (x1) 59 Crops terrain.png 15,5 60 Farmland terrain.png 7,5 61 Furnace terrain.png 12,2 @@ -136,29 +145,33 @@ items_txt = """ 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 + 98 Circle_Stone_Bricks terrain.png 5,13 3 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 + 105 Melon_Stem terrain.png 6,3 + 106 Vines special.png 4,3 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 + 111 Lily_Pad special.png 6,2 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 + 116 Enchantment_Table terrain.png 6,11 (x1) 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 - + 119 End_Portal special.png 1,5 + 120 End_Portal_Frame terrain.png 15,9 + 121 End_Stone terrain.png 15,10 + 122 Dragon_Egg special.png 2,5 + 123 Redstone_Lamp terrain.png 3,13 + 124 Redstone_Lamp_(on) terrain.png 4,13 # Items # ID NAME FILE CORDS DAMAGE @@ -190,10 +203,10 @@ items_txt = """ 280 Stick items.png 5,3 281 Bowl items.png 7,4 x1 282 Mushroom_Stew items.png 8,4 x1 - 283 Golden_sword items.png 4,4 +32 - 284 Golden_shovel items.png 4,5 +32 - 285 Golden_pickaxe items.png 4,6 +32 - 286 Golden_axe items.png 4,7 +32 + 283 Golden_Sword items.png 4,4 +32 + 284 Golden_Shovel items.png 4,5 +32 + 285 Golden_Pickaxe items.png 4,6 +32 + 286 Golden_Axe items.png 4,7 +32 287 String items.png 8,0 288 Feather items.png 8,1 289 Gunpowder items.png 8,2 @@ -201,7 +214,7 @@ items_txt = """ 291 Stone_Hoe items.png 1,8 +131 292 Iron_Hoe items.png 2,8 +250 293 Diamond_Hoe items.png 3,8 +1561 - 294 Golden_hoe items.png 4,8 +32 + 294 Golden_Hoe items.png 4,8 +32 295 Seeds items.png 9,0 296 Wheat items.png 9,1 297 Bread items.png 9,2 x1 @@ -295,15 +308,18 @@ items_txt = """ 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 + 379 Brewing_Stand items.png 12,10 (x1) + 380 Cauldron items.png 12,9 (x1) 381 Eye_of_Ender items.png 11,9 + 382 Glistering_Melon items.png 9,8 + 383 Spawn_Egg items.png 9,9 + 384 Bottle_o'_Enchanting items.png 11,10 + 385 Fire_Charge items.png 14,2 2256 C418_-_13 items.png 0,15 x1 2257 C418_-_cat items.png 1,15 x1 2258 C418_-_blocks items.png 2,15 x1 @@ -316,19 +332,119 @@ items_txt = """ 2265 C418_-_ward items.png 9,15 x1 2266 C418_-_11 items.png 10,15 x1 +# Potions +# ID NAME FILE CORDS DAMAGE + 373 Water_Bottle special.png 0,14 0 + 373 Awkward_Potion special.png 1,14 16 + 373 Thick_Potion special.png 1,14 32 + 373 Mundane_Potion special.png 1,14 64 + 373 Mundane_Potion special.png 1,14 8192 + 373 Regeneration_(0:45) special.png 2,14 8193 + 373 Regeneration_(2:00) special.png 2,14 8257 + 373 Regeneration_II_(0:22) special.png 2,14 8225 + 373 Swiftness_(3:00) special.png 3,14 8194 + 373 Swiftness_(8:00) special.png 3,14 8258 + 373 Swiftness_II_(1:30) special.png 3,14 8226 + 373 Fire_Resistance_(3:00) special.png 4,14 8195 + 373 Fire_Resistance_(3:00) special.png 4,14 8227 + 373 Fire_Resistance_(8:00) special.png 4,14 8259 + 373 Healing special.png 6,14 8197 + 373 Healing special.png 6,14 8261 + 373 Healing_II special.png 6,14 8229 + 373 Strength_(3:00) special.png 8,14 8201 + 373 Strength_(8:00) special.png 8,14 8265 + 373 Strength_II_(1:30) special.png 8,14 8233 + 373 Poison_(0:45) special.png 5,14 8196 + 373 Poison_(2:00) special.png 5,14 8260 + 373 Poison_II_(0:22) special.png 5,14 8228 + 373 Weakness_(1:30) special.png 7,14 8200 + 373 Weakness_(1:30) special.png 7,14 8332 + 373 Weakness_(4:00) special.png 7,14 8264 + 373 Slowness_(1:30) special.png 9,14 8202 + 373 Slowness_(1:30) special.png 9,14 8234 + 373 Slowness_(4:00) special.png 9,14 8266 + 373 Harming special.png 10,14 8204 + 373 Harming special.png 10,14 8268 + 373 Harming_II special.png 10,14 8236 +# Unbrewable: + 373 Regeneration_II_(1:00) special.png 2,14 8289 + 373 Swiftness_II_(4:00) special.png 3,14 8290 + 373 Strength_II_(4:00) special.png 8,14 8297 + 373 Poison_II_(1:00) special.png 5,14 8292 + +# Splash Potions +# ID NAME FILE CORDS DAMAGE + 373 Splash_Mundane special.png 1,13 16384 + 373 Regeneration_(0:33) special.png 2,13 16385 + 373 Regeneration_(1:30) special.png 2,13 16499 + 373 Regeneration_II_(0:16) special.png 2,13 16417 + 373 Swiftness_(2:15) special.png 3,13 16386 + 373 Swiftness_(6:00) special.png 3,13 16450 + 373 Swiftness_II_(1:07) special.png 3,13 16418 + 373 Fire_Resistance_(2:15) special.png 4,13 16387 + 373 Fire_Resistance_(2:15) special.png 4,13 16419 + 373 Fire_Resistance_(6:00) special.png 4,13 16451 + 373 Healing special.png 6,13 16389 + 373 Healing special.png 6,13 16453 + 373 Healing_II special.png 6,13 16421 + 373 Strength_(2:15) special.png 8,13 16393 + 373 Strength_(6:00) special.png 8,13 16457 + 373 Strength_II_(1:07) special.png 8,13 16425 + 373 Poison_(0:33) special.png 5,13 16388 + 373 Poison_(1:30) special.png 5,13 16452 + 373 Poison_II_(0:16) special.png 5,13 16420 + 373 Weakness_(1:07) special.png 7,13 16392 + 373 Weakness_(1:07) special.png 7,13 16424 + 373 Weakness_(3:00) special.png 7,13 16456 + 373 Slowness_(1:07) special.png 9,13 16394 + 373 Slowness_(1:07) special.png 9,13 16426 + 373 Slowness_(3:00) special.png 9,13 16458 + 373 Harming special.png 10,13 16396 + 373 Harming special.png 10,13 16460 + 373 Harming_II special.png 10,13 16428 +# Unbrewable: + 373 Regeneration_II_(0:45) special.png 2,13 16481 + 373 Swiftness_II_(3:00) special.png 3,13 16482 + 373 Strength_II_(3:00) special.png 8,13 16489 + 373 Poison_II_(0:45) special.png 5,13 16484 + +# Spawn Eggs +# ID NAME FILE CORDS DAMAGE + 383 Spawn_Creeper special.png 0,9 50 + 383 Spawn_Skeleton special.png 1,9 51 + 383 Spawn_Spider special.png 2,9 52 + 383 Spawn_Zombie special.png 3,9 54 + 383 Spawn_Slime special.png 4,9 55 + 383 Spawn_Ghast special.png 0,10 56 + 383 Spawn_Zombie_Pigmen special.png 1,10 57 + 383 Spawn_Enderman special.png 2,10 58 + 383 Spawn_Cave_Spider special.png 3,10 59 + 383 Spawn_Silverfish special.png 4,10 60 + 383 Spawn_Blaze special.png 0,11 61 + 383 Spawn_Magma_Cube special.png 1,11 62 + 383 Spawn_Pig special.png 2,11 90 + 383 Spawn_Sheep special.png 3,11 91 + 383 Spawn_Cow special.png 4,11 92 + 383 Spawn_Chicken special.png 0,12 93 + 383 Spawn_Squid special.png 1,12 94 + 383 Spawn_Wolf special.png 2,12 95 + 383 Spawn_Mooshroom special.png 3,12 96 + 383 Spawn_Ocelot special.png 5,12 98 + 383 Spawn_Villager special.png 4,12 120 + # Groups # NAME ICON ITEMS # 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 +~ NetherEnd 87 87,88,89,348,112,114,113,372,121,122 ~ 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 +~ Logic 331 331,76,356,69,70,72,77,33,29,123 ~ 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 @@ -337,11 +453,14 @@ items_txt = """ ~ 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 +~ Tools 261 50,261,262,259,346,359,345,347,358,325,326,327,335,384,385 ~ 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 +~ Drops 341 344,288,334,287,352,289,367,375,376,341,368,369,377,370,371,378,382,381 ~ Music 2257 2256,2257,2258,2259,2260,2261,2262,2263,2264,2265,2266 +# New +~ Potion 373 373~0,373~16,373~32,373~8192,373~8193,373~8257,373~8225,373~8289,373~8194,373~8258,373~8226,373~8290,373~8195,373~8259,373~8197,373~8229,373~8201,373~8265,373~8233,373~8297,373~8196,373~8260,373~8228,373~8292,373~8200,373~8264,373~8202,373~8266,373~8204,373~8236,373~16384,373~16385,373~16499,373~16417,373~16481,373~16386,373~16450,373~16418,373~16482,373~16387,373~16451,373~16389,373~16421,373~16393,373~16457,373~16425,373~16489,373~16388,373~16452,373~16420,373~16484,373~16392,373~16456,373~16394,373~16458,373~16396,373~16428 +~ Eggs 383 383~50,383~51,383~52,383~54,383~55,383~56,383~57,383~58,383~59,383~60,383~61,383~62,383~90,383~91,383~92,383~93,383~94,383~95,383~96,383~98,383~120 """ diff --git a/items.txt b/items.txt index 6dfc5c6..64f3ba3 100644 --- a/items.txt +++ b/items.txt @@ -1,5 +1,5 @@ -:version 29 -:mc-version Minecraft 1.2 +:version 31 +:mc-version Minecraft 1.2.4 # Blocks # ID NAME FILE CORDS DAMAGE @@ -7,7 +7,10 @@ 2 Grass terrain.png 3,0 3 Dirt terrain.png 2,0 4 Cobblestone terrain.png 0,1 - 5 Wooden_Planks terrain.png 4,0 + 5 Wooden_Planks terrain.png 4,0 0 + 5 Dark_Wooden_Planks terrain.png 6,12 1 + 5 Birch_Wooden_Planks terrain.png 6,13 2 + 5 Jungle_Wooden_Planks terrain.png 7,12 3 6 Sapling terrain.png 15,0 0 6 Spruce_Sapling terrain.png 15,3 1 6 Birch_Sapling terrain.png 15,4 2 @@ -35,7 +38,9 @@ 21 Lapis_Lazuli_Ore terrain.png 0,10 22 Lapis_Lazuli_Block terrain.png 0,9 23 Dispenser terrain.png 14,2 - 24 Sandstone terrain.png 0,12 + 24 Sandstone terrain.png 0,12 0 + 24 Decorative_Sandstone terrain.png 5,14 1 + 24 Smooth_Sandstone terrain.png 6,14 2 25 Note_Block terrain.png 10,4 26 Bed_Block terrain.png 6,8 27 Powered_Rail terrain.png 3,10 @@ -136,6 +141,7 @@ 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 + 98 Circle_Stone_Bricks terrain.png 5,13 3 99 Brown_Mushroom_Block terrain.png 13,7 100 Red_Mushroom_Block terrain.png 14,7 101 Iron_Bars terrain.png 5,5 @@ -419,6 +425,7 @@ 383 Spawn_Squid special.png 1,12 94 383 Spawn_Wolf special.png 2,12 95 383 Spawn_Mooshroom special.png 3,12 96 + 383 Spawn_Ocelot special.png 5,12 98 383 Spawn_Villager special.png 4,12 120 # Groups @@ -449,4 +456,4 @@ ~ Music 2257 2256,2257,2258,2259,2260,2261,2262,2263,2264,2265,2266 # New ~ Potion 373 373~0,373~16,373~32,373~8192,373~8193,373~8257,373~8225,373~8289,373~8194,373~8258,373~8226,373~8290,373~8195,373~8259,373~8197,373~8229,373~8201,373~8265,373~8233,373~8297,373~8196,373~8260,373~8228,373~8292,373~8200,373~8264,373~8202,373~8266,373~8204,373~8236,373~16384,373~16385,373~16499,373~16417,373~16481,373~16386,373~16450,373~16418,373~16482,373~16387,373~16451,373~16389,373~16421,373~16393,373~16457,373~16425,373~16489,373~16388,373~16452,373~16420,373~16484,373~16392,373~16456,373~16394,373~16458,373~16396,373~16428 -~ Eggs 383 383~50,383~51,383~52,383~54,383~55,383~56,383~57,383~58,383~59,383~60,383~61,383~62,383~90,383~91,383~92,383~93,383~94,383~95,383~96,383~120 \ No newline at end of file +~ Eggs 383 383~50,383~51,383~52,383~54,383~55,383~56,383~57,383~58,383~59,383~60,383~61,383~62,383~90,383~91,383~92,383~93,383~94,383~95,383~96,383~98,383~120 \ No newline at end of file diff --git a/minecraft.yaml b/minecraft.yaml index 60f7c4e..04589df 100644 --- a/minecraft.yaml +++ b/minecraft.yaml @@ -306,6 +306,19 @@ blocks: name: Wood Planks mapcolor: [157, 128, 79] tex: [4, 0] + data: + 0: + name: Wood Planks + tex: [4, 0] + 1: + name: Wood Planks + tex: [6, 12] + 2: + name: Wood Planks + tex: [6, 13] + 3: + name: Wood Planks + tex: [7, 12] - id: 6 idStr: SAPLING @@ -324,6 +337,9 @@ blocks: 2: name: Birch Sapling tex: [15, 4] + 3: + name: Jungle Sapling + tex: [14, 1] - id: 7 idStr: BEDROCK @@ -413,6 +429,9 @@ blocks: 2: name: Birch Wood tex: [5, 7] + 3: + name: Jungle Wood + tex: [9, 9] - id: 18 idStr: LEAVES @@ -524,6 +543,27 @@ blocks: tex_direction: TOP: [0, 11] BOTTOM: [0, 13] + data: + 0: + name: Sandstone + mapcolor: [218, 210, 158] + tex: [0, 12] + 1: + name: Sandstone + aka: Decorative Sandstone + mapcolor: [218, 210, 158] + tex: [5, 14] + tex_direction: + TOP: [0, 11] + BOTTOM: [0, 11] + 2: + name: Sandstone + aka: Smooth Sandstone + mapcolor: [218, 210, 158] + tex: [6, 14] + tex_direction: + TOP: [0, 11] + BOTTOM: [0, 11] - id: 25 idStr: NOTE_BLOCK @@ -783,6 +823,9 @@ blocks: 5: tex: [6, 3] name: Double Stone Brick Slab + 6: + name: Double Smooth Stone Slab + tex: [6, 0] - id: 44 idStr: SLAB @@ -799,7 +842,6 @@ blocks: FORWARD: [5, 0] BACKWARD: [5, 0] SIDES: [5, 0] - name: Stone Slab 1: tex: [0, 12] @@ -1313,6 +1355,9 @@ blocks: 2: tex: [5, 6] name: Cracked Stone Bricks + 3: + tex: [5, 13] + name: Circle Stone Bricks - id: 99 idStr: HUGE_BROWN_MUSHROOM @@ -1514,4 +1559,24 @@ blocks: mapcolor: [235, 248, 182] tex: [15, 10] + - id: 122 + idStr: DRAGON_EGG + name: Dragon Egg + aka: Ender Dragon Egg + mapcolor: [45, 1, 51] + tex: [7, 10] + + - id: 123 + idStr: REDSTONE_LAMP_OFF + name: Redstone Lamp (off) + mapcolor: [156, 104, 54] + tex: [3, 13] + + - id: 124 + idStr: REDSTONE_LAMP_ON + name: Redstone Lamp (on) + mapcolor: [208, 152, 70] + tex: [4, 13] + brightness: 15 + ...