mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Prioritize ISidedInventory
This commit is contained in:
1 parent
ba3c37b6c3
commit
be6d3901bf
2 files changed
+65
-65
No files matched your search
@@ -21,11 +21,7 @@ public class StackSearcher
|
||||
tileEntity = tile;
|
||||
side = direction;
|
||||
|
||||
if(InventoryUtils.isItemHandler(tile, direction.getOpposite()))
|
||||
{
|
||||
i = InventoryUtils.getItemHandler(tile, direction.getOpposite()).getSlots();
|
||||
}
|
||||
else if(tile instanceof ISidedInventory)
|
||||
if(tile instanceof ISidedInventory)
|
||||
{
|
||||
slots = ((ISidedInventory)tile).getSlotsForFace(side.getOpposite());
|
||||
|
||||
@@ -38,25 +34,15 @@ public class StackSearcher
|
||||
{
|
||||
i = ((IInventory)tile).getSizeInventory();
|
||||
}
|
||||
else if(InventoryUtils.isItemHandler(tile, direction.getOpposite()))
|
||||
{
|
||||
i = InventoryUtils.getItemHandler(tile, direction.getOpposite()).getSlots();
|
||||
}
|
||||
}
|
||||
|
||||
public InvStack takeTopStack(Finder id)
|
||||
{
|
||||
if(InventoryUtils.isItemHandler(tileEntity, side.getOpposite()))
|
||||
{
|
||||
IItemHandler inventory = InventoryUtils.getItemHandler(tileEntity, side.getOpposite());
|
||||
|
||||
for(i = i - 1; i >= 0; i--)
|
||||
{
|
||||
ItemStack stack = inventory.extractItem(i, 64, true);
|
||||
|
||||
if(!stack.isEmpty() && id.modifies(stack))
|
||||
{
|
||||
return new InvStack(tileEntity, i, stack, side.getOpposite());
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(tileEntity instanceof ISidedInventory)
|
||||
if(tileEntity instanceof ISidedInventory)
|
||||
{
|
||||
ISidedInventory inventory = (ISidedInventory)tileEntity;
|
||||
|
||||
@@ -91,6 +77,20 @@ public class StackSearcher
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(InventoryUtils.isItemHandler(tileEntity, side.getOpposite()))
|
||||
{
|
||||
IItemHandler inventory = InventoryUtils.getItemHandler(tileEntity, side.getOpposite());
|
||||
|
||||
for(i = i - 1; i >= 0; i--)
|
||||
{
|
||||
ItemStack stack = inventory.extractItem(i, 64, true);
|
||||
|
||||
if(!stack.isEmpty() && id.modifies(stack))
|
||||
{
|
||||
return new InvStack(tileEntity, i, stack, side.getOpposite());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -99,36 +99,7 @@ public class StackSearcher
|
||||
{
|
||||
InvStack ret = new InvStack(tileEntity, side.getOpposite());
|
||||
|
||||
if(InventoryUtils.isItemHandler(tileEntity, side.getOpposite()))
|
||||
{
|
||||
IItemHandler inventory = InventoryUtils.getItemHandler(tileEntity, side.getOpposite());
|
||||
|
||||
for(i = i - 1; i >= 0; i--)
|
||||
{
|
||||
ItemStack stack = inventory.extractItem(i, max, true);
|
||||
|
||||
if(!stack.isEmpty() && StackUtils.equalsWildcard(stack, type))
|
||||
{
|
||||
int current = !ret.getStack().isEmpty() ? ret.getStack().getCount() : 0;
|
||||
|
||||
if(current+stack.getCount() <= max)
|
||||
{
|
||||
ret.appendStack(i, stack.copy());
|
||||
}
|
||||
else {
|
||||
ItemStack copy = stack.copy();
|
||||
copy.setCount(max-current);
|
||||
ret.appendStack(i, copy);
|
||||
}
|
||||
|
||||
if(!ret.getStack().isEmpty() && ret.getStack().getCount() == max)
|
||||
{
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(tileEntity instanceof ISidedInventory)
|
||||
if(tileEntity instanceof ISidedInventory)
|
||||
{
|
||||
ISidedInventory sidedInventory = (ISidedInventory)tileEntity;
|
||||
int[] slots = sidedInventory.getSlotsForFace(side.getOpposite());
|
||||
@@ -199,6 +170,35 @@ public class StackSearcher
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(InventoryUtils.isItemHandler(tileEntity, side.getOpposite()))
|
||||
{
|
||||
IItemHandler inventory = InventoryUtils.getItemHandler(tileEntity, side.getOpposite());
|
||||
|
||||
for(i = i - 1; i >= 0; i--)
|
||||
{
|
||||
ItemStack stack = inventory.extractItem(i, max, true);
|
||||
|
||||
if(!stack.isEmpty() && StackUtils.equalsWildcard(stack, type))
|
||||
{
|
||||
int current = !ret.getStack().isEmpty() ? ret.getStack().getCount() : 0;
|
||||
|
||||
if(current+stack.getCount() <= max)
|
||||
{
|
||||
ret.appendStack(i, stack.copy());
|
||||
}
|
||||
else {
|
||||
ItemStack copy = stack.copy();
|
||||
copy.setCount(max-current);
|
||||
ret.appendStack(i, copy);
|
||||
}
|
||||
|
||||
if(!ret.getStack().isEmpty() && ret.getStack().getCount() == max)
|
||||
{
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(ret != null && !ret.getStack().isEmpty() && ret.getStack().getCount() >= min)
|
||||
{
|
||||
|
||||
@@ -66,21 +66,7 @@ public class TransitRequest
|
||||
{
|
||||
TransitRequest ret = new TransitRequest();
|
||||
|
||||
if(InventoryUtils.isItemHandler(tile, side.getOpposite()))
|
||||
{
|
||||
IItemHandler inventory = InventoryUtils.getItemHandler(tile, side.getOpposite());
|
||||
|
||||
for(int i = inventory.getSlots() - 1; i >= 0; i--)
|
||||
{
|
||||
ItemStack stack = inventory.extractItem(i, amount, true);
|
||||
|
||||
if(!stack.isEmpty() && !ret.hasType(stack) && finder.modifies(stack))
|
||||
{
|
||||
ret.setItem(stack, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(tile instanceof ISidedInventory)
|
||||
if(tile instanceof ISidedInventory)
|
||||
{
|
||||
ISidedInventory sidedInventory = (ISidedInventory)tile;
|
||||
int[] slots = sidedInventory.getSlotsForFace(side.getOpposite());
|
||||
@@ -122,6 +108,20 @@ public class TransitRequest
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(InventoryUtils.isItemHandler(tile, side.getOpposite()))
|
||||
{
|
||||
IItemHandler inventory = InventoryUtils.getItemHandler(tile, side.getOpposite());
|
||||
|
||||
for(int i = inventory.getSlots() - 1; i >= 0; i--)
|
||||
{
|
||||
ItemStack stack = inventory.extractItem(i, amount, true);
|
||||
|
||||
if(!stack.isEmpty() && !ret.hasType(stack) && finder.modifies(stack))
|
||||
{
|
||||
ret.setItem(stack, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user