mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-19 11:59:17 +00:00
Cleaned and generalised item loading/searching
Reimplemented subsets Added regex searching Fixed format error on delete all Fixed GuiButton handling clicks before NEI widgets could override Re-Implemented banned blocks implementation Added brewing recipes again note test obf ASM beacons Fixed some calls being intercepted by item panel when mouse was over a gui element Fixed crash on closing potion window with escape Disabled fast transfer, scrolling, and drag 'n' drop in creative Added item panel sorting Removed TMI uninstaller Fixed /give command Updated to 1.7.10
This commit is contained in:
1 parent
3c9ebc6961
commit
3c84527806
67 files changed
+3251
-2319
No files matched your search
@@ -94,7 +94,7 @@ public class FastTransferManager
|
||||
Integer fromZone = slotZoneMap.get(fromSlot);
|
||||
Integer toZone = slotZoneMap.get(toSlot);
|
||||
|
||||
if (fromZone == null || toZone == null || fromZone == toZone)
|
||||
if (fromZone == null || toZone == null || fromZone.equals(toZone))
|
||||
return;
|
||||
|
||||
if (NEIClientUtils.getHeldItem() != null && !areStacksSameType(heldStack, NEIClientUtils.getHeldItem()))
|
||||
@@ -146,13 +146,10 @@ public class FastTransferManager
|
||||
ItemStack before = compareBefore.get(i);
|
||||
ItemStack after = compareAfter.get(i);
|
||||
|
||||
if (!areStacksIdentical(before, after) && after != null) {
|
||||
if ((before == null && areStacksSameType(stack, after)) ||//transfered into this empty slot
|
||||
(areStacksSameType(stack, after) &&
|
||||
after.stackSize -
|
||||
before.stackSize > 0))//it added to this stack
|
||||
if (!areStacksIdentical(before, after) && after != null)
|
||||
if (before == null ? areStacksSameType(stack, after) ://transfered into this empty slot
|
||||
areStacksSameType(stack, after) && after.stackSize - before.stackSize > 0)//it added to this stack
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
|
||||
Reference in new issue
Block a user