diff --git a/Classes/IJInventoryItem.m b/Classes/IJInventoryItem.m index 9966ea3..524feb4 100644 --- a/Classes/IJInventoryItem.m +++ b/Classes/IJInventoryItem.m @@ -65,17 +65,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); @@ -83,12 +83,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 d33b1b3..4882e68 100644 --- a/Items.csv +++ b/Items.csv @@ -23,17 +23,7 @@ 23,Dispenser 24,Sandstone 25,Note Block -26,Green-Blue Wool Block -27,Blue-Green Wool Block -28,Blue Wool Block -29,Purple Wool Block -30,Indigo Wool Block -31,Violet Wool Block -32,Magenta Wool Block -33,Pink Wool Block -34,Black Wool Block -35,White Cloth -36,White Wool Block +35,Wool 37,Yellow Flower 38,Red Rose 39,Brown Mushroom @@ -84,12 +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) +92,Cake Block 256,Iron Spade 257,Iron Pickaxe 258,Iron Axe @@ -172,7 +162,6 @@ 335,Milk Bucket 336,Clay Brick 337,Clay Balls -338,Reed 338,Sugar Cane 339,Paper 340,Book @@ -183,7 +172,7 @@ 345,Compass 346,Fishing Rod 347,Watch -348,Lightstone Dust +348,Glowstone Dust 349,Raw Fish 350,Cooked Fish 351,Ink Sack