diff --git a/.gitignore b/.gitignore index 63b3dfe..1c69543 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,34 @@ -build +# Mac OS X Finder and whatnot +.DS_Store + +# Sparkle distribution Private Key (Don't check me in!) +dsa_priv.pem + +# XCode (and ancestors) per-user config (very noisy, and not relevant) +*.mode1 +*.mode1v3 +*.mode2v3 +*.perspective *.perspectivev3 *.pbxuser -tmp \ No newline at end of file + +# Generated files +VersionX-revision.h + +# build products +build/ +*.[oa] + +# Other source repository archive directories (protects when importing) +.hg +.svn +CVS + +# automatic backup files +*~.nib +*.swp +*~ +*(Autosaved).rtfd/ +Backup[ ]of[ ]*.pages/ +Backup[ ]of[ ]*.key/ +Backup[ ]of[ ]*.numbers/ \ No newline at end of file diff --git a/Classes/IJInventoryItem.m b/Classes/IJInventoryItem.m index d6cf9d0..d0dda82 100644 --- a/Classes/IJInventoryItem.m +++ b/Classes/IJInventoryItem.m @@ -65,7 +65,7 @@ int index = 0; - if (itemId <= 85) + if (itemId <= 91) { if (itemId <= 20) index = itemId - 1; // first item is 1 @@ -75,7 +75,7 @@ index = itemId - (37 - 21); atlasOffset = NSMakePoint(36, 75); } - else if (itemId >= 256 && itemId <= 346) + else if (itemId >= 256 && itemId <= 350) { index = itemId - 256; atlasOffset = NSMakePoint(445, 23+52); @@ -83,25 +83,25 @@ else if (itemId == 2256) { index = 0; - atlasOffset = NSMakePoint(445+pixelsPerColumn + 4, 23+52 + 10 * pixelsPerRow); + atlasOffset = NSMakePoint(445+pixelsPerColumn + 147, 23+52 + 10 * pixelsPerRow); } else if (itemId == 2257) { index = 0; - atlasOffset = NSMakePoint(445+pixelsPerColumn + 49, 23+52 + 10 * pixelsPerRow); + atlasOffset = NSMakePoint(445+pixelsPerColumn + 192, 23+52 + 10 * pixelsPerRow); } else { NSLog(@"%s error: unrecognized item id %d", __PRETTY_FUNCTION__, itemId); return nil; } - + atlasOffset.x += pixelsPerColumn * (index % itemsPerRow); atlasOffset.y += pixelsPerRow * (index / itemsPerRow); NSRect atlasRect = NSMakeRect(atlasOffset.x, atlasOffset.y, itemImageSize.width, itemImageSize.height); - + NSImage *atlas = [NSImage imageNamed:@"DataValuesV110Transparent.png"]; NSImage *output = [[NSImage alloc] initWithSize:itemImageSize]; diff --git a/Images/DataValuesV110.png b/Images/DataValuesV110.png index 987e395..ce414b6 100644 Binary files a/Images/DataValuesV110.png and b/Images/DataValuesV110.png differ diff --git a/Images/DataValuesV110Transparent.png b/Images/DataValuesV110Transparent.png index a6e53b6..3f17d1a 100644 Binary files a/Images/DataValuesV110Transparent.png and b/Images/DataValuesV110Transparent.png differ diff --git a/Items.csv b/Items.csv index f61582a..1381f9f 100644 --- a/Items.csv +++ b/Items.csv @@ -68,6 +68,12 @@ 83,Reed 84,Jukebox 85,Fence +86,Pumpkin +87,Hellstone +88,Slow Sand +89,Lightstone Ore +90,Portal +91,Jack-O-Lantern 256,Iron Spade 257,Iron Pickaxe 258,Iron Axe @@ -159,5 +165,9 @@ 344,Egg 345,Compass 346,Fishing Rod +347,Watch +348,Lightstone Dust +349,Raw Fish +350,Cooked Fish 2256,Gold Record -2257,Green Record +2257,Green Record \ No newline at end of file