AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 04:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

made inventory driver callback names a little longer to reduce chance of name collisions

Browse Source
This commit is contained in:
Florian Nücke 2014-02-05 18:15:07 +01:00
parent acf3448363
commit 1df0015d49
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/li/cil/oc/driver/vanilla/DriverInventory.java
View File

@ -35,12 +35,17 @@ public final class DriverInventory implements li.cil.oc.api.driver.Block {
} }
@Callback @Callback
public Object[] getCapacity(final Context context, final Arguments args) { public Object[] getInventoryName(final Context context, final Arguments args) {
return new Object[]{tileEntity.getInvName()};
}
@Callback
public Object[] getInventorySize(final Context context, final Arguments args) {
return new Object[]{tileEntity.getSizeInventory()}; return new Object[]{tileEntity.getSizeInventory()};
} }
@Callback @Callback
public Object[] getSlotCount(final Context context, final Arguments args) { public Object[] getSlotStackSize(final Context context, final Arguments args) {
final int slot = checkSlot(args, 0); final int slot = checkSlot(args, 0);
final ItemStack stack = tileEntity.getStackInSlot(slot); final ItemStack stack = tileEntity.getStackInSlot(slot);
if (stack != null) { if (stack != null) {
@ -51,19 +56,18 @@ public final class DriverInventory implements li.cil.oc.api.driver.Block {
} }
@Callback @Callback
public Object[] getSlotSpace(final Context context, final Arguments args) { public Object[] getSlotMaxStackSize(final Context context, final Arguments args) {
final int slot = checkSlot(args, 0); final int slot = checkSlot(args, 0);
final ItemStack stack = tileEntity.getStackInSlot(slot); final ItemStack stack = tileEntity.getStackInSlot(slot);
if (stack != null) { if (stack != null) {
final int maxStack = Math.min(tileEntity.getInventoryStackLimit(), stack.getMaxStackSize()); return new Object[]{Math.min(tileEntity.getInventoryStackLimit(), stack.getMaxStackSize())};
return new Object[]{maxStack - stack.stackSize};
} else { } else {
return new Object[]{tileEntity.getInventoryStackLimit()}; return new Object[]{tileEntity.getInventoryStackLimit()};
} }
} }
@Callback @Callback
public Object[] compare(final Context context, final Arguments args) { public Object[] compareStacks(final Context context, final Arguments args) {
final int slotA = checkSlot(args, 0); final int slotA = checkSlot(args, 0);
final int slotB = checkSlot(args, 1); final int slotB = checkSlot(args, 1);
if (slotA == slotB) { if (slotA == slotB) {
@ -81,7 +85,7 @@ public final class DriverInventory implements li.cil.oc.api.driver.Block {
} }
@Callback @Callback
public Object[] transfer(final Context context, final Arguments args) { public Object[] transferStack(final Context context, final Arguments args) {
final int slotA = checkSlot(args, 0); final int slotA = checkSlot(args, 0);
final int slotB = checkSlot(args, 1); final int slotB = checkSlot(args, 1);
final int count = Math.max(0, Math.min(args.count() > 2 && args.checkAny(2) != null ? args.checkInteger(2) : 64, tileEntity.getInventoryStackLimit())); final int count = Math.max(0, Math.min(args.count() > 2 && args.checkAny(2) != null ? args.checkInteger(2) : 64, tileEntity.getInventoryStackLimit()));