diff --git a/Classes/IJInventoryItem.m b/Classes/IJInventoryItem.m index 98ea1ac..a944bf2 100644 --- a/Classes/IJInventoryItem.m +++ b/Classes/IJInventoryItem.m @@ -67,17 +67,17 @@ int index = 0; - if (itemId <= 91) + if (itemId <= 92) { - if (itemId <= 20) + if (itemId <= 25) index = itemId - 1; // first item is 1 else if (itemId == 35) - index = itemId - (35 - 20); + index = itemId - (35 - 25); else if (itemId >= 37) - index = itemId - (37 - 21); + index = itemId - (37 - 26); atlasOffset = NSMakePoint(36, 75); } - else if (itemId >= 256 && itemId <= 350) + else if (itemId >= 256 && itemId <= 355) { index = itemId - 256; atlasOffset = NSMakePoint(445, 23+52); @@ -85,12 +85,12 @@ else if (itemId == 2256) { index = 0; - atlasOffset = NSMakePoint(445+pixelsPerColumn + 147, 23+52 + 10 * pixelsPerRow); + atlasOffset = NSMakePoint(445, pixelsPerRow*12+17); } else if (itemId == 2257) { index = 0; - atlasOffset = NSMakePoint(445+pixelsPerColumn + 192, 23+52 + 10 * pixelsPerRow); + atlasOffset = NSMakePoint(445+pixelsPerColumn, pixelsPerRow*12+17); } else { diff --git a/Images/DataValuesV110.png b/Images/DataValuesV110.png index ce414b6..d2965b2 100644 Binary files a/Images/DataValuesV110.png and b/Images/DataValuesV110.png differ diff --git a/Images/DataValuesV110Transparent.png b/Images/DataValuesV110Transparent.png index 07895f1..1ff1fa8 100644 Binary files a/Images/DataValuesV110Transparent.png and b/Images/DataValuesV110Transparent.png differ diff --git a/Items.csv b/Items.csv index 8684a82..f4d1df3 100644 --- a/Items.csv +++ b/Items.csv @@ -18,7 +18,12 @@ 18,Leaves 19,Sponge 20,Glass -35,White Cloth +21,Lapis Lazuli Ore +22,Lapis Lazuli Block +23,Dispenser +24,Sandstone +25,Note Block +35,Wool 37,Yellow Flower 38,Red Rose 39,Brown Mushroom @@ -69,11 +74,12 @@ 84,Jukebox 85,Fence 86,Pumpkin -87,Hellstone -88,Slow Sand -89,Lightstone Ore +87,Netherrack +88,Soul Sand +89,Glowstone 90,Portal 91,Jack-O-Lantern +92,Cake Block 256,Iron Spade 257,Iron Pickaxe 258,Iron Axe @@ -156,7 +162,7 @@ 335,Milk Bucket 336,Clay Brick 337,Clay Balls -338,Reed +338,Sugar Cane 339,Paper 340,Book 341,Slime Ball @@ -166,8 +172,30 @@ 345,Compass 346,Fishing Rod 347,Watch -348,Lightstone Dust +348,Glowstone Dust 349,Raw Fish 350,Cooked Fish +#Dye +#351,Ink sack,0 +#351,Rose Red,1 +#351,Cactus Green,2 +#351,Brown,3 +#351,Lapis Lazuli Dye,4 +#351,Purple Dye,5 +#351,Cyan Dye,6 +#351,Light Gray Dye,7 +#351,Gray Dye,8 +#351,Pink Dye,9 +#351,Lime Dye,10 +#351,Dandelion Yellow Dye,11 +#351,Light Blue Dye,12 +#351,Magenta Dye,13 +#351,Orange Dye,14 +#351,Bone Meal,15 +351,Dye +#Dye End +352,Bone +353,Sugar +354,Cake 2256,Gold Record 2257,Green Record \ No newline at end of file