Skip to content

Commit

Permalink
1.2 item changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
preble committed Feb 25, 2011
1 parent 67958f5 commit 32a8259
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 24 deletions.
14 changes: 7 additions & 7 deletions Classes/IJInventoryItem.m
Expand Up @@ -65,30 +65,30 @@ + (NSImage *)imageForItemId:(uint16_t)itemId

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);
}
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
{
Expand Down
Binary file modified Images/DataValuesV110.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Images/DataValuesV110Transparent.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 6 additions & 17 deletions Items.csv
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -172,7 +162,6 @@
335,Milk Bucket
336,Clay Brick
337,Clay Balls
338,Reed
338,Sugar Cane
339,Paper
340,Book
Expand All @@ -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
Expand Down

0 comments on commit 32a8259

Please sign in to comment.