Various minor improvements prepping for release.
This commit is contained in:
parent
c7f86950f7
commit
e3e071a157
10
Credits.rtf
10
Credits.rtf
@ -7,4 +7,12 @@
|
||||
\f0\fs20 \cf0 A Minecraft Inventory Editor\
|
||||
\
|
||||
{\field{\*\fldinst{HYPERLINK "http://adampreble.net"}}{\fldrslt http://adampreble.net}}\
|
||||
{\field{\*\fldinst{HYPERLINK "http://github.com/preble/InsideJob"}}{\fldrslt http://github.com/preble/InsideJob}}}
|
||||
{\field{\*\fldinst{HYPERLINK "http://github.com/preble/InsideJob"}}{\fldrslt http://github.com/preble/InsideJob}}\
|
||||
\
|
||||
{\field{\*\fldinst{HYPERLINK "http://www.minecraftwiki.net/wiki/File:DataValuesV110.png"}}{\fldrslt Item Images}}\
|
||||
Copyright Mojang Specifications\
|
||||
Compiled by Trojam\
|
||||
and the Minecraft Community\
|
||||
\
|
||||
Uses MAAttachedWindow\
|
||||
by {\field{\*\fldinst{HYPERLINK "http://mattgemmell.com/"}}{\fldrslt Matt Gemmell}}}
|
||||
File diff suppressed because it is too large
Load Diff
@ -319,6 +319,12 @@ const static CGFloat cellOffset = 40;
|
||||
NSData *itemData = [[sender draggingPasteboard] dataForType:IJPasteboardTypeInventoryItem];
|
||||
IJInventoryItem *item = [NSKeyedUnarchiver unarchiveObjectWithData:itemData];
|
||||
|
||||
IJInventoryItem *existingItem = [items objectAtIndex:index];
|
||||
|
||||
if (existingItem.itemId == item.itemId)
|
||||
{
|
||||
item.count = MIN(64, item.count + existingItem.count);
|
||||
}
|
||||
[delegate inventoryView:self setItem:item atIndex:index];
|
||||
return YES;
|
||||
}
|
||||
|
||||
@ -55,6 +55,7 @@
|
||||
|
||||
@property (nonatomic, retain) NSNumber *worldTime;
|
||||
|
||||
- (IBAction)menuSelectWorld:(id)sender;
|
||||
- (IBAction)worldSelectionChanged:(id)sender;
|
||||
- (IBAction)updateItemSearchFilter:(id)sender;
|
||||
- (IBAction)makeSearchFieldFirstResponder:(id)sender;
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#import "MAAttachedWindow.h"
|
||||
|
||||
@interface IJInventoryWindowController ()
|
||||
- (void)removePropertiesWindow;
|
||||
@end
|
||||
|
||||
@implementation IJInventoryWindowController
|
||||
@ -200,6 +199,13 @@
|
||||
#pragma mark -
|
||||
#pragma mark Actions
|
||||
|
||||
- (IBAction)menuSelectWorld:(id)sender
|
||||
{
|
||||
int worldIndex = [sender tag];
|
||||
[self loadWorldAtIndex:worldIndex];
|
||||
[worldSelectionControl setSelectedSegment:worldIndex - 1];
|
||||
}
|
||||
|
||||
- (IBAction)worldSelectionChanged:(id)sender
|
||||
{
|
||||
int worldIndex = [worldSelectionControl selectedSegment] + 1;
|
||||
@ -301,8 +307,6 @@
|
||||
// Show the properties window for this item.
|
||||
IJInventoryItem *lastItem = propertiesViewController.item;
|
||||
|
||||
//[self removePropertiesWindow];
|
||||
|
||||
NSPoint itemLocationInView = [theInventoryView pointForItemAtIndex:itemIndex];
|
||||
NSPoint point = [theInventoryView convertPoint:itemLocationInView toView:nil];
|
||||
point.x += 16 + 8;
|
||||
@ -435,35 +439,11 @@
|
||||
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark
|
||||
#pragma mark NSWindowDelegate
|
||||
|
||||
- (void)reloadInventoryViewForItem:(IJInventoryItem *)item
|
||||
- (void)windowWillClose:(NSNotification *)notification
|
||||
{
|
||||
if ([normalInventory containsObject:item])
|
||||
[inventoryView reloadItemAtIndex:[normalInventory indexOfObject:item]];
|
||||
else if ([quickInventory containsObject:item])
|
||||
[quickView reloadItemAtIndex:[quickInventory indexOfObject:item]];
|
||||
else if ([armorInventory containsObject:item])
|
||||
[armorView reloadItemAtIndex:[armorInventory indexOfObject:item]];
|
||||
[NSApp terminate:nil];
|
||||
}
|
||||
|
||||
- (void)removePropertiesWindow
|
||||
{
|
||||
if (observerObject)
|
||||
{
|
||||
[propertiesViewController commitEditing];
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:observerObject];
|
||||
observerObject = nil;
|
||||
|
||||
[self reloadInventoryViewForItem:propertiesViewController.item];
|
||||
|
||||
[self.window removeChildWindow:propertiesWindow];
|
||||
[propertiesWindow orderOut:nil];
|
||||
//[propertiesWindow release];
|
||||
propertiesWindow = nil;
|
||||
propertiesViewController.item = nil;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.1</string>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user